提交

pages/index/index.vue

@@ -64,7 +64,7 @@
 					</view>
 					<view class="text">设备注销</view>
 				</view>
-				<view class="item-box" @click="$util.navTo(`/subpackage/after-sale/activation-once-again/select-car?type=2`,true)">
+				<view class="item-box" @click="$util.navTo(`/subpackage/after-sale/equipment-upgrade/select-car`,true)">
 					<view class="item item-6">
 						<image :src="fileURL + 'image/index/item-6.png'" mode="aspectFill" />
 					</view>

subpackage/after-sale/activation/activate.vue

@@ -194,7 +194,7 @@
 			//BDS-二发指令申请  
 			request('4b001421f5354c248a7759971881b52f', options)
 				.then((res) => {
-					tools.hideLoadingAlert();
+					// tools.hideLoadingAlert();
 					console.log("在线激活 请求");
 					console.log(stringToJson(res.bizContent));
 					const datas = stringToJson(res.bizContent).data;
@@ -258,45 +258,45 @@
 	const btn = () => {
 		state.disabled = false
 		console.log('orderInfo参数', orderInfo, state.disabled)
-		// cmdResult()
+		cmdResult()
 		// //0  是原来的激活   1  是过户激活
-		if (state.transfer) {
-			// 获取cardId
-			getCardId()
-			// 过户激活  1
-			// 1. 过户激活申请  2.设备升级  3.过户升级（跟过户升级一样）    4.79(BDS-安装申请)(后台数据)-
-			// >76(VFJ-OBU在线激活)(指令接口)->80(BDS-安装确认)->73(BDS-卡签绑定)(指令接口)->51(BDS-写卡指令返回)(指令接口)
-		} else {
-			console.log("=================================")
-			if (orderInfo) {
-				//根据订单详情走相应的断步功能
-				const cardId = orderInfo.cardId;
-				const cardStatus = orderInfo.cardStatus != null ? orderInfo.cardStatus : '0'
-				const obuId = orderInfo.obuId;
-				const obuStatus = orderInfo.obuStatus != null ? orderInfo.obuStatus : '9'
-				console.log('当前卡签状态', cardId, obuId, cardStatus, obuStatus)
-				console.log('输出内容', obu.obuId, '=======', fileDataStrings.obuId, obu.obuId != fileDataStrings.obuId)
-				if (fileDataStrings.obuId) {
-					if (obu.obuId + '' != fileDataStrings.obuId + '') {
-						tools.showModalAlert("订单设备号信息与当前设备号信息不符!");
-						return
-					}
-				}
-				if (!cardId) { //卡发行
-					getCardId()
-				} else if (cardId && cardStatus == '0') { //卡发行
-					getCardId()
-				} else if (!obuId) { //OBU发行
-					getObuApply();
-				} else if (obuId && obuStatus == '9') { //OBU发行
-					getObuApply();
-				} else if (cardId && obuId && (obuStatus == '1' || obuStatus == '11' || obuStatus == '0')) {
-					getInstallApply(); //激活
-				} else {
-					getCardId()
-				}
-			}
-		}
+		// if (state.transfer) {
+		// 	// 获取cardId
+		// 	getCardId()
+		// 	// 过户激活  1
+		// 	// 1. 过户激活申请  2.设备升级  3.过户升级（跟过户升级一样）    4.79(BDS-安装申请)(后台数据)-
+		// 	// >76(VFJ-OBU在线激活)(指令接口)->80(BDS-安装确认)->73(BDS-卡签绑定)(指令接口)->51(BDS-写卡指令返回)(指令接口)
+		// } else {
+		// 	console.log("=================================")
+		// 	if (orderInfo) {
+		// 		//根据订单详情走相应的断步功能
+		// 		const cardId = orderInfo.cardId;
+		// 		const cardStatus = orderInfo.cardStatus != null ? orderInfo.cardStatus : '0'
+		// 		const obuId = orderInfo.obuId;
+		// 		const obuStatus = orderInfo.obuStatus != null ? orderInfo.obuStatus : '9'
+		// 		console.log('当前卡签状态', cardId, obuId, cardStatus, obuStatus)
+		// 		console.log('输出内容', obu.obuId, '=======', fileDataStrings.obuId, obu.obuId != fileDataStrings.obuId)
+		// 		if (fileDataStrings.obuId) {
+		// 			if (obu.obuId + '' != fileDataStrings.obuId + '') {
+		// 				tools.showModalAlert("订单设备号信息与当前设备号信息不符!");
+		// 				return
+		// 			}
+		// 		}
+		// 		if (!cardId) { //卡发行
+		// 			getCardId()
+		// 		} else if (cardId && cardStatus == '0') { //卡发行
+		// 			getCardId()
+		// 		} else if (!obuId) { //OBU发行
+		// 			getObuApply();
+		// 		} else if (obuId && obuStatus == '9') { //OBU发行
+		// 			getObuApply();
+		// 		} else if (cardId && obuId && (obuStatus == '1' || obuStatus == '11' || obuStatus == '0')) {
+		// 			getInstallApply(); //激活
+		// 		} else {
+		// 			getCardId()
+		// 		}
+		// 	}
+		// }
 
 	};
 

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

@@ -74,6 +74,12 @@
 						</view>
 					</view>
 				</u-form-item>
+				<u-form-item >
+					<view class="from_item">
+						<text><text style="color: red"></text>邮寄地址：</text>
+						<u-input v-model="form.goodsAddress" class="input" disabled/>
+					</view>
+				</u-form-item>
 			</view>
 		</u-form>
 		<view class="attention">{{params.msg}}</view>
@@ -139,8 +145,7 @@
 		onReady
 	} from "@dcloudio/uni-app";
 	import {
-		navTo,
-		checkStr
+		navTo
 	} from "@/utils/utils";
 	import {
 		request
@@ -149,7 +154,8 @@
 		getLogistics,
 		addressQuery,
 		changeCardInfo,
-		changeCardQueryCancle
+		changeCardQueryCancle,
+		getMailingAddressApi
 	} from "@/utils/network/api.js";
 	import {
 		stringToJson
@@ -192,7 +198,8 @@
 		postalCode: '',
 		receiveMethodName: '邮寄', //0 --- 不邮寄 1 --- 邮寄
 		applyRes: '',
-		defaultAddress: 2
+		defaultAddress: 2,
+		goodsAddress:""
 	});
 
 
