微信订单顺序

composables/order/useOrderSkip.ts

@@ -77,19 +77,13 @@ export default function useOrderSkip() {
 			url = '/subpackage/orders/car-release';
 		} else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传 && orderInfo.isValueCard != 1) {
 			url = `/subpackage/orders/release-products`;
-		} else if (orderInfo.orderStep === OrderStatus.待加购权益 && orderInfo.isValueCard == 1) {
+		} else if (orderInfo.orderStep === OrderStatus.待加购权益 ) {
 			url = `/subpackage/orders/interestsList?orderId=${orderInfo.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`;
 			// uni.redirectTo({
 			//   url: `/subpackage/orders/choice-product?orderId=${val.orderId}`,
 			// });
 		} else {
-			// #ifdef MP-ALIPAY
-			url = `/subpackage/orders/sign-up-ali`;
-			// #endif
-			// #ifdef MP-WEIXIN
-			url = `/subpackage/orders/essential-information`;
-			// #endif
-
+			
 		}
 		console.log("url", url)
 		navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`);

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

@@ -49,14 +49,14 @@
 
 			</view>
 			<!-- 待支付 -->
-			<view class="btns" v-if="item.orderStep == OrderStatus.待加购权益&& item.isValueCard == 1">
+			<view class="btns" v-if="item.orderStep == OrderStatus.待加购权益">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
 				<view class="btn btn-primary" @click.stop="gotoEditUserOrUnitInfo(item)">加购权益</view>
 			</view>
-			<view class="btns" v-if="item.orderStep == OrderStatus.待加购权益&& item.isValueCard != 1">
+			<!-- <view class="btns" v-if="item.orderStep == OrderStatus.待加购权益&& item.isValueCard != 1">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
 				<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">支付</view>
-			</view>
+			</view> -->
 			<view class="btns" v-if="item.orderStep == OrderStatus.待支付2">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
 				<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">支付</view>

subpackage/orders/car-release.vue

@@ -271,8 +271,7 @@
 								// #endif
 								// #ifdef MP-WEIXIN
 								uni.redirectTo({
-									url:`/subpackage/orders/interestsList?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`
-									// url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
+									url: `/subpackage/orders/interestsList?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`// url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 								});
 								// #endif
 								

subpackage/orders/order_payment.vue

@@ -6,7 +6,7 @@
 			<image style="width: 100%; height: 170rpx; border-radius: 20rpx"
 				:src="`${$imgUrl}applyCard/product-bg.png`"></image>
 			<view class="item-value">
-				<image class="icon-tip" :src="`${$imgUrl}applyCard/alibaba.png`"></image>
+				<image class="icon-tip" :src="imageUrl"></image>
 				<view class="content">
 					<view class="title">
 						{{ item.payName }}
@@ -69,6 +69,7 @@
 	import { getItem, StorageKeys, setItem } from "@/utils/storage.ts";
 	import { msg } from "@/utils/utils";
 	const imgURL = `${fileURL}image/`;
+	let imageUrl = ""
 	// import { setItem } from "@/utils/storage";
 
 	let logo
@@ -235,9 +236,8 @@
 			// console.log(typeof(data));
 			if(data.paymentStatus == 'ALLSUCCESS'){
 				gotoEditUserOrUnitInfo()
-				// uni.redirectTo({
-				// 	url: `/subpackage/orders/sign-up-ali?orderId=${state.orderId}`,
-				// });
+				
+				
 			}
 			state.dataArray = data.datas;
 			// HANDLE("办理费",1){},
@@ -290,6 +290,17 @@
 	onLoad((option : any) => {
 		state.orderId = option.orderId;
 		state.isValueCard = option.isValueCard;
+		let source = ""
+	
+		// #ifdef MP-ALIPAY
+			imageUrl = imgURL + "applyCard/alibaba.png";
+			source ="ALI"
+			
+		// #endif
+		// #ifdef MP-WEIXIN
+			imageUrl = imgURL + "applyCard/wechat.png";
+			source ="WECHAT"
+		// #endif
 		// state.userType = option.userType;
 		// state.vehiclePlateColor = option.vehiclePlateColor;
 		// state.userType = option.userType;
@@ -312,10 +323,19 @@
 			console.log(data);
 			// console.log(typeof(data));
 			if(data.paymentStatus == 'ALLSUCCESS'){
-				gotoEditUserOrUnitInfo(state)
+				// gotoEditUserOrUnitInfo()
 				// uni.redirectTo({
 				// 	url: `/subpackage/orders/sign-up-ali?orderId=${state.orderId}`,
 				// });
+				if(state.isValueCard != 1 ){
+					uni.redirectTo({
+						url: `/subpackage/orders/release-products?orderId=${state.orderId}`,
+					});
+				}else{
+					uni.switchTab({
+						url: "/pages/order/order"
+					})
+				}
 			}
 			state.dataArray = data.datas;
 			// HANDLE("办理费",1){},
@@ -391,22 +411,15 @@
 		});
 	};
 const gotoEditUserOrUnitInfo = () => {
-		let url = '';
-		if (state.isValueCard != 1) {
-			url = `/subpackage/orders/release-products`;
-		} else {
-			// #ifdef MP-ALIPAY
-				url = `/subpackage/orders/sign-up-ali`;
-			// #endif
-			// #ifdef MP-WEIXIN
-				url = `/subpackage/orders/essential-information`;
-			// #endif
-
+		if(state.isValueCard != 1 ){
+			uni.redirectTo({
+				url: `/subpackage/orders/release-products?orderId=${state.orderId}`,
+			});
+		}else{
+			uni.switchTab({
+				url: "/pages/order/order"
+			})
 		}
-		console.log("url", url)
-		uni.redirectTo({
-			url: `${url}?orderId=${state.orderId}`,
-		});
 	}
 	const state = reactive({
 		isValueCard: 1, //卡的类型

subpackage/orders/sign-up.vue

@@ -142,10 +142,9 @@ const savaHandle = () => {
         // uni.navigateTo({
         //   url: `/subpackage/orders/product-detail?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`,
         // });
-		uni.navigateTo({
-        url: "/pages/order/order"
-			// url:`/subpackage/orders/interestsList?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`
-		});
+		uni.switchTab({
+			url: "/pages/order/order"
+		})
       } else if (data.userState === "PAUSED") {
         msg("已暂停车主服务");
         return;