提交

1 year ago · dd8efdb9e4
parent 878bd7667a
commit dd8efdb9e4
6 changed files with 68 additions and 46 deletions
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@ -1,38 +1,35 @@
 {
-  "version": "1.0.8",  
-  "prompt": "template",
-  "title": "服务协议和隐私政策",
-  "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
-  "buttonAccept": "同意并接受",
-  "buttonRefuse": "暂不同意",
-  "hrefLoader": "system|default",
-  "backToExit":"false",
-  "second": {
-    "title": "确认提示",
-    "message": "　　进入应用前，你需先同意<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>，否则将退出应用。",
-    "buttonAccept": "同意并继续",
-    "buttonRefuse": "退出应用"
-  },
-  "disagreeMode":{
-    "support": false,
-    "loadNativePlugins": false,
-    "visitorEntry": true,
-    "showAlways": false 
-  },
-  "styles": {
-    "backgroundColor": "#ffffff",
-    "borderRadius":"5px",
-    "title": {
-      "color": "#333"
+    "version" : "1.0.8",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "system|default",
+    "backToExit" : "false",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "　　进入应用前，你需先同意<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
    },
-    "buttonAccept": {
-      "color": "#08BF77"
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : false,
+        "visitorEntry" : false,
+        "showAlways" : false
    },
-    "buttonRefuse": {
-      "color": "#333333"
+    "styles" : {
+        "backgroundColor" : "#ffffff",
+        "borderRadius" : "5px",
+        "title" : {
+            "color" : "#333"
+        },
+        "buttonAccept" : {
+            "color" : "#08BF77"
+        },
+        "buttonRefuse" : {
+            "color" : "#333333"
+        }
    }
-    // "buttonVisitor": {
-    //   "color": "#00ffff"
-    // }
-  }
-}
+}
--- a/components/shopro-auth-modal/shopro-auth-modal.vue
+++ b/components/shopro-auth-modal/shopro-auth-modal.vue
@ -284,11 +284,11 @@
 			<view v-if="authType === 'accountLogin' || authType === 'smsLogin'"
 				class="auto-login-box u-flex u-row-center u-col-center">
 				<!-- 微信 -->
-				<button v-if="['App', 'wxOfficialAccount', 'wxMiniProgram'].includes(platform)" class="u-reset-button"
+				<!-- <button v-if="['App', 'wxOfficialAccount', 'wxMiniProgram'].includes(platform)" class="u-reset-button"
 					open-type="getPhoneNumber" @getphonenumber="thirdLogin('wechat', $event)"
 					@tap="thirdLogin('wechat')">
 					<image class="auto-login-img" :src="$IMG_URL + '/imgs/auto_login_wx.png'"></image>
-				</button>
+				</button> -->
 				<!-- 支付宝 -->
 				<!-- <image
 					v-if="['App', 'alipayMiniProgram', 'H5'].includes(platform)"
--- a/manifest.json
+++ b/manifest.json
@ -2,8 +2,8 @@
    "name" : "蓝鲸鲜森",
    "appid" : "__UNI__EDA2611",
    "description" : "蓝鲸鲜森",
