修改更换设备传参

subpackage/after-sale/replace-equipment/form.vue

@@ -76,7 +76,7 @@
 				</u-form-item>
 			</view>
 		</u-form>
-
+		<view class="attention">{{params.msg}}</view>
 		<!-- 物流弹窗 -->
 		<view>
 			<!-- 物流 -->
@@ -200,6 +200,9 @@
 	const params = reactive({
 		orderId: '',
 		id: '',
+		msg: "",
+		cardExpire: "", //1:质保期过了  0：在质保期内
+		obuExpire: ""  //1:质保期过了  0：在质保期内
 	});
 
 	const applyResList = reactive([{
@@ -223,8 +226,12 @@
 	// 单选数据列表
 	const radiolist1 = reactive([]);
 	onLoad((option) => {
+		console.log("option", option)
 		params.orderId = option.orderId
 		params.id = option.id
+		params.msg = option.msg == "undefined" ? "" : option.msg
+		params.cardExpire = option.cardExpire == "undefined" ? "" : option.cardExpire
+		params.obuExpire = option.obuExpire == "undefined" ? "" : option.obuExpire
 		if (option.damageMode == "0") {
 			var data = {
 				name: "寄回",
@@ -409,7 +416,9 @@
 			address: form.address,
 			region: form.region,
 			postalCode: form.postalCode,
-			applyRes: form.applyRes
+			applyRes: form.applyRes,
+			cardExpire: params.cardExpire,
+			obuExpire: params.obuExpire,
 		};
 		const options = {
 			type: 2,
@@ -417,7 +426,7 @@
 			method: "POST",
 			showLoading: true,
 		};
-
+		console.log("data", data)
 		return new Promise(async (resolve, reject) => {
 			const res = await request(changeCardInfo, options);
 			console.log("res", res.errorMsg)
@@ -729,4 +738,9 @@
 	.editAddress {
 		font-size: 30rpx;
 	}
+
+	.attention {
+		padding: 20rpx;
+		font-size: 30rpx;
+	}
 </style>

subpackage/after-sale/replace-equipment/replace-equipment-confirm.vue

@@ -163,7 +163,7 @@
 				// 申请中APPLY  审核中AUDIT
 				if (val.status == "APPLY" || val.status == "AUDIT") {
 					navTo(
-						`/subpackage/after-sale/replace-equipment/form?orderId=${state.data.orderId}&&id=${apply.data.id}`
+						`/subpackage/after-sale/replace-equipment/form?orderId=${state.data.orderId}&&id=${apply.data.id}&&msg=${val.msg}&&cardExpire=${val.cardExpire}&&obuExpire=${val.obuExpire}`
 					)
 				} else {
 					navTo(

subpackage/after-sale/replace-equipment/verification.vue

@@ -303,9 +303,9 @@
 		// } else {
 		console.log("form.damageMode", form.damageMode)
 		queryCckChangejzCardAction().then(val => {
-			console.log("val888888", val.id)
+			console.log("val888888", val)
 			navTo(
-				`/subpackage/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${val.id}&&damageMode=${form.damageMode}`
+				`/subpackage/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${val.id}&&damageMode=${form.damageMode}&&msg=${val.msg}&&cardExpire=${val.cardExpire}&&obuExpire=${val.obuExpire}`
 			)
 		})
 		// }

subpackage/orders/order-details-new.vue

@@ -437,7 +437,8 @@
 						</view>
 						<!-- 待激活 -->
 						<view v-if="state.orderInfo.orderStep == OrderStatus.待激活" class="btn-status">
-							<view class="btn space" @click="gotoReturnOrder(state.orderInfo)">申请退货</view>
+							<view class="btn space" @click="gotoReturnOrder(state.orderInfo)"
+								v-if="state.orderInfo.applyReturn">申请退货</view>
 							<view class="btn space" @click="gotoExchangeOrder(state.orderInfo)">申请换货</view>
 							<view class="btn-green space" @click="gotoActiveOrder(state.orderInfo)">去激活</view>
 							<view class="btn-green" @click.stop="closeOrder(state.orderInfo)"
@@ -645,9 +646,16 @@
 						state.orderInfo['isUseAgain'] = false  //不可以结束
 					}
 				}
+				// 收货日期超过7个自然日不允许申请退货
+				if (state.orderInfo.orderInfoExt['receivingTime']) {
+					if (timesDiff(state.orderInfo.orderInfoExt['receivingTime'].replace("T", " ")).days > 7) {
+						state.orderInfo['applyReturn'] = false  //不展示申请退货
+					} else {
+						state.orderInfo['applyReturn'] = true  //展示申请退货
+					}
+				}
 			}
-			// state.orderInfo.appraise = appraise;
-			console.log("获取订单详情", state.orderInfo)
+			console.log("获取订单详情", state.orderInfo, state.orderInfo['applyReturn'])
 		})
 	}
 

utils/network/api.js

@@ -80,7 +80,6 @@ export const etcCompanyCardInfoSubmit = "20"; // CSMSN-提交单位用户信息
 export const etcCarCardInfoSubmit = "18"; // CSMSN-提交车辆信息
 export const etcQyList = "66"; // 统一会员平台可签约渠道列表查询接口
 export const exchangeApply = '888' //8.99.ASS-换货/换卡签申请接口
-export const exchangeFillIn = '887' //8.100. ASS-换货/换卡签填写信息接口
 export const exchangeProcess = '886' //8.101.ASS-换货/换卡签审核接口
 
 //产品选择