Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

pages/login/index.vue

@@ -43,7 +43,8 @@
 		</view>
 		<view class="foot">
 			<view class="u-flex u-row-center u-col-center">
-				<u-divider color="#0095FF" border-color="#0095FF" bg-color="#F4F4F4" fontSize="30" @click="switchLang">{{$t("login.Lan")}}</u-divider>
+				<!-- <u-divider color="#0095FF" border-color="#0095FF" bg-color="#F4F4F4" fontSize="30" @click="switchLang">{{$t("login.Lan")}}</u-divider> -->
+				<u-divider color="#0095FF" border-color="#0095FF" bg-color="#F4F4F4" fontSize="30">赛轮集团</u-divider>
 			</view>
 		</view>
 	</view>

pages/login/register_3.vue

@@ -104,10 +104,21 @@
 				</view>
 			</u-card>
 			<u-form-item :border-bottom="false">
-				<view style="margin:0 30rpx;">
+				<view style="margin:0 30rpx;" class="u-flex">
 					<u-checkbox-group>
-						<u-checkbox v-model="protocol">同意《用户协议》及《隐私政策》</u-checkbox>
+						<u-checkbox v-model="protocol">
+						</u-checkbox>
 					</u-checkbox-group>
+					<view class="u-flex">
+						同意
+						<view class="" @click="openPdf(xy)">
+							《用户协议》
+						</view>
+						及
+						<view class="" @click="openPdf(zc)">
+							《隐私政策》
+						</view>
+					</view>
 				</view>
 			</u-form-item>
 		</u-form>
@@ -164,6 +175,24 @@
 			this.getTasknum()
 		},
 		methods: {
+			openPdf(x) {
+				if(x=='xy'){
+					uni.openDocument({
+						filePath: '../../static/pdf/xy.pdf',
+						success: function(res) {
+							console.log('打开文档成功');
+						}
+					});
+				}else{
+					uni.openDocument({
+						filePath: '../../static/pdf/zc.pdf',
+						success: function(res) {
+							console.log('打开文档成功');
+						}
+					});
+				}
+				
+			},
 			getAgentArea() {
 				uni.showLoading({
 					title: '加载中...'

pages/me/index.vue

@@ -172,6 +172,9 @@
 					<u-cell-item title="经销商库存" @click="inPage(10)">
 						<u-icon slot="icon" size="42" name="points" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>
+					<u-cell-item v-if="this.$store.state.storeInfo.sourceFlag==1" title="修改地理位置" @click="inPage(12)">
+						<u-icon slot="icon" size="42" name="points" custom-prefix="van-icon"></u-icon>
+					</u-cell-item>
 					<u-cell-item title="设置" @click="inPage(11)">
 						<u-icon slot="icon" size="42" name="setting-o" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>

pages/msg/index.vue

@@ -9,7 +9,7 @@
         >
           <image
             mode="aspectFill"
-            src="https://cdn.uviewui.com/uview/common/logo.png"
+            src="../../static/sailun/xiaoxi.png"
           />
           <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
           <view class="title-wrap">
@@ -149,15 +149,7 @@ export default {
     // 如果打开一个的时候，不需要关闭其他，则无需实现本方法
     open(index) {
       console.log(index);
-      // console.log(this.orderList[index].show)
-      // 先将正在被操作的swipeAction标记为打开状态，否则由于props的特性限制，
-      // 原本为'false'，再次设置为'false'会无效
-      // this.orderList[index].show = true;
       console.log(this.orderList[index].show);
-      // this.orderList.map((val, idx) => {
-      // 	console.log(index)
-      // 	console.log(idx)
-      // if (index != idx) this.orderList[index].show = false;
       this.orderList[index].show = true;
       this.orderList.map((val, idx) => {
         if (index != idx) this.orderList[idx].show = false;