修改问题

composables/order/useOrderSkip.ts

@@ -17,10 +17,10 @@ export default function useOrderSkip() {
 		} else {
 			// #ifdef MP-WEIXIN
 			// navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}&vehicleId=${orderInfo.vehicleId}`);
-			navTo(`/subpackage/orders/product-detail?orderId=${orderInfo.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&&vehicleId=${orderInfo.vehicleId}`);
+			navTo(`/subpackage/orders/product-detail?orderId=${orderInfo.orderId?orderInfo.orderId:orderInfo.orderNo}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&&vehicleId=${orderInfo.vehicleId}`);
 			// #endif
 			// #ifdef MP-ALIPAY
-			navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}&vehicleId=${orderInfo.vehicleId}`);
+			navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId?orderInfo.orderId:orderInfo.orderNo}&isValueCard=${orderInfo.isValueCard}&vehicleId=${orderInfo.vehicleId}`);
 			// #endif
 		}
 	}

stores/user.js

@@ -13,7 +13,8 @@ import {
 import {
 	appId,
 	getToken,
-	wechatAppID
+	wechatAppID,
+	getOpenId
 } from "@/utils/network/api";
 import {
 	stringToJson
@@ -49,31 +50,90 @@ export const useUserStore = defineStore("userStore", {
 
 		/*根据登录code获取token信息*/
 		fetchToken(code) {
-			const options = {
-				type: 2,
-				data: {
-					deviceId: "",
-					code: code,
-					loginSource: getItem("loginSource"),
-					wxOpenid: getItem("QYorder").openid,
-					zfbOpenId: getItem("zfbOpenId"),
-					zfbUserId: getItem("zfbUserId"),
-				},
-				method: "POST",
-				showLoading: false,
-			};
-
-			return new Promise(async (resolve, reject) => {
-				const res = await requestNew(getToken, options);
-				const data = res;
-				console.log("fetchToken", options)
-				this.saveToken(data.accessToken);
-				this.saveOpenId(data.openId);
-				console.log('输出内容', data.openId)
-				resolve(data);
-			}).catch((error) => {
-				reject(error);
-			});
+			if(getItem("QYorder") && getItem("QYorder").openid){
+				const options = {
+					type: 2,
+					data: {
+						deviceId: "",
+						code: code,
+						loginSource: getItem("loginSource"),
+						wxOpenid: getItem("QYorder").openid,
+						zfbOpenId: getItem("zfbOpenId"),
+						zfbUserId: getItem("zfbUserId"),
+					},
+					method: "POST",
+					showLoading: false,
+				};
+				
+				return new Promise(async (resolve, reject) => {
+					const res = await requestNew(getToken, options);
+					const data = res;
+					console.log("fetchToken", options)
+					this.saveToken(data.accessToken);
+					this.saveOpenId(data.openId);
+					console.log('输出内容', data.openId)
+					resolve(data);
+				}).catch((error) => {
+					reject(error);
+				});
+			}else{
+				var that=this
+				// 如果没有wxOpenid重新获取
+				//获取微信小程序openid
+				// #ifdef MP-WEIXIN
+				uni.login({
+					provider: "weixin",
+					success: function(e) {
+						console.log("jsCode",e.code)
+							const options = {
+								type: 2,
+								data: {
+									"jsCode": e.code
+								},
+								method: "POST",
+							};
+							// #ifdef MP-WEIXIN
+							requestNew(getOpenId, options).then((res) => {
+								const result =res;
+								console.log("getOpenId===",result)
+								const openidData = stringToJson(result.data);
+								setItem("QYorder", openidData);
+								const options = {
+									type: 2,
+									data: {
+										deviceId: "",
+										code: code,
+										loginSource: getItem("loginSource"),
+										wxOpenid: getItem("QYorder").openid,
+										zfbOpenId: getItem("zfbOpenId"),
+										zfbUserId: getItem("zfbUserId"),
+									},
+									method: "POST",
+									showLoading: false,
+								};
+								
+								return new Promise(async (resolve, reject) => {
+									const res = await requestNew(getToken, options);
+									const data = res;
+									console.log("fetchToken", options)
+									that.saveToken(data.accessToken);
+									that.saveOpenId(data.openId);
+									console.log('输出内容', data.openId)
+									resolve(data);
+								}).catch((error) => {
+									reject(error);
+								});
+							});
+							// #endif
+				
+					},
+				});
+				// #endif
+			}
+			
+		},
+		loginAll(code){
+			
 		},
 
 

subpackage/orders/addAddress.vue

@@ -39,7 +39,7 @@
 	import { reactive } from "vue";
 	import { onLoad } from "@dcloudio/uni-app";
 	import { addressAdd, updateReceive } from "@/utils/network/api.js";
-	import { request, requestNew } from "@/utils/network/request.js";
+	import {requestNew } from "@/utils/network/request.js";
 	import { getItem, StorageKeys } from "@/utils/storage";
 	import { msg, checkStr } from "@/utils/utils";
 	const btnGetCode = {
@@ -68,7 +68,7 @@ const labelStyle = {
 			defaultAddress: 2,
 			openId: '',
 			orderId: '',
-			whetherToMail: 0,
+			whetherToMail:true,
 		},
 		isDefault: false,
 	});

subpackage/orders/product-detail.vue

@@ -51,9 +51,7 @@
 		getOpenId,
 		envs, payQuery, agreementInSertOrder, agreeOrderProdcut
 	} from "@/utils/network/api.js";
-	import {
-		request, requestNew
-	} from "@/utils/network/request.js";
+	import { requestNew} from "@/utils/network/request.js";
 
 	import {
 		stringToJson

subpackage/personal-center/car-details.vue

@@ -92,7 +92,7 @@
 		margin-top: 100rpx;
 		width: 670rpx;
 		height: 80rpx;
-		background: linear-gradient(-90deg, #43A1E0 0%, #13E7C1 100%);
+		background: linear-gradient(to right,#01243A,#004576);
 		border-radius: 40rpx;
 		font-size: 32rpx;
 		font-family: Noto Sans S Chinese;

subpackage/personal-center/setting/car-information/car-create.vue

@@ -127,13 +127,8 @@
 		vehicleLicenseOcr,
 		createCarInfo
 	} from "@/utils/network/api.js";
-	import {
-		request,requestNew
+	import {requestNew
 	} from "@/utils/network/request.js";
-
-	import {
-		stringToJson
-	} from "@/utils/network/encryption";
 	import {
 		onLoad,
 		onShow

subpackage/personal-center/vehicle-information.vue

@@ -16,8 +16,7 @@
 
 <script lang="ts" setup>
 	import { reactive } from "vue";
-	import { request,requestNew } from "@/utils/network/request.js";
-	import { stringToJson } from "@/utils/network/encryption.js";
+	import { requestNew } from "@/utils/network/request.js";
 	import { onLoad } from "@dcloudio/uni-app";
 	import { selectCarInfo, delCarInfo } from "@/utils/network/api.js";
 	import { getItem } from "@/utils/storage";