待支付，签约跳转9901

composables/order/useOrderSkip.ts

@@ -53,7 +53,12 @@ export default function useOrderSkip() {
 		console.log("********555555555555**********", orderInfo.orderStep, OrderStatus["已支付/待签约"]);
 		let url = '';
 		if (orderInfo.orderStep == OrderStatus.完成填写基本信息 || orderInfo.orderStep == OrderStatus.待支付3) {
-			url = orderInfo.userType === 'PERSONAL_USER' ? '/subpackage/orders/opening-account-people' : '/subpackage/orders/opening-account-unit';
+			if (orderInfo.agencyId == "52010106004") {
+				const params = encodeURIComponent(JSON.stringify(orderInfo))
+				jump("10", params)
+			} else {
+				url = orderInfo.userType === 'PERSONAL_USER' ? '/subpackage/orders/opening-account-people' : '/subpackage/orders/opening-account-unit';
+			}
 		} else if (orderInfo.orderStep === OrderStatus["完成个人/单位信息上传"]) {
 			url = '/subpackage/orders/car-release';
 		} else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传 && orderInfo.isValueCard != 1) {
@@ -61,11 +66,22 @@ export default function useOrderSkip() {
 		} else if (orderInfo.orderStep === OrderStatus.待加购权益) {
 			navTo(`/subpackage/orders/interestsList?orderId=${orderInfo.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`);
 		} else if (orderInfo.orderStep === OrderStatus["完成车辆信息上传/待支付"]) {
-			url = '/subpackage/orders/order-payment';
+			if (orderInfo.agencyId == "52010106004") {
+				const params = encodeURIComponent(JSON.stringify(orderInfo))
+				jump("11", params)
+			} else {
+				url = '/subpackage/orders/order-payment';
+			}
 		} else if (orderInfo.orderStep === OrderStatus["审核不通过"]) {  //修改资料
 			url = '/subpackage/orders/changeInformation';
 		} else if (orderInfo.orderStep === OrderStatus["已支付/待签约"]) {  //修改资料
-			url = '/subpackage/orders/release-products';
+			if (orderInfo.agencyId == "52010106004") {
+				const params = encodeURIComponent(JSON.stringify(orderInfo))
+				jump("12", params)
+			} else {
+				url = '/subpackage/orders/release-products';
+			}
+
 		}
 		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'}&vehicleId=${orderInfo.vehicleId}`);
@@ -96,10 +112,10 @@ export default function useOrderSkip() {
 
 	//申请退货
 	const gotoReturnOrder = (orderInfo : any) => {
-		if(orderInfo.agencyId=="52010106004"){
+		if (orderInfo.agencyId == "52010106004") {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
-			jump("8",params)
-		}else{
+			jump("8", params)
+		} else {
 			const data = {
 				id: orderInfo.id,
 				orderId: orderInfo.orderId,
@@ -108,32 +124,32 @@ export default function useOrderSkip() {
 			}
 			navTo(`/subpackage/orders/apply-return-goods?data=${JSON.stringify(data)}`);
 		}
-		
+
 	}
 
 	//申请换货
 	const gotoExchangeOrder = (orderInfo : any) => {
-		if(orderInfo.agencyId=="52010106004"){
+		if (orderInfo.agencyId == "52010106004") {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
-			jump("3",params)
-		}else{
-		    navTo(`/subpackage/orders/apply-ex-goods-step1?orderId=${orderInfo.orderId}&id=${orderInfo.id}`);
+			jump("3", params)
+		} else {
+			navTo(`/subpackage/orders/apply-ex-goods-step1?orderId=${orderInfo.orderId}&id=${orderInfo.id}`);
 		}
 	}
 	//申请补货
 	const gotoReplenishmentOrder = (orderInfo : any) => {
-		if(orderInfo.agencyId=="52010106004"){
+		if (orderInfo.agencyId == "52010106004") {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
-			jump("9",params)
+			jump("9", params)
 		}
 	}
 
 	//去激活订单
 	const gotoActiveOrder = (orderInfo : any) => {
-		if(orderInfo.agencyId=="52010106004"){
+		if (orderInfo.agencyId == "52010106004") {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
-			jump("3",params)
-		}else{
+			jump("3", params)
+		} else {
 			navTo(`/subpackage/after-sale/activation/operation-tips?id=${orderInfo.id}&orderId=${orderInfo.orderId}&cardStatus=${orderInfo.cardStatus}&obuStatus=${orderInfo.obuStatus}&transfer=${orderInfo.transfer}`);
 		}
 	}
@@ -257,6 +273,13 @@ export default function useOrderSkip() {
 		});
 
 
+	}
+	//异地-邮寄地址填写
+	const gotoAddressOrder=(orderInfo:any)=>{
+		if (orderInfo.agencyId == "52010106004") {
+			const params = encodeURIComponent(JSON.stringify(orderInfo))
+			jump("13", params)
+		}
 	}
 	return {
 		gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
@@ -264,6 +287,7 @@ export default function useOrderSkip() {
 		gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay,
 		gotoOrderDetails, gotoLogoffETC, gotoEditCarWriteInfo,
 		gotoEditCarApplyAgain, gotoCardSignPay, gotoAgainUseOrder, gotoOrderDetailsPay, gotoOrderSign, closeOrder,
-		gotoReplenishmentOrder
+		gotoReplenishmentOrder,
+		gotoAddressOrder
 	}
 }

datas/9901Jump.js

@@ -9,6 +9,7 @@ export function jump(type,item){
 	}
 	let path=""
 	let jumpType=type //1 obu重新激活  2 卡签注销  3 首次激活  4客车个人用户办理etc  5更换设备  6卡签续期  7申请换货  8申请退货 9申请补货
+	// 10 上传身份信息   11待支付  12待签约  13异地-邮寄地址填写
 	    if(jumpType=="1"){
 			path="pages/route/index"
 		}else if(jumpType=="2"){
@@ -27,6 +28,16 @@ export function jump(type,item){
 			path="pages/route/index"
 		}else if(jumpType=="8"){
 			path="pages/route/index"
+		}else if(jumpType=="9"){
+			path="pages/route/index"
+		}else if(jumpType=="10"){
+			path="pages/route/index"
+		}else if(jumpType=="11"){
+			path="pages/route/index"
+		}else if(jumpType=="12"){
+			path="pages/route/index"
+		}else if(jumpType=="13"){
+			path="pages/route/index"
 		}
 		console.log("===",getItem("QYorder").openid,data.vehicleId,data.cardId,jumpType)
 		uni.navigateToMiniProgram({

datas/enum.ts

@@ -27,6 +27,7 @@ export enum OrderStatus {
 	'退款成功' = 16,
 	'退货成功' = 17,
 	'换货-设备已回收' = 18,
+	'邮寄地址填写' = 30,  //异地-邮寄地址填写
 }
 
 //订单类型

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

@@ -117,6 +117,10 @@
 				<view class="btns" v-else-if="item.orderStep == OrderStatus.已结束 && item.isUseAgain">
 					<view class="btn btn-primary" @click.stop="gotoAgainUseOrder(item)">再次使用订单</view>
 				</view>
+				<!-- 异地-邮寄地址填写 -->
+				<view class="btns" v-else-if="item.orderStep == OrderStatus.邮寄地址填写 && item.agencyId=='52010106004'">
+					<view class="btn btn-primary" @click.stop="gotoAddressOrder(item)">邮寄地址填写</view>
+				</view>
 			</view>
 
 
@@ -190,7 +194,8 @@
 		gotoAgainUseOrder,
 		gotoOrderSign,
 		closeOrder,
-		gotoReplenishmentOrder
+		gotoReplenishmentOrder,
+		gotoAddressOrder
 	} = useOrderSkip();
 
 	//激活订单

subpackage/orders/interestsList.vue

@@ -72,9 +72,9 @@
 		state.signAgencyId = option.signAgencyId;
 	})
 	const addInterestsList = () => {
-		if(state.signAgencyId=="52010102041"){
-					jump("4","")
-		}else{
+		// if(state.signAgencyId=="52010102041"){
+		// 			jump("4","")
+		// }else{
 			if (state.changeCardType == "1") {
 				navTo(
 					`/subpackage/after-sale/to-bookkeeping-card/mailing_information?orderId=${state.orderId}&&applyId=${state.applyId}&&productId=${state.promoteId}&&totalAmount=${state.totalAmount}&&equityId=${state.equityId}`
@@ -85,7 +85,7 @@
 					url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}`,
 				});
 			}
-		}
+		// }
 		
 	}
 

subpackage/orders/order-details-new.vue

@@ -449,6 +449,11 @@
 							class="btn-status">
 							<view class="btn-green" @click.stop="gotoAgainUseOrder(state.orderInfo)">再次使用订单</view>
 						</view>
+						<!-- 异地-邮寄地址填写 -->
+						<view v-if="state.orderInfo.orderStep == OrderStatus.邮寄地址填写 && state.orderInfo.agencyId=='52010106004'"
+							class="btn-status">
+							<view class="btn-green" @click.stop="gotoAddressOrder(state.orderInfo)">邮寄地址填写</view>
+						</view>
 						<!-- 订单完成 -->
 						<view v-if="state.isWeiXin==1">
 							<view
@@ -520,7 +525,7 @@
 	//按钮跳转业务逻辑
 	const { gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
 		gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateProduct,
-		gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay, gotoOrderSign, gotoOrderDetailsPay, gotoEvaluateSalesman, closeOrder, gotoAgainUseOrder } = useOrderSkip();
+		gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay, gotoOrderSign, gotoOrderDetailsPay, gotoEvaluateSalesman, closeOrder, gotoAgainUseOrder,gotoAddressOrder } = useOrderSkip();
 
 
 	//获取订单详情

utils/network/request.js

@@ -70,8 +70,8 @@ export function request(code, options = {}, start = false) {
 
 	}
 
-	options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
-	// options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
+	// options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
+	options.url = envs[process.env.NODE_ENV].baseUrl + '/dev/api/interfaceMidGroundIn'
 	//默认json数据格式提交`
 	let contentType = 'application/x-www-form-urlencoded'