提交

composables/order/useOrderSkip.ts

@@ -7,7 +7,7 @@ import { request } from "@/utils/network/request.js";
 import { gotoAgainUseOrderApi, finishUseOrderApi } from "@/utils/network/api.js";
 import { stringToJson } from "@/utils/network/encryption.js";
 import { jump } from "@/datas/9901Jump.js";
-import { agencyId } from "@/utils/network/difference";
+import { deviceType } from "@/utils/network/difference";
 export default function useOrderSkip() {
 	const gotoOrderDetailsPay = (orderInfo) => {
 		// #ifdef MP-WEIXIN
@@ -54,7 +54,7 @@ export default function useOrderSkip() {
 		console.log("********555555555555**********", orderInfo.orderStep, OrderStatus["已支付/待签约"]);
 		let url = '';
 		if (orderInfo.orderStep == OrderStatus.完成填写基本信息 || orderInfo.orderStep == OrderStatus.待支付3) {
-			if (orderInfo.agencyId == agencyId) {
+			if (orderInfo.deviceType == deviceType) {
 				const params = encodeURIComponent(JSON.stringify(orderInfo))
 				jump("10", params)
 			} else {
@@ -67,7 +67,7 @@ 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["完成车辆信息上传/待支付"]) {
-			if (orderInfo.agencyId == agencyId) {
+			if (orderInfo.deviceType == deviceType) {
 				const params = encodeURIComponent(JSON.stringify(orderInfo))
 				jump("11", params)
 			} else {
@@ -76,7 +76,7 @@ export default function useOrderSkip() {
 		} else if (orderInfo.orderStep === OrderStatus["审核不通过"]) {  //修改资料
 			url = '/subpackage/orders/changeInformation';
 		} else if (orderInfo.orderStep === OrderStatus["已支付/待签约"]) {  //修改资料
-			if (orderInfo.agencyId == agencyId) {
+			if (orderInfo.deviceType == deviceType) {
 				const params = encodeURIComponent(JSON.stringify(orderInfo))
 				jump("12", params)
 			} else {
@@ -113,7 +113,7 @@ export default function useOrderSkip() {
 
 	//申请退货
 	const gotoReturnOrder = (orderInfo : any) => {
-		if (orderInfo.agencyId == agencyId) {
+		if (orderInfo.deviceType == deviceType) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("8", params)
 		} else {
@@ -130,7 +130,7 @@ export default function useOrderSkip() {
 
 	//申请换货
 	const gotoExchangeOrder = (orderInfo : any) => {
-		if (orderInfo.agencyId == agencyId) {
+		if (orderInfo.deviceType == deviceType) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("7", params)
 		} else {
@@ -139,7 +139,7 @@ export default function useOrderSkip() {
 	}
 	//申请补货
 	const gotoReplenishmentOrder = (orderInfo : any) => {
-		if (orderInfo.agencyId == agencyId) {
+		if (orderInfo.deviceType == deviceType) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("9", params)
 		}
@@ -147,7 +147,7 @@ export default function useOrderSkip() {
 
 	//去激活订单
 	const gotoActiveOrder = (orderInfo : any) => {
-		if (orderInfo.agencyId == agencyId) {
+		if (orderInfo.deviceType == deviceType) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("14", params)
 		} else {
@@ -201,7 +201,7 @@ export default function useOrderSkip() {
 	}
 	//去签约
 	const gotoOrderSign = (orderInfo : any) => {
-		if (orderInfo.agencyId == agencyId) {
+		if (orderInfo.deviceType == deviceType) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("12", params)
 		} else {
@@ -282,7 +282,7 @@ export default function useOrderSkip() {
 	}
 	//异地-邮寄地址填写
 	const gotoAddressOrder=(orderInfo:any)=>{
-		if (orderInfo.agencyId == agencyId) {
+		if (orderInfo.deviceType == deviceType) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("13", params)
 		}

datas/9901Jump.js

@@ -15,14 +15,32 @@ export function jump(type,item){
 	let handleType=""
 	let orderType=""
 	let afterType=""
+	
+	let accountType=""
+	let carType=""
 	if(type=="15" ){
+		// 7. accountType 1 个人  2企业
+  //       8. carType 0 客车 1 货车
+		accountType=data.userType
+		carType=data.type=='1'?0:1
+		console.log("accountType",accountType,carType)
+		redirectUrl=`/pages/order/order`
+	}
+	if(type=="10" || type=="11"  || type=="12"|| type=="13"){
 		redirectUrl="/pages/order/order"
+		handleType="continuation"
 	}
-	if(type=="14" || type=="10" || type=="11"  || type=="12"|| type=="13"){
+	// 售后激活 更换卡签
+	if(type=="14" && (data['orderType']=='EXCHANGE_CARD' || data['orderType']=='EXCHANGE_OBU' || data['orderType']=='EXCHANGE_ALL')){
+		afterType=3
+		orderType=2
+		handleType="aftersale"
+		redirectUrl="/pages/order/order"
+	}else{
+		// 14 正常激活
 		redirectUrl="/pages/order/order"
 		handleType="continuation"
 	}
-	
 	if(type=="7" || type=="8" || type=="9"){
 		redirectUrl="/pages/order/order"
 		handleType="aftersale"
@@ -46,7 +64,7 @@ export function jump(type,item){
 	}
 	// 售后业务
 	if(type=="2" || type=="3"|| type=="4" || type=="5"|| type=="6"){
-		redirectUrl="/pages/service/service"
+		redirectUrl="/pages/index/index"
 		handleType="aftersale"
 		if(data['after']){
 			orderType=2
@@ -69,10 +87,10 @@ export function jump(type,item){
 	// 重新激活
 	if(type=="1"){
 		handleType="reactivate"
-		redirectUrl="/pages/service/service"
+		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}`
+		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}`
 	})
 	
 		

manifest.json

@@ -73,7 +73,7 @@
 		"requiredPrivateInfos": ["chooseLocation", "getLocation", "chooseAddress"],
 		"plugins": {
 		  "issuer-plugin": {
-		   "version": "dev-442e4ff301000c311d271e67449f871a",
+		   "version": "dev-6124a94c780bba48fa11c972bcca2c98",
 		   "provider": "wxa2d9acdd1054e69b"
 		  }
 		 }

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

@@ -91,14 +91,25 @@
 				</view>
 
 				<!-- 待激活 -->
+				
 				<view class="btns" v-else-if="item.orderStep == OrderStatus.待激活">
 					<view class="btn btn-normal" @click.stop="gotoReturnOrder(item)" v-if="item.applyReturn">申请退货</view>
 					<view class="btn btn-normal" @click.stop="gotoExchangeOrder(item)">申请换货</view>
-					<view class="btn btn-normal" @click.stop="gotoReplenishmentOrder(item)" v-if="item.agencyId==agencyId">申请补货</view>
+					<view class="btn btn-normal" @click.stop="gotoReplenishmentOrder(item)" v-if="item.deviceType==deviceType">申请补货</view>
 					<view class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
 					<view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view>
 				</view>
-
+				<!-- ORDER_STEP_31(31, "异地-售前退货"),
+				ORDER_STEP_32(32, "异地-售前退货后确认收货"),
+				ORDER_STEP_33(33, "异地-售前换货"),
+				ORDER_STEP_34(34, "异地-售前换货后确认收货"), -->
+                <view class="btns" v-else-if="item.orderStep == 31">
+					<view class="btn btn-primary" @click.stop="gotoReturnOrder(item)" >退货</view>
+				</view>
+				<view class="btns" v-else-if="item.orderStep==33">
+					<view class="btn btn-primary" @click.stop="gotoExchangeOrder(item)">换货</view>
+				</view>
+				
 				<!-- 已完成  售后订单不允许评价产品，储值卡转记账卡除外-->
 				<!-- 发行产品 isProduct=0;  业务员 isStaff=0; 权益 isEquity=0  业务服务  isService=0; -->
 				<view class="btns"
@@ -118,7 +129,7 @@
 					<view class="btn btn-primary" @click.stop="gotoAgainUseOrder(item)">再次使用订单</view>
 				</view>
 				<!-- 异地-邮寄地址填写 -->
-				<view class="btns" v-else-if="item.orderStep == OrderStatus.邮寄地址填写 && item.agencyId==agencyId">
+				<view class="btns" v-else-if="item.orderStep == OrderStatus.邮寄地址填写 && item.deviceType==deviceType">
 					<view class="btn btn-primary" @click.stop="gotoAddressOrder(item)">邮寄地址填写</view>
 				</view>
 			</view>
@@ -151,7 +162,7 @@
 <script lang="ts" setup>
 	import popupActiveOrder from "./popup-active-order.vue";
 	import useOrderSkip from "@/composables/order/useOrderSkip";
-	import { agencyId } from "@/utils/network/difference";
+	import { deviceType } from "@/utils/network/difference";
 	import {
 		getOrderStatusName,
 		msg,

subpackage/after-sale/activation-once-again/select-car.vue

@@ -23,7 +23,7 @@
 	import { getItem, StorageKeys, setItem } from "@/utils/storage";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { jump } from "@/datas/9901Jump.js";
-import { agencyId } from "@/utils/network/difference";
+import { deviceType } from "@/utils/network/difference";
 	const state = reactive({
 		list: [],
 		type: "",//1 OBU重新激活   2 卡签注销   3 更换设备  4卡签续期  5挂失解挂  6增补设备
@@ -96,7 +96,7 @@ import { agencyId } from "@/utils/network/difference";
 		console.log(item.cardId);
 		flag.value = i
 		// 判断9901
-		if (item.agencyId == agencyId) {
+		if (item.deviceType == deviceType) {
 			// OBU重新激活跳转
 			const params = encodeURIComponent(JSON.stringify(item))
 			if(state.type=="5"){

subpackage/orders/choice-product.vue

@@ -2,7 +2,7 @@
 	<navBar title="选择产品" :scrollTop="scrollTop"></navBar>
 	<navBgCar></navBgCar>
 	<view class="content-value">
-		<view v-for="(item, index) in state.dataArray" :key="index">
+		<view v-for="(item, index) in state.dataArray" :key="index" >
 			<view :style="`background-color:${bgc}`" style="border-radius: 16rpx;padding: 20rpx;margin-top: 20rpx;">
 				<view class="title" style="display: flex;flex-direction: row;justify-content: flex-start;">
 					<view style="font-weight: bold;margin-right: 10rpx;font-size: 18px;">
@@ -108,7 +108,7 @@
 		setItem("promoteId", val.promoteId);
 
 		state.isSign = val.isSign;
-		state.signAgencyId = val['releaseProductStandards']['signAgencyId'];
+		state.signAgencyId = val['releaseProductStandards']['deviceType'];
 		state.equityId = val.releaseProductStandards.equityList[idx].equityId;
 		// 产品金额+权益金额
 		state.fee = Number(val.fee) + Number(val.releaseProductStandards.equityList[idx].discountPrice);
@@ -126,7 +126,7 @@
 			console.log("state.isValueCard", state.isValueCard)
 			setItem("isValueCard", state.isValueCard);
 			uni.navigateTo({
-				url: `/subpackage/orders/interestsList?equityId=${val.releaseProductStandards.equityList[idx].equityId}&promoteId=${val['promoteId']}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${state.fee}&signAgencyId=${val['releaseProductStandards']['signAgencyId']}`,
+				url: `/subpackage/orders/interestsList?equityId=${val.releaseProductStandards.equityList[idx].equityId}&promoteId=${val['promoteId']}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${state.fee}&signAgencyId=${val['releaseProductStandards']['deviceType']}`,
 			});
 		} else {
 			state.radiolist1 = [];

subpackage/orders/interestsList.vue

@@ -25,7 +25,7 @@
 		getItem,
 		setItem
 	} from "@/utils/storage";
-
+import { deviceType } from "@/utils/network/difference";
 	const state = reactive({
 		openid: "",
 		equityId: "",
@@ -72,11 +72,14 @@
 		state.signAgencyId = option.signAgencyId;
 	})
 	const addInterestsList = () => {
-		if(state.signAgencyId=="52010102041"){
-			jump("15","")
-			// uni.navigateTo({
-			// 	url:`plugin://issuer-plugin/login?wxOpenId=${getItem("QYorder").openid}&type=1`
-			// })
+		console.log("state.signAgencyId",state.signAgencyId,deviceType)
+		if(state.signAgencyId==deviceType){
+			let obj={
+				type:state.type,
+				userType:state.userType,
+			}
+			const params = encodeURIComponent(JSON.stringify(obj))
+			jump("15",params)
 		}else{
 			if (state.changeCardType == "1") {
 				navTo(

subpackage/orders/order-confirm-receipt.vue

@@ -66,7 +66,7 @@
 			data: {
 				id: state.orderInfo.id,
 				source: "WECHAT",
-				opId: getItem(StorageKeys.OpenId),
+				opId: getItem(StorageKeys.OpenId)
 			},
 			method: "POST",
 			showLoading: true,

subpackage/orders/order-details-new.vue

@@ -444,16 +444,25 @@
 							<view class="btn-green" @click.stop="closeOrder(state.orderInfo)"
 								v-if="state.orderInfo.finishOrder">结束订单</view>
 						</view>
+					
 						<!-- 订单已结束 -->
 						<view v-if="state.orderInfo.orderStep == OrderStatus.已结束 && state.orderInfo.isUseAgain"
 							class="btn-status">
 							<view class="btn-green" @click.stop="gotoAgainUseOrder(state.orderInfo)">再次使用订单</view>
 						</view>
 						<!-- 异地-邮寄地址填写 -->
-						<view v-if="state.orderInfo.orderStep == OrderStatus.邮寄地址填写 && state.orderInfo.agencyId==agencyId"
+						<view v-if="state.orderInfo.orderStep == OrderStatus.邮寄地址填写 && state.orderInfo.deviceType==deviceType"
 							class="btn-status">
 							<view class="btn-green" @click.stop="gotoAddressOrder(state.orderInfo)">邮寄地址填写</view>
 						</view>
+						<!-- 异地开始 -->
+						<view v-if="state.orderInfo.orderStep == 31" class="btn-status">
+							<view class="btn btn-green" @click="gotoReturnOrder(state.orderInfo)">退货</view>
+						</view>
+						<view v-if="state.orderInfo.orderStep == 33" class="btn-status">
+							<view class="btn btn-green" @click="gotoExchangeOrder(state.orderInfo)">换货</view>
+						</view>
+						<!-- 异地结束-->
 						<!-- 订单完成 -->
 						<view v-if="state.isWeiXin==1">
 							<view
@@ -511,7 +520,7 @@
 	import useOrderSkip from "@/composables/order/useOrderSkip";
 	import { getETCStatusName, getOBUStatusName, msg, getOrderTypeName, getCarTypeName, getOrderTime, isBlank, timesDiff } from "@/utils/utils";
 	import { OrderStatus } from "@/datas/enum";
-	import {agencyId} from "@/utils/network/difference";
+	import {deviceType} from "@/utils/network/difference";
 	const state = reactive({
 		orderInfo: {
 			orderInfoExt: {}

utils/network/difference.js

@@ -24,4 +24,4 @@ export const channelId = "5201010200601130001" //
 // #endif
 
 // 9901渠道
-export const agencyId = "52010106004"
+export const deviceType = "TYMY9901"