提交

subpackage/after-sale/ETC-log-off/upload-card.vue

 			queryCardSignCancellation(1, 1, 1).then((item : any) => {
 				instructAction(item).then(value => {
 					console.log('orderStatus=======', value.orderStatus)
-					
+
 				})
 			})
 		})
 			navTo("/pages/bluetooth/bluetooth?routeType=5");
 
 		} else {
-			queryCardSignCancellation(2, 2, 0).then((item : any) => {
+			queryCardSignCancellation(2, 1, 0).then((item : any) => {
 				queryConfirmSignCancellation(0).then((val : any) => {
 					console.log(val)
 					navTo("/subpackage/after-sale/ETC-log-off/log-off-result");

subpackage/after-sale/activation/activate.vue

 			const obuId = orderInfo.obuId;
 			const obuStatus = orderInfo.obuStatus != null ? orderInfo.obuStatus : '9'
 			console.log('当前卡签状态', cardId, obuId, cardStatus, obuStatus)
-			console.log('输出内容', obu.obuId, '=======', fileDataStrings.obuId)
-			if (obu.obuId != fileDataStrings.obuId) {
+			console.log('输出内容', obu.obuId, '=======', fileDataStrings.obuId, obu.obuId != fileDataStrings.obuId)
+			if (obu.obuId + '' != fileDataStrings.obuId + '') {
 				tools.showModalAlert("订单设备号信息与当前设备号信息不符!");
 				return
 			}
 			//第一次获取随机数
 			if (status == "9000") {
 				obu.obuId = res[1].substring(20, 36);
+				console.log("obu.obuId===========", obu.obuId, res[1].substring(20, 36))
 				obu.vin = res[1].substring(18, 20);
 				obu.version = res[1].substring(18, 19) >= 4 ? "4x" : "2x";
 				cmdRandNum = res[2].substring(0, res[2].length - 4);
 				orderId: fileDataStrings.orderId
 			},
 			method: "POST",
-			showLoading: true,
+			showLoading: false,
 		};
 		request(IFCODE.DataSynchronizationApi, options).then((res) => {
-			uni.hideLoading()
+
 		})
 	}
 	const back = () => {

subpackage/orders/apply-ex-goods-step1.vue

 							<picker @change="bindPickerChange" :value="index" :range="columnsOld">
 								<view class="uni-input">{{index>=0?columnsOld[index]:"请选择"}}</view>
 							</picker>
-							<u-icon name="arrow-right" style="margin-left: 10px;display: flex;"></u-icon>
+							<u-icon name="arrow-right" style="margin-left: 10px;display: flex;"
+								@click="showPicker"></u-icon>
 							<!-- <u-input v-model="applyType" class="input" disabled placeholder="请选择" />
-							<u-icon name="arrow-right" style="margin-left: 10px;display: flex;" showPicker></u-icon> -->
+							<u-icon name="arrow-right" style="margin-left: 10px;display: flex;" ></u-icon> -->
 						</view>
 					</view>
 				</u-form-item>
 	const columns = [{
 		label: '换货-换卡',
 		// 其他属性值
-		id: 'CARD '
+		id: 'CARD'
 	},
 	{
 		label: '换货-换签',
 	// 确定地区
 	const confirm = (e) => {
 		console.log(e, columns[e].id, columns[e].label);
+		index.value = e
 		form.applyType = columns[e].id
 		applyType.value = columns[e].label
 	}

subpackage/orders/apply-ex-goods.vue

 				star: true,
 				required: true,
 				divider: true,
-				emptyHint: "请选择退货方式",
+				emptyHint: "请选择换货方式",
 				itemData: [
 					{
 						checked: false,
 				star: true,
 				divider: true,
 				itemData: [
-					{
-						checked: false,
-						value: "SELF",
-						name: "营业点自提",
-					},
+					// {
+					// 	checked: false,
+					// 	value: "SELF",
+					// 	name: "营业点自提",
+					// },
 					{
 						checked: false,
 						value: "MAIL",
 				star: true,
 				hint: "请输入",
 				divider: true,
-				hide: false,
+				hide: true,
 				itemData: [],
 				emptyHint: "请选择自提网点",
 				mode: "search",
 
 			/* 区别-线下方式 */
 			{
-				title: "退货网点:",
+				title: "换货网点:",
 				type: 4,
 				value: "exchangeNetworkName",
 				required: true,
 				divider: true,
 				itemData: ["1"],
 				hide: true,
-				emptyHint: "请选择退货网点",
+				emptyHint: "请选择换货网点",
 				mode: "search",
 				searchPickerVisible: false,
 			},
 		});
 	};
 
-	/* 获取退货网点 */
+	/* 获取换货网点 */
 	const getOutletList = () => {
 		const options = {
 			type: 2,
 
 			state.formData[7].itemData = nameList;
 			state.formData[14].itemData = nameList;
-			console.log("获取退货网点", state.outlets, nameList)
+			console.log("获取换货网点", state.outlets, nameList)
 		});
 
 	};
 
 	//radio改变
 	const radioChange = (e : any, item : any) => {
+		console.log("e", e, item)
 		if (item.value === "exchangeMode") {
 			//退货方式
 			state.exchangeMode =
-				item.exchangeMode === "ON_LINE"
-					? state.formData[6][state.formData[6].value] ? state.formData[6][state.formData[6].value] : "SELF"
+				item.exchangeMode === "ON_LINE" ? state.formData[6][state.formData[6].value] ? state.formData[6][state.formData[6].value] : "SELF"
 					: item.exchangeMode;
+
 		} else if (item.value === "exchangeRgMode") {
 			//收货方式
 			state.exchangeMode = item.exchangeRgMode;
+			console.log("item", item, state.exchangeMode)
 		}
 
 		state.formData[4].hide = state.exchangeMode === "OFFLINE" ? true : false;
 		state.formData[5].hide = state.exchangeMode === "OFFLINE" ? true : false;
-		state.formData[6].hide = state.exchangeMode === "OFFLINE" ? true : false;
+		// state.formData[6].hide = state.exchangeMode === "OFFLINE" ? true : false;
 		for (let i = 7; i < 15; i++) {
 			state.formData[i].hide = true;
 		}
 			// #endif
 		} else if (state.exchangeMode === "SELF") {
 			//SELF-线上-营业点自提
-			state.formData[7].hide = false;
+			// state.formData[7].hide = false;
+			state.formData[4].hide = true;
+			state.formData[5].hide = true;
+			state.formData[14].hide = false;
+			console.log("1111111111111111111111111111")
 		} else if (state.exchangeMode === "OFFLINE") {
 			//OFFLINE-线下
 			state.formData[14].hide = false;
+			state.formData[6].itemData = [
+				{
+					checked: false,
+					value: "SELF",
+					name: "营业点自提",
+				},
+			]
+		}
+		if (item.exchangeMode == "ON_LINE") {
+			state.formData[14].hide = true;
+			state.formData[6].itemData = [
+				{
+					checked: false,
+					value: "MAIL",
+					name: "邮寄",
+				},
+			]
 		}
 		console.log("全部数据", state.formData)
 	};
-	// const handleGetRegion = (e : any, item : any) => {
-	// 	console.log("dizhi")
-	// }
 	//地址改变
 	const addressInfo = (content : any) => {
 		console.log("content", `${content.provinceName}${content.cityName}${content.countyName}`)
 
 	//提交换货申请
 	const submit = (e : any) => {
-		for (var k = 0; k < state.outlets.length; k++) {
-			if (e.exchangeRgNetworkName == state.outlets[k]['name']) {
-				e['exchangeRgNetworkId'] = state.outlets[k]['servicehallId']
-				break;
+		if (e.exchangeMode == "OFFLINE") {
+			for (var k = 0; k < state.outlets.length; k++) {
+				if (e.exchangeNetworkName == state.outlets[k]['name']) {
+					e['exchangeNetworkId'] = state.outlets[k]['servicehallId']
+					e['exchangeRgNetworkId'] = state.outlets[k]['servicehallId']
+					console.log("e.exchangeRgNetworkName", e.exchangeNetworkName, e['exchangeNetworkId'])
+					break;
+				}
+			}
+		} else {
+			for (var k = 0; k < state.outlets.length; k++) {
+				if (e.exchangeRgNetworkName == state.outlets[k]['name']) {
+					e['exchangeNetworkId'] = state.outlets[k]['servicehallId']
+					e['exchangeRgNetworkId'] = state.outlets[k]['servicehallId']
+					console.log("e.exchangeRgNetworkName", e.exchangeRgNetworkName, e['exchangeNetworkId'])
+					break;
+				}
 			}
 		}
+
 		console.log("是否确认换货", e)
 		confirm(
 			"是否确认换货？",
 					data: {
 						id: state.orderInfo.id,
 						exchangeMode: e.exchangeMode,
-						// exchangeNetworkId: curOutlet == null ? "" : curOutlet.servicehallId,
-						exchangeNetworkId: e.exchangeNetworkName,
-						exchangeNetworkName: e.exchangeNetworkName,
-						exchangeRgMode: e.exchangeRgMode,
-						// exchangeRgNetworkId: curOutlet == null ? "" : curOutlet.servicehallId,
+						exchangeNetworkId: e.exchangeNetworkId,
+						exchangeNetworkName: e.exchangeRgNetworkName ? e.exchangeRgNetworkName : e.exchangeNetworkName,  //换货网点
+						exchangeRgMode: e.exchangeMode == "ON_LINE" ? 'MAIL' : "SELF",
 						exchangeRgNetworkId: e.exchangeRgNetworkId,
-						exchangeRgNetworkName: e.exchangeRgNetworkName,
+						exchangeRgNetworkName: e.exchangeRgNetworkName ? e.exchangeRgNetworkName : e.exchangeNetworkName,  //自提网点
 						exchangeLogisticsCompany: e.exchangeLogisticsCompany,
 						exchangeLogisticsNumber: e.exchangeLogisticsNumber,
 						exchangeReason: e.exchangeReason,
 					showLoading: true,
 				};
 				console.log("提交数据", options);
+				// return;
 				request(orderExchange, options).then((res) => {
 					confirm(
 						"您申办的ETC订单已申请换货",

subpackage/orders/order-details-new.vue

 									</view>
 									<view class="d-row">
 										<text class="d-label">收件人地址：</text>
-										<text
-											class="d-value">{{state.orderInfo.orderInfoExt.region + " " + state.orderInfo.orderInfoExt.address}}</text>
+										<text class="d-value">{{state.orderInfo.orderInfoExt.address}}</text>
 									</view>
-									<view class="d-row">
+									<view class="d-row" v-if="state.orderInfo.orderInfoExt.postalCode">
 										<text class="d-label">邮政编码：</text>
 										<text
 											class="d-value">{{state.orderInfo.orderInfoExt.postalCode ?state.orderInfo.orderInfoExt.postalCode: ''}}</text>