-    "versionName" : "1.8.0",
-    "versionCode" : 180,
+    "versionName" : "2.0.1",
+    "versionCode" : 201,
    "transformPx" : false,
    "app-plus" : {
        "optimization" : {
@ -31,7 +31,8 @@
            "OAuth" : {},
            "Payment" : {},
            "Share" : {},
-            "VideoPlayer" : {}
+            "VideoPlayer" : {},
+            "Camera" : {}
        },
        "distribute" : {
            "android" : {
@ -97,13 +98,13 @@
                    "amap" : {
                        "__platform__" : [ "android" ],
                        "appkey_ios" : "949f************8632de010206494",
-                        "appkey_android" : "0d51************bf2bcbe264dac409"
+                        "appkey_android" : "027e12264cd8b0d30a837a92c771c143"
                    }
                },
                "maps" : {
                    "amap" : {
                        "appkey_ios" : "949f************d8632de010206494",
-                        "appkey_android" : "0d51************bf2bcbe264dac409"
+                        "appkey_android" : "027e12264cd8b0d30a837a92c771c143"
                    }
                },
                "oauth" : {
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -17,6 +17,7 @@
 				v-if="headSwiperList && headSwiperList.length"
 				:scrollTop="scrollTop"
 				borderRadius="0"
+				@setLocation="getLocation"
 				:storeInfo ='storeInfo'
 				:locationInfo="locationInfo"
 				:navTitle="storeInfo.name"
@ -215,7 +216,7 @@ export default {
 			this.showNoticeModal = false;
 		}
 		// #endif
-		this.getLocation();
+		// this.getLocation();
 		if(o && o.spm) {
 			this.spm = o.spm	
 		}
--- a/pages/index/index/home-head.vue
+++ b/pages/index/index/home-head.vue
@ -8,20 +8,23 @@
 			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
 				<view class="home_title" :style="[navTitleStyle, navTitleColor]">首页</view>
 				<view class="u-navbar-inner">
-					<view class="u-back-wrap" @tap="
+					<view class="u-back-wrap">
+						<view class="u-back-text u-line-1" :style="[navTitleStyle, navTitleColor]" @tap="
 						  jump('/pages/order/express/store-address2', {
 							lat: locationInfo.latitude,
 							lng: locationInfo.longitude,
 							storeId: storeInfo ? storeInfo.id : 0,
 						  })
 						">
-						<view class="u-back-text u-line-1" :style="[navTitleStyle, navTitleColor]">
 							<view style="display: flex;align-items: center;">
 								<u-icon name="map-fill" size="33" :color="navTitleColor.color"></u-icon>
 								<view style="font-size: 36rpx;margin-left:16rpx;">{{ navTitle || '' }}</view>
 							</view>
 							<!-- <view style="font-size: 26rpx;margin-top:18rpx;margin-left: 50rpx;">距离您{{distance}}</view> -->
 						</view>
+						<view class="dingwei"  @tap="setLocation">
+							定位
+						</view>
 					</view>
 					<!-- <view
 						hover-class="hover-search"
@ -99,7 +102,7 @@ export default {
 		},
 		navTitle: {
 			type: String,
-			default: '焦福记'
+			default: '蓝鲸鲜森'
 		},
 		distance: {
 			type: String,
@ -175,6 +178,17 @@ export default {
 		this.navBgImage = this.list[0].image;
 	},
 	methods: {
+		setLocation(){
+			if(JSON.stringify(this.locationInfo)=="{}"){
+				this.$emit("setLocation")
+			}else{
+				this.jump('/pages/order/express/store-address2', {
+					lat: this.locationInfo.latitude,
+					lng: this.locationInfo.longitude,
+					storeId: this.storeInfo ? this.storeInfo.id : 0,
+				})
+			}
+		},
 		jump(path, parmas) {
 		  this.$Router.push({
 			path: path,
@ -337,4 +351,13 @@ export default {
 		align-items: center;
 	}
 }
+.dingwei{
+	// background-color: rgba(23,193,97,0.5);
+	background-color: rgba(255, 255, 255, 0.6);
+	border-radius:20rpx;
+	font-size:22rpx;
+	padding: 3rpx 10rpx;
+	color:#ffffff;
+	margin-left:20rpx;
+}
 </style>
--- a/pages/user/set.vue
+++ b/pages/user/set.vue
@ -6,7 +6,7 @@
      class="logo-box u-flex-col u-row-center u-col-center"
      v-if="initShop.name"
    >
-      <image class="logo-img" :src="initShop.logo" mode="aspectFit"></image>
+      <!-- <image class="logo-img" :src="initShop.logo" mode="aspectFit"></image> -->
      <view class="app-name u-m-t-50">{{ initShop.name }}</view>
    </view>