Browse Source

Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

ccj 2 years ago
parent
commit
e855b652cf
3 changed files with 12 additions and 13 deletions
  1. 9 10
      App.vue
  2. 2 2
      pages/goodSource/shippingDetails.vue
  3. 1 1
      pages/public/login.vue

+ 9 - 10
App.vue

@@ -503,18 +503,17 @@
 		},
 		onShow: function() {
 			console.log('App Show')
-		
 			// #ifdef APP-PLUS
-			var isContains = true;//隐私权政策是否包含高德开平隐私权政策  true是包含
-			var isShow = true;//隐私权政策是否弹窗展示告知用户 true是展示 
-			sdkwx.updatePrivacyShow(isContains, isShow);
+			// var isContains = true;//隐私权政策是否包含高德开平隐私权政策  true是包含
+			// var isShow = true;//隐私权政策是否弹窗展示告知用户 true是展示 
+			// sdkwx.updatePrivacyShow(isContains, isShow);
 			
-			var isAgree = true;//隐私权政策是否取得用户同意  true是用户同意
-			sdkwx.updatePrivacyAgree(isAgree);
-			//检查定位权限
-			sdkwx.checkLocationPermission(function(res){
-				console.log(res);
-			});
+			// var isAgree = true;//隐私权政策是否取得用户同意  true是用户同意
+			// sdkwx.updatePrivacyAgree(isAgree);
+			// //检查定位权限
+			// sdkwx.checkLocationPermission(function(res){
+			// 	console.log(res);
+			// });
 			getCurrentNo(res => {
 				// 进页面获取当前APP版本号(用于页面显示)
 				this.version = res.versionName;

+ 2 - 2
pages/goodSource/shippingDetails.vue

@@ -15,8 +15,8 @@
 				<u-icon name="home" size="20"></u-icon> -->
 			</view>
 			<view class="u-nav-slot nav-right" slot="right">
-				<text class="case-style" @click="rightClick">已关注</text>
-				<image src="../../static/fenxiang.png" mode="widthFix" style="width: 40rpx;" @click="share"></image>
+				<!-- <text class="case-style" @click="rightClick">已关注</text>
+				<image src="../../static/fenxiang.png" mode="widthFix" style="width: 40rpx;" @click="share"></image> -->
 			</view>
 		</u-navbar>
 		<view class="top-bgc"></view>

+ 1 - 1
pages/public/login.vue

@@ -3,7 +3,7 @@
 		<u-icon class="back-btn" name="arrow-left" color="black" size="20" @click="navBack"></u-icon>
 		<view class="wrapper">
 			<image style='width:38px;height:38px;margin:223rpx 0 20px 0;' src='@/static/logo.png'></image>
-			<h2 class="title Semibold">欢迎使用畅运通司机端</h2>
+			<h2 class="title Semibold">欢迎使用畅运通</h2>
 			<view
 				style='position:relative;width:93%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;align-items: center;'
 				class="flex">