@@ -253,8 +260,25 @@
 		console.log("radiolist1.value", radiolist1.value)
 		getexpresslist();
 		getAddressList();
+		getMailingAddress(option.orderId)
 
 	});
+	const getMailingAddress = (orderId) => {
+		var data = {
+			orderId: orderId,
+		};
+		const options = {
+			type: 2,
+			data: data,
+			method: "POST",
+			showLoading: true,
+		};
+		request(getMailingAddressApi, options).then((res) => {
+			const data = stringToJson(res.bizContent);
+			form.goodsAddress=data.address
+			console.log("获取邮寄地址", data)
+		});
+	};
 	const goToAddAddress = () => {
 		uni.navigateTo({
 			url: "/subpackage/orders/addAddress",
@@ -418,6 +442,7 @@
 			applyRes: form.applyRes,
 			cardExpire: params.cardExpire,
 			obuExpire: params.obuExpire,
+			goodsAddress:""
 		};
 		const options = {
 			type: 2,

utils/network/api.js

@@ -310,4 +310,5 @@ export const getZfbOpenid = "62f02a3fd5eb462d9541aa21b78bba06" // 获取支付
 export const channelSingQueryApi = "0c6d650d94274ee086008652fa0fe41a"
 
 
-export const decrypt9901 = "c6e7c27e774c493d82c942dc69507d67"
+export const decrypt9901 = "c6e7c27e774c493d82c942dc69507d67"
+export const getMailingAddressApi = "1babe3f09d0b458a84c798e89895664f"  //更换设备获取邮寄地址

utils/network/request.js

@@ -14,6 +14,7 @@ import {
 import {
 	sm4Key
 } from "../network/api.js";
+const tools = require("../../static/etcUtil/tools.js");
 import SM4Util from '../util/sm4.js'
 import {
 	agentId,
@@ -238,6 +239,7 @@ export function request(code, options = {}, start = false) {
 							}
 						});
 					} else {
+						tools.showLoadingAlert("执行指令");
 						console.log("请求失败返回参数", code, res)
 						uni.showModal({
 							title: '提示',