提交

composables/order/useOrderSkip.ts

@@ -20,7 +20,7 @@ export default function useOrderSkip() {
 	//根据订单类型 跳转到不同的订单详情页面
 	const gotoOrderDetails = (orderInfo, isWeiXin) => {
 		console.log('输出内容=====', orderInfo)
-		navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}&isWeiXin=${isWeiXin}`);
+		navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}&isWeiXin=${isWeiXin}&reshipment=${orderInfo.reshipment}`);
 
 	}
 

datas/9901Jump.js

@@ -101,7 +101,7 @@ export function jump(type,item){
 				redirectUrl="/pages/index/index"
 			}
 			uni.navigateTo({
-				url:`plugin://issuer-plugin/login?redirectUrl=${redirectUrl}&plateNum=${data.vehicleId?data.vehicleId:""}&handleType=${handleType}&orderNo=${data.orderId?data.orderId:""}&orderType=${orderType}&afterType=${afterType}&accountType=${accountType}&carType=${carType}&etcProductId=${data.promoteId}`
+				url:`plugin://issuer-plugin/login?redirectUrl=${redirectUrl}&plateNum=${data.vehicleId?data.vehicleId:""}&handleType=${handleType}&orderNo=${(handleType!='continuation' && data.orderId)?data.orderId:""}&orderType=${orderType}&afterType=${afterType}&accountType=${accountType}&carType=${carType}&etcProductId=${data.promoteId}`
 			})
 	}
 }

pages.json

@@ -1907,7 +1907,7 @@
 			"plugins": {
 			  "issuer-plugin": {
 			   // "version": "1.0.0",
-			   "version": "dev-7622ba33f9627a64cca289877e8237ed",
+			   "version": "dev-902a9b8423bbea1f5d6f69a25ea9da33",
 			   "provider": "wxa2d9acdd1054e69b"
 			  }
 			 },

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

@@ -13,7 +13,7 @@
 			<view class="status text-green" v-else
 				:class="{'text-orange':item.orderStep == OrderStatus.已完成 || item.orderStep == OrderStatus.已结束 
 			 || item.orderStep == OrderStatus['换货-设备已回收'] || item.orderStep == OrderStatus.退款成功 || item.orderStep == OrderStatus.退货成功}">
-				{{(item.orderStep==12 && item.reshipment==1)?"补货":getOrderStatusName(item.orderStep)}}
+				{{(item.orderStep==12 && item.reshipment==1)?"补货中":getOrderStatusName(item.orderStep)}}
 			</view>
 		</view>
 		<view class="detail">

subpackage/carPark/etc/etcDeviceInfo.vue

@@ -143,7 +143,8 @@
 	import {
 		decrypt9901,
 		cardList,
-		searchObuInfo
+		searchObuInfo,
+		getOpenidApi
 	} from "@/utils/network/api";
 	import {
 		stringToJson
@@ -202,12 +203,46 @@
 		vehicleId: "",
 		obuStatus: "",
 		cardStatus: "",
-		cardTypeName: ""
+		cardTypeName: "",
+		openid:""
 	})
 	onLoad((option) => {
+		// #ifdef MP-WEIXIN
+		getOpenID();/*传参*/
+		// #endif
 		getCardId()
 	})
+//获取微信小程序openid
+	const getOpenID = () => {
+		uni.login({
+			provider: "weixin",
+			success: function (e) {
+				getOpenid(e.code);
+			},
+			fail: function () {
+				msg("获取不到oppenId，请检查AppID和Secret是否争取");
+			},
+		});
+	};
+	const getOpenid = (code) => {
+		const options = {
+			type: 2,
+			data: {
+				"jsCode": code
+			},
+			method: "POST",
+			showLoading: true,
+		};
+		// #ifdef MP-WEIXIN
+		request(getOpenidApi, options).then((res) => {
+			const result = stringToJson(res.bizContent);
+			console.log("获取微信小程序openid", result);
+			const openidData = stringToJson(result.data);
+			state.openid = openidData.openid
+		});
+		// #endif
 
+	}
 	/**
 	 * 获取卡号
 	 */
@@ -420,7 +455,8 @@
 			type: 2,
 			data: {
 				obuId: num,
-				encryptedInfo: data
+				encryptedInfo: data,
+				wxOpenId:state.openid
 			},
 			method: "POST",
 			showLoading: true,

subpackage/orders/order-details-new.vue

@@ -68,8 +68,10 @@
 						</view>
 						<view class="d-row">
 							<text class="d-label">订单状态：</text>
-							<text
-								class="d-value text-green">{{state.orderInfo.orderStatus == OrderStatus.已取消 ? '已取消' : $util.getOrderStatusName(state.orderInfo.orderStep)}}</text>
+							<text v-if="state.orderInfo.orderStep == 12 && state.reshipment=='1'"
+								class="d-value text-green">补货中</text>
+								<text v-else
+									class="d-value text-green">{{state.orderInfo.orderStatus == OrderStatus.已取消 ? '已取消' : $util.getOrderStatusName(state.orderInfo.orderStep)}}</text>
 						</view>
 						<view class="d-row">
 							<text class="d-label">创建时间：</text>
@@ -529,7 +531,8 @@
 		showActiveOrder: false, //激活弹窗
 		isWeiXin: 1,  //1  微信   2 app
 		appraise: "",
-		id: ""
+		id: "",
+		reshipment:"",//异地补货
 	});
 
 	//按钮跳转业务逻辑
@@ -622,6 +625,8 @@
 
 	onLoad((options) => {
 		state.isWeiXin = options.isWeiXin
+		state.reshipment = options.reshipment
+		console.log("options.reshipment",options.reshipment)
 		//刷新订单信息
 		uni.$on('refreshOrder', (data) => {
 			getOrderDetails(options.id, state.orderInfo.appraise);