细节优化

components/toolBox/toolBox.vue

@@ -43,7 +43,7 @@
 						url:config.assetsPath+'/tool_3.png',
 						imgUrl: config.assetsPath+'/scan_code_icon.png',
 						sortName:"验",
-						routePath:"/pages/useCouponIllustrate/useCouponIllustrate"
+						routePath:"/pages/useCouponIllustrate/useCouponIllustrate?keyData=coupon_use_process"
 					},
 					{
 						name:"客服",

pages/my/myInfo.vue

@@ -258,6 +258,10 @@
 					uni.navigateTo({
 						url:'/pages/storeList/storeList'
 					})
+				} else if(val === 4){
+					uni.navigateTo({
+						url:'/pages/useCouponIllustrate/useCouponIllustrate?keyData=call_us_images'
+					})
 				}
 			},
 			onClose(){

pages/order/order.vue

@@ -300,7 +300,7 @@
 						</view>
 						<view class="btn-box">
 							<button class="cu-btn round block bg-pink lg"
-								@tap="onOrderCreate">立即{{orderType==1? '预约':'续单'}}</button>
+								@tap="onOrder">立即{{orderType==1? '预约':'续单'}}</button>
 						</view>
 					</view>
 				</view>
@@ -908,23 +908,23 @@
 					})
 					return
 				}
-				if (uni.getStorageSync("orderUseMessage")) {
-					this.$refs.confirmPop.open();
-				}else{
-					wx.requestSubscribeMessage({
-						tmplIds: ['K8fbcKVq46w9o7Ekpesn74WPjwxnbso947YZiYBQw9c',
-							'HB2_moQRQrXC2cKw6zE08NU3AQO9Ggj3aAOg0lIgecg',
-							'oTc000e4NHkoc7v9OLBZiwM6Q6SFzguemrx6d0iuVS8'
-						],
-						success: (res) => {
-							uni.setStorageSync("orderUseMessage", true);
-							this.$refs.confirmPop.open();
-						},
-						complete: (res) => {
-							console.log(res, 909090)
-						}
-					})
-				}
+				this.$refs.confirmPop.open();
+			},
+			onOrder(){
+				wx.requestSubscribeMessage({
+					tmplIds: ['K8fbcKVq46w9o7Ekpesn74WPjwxnbso947YZiYBQw9c',
+						'HB2_moQRQrXC2cKw6zE08NU3AQO9Ggj3aAOg0lIgecg',
+						'oTc000e4NHkoc7v9OLBZiwM6Q6SFzguemrx6d0iuVS8'
+					],
+					success: (res) => {
+						// uni.setStorageSync("orderUseMessage", true);
+						// this.$refs.confirmPop.open();
+						this.onOrderCreate()
+					},
+					complete: (res) => {
+						console.log(res, 909090)
+					}
+				})
 			},
 			onOrderCreate() {
 				this.onCancle();
@@ -975,9 +975,8 @@
 								"fail": (resp) => {
 									// 取消支付或支付失败
 									uni.showToast({
-										title: "取消支付或支付失败"
+										title: "取消支付"
 									})
-									// 调用取消订单接口
 								},
 								"complete": (resp) => {
 									// 接口调用结束的回调函数（调用成功、失败都会执行）

pages/orderResult/orderResult.vue

@@ -80,7 +80,7 @@
 						<view class="part">
 							<button class="cu-btn block round line-pink lg" @tap="onNavToShare">分享好友</button>
 						</view>
-						<view v-is="orderInfo.status == 1" class="part">
+						<view v-if="orderInfo.status === 1" class="part">
 							<button class="cu-btn block round bg-mauve lg" @tap="onNavToOrder">房间续单</button>
 						</view>
 					</view>

pages/useCouponIllustrate/useCouponIllustrate.vue

@@ -11,15 +11,19 @@
 	export default {
 		data() {
 			return {
-				content:''
+				content:'',
+				keyData:"coupon_use_process"
 			};
 		},
-		onLoad() {
+		onLoad(option) {
+			if(option && option.keyData){
+				this.keyData = option.keyData
+			}
 			this.onLoading()
 		},
 		methods:{
 			onLoading(){
-				getProtocol('coupon_use_process').then(res=>{
+				getProtocol(this.keyData).then(res=>{
 					console.log(res)
 					if(res.data.code){
 						uni.setNavigationBarTitle({