Bladeren bron

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/qhsxKx-mini-html into deploy

lilei 4 jaren geleden
bovenliggende
commit
a08a716e5b
3 gewijzigde bestanden met toevoegingen van 7 en 15 verwijderingen
  1. 3 11
      pages/index/index.vue
  2. 2 2
      pages/order/orderDetail.vue
  3. 2 2
      pages/store/storeDetail.vue

+ 3 - 11
pages/index/index.vue

@@ -210,11 +210,7 @@
 						uni.navigateTo({
 						    url: '/pages/userCenter/index'
 						})
-					} else {
-						uni.navigateTo({
-						  url: `/pages/login/login?lanuch=false&path=` + encodeURIComponent(`/pages/userCenter/index`)
-						});
-					}
+					} 
 				})
 			},
 			// 打开网点列表
@@ -227,14 +223,10 @@
 			openPop() {
 				 let _this = this
 				 uni.showActionSheet({
-				     itemList: ['在线客服', '电话客服'],
+				     itemList: ['电话客服'],
 				     success: function (res) {
-						 //在线客服
-						 if(res.tapIndex == 1){
-						   _this.callPhone()
-						 }
 				         //电话客服
-						 if(res.tapIndex == 1){
+						 if(res.tapIndex == 0){
 							 _this.callPhone()
 						 }
 				     },

+ 2 - 2
pages/order/orderDetail.vue

@@ -36,9 +36,9 @@
 		</u-cell-group>
 		<view class="order-photo">
 			<view>洗车前</view>
-			<u-image width="100%" height="400rpx" :src="item.beginImage"></u-image>
+			<u-image width="100%" height="400rpx" :src="orderInfo.beginImage"></u-image>
 			<view>洗车后</view>
-			<u-image width="100%" height="400rpx" :src="item.endImage"></u-image>
+			<u-image width="100%" height="400rpx" :src="orderInfo.endImage"></u-image>
 		</view>
 	</view>
 </template>

+ 2 - 2
pages/store/storeDetail.vue

@@ -173,8 +173,8 @@
 				uni.getLocation({
 				    type: 'gcj02', //返回可以用于uni.openLocation的经纬度
 				    success: function (res) {
-				        const latitude = res.latitude;
-				        const longitude = res.longitude;
+				        const latitude = data.lat;
+				        const longitude = data.lng;
 						uni.openLocation({
 							latitude: latitude,
 							longitude: longitude,