优化订单

pages/jiuzhai/jz_Reserve.vue

@@ -831,7 +831,6 @@
 							}
 						}
 					})
-					console.log(maxCouponId)
 					if(maxCouponId>0) this.closeCouponHandler([maxCouponId])
 				}
 			},
@@ -915,7 +914,6 @@
 				
 				this.apipost( "vip_post_CheckCustomerIsVip", parameter,(r) => {
 					const v = r.data
-					v.FinishOrderCount=2
 					if(v.FinishOrderCount >= v.OrderCount){
 						let rule = v.RuleList.find(x=>x.LineId==lineId)
 						if(!rule) rule = v.RuleList.find(x=>x.LineId==0)

pages/jiuzhai/jz_SureOrder.vue

@@ -567,31 +567,10 @@
 						<u-loading v-if="submitCancel" size="32" color="#111"></u-loading> -->
 					</button>
 				<!-- #endif -->
-				<!-- 返回上一页 -->
-				<!-- <view
-          class="jz_OrderReNow"
-          @click="goback"
-          style="background: #fff; color: #111; border: 1px solid #111"
-          v-if="!showPayBtn"
-          >关闭
-        </view> -->
 			</view>
 			<view style="display: flex; margin-left: 30rpx">
-				<!-- #ifdef MP-WEIXIN -->
-				<!-- 	<button class="jz_OrderReNow" @click="goFukuan" v-if="showPayBtn" :disabled="submit">
-					立即支付
-				</button> -->
-				<!-- #endif -->
-				<!-- #ifdef MP-ALIPAY -->
-				<!-- 		<button class="jz_OrderReNow" @click="goZhifuAli" v-if="showPayBtn" :disabled="submit">
-					立即支付
-				</button> -->
-				<!-- #endif -->
 			</view>
 		</view>
-		<!-- #ifdef MP-ALIPAY -->
-		<subscribe-msg />
-		<!-- #endif -->
 	</view>
 </template>
 
@@ -648,6 +627,13 @@
 						})
 						this.submit = false;
 					}
+				},e=>{
+					uni.showToast({
+						title:'无法发起支付，请稍后',
+						icon:'none',
+						duration:3000
+					})
+					this.submit=false
 				});
 			},
 			goPayHandler() {
@@ -763,7 +749,7 @@
 			goCancelZK() {
 				if (this.submit || this.submitCancel) return;
 				this.submitCancel = true;
-				if (this.orderData.model.OrderState == 2) {
+				if (this.orderData.model.OrderState == 2 ||this.orderData.model.OrderState == 3) {
 					this.apipost(
 						"GetCancelOrder_post", {
 							OrderNo: this.OrderNo