签证

pages/visa/visa_MyOrder.vue

@@ -139,8 +139,15 @@
 							<!-- #ifdef MP-ALIPAY -->
 							<!-- <view class="jz_Zailai" style="width: 110rpx; margin-right: 10rpx" @click.stop="goZhifuAli(item)">付款</view> -->
 							<!-- #endif -->
-							<view v-if="item.visaOrderStatus==3" class="jz_Zailai"
-							 style="width: 110rpx" @click.stop="goCancel(item)">取消</view>
+							<!-- #ifdef MP-DI -->
+								<button v-if="item.visaOrderStatus==1" class="jz_Zailai"
+								style="width: 110rpx" @click.stop="goCancelZK(item)"
+								:disabled="submitCancel">取消</button>
+							<!-- #endif -->
+							<!-- #ifdef MP-AG -->
+								<view v-if="item.visaOrderStatus==3" class="jz_Zailai"
+								style="width: 110rpx" @click.stop="goCancel(item)">取消</view>
+							<!-- #endif -->
 						</view>
 					</view>
 				</scroll-view>
@@ -207,6 +214,7 @@
 				b2b_user_info: {},
 				userInfo: {},
 				showAuth: false,
+				submitCancel: false,
 			};
 		},
 		created() {
@@ -270,9 +278,17 @@
 				}
 			},
 			goOrderDetail(item) {
-				uni.navigateTo({
-					url: "/pages/visa/visa_SureOrder?orderId=" + item.id,
-				});
+				// #ifdef MP-DI
+					uni.navigateTo({
+						url: `/pages/visa/visa_SureOrder?orderId=${item.id}&OrderTypeStr=Visa`,
+					});
+				// #endif
+				// #ifdef MP-AG
+					uni.navigateTo({
+						url: `/pages/visa/visa_SureOrder?orderId=${item.id}`,
+					});
+				// #endif
+				
 			},
 			change(i) {
 				this.current = i;
@@ -365,6 +381,36 @@
 					}
 				})
 				
+			},
+			goCancelZK(item) {
+				let that = this
+				if(this.submitCancel) return
+				this.submitCancel = true
+				wx.showModal({
+					title: '提示',
+					content: '确定取消订单？',
+					success: (tip) => {
+						if (tip.confirm) {
+							that.apipost(
+								"GetCancelOrder_post", {
+									OrderNo: 0,
+								},
+								(res) => {
+									if (res.resultCode == 1) {
+										uni.showToast({
+											title: "操作成功",
+											icon: "success",
+										});
+										that.research();
+									}
+									that.submitCancel = false
+								},
+								(err) => {}
+							);
+						}else that.submitCancel = false
+					}
+				})
+				
 			},
 			//付款
 			// #ifdef MP-WEIXIN

pages/visa/visa_SureOrder.vue

@@ -585,7 +585,7 @@
 				Refund: 0,
 				orderInfo:null,
 				orderId: 0,
-				goodsType: 0,
+				OrderTypeStr: 0,
 				OrderNo: '',
 			};
 		},
@@ -593,11 +593,11 @@
 		onLoad(option) {
 			if (option.orderData) {
 				this.orderData = JSON.parse(decodeURIComponent(option.orderData));
-			} else if (option.orderId&&!option.goodsType) {
+			} else if (option.orderId&&!option.OrderTypeStr) {
 				this.initOrderInfo(option.orderId);
-			} else if(option.OrderNo||(option.orderId&&option.goodsType)){
-				if(option.goodsType){
-					this.goodsType = option.goodsType
+			} else if(option.OrderNo||(option.orderId&&option.OrderTypeStr)){
+				if(option.OrderTypeStr){
+					this.OrderTypeStr = option.OrderTypeStr
 				}
 				if(option.orderId){
 					this.orderId = option.orderId
@@ -663,10 +663,10 @@
 				});
 			}, 
 			getOrderInfoHandler(){
-				this.apipost("GetDetailsByOrderNo_post",{
+				this.apipost("GetDetailsByErpOrderId_post",{
 					OrderNo: this.OrderNo, 
-					orderId: this.orderId,
-					goodsType: this.goodsType,
+					ErpOrderId: this.orderId,
+					OrderTypeStr: this.OrderTypeStr,
 				},res=>{
 					if(res.resultCode==1){
 						this.orderData = {