支付后跳转问题

pages/order/components/order-list-item-new.vue

@@ -73,8 +73,8 @@
 					<view v-if="item.orderSource == 'WECHAT' && item.orderStep=='WAITING_RECEIVE' && item.shippingStatus=='WAIT_RECEIVING'"
 						class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货</view>
 					<view v-if="item.orderSource == 'WECHAT' && (item.orderStep=='WAITING_AUDIT' || item.orderStep=='WAITING_SEND') && item.shippingStatus=='WAIT_SHIPPING'" class="btn btn-primary" @click.stop="gotoEditAddressNew(item)">修改地址</view>
-					//评价暂不上线
-					<!--<view v-if="item.orderSource == 'WECHAT' && item.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(item)">去评价产品</view>-->
+					<!--评价暂不上线
+					<view v-if="item.orderSource == 'WECHAT' && item.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(item)">去评价产品</view>-->
 					<view v-if="item.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoOrderSign(item)">签约
 					</view>
 					<view

subpackage/orders/order-details-new.vue

@@ -119,8 +119,8 @@
 						<view v-if="state.orderInfo.orderSource == 'WECHAT' && state.orderInfo.orderStep=='WAITING_RECEIVE' && state.orderInfo.shippingStatus=='WAIT_RECEIVING'"
 							class="btn btn-primary" @click.stop="gotoConfirmReceipt(state.orderInfo)">确认收货</view>
 							<view v-if="state.orderInfo.orderSource == 'WECHAT' && (state.orderInfo.orderStep=='WAITING_AUDIT' || state.orderInfo.orderStep=='WAITING_SEND') && state.orderInfo.shippingStatus=='WAIT_SHIPPING'" class="btn btn-primary" @click.stop="gotoEditAddressNew(state.orderInfo)">修改地址</view>
-							//评价暂不上线
-						<!--<view v-if="state.orderInfo.orderSource == 'WECHAT' && state.orderInfo.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(state.orderInfo)">去评价产品</view>-->
+							<!--//评价暂不上线
+						<view v-if="state.orderInfo.orderSource == 'WECHAT' && state.orderInfo.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(state.orderInfo)">去评价产品</view>-->
 						<view v-if="state.orderInfo.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoOrderSign(state.orderInfo)">签约
 						</view>
 						<view

subpackage/orders/order_payment.vue

@@ -558,6 +558,17 @@
 					// 	const params = encodeURIComponent(JSON.stringify(res.qdSignUrl))
 					// 	tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
 					// }
+				}else{
+					uni.showModal({
+						content: "订单待审核，可在ETC订单查看",
+						showCancel: false,
+						confirmText: "我知道了",
+						success() {
+							uni.redirectTo({
+								url: `/pages/order/order`
+							});
+						}
+					});
 				}
 			});
 			

subpackage/orders/product-detail.vue

@@ -65,6 +65,8 @@
 	import {
 		msg, navTo
 	} from "@/utils/utils";
+	
+	let signFlag = "NO";//触发按钮标识
 
 	const savaHandle = () => {
 		console.log("state.productId.length", state.productId.length, "111", state.typeScanCode)
@@ -236,6 +238,7 @@
 	});
 	// 查协议
 	const queryAgreement = () => {
+		if(signFlag === "NO") return;
 		const options = {
 			type: 2,
 			data: {
@@ -383,6 +386,7 @@
 			} else {
 				state.isSign = false
 			}
+			signFlag = "YES"
 			console.log("查询是否签署协议", res)
 
 			let data = res;

subpackage/orders/release-products.vue

@@ -224,6 +224,17 @@
 						const params = encodeURIComponent(JSON.stringify(res.qdSignUrl))
 						tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
 					}
+				}else{
+					uni.showModal({
+						content: "订单待审核，可在ETC订单查看",
+						showCancel: false,
+						confirmText: "我知道了",
+						success() {
+							uni.redirectTo({
+								url: `/pages/order/order`
+							});
+						}
+					});
 				}
 			});
 	}