9901

composables/order/useOrderSkip.ts

@@ -50,7 +50,8 @@ export default function useOrderSkip() {
 			id: orderInfo.id,
 			orderId: orderInfo.orderId,
 			vehiclePlate: orderInfo.vehiclePlate,
-			orderStep: orderInfo.orderStep
+			orderStep: orderInfo.orderStep,
+			deviceType:orderInfo.deviceType
 		}
 		navTo(`/subpackage/orders/cancel-order?data=${JSON.stringify(item)}`);
 	}

pages.json

@@ -1906,7 +1906,7 @@
 			"root": "subpackage/carPark",
 			"plugins": {
 			  "issuer-plugin": {
-			   "version": "dev-45a0e383d75ce8d9a2e14a3c4e3e31e2",
+			   "version": "dev-c968a95bd8b2e12ed880d15141e81dcd",
 			   // "version": "1.0.1",
 			   "provider": "wxa2d9acdd1054e69b"
 			  }

subpackage/orders/cancel-order.vue

@@ -12,13 +12,14 @@
 	import { msg, confirm, getOrderStatusName } from "@/utils/utils";
 	import { cancelOrder, cancelOrderNew } from "@/utils/network/api";
 	import { getItem, StorageKeys } from "@/utils/storage";
-
+import { deviceType } from "@/utils/network/difference";
 	const config = {
 		submitName: "取消订单", //按钮名称(默认提交)
 		titleWidth: 160, //标题最小宽度
 	};
 
 	const state = reactive({
+		deviceType:"",
 		orderInfo: {} as any, //订单数据
 		formData: [
 			{
@@ -70,12 +71,14 @@
 					data: {
 						id: state.orderInfo.id,
 						reason: e.orderReason,
-						openId: getItem(StorageKeys.OpenId),
+						openId: getItem(StorageKeys.OpenId)
 					},
 					method: "POST",
 					showLoading: true,
 				};
-
+                if(state.deviceType==deviceType){
+					options.data['wxOpenId'] =getItem("QYorder").openid
+				}
 				// #ifdef MP-WEIXIN
 				options.data['source'] = 'WECHAT'
 				// #endif
@@ -113,7 +116,8 @@
 		state.formData[0].hint = state.orderInfo.orderId;
 		state.formData[1].hint = state.orderInfo.vehiclePlate;
 		state.formData[2].hint = getOrderStatusName(state.orderInfo.orderStep);
-		console.log("options", options, getOrderStatusName(state.orderInfo.orderStep))
+		state.deviceType = state.orderInfo.deviceType;
+		console.log("options", state.orderInfo, getOrderStatusName(state.orderInfo.orderStep))
 	});
 </script>