1.预约详情

pages.json

@@ -122,7 +122,7 @@
 	        },
 	        {
 	        	"pagePath": "pages/activity/activity",
-	        	"iconPath": "./static/tabimg/activity2.png",
+	        	"iconPath": "./static/tabimg/activty2.png",
 	        	"selectedIconPath": "./static/tabimg/activity1.png",
 	        	"text": "活动"
 	        },

pages/user/bespeakDetail.vue

@@ -19,7 +19,7 @@
 		<view class="shopBox">
 			<image src="../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
 			<view class="shopCont">
-				<view class="shopName">{{orderData.shopInfo.ShopName}}</view>
+				<view class="shopName">{{orderData.shopInfo.shopName}}</view>
 				<view class="Address">{{orderData.shopInfo.province}}{{orderData.shopInfo.city}}{{orderData.shopInfo.area}}{{orderData.shopInfo.address}}</view>
 
 			</view>
@@ -75,7 +75,7 @@
 				</view>
 				<view class="detailedLine" v-if=" orderData.orderDetails.length!=0">
 						<view class="detailedName">预估总价</view>
-						<span>￥{{v.amountMoney}}</span>
+						<span v-if="orderData.sumMoney>0">￥{{orderData.sumMoney}}</span>
 				</view>
 				<view class="content">温馨提示：该报价仅为参考价格，实际以门店为准（不同品牌和车型费用会不同）</view>
 			</view>
@@ -84,7 +84,7 @@
 		
 		<view class="bottom" v-if="(orderData.orderSheet.sheetState == 0)||(orderData.orderSheet.sheetState == 1)">
 		
-			<view class="cancel">取消预约</view>
+			<view class="cancel" @click="cancelBespeak" >取消预约</view>
 			<view class="defer" @click="cktime">延期</view>
 		</view>
 		
@@ -134,17 +134,51 @@
 				uni.showLoading({
 					title: '加载中'
 				})
+				var that = this
 				this.$http('openreservation/carOwner/updateTimeOfAppointment', {
 			
 					id: this.id,
-					shopid: this.orderData.shopInfo.id,
+					shopId: this.orderData.shopInfo.id,
 					billDate:this.billDate
 				}, 'POST').then(res => {
 					uni.hideLoading();
 					// var list = res.data.Items
 					var list = res.data
 					console.log("result+=",res.data);
+					uni.showToast({
+						title: '延期成功',
+						icon: 'none',
+						duration: 2000
+					});
+					setTimeout(function() {
+						that.getData();
+					}, 1000);
+					
+			
+				})
+			},
+			cancelBespeak() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				var that = this
+				this.$http('openreservation/carOwner/updateState', {
 			
+					id: this.id,
+					shopId: this.orderData.shopInfo.id,
+					sheetState:3
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					// var list = res.data.Items
+					var list = res.data
+					uni.showToast({
+						title: '取消成功',
+						icon: 'none',
+						duration: 2000
+					});
+					setTimeout(function() {
+						that.getData();
+					}, 1000);
 				})
 			},
 			map() {
@@ -161,7 +195,7 @@
 						latitude: Number(that.orderData.shopInfo.lat),
 						longitude: Number(that.orderData.shopInfo.lng),
 						name: that.orderData.shopInfo.shopName,
-						address: that.orderData.shopInfo.province+that.orderData.shopInfo.city+that.orderData.shopInfo.area+that.orderData.shopInfo.Address,
+						address: that.orderData.shopInfo.province+that.orderData.shopInfo.city+that.orderData.shopInfo.area+that.orderData.shopInfo.address,
 						success: function() {
 							console.log('success');
 						},

pages/user/myBespeak.vue

@@ -46,6 +46,10 @@
 		onLoad() {
 			this.page = 1
 			this.myOrderCoupon()
+		},
+		onShow() {
+			this.page = 1
+			this.myOrderCoupon()
 		},
 		methods: {
 			goDetail(id) {