细节

pages/order/detail.vue

@@ -296,6 +296,8 @@
 					v-if="(order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == ReceiptStatusEnum.NOT_RECEIVED.value)||order.order_status == OrderStatusEnum.CANCELLED.value">
 					再次购买
 				</view>
+				<view class="buyAgain" @click="onShenOrder(order.order_id)" v-if="order.is_standard==1">审单
+				</view>
 				<view class="buyAgain" @click="onCopyLink(order.jd_link)" v-if="order.jd_link">
 					复制链接
 				</view>
@@ -418,15 +420,15 @@
 				menushow: false,
 				Store: '',
 				userInfo: {},
-				setting: {}
+				setting: {},
+				dataType: ''
 			}
 		},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad({
-			orderId
-		}) {
+			orderId}) {
 			// 当前订单ID
 			this.orderId = orderId
 			// 获取当前订单信息
@@ -470,6 +472,12 @@
 			}
 		},
 		methods: {
+			onShenOrder(orderId) {
+				uni.navigateTo({
+					url: '/pages/order/reviewOrder?orderId=' + orderId + '&dataType=' + this.dataType + '&type=' +
+						2
+				})
+			},
 			// 在线客服
 			handleContact() {
 				// 商城客服设置

pages/order/index.vue

@@ -257,7 +257,7 @@
 				showQRCodePopup: false,
 				// 核销二维码图片url (通过后端获取)
 				qrcodeImage: '',
-				standard_status: ''
+				standard_status: '',
 			}
 		},
 
@@ -382,7 +382,7 @@
 			},
 			onShenOrder(orderId) {
 				uni.navigateTo({
-					url: '/pages/order/reviewOrder?orderId=' + orderId
+					url: '/pages/order/reviewOrder?orderId=' + orderId+'&dataType='+this.getTabValue()+'&type='+1
 				})
 			},
 			onCopyLink(str) {
@@ -554,7 +554,8 @@
 			// 跳转到订单详情页
 			goOrderDetail(orderId) {
 				this.$navTo('pages/order/detail', {
-					orderId
+					orderId,
+					dataType:this.getTabValue()
 				})
 			},
 			onCdDia(orderId) {

pages/order/reviewOrder.vue

@@ -39,7 +39,7 @@
 			<view class="shenRoide" style="border-top: none;">
 				<u-radio-group v-model="value_2" @change="radioChange_2">
 					<view class="radio-group">
-						<u-radio v-for="(item, index) in list_2"  activeColor="red" :key="index" :name="item">
+						<u-radio v-for="(item, index) in list_2" activeColor="red" :key="index" :name="item">
 							{{item.name}}
 						</u-radio>
 					</view>
@@ -88,8 +88,7 @@
 			提交审核
 		</view>
 		<view class="shendanCode" v-if="storeInfo.standard_image">
-			<image
-				@click="previewImage(storeInfo.standard_image.preview_url)"
+			<image @click="previewImage(storeInfo.standard_image.preview_url)"
 				:src="storeInfo.standard_image.preview_url" mode=""></image>
 			<view class="name">
 				审单疑问 欢迎咨询
@@ -108,7 +107,7 @@
 					<view class="poptext">
 						我们会尽快审核哦!
 					</view>
-					<view class="knowBtn" @click="popShow = false">
+					<view class="knowBtn" @click="onClickYes()">
 						我知道了
 					</view>
 				</view>
@@ -160,11 +159,15 @@
 				value_1: '',
 				value_2: '',
 				popShow: false,
-				orderId: ''
+				orderId: '',
+				dataType: 'all',
+				laiType: ''
 			}
 		},
 		onLoad(options) {
 			this.orderId = options.orderId
+			this.dataType = options.dataType || 'all'
+			this.laiType = options.type
 			this.storeInfo = JSON.parse(uni.getStorageSync("storeInfo"));
 		},
 		onShow() {
@@ -190,6 +193,29 @@
 			}
 		},
 		methods: {
+			onClickYes() {
+				let that=this
+				that.popShow = false
+				const pages = getCurrentPages(); // 获取当前页面栈
+				const prevPage = pages[pages.length - 2]; // 上一页实例对象
+				if (prevPage) {
+					if (that.laiType == 1) {
+						prevPage.onLoad({
+							dataType: that.dataType
+						}); // 调用上一页的onLoad方法，并传递参数
+					}
+
+					if (that.laiType == 2) {
+						prevPage.onLoad({
+							orderId: that.orderId
+						}); // 调用上一页的onLoad方法，并传递参数
+					}
+				}
+				// 返回操作
+				uni.navigateBack({
+					delta: 1 // 返回的页面数，如果需要返回上一页，delta 设为 1
+				});
+			},
 			previewImage(image_url) {
 				// 调用预览图片API
 				uni.previewImage({
@@ -198,11 +224,9 @@
 				});
 			},
 			// 选中某个单选框时，由radio时触发
-			radioChange_1(e) {
-			},
+			radioChange_1(e) {},
 			// 选中任一radio时，由radio-group触发
-			radioChange_2(e) {
-			},
+			radioChange_2(e) {},
 			toTextPage(type) {
 				uni.navigateTo({
 					url: '/pages/news1/text?pageFlag=' + type
@@ -210,6 +234,8 @@
 			},
 			async nextSumbit() {
 				let that = this
+				that.popShow = true
+				return
 				if (!that.value_1) {
 					uni.showToast({
 						title: "请选择您的这单客户来源",

pages/user/index.vue

@@ -1175,7 +1175,6 @@
 				});
 			},
 			goMember(type) {
-				console.log('啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦')
 				if (this.isLogin == false) {
 					this.goLogin();
 					return;