bug修改

pages/index/confirmRescue.vue

@@ -159,6 +159,30 @@
 				if(this.isGoing){
 					return false;
 				}
+				if(!this.carInfo.carModel){
+					uni.showToast({
+						title: '请输选择车型',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if(!this.customerName){
+					uni.showToast({
+						title: '请输入救援联系人',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if(!this.mobilePhone){
+					uni.showToast({
+						title: '请输入手机号',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
 				this.isGoing=true;
 				this.$http('openShopHelpSheetOrder/submitOrder', {
 				  helpType:this.opt.type,

pages/index/index.vue

@@ -591,12 +591,12 @@
 							url:'aboutUS?unionID='+this.userInfo.unionId
 						})
 					}else if(item.bizType==18){ //领券中心
-							/* uni.navigateTo({
+						    uni.navigateTo({
 								url:'receiveCoupon'
-							}) */
-							 uni.navigateTo({
+							}) 
+							/* uni.navigateTo({
 							 	url:'rescue'
-							 })
+							 }) */
 					}
 					// uni.navigateTo({
 					// 	url:url

pages/index/rescue.vue

@@ -36,7 +36,7 @@
 				</view>
 			</view>
 
-			<view class="price">服务费用 199元/次</view>
+			<view class="price">服务费用 {{helpPrice}}</view>
 
 			<!-- <view class="shopBox">
 				<view class="left">
@@ -77,7 +77,7 @@
       <w-picker
 			  :visible.sync="visible"
 			  mode="date" 
-			  startYear="2022" 
+			  startYear="2023" 
 			  endYear="2029"
 			  value="2020-04-08 13:18"
 			  :current="true"
@@ -137,12 +137,7 @@
 				distance:'',
 				time:'',
 				typeIndex:1,
-				shopInfo:{
-					lat: "36.671541",
-					lng: "117.138777",
-					shopName: "连锁一号测试店铺",
-					id: "1B43BADD-B670-4B27-B6C1-604523287EAF"
-				},
+				shopInfo:'',
 				shopList:'',
 				visible:false,
 				yytime:'',
@@ -152,13 +147,13 @@
 				authorizShow:false,
 				shopid:'',
 				msg:'',
+				helpPrice:'',
 			}
 		},
 		onLoad() {
 			var that = this;
 			this.userInfo=this.$store.state.userInfo;
 			this.ext=this.$common.getExtStoreId();
-			
 			if(this.userInfo){
 				
 			}else{
@@ -253,8 +248,8 @@
 					lng:this.longitude
 				}, 'GET').then(res => {
 					this.shopInfo=res.data.shopInfo;
+					this.helpPrice=res.data.shopHelpSetting.helpPrice;
 					this.msg=res.msg
-					
 				})
 			},
 			onConfirm(e){
@@ -291,7 +286,7 @@
 			sure(){
 				if(!this.shopInfo){
 					uni.showToast({
-						 title: this.msg,
+						 title: this.msg||'暂未找到救援门店',
 						 icon:'none',
 						 duration: 3000
 					});

pages/subPack/vipCard.vue

@@ -196,7 +196,7 @@
 			</view>	 
 	   </view>
 	   <view class="support"></view>
-	   <view class="bottom" v-if="viopId!=data.currentLevel.id">
+	   <view class="bottom" v-if="viopId!=data.currentLevel.id&&data.currentLevel.money">
 		  <view class="bottomLeft">
 			 <view class="price">￥ <span class="priceSpan">{{data.currentLevel.money}}</span> </view>
 			 <view class="bottomTitme" v-if="data.cLExpireDate">有效期：{{data.cLExpireDate}}个月</view>

pages/user/user.vue

@@ -147,13 +147,13 @@
 
 		<!-- 我的 相关 -->
 		<view class="rowBoxBg">
-			<view class="rowBox" @click="gonavigateTo('../subPack/rescueOrder')">
+			<!-- <view class="rowBox" @click="gonavigateTo('../subPack/rescueOrder')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me1.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">救援订单</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view>
+			</view> -->
 			<view class="rowBox" @click="gonavigateTo('../user/expertServices')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me1.png" mode="" class="liftIcon"></image>
@@ -211,7 +211,6 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</button>
-
 			<view class="rowBox" @click="gonavigateTo('feedBack')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me7.png" mode="" class="liftIcon"></image>
@@ -235,6 +234,11 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
+			<!-- <view class="rowBox" @click="gonavigateTo('../report/working?id=56D5F8C1-9F11-40BA-8937-B4AABD4666B5')">
+				<view class="leftView">
+					<image src="../../static/img/icon_kehuzhuanjieshao.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">施工报告</view>
+				</view> -->
 			<!-- <view class="rowBox" @click="gonavigateTo('../report/complete?id=278569FB-6F21-47AD-8B66-D62D2EA6981D')">
 				<view class="leftView">
 					<image src="../../static/img/icon_kehuzhuanjieshao.png" mode="" class="liftIcon"></image>
@@ -242,11 +246,7 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-            <view class="rowBox" @click="gonavigateTo('../report/working?id=56D5F8C1-9F11-40BA-8937-B4AABD4666B5')">
-            	<view class="leftView">
-            		<image src="../../static/img/icon_kehuzhuanjieshao.png" mode="" class="liftIcon"></image>
-            		<view class="rowTitle">施工报告</view>
-            	</view>
+           
             	<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
             </view> -->
 			<!-- 先隐藏 -->