提交

composables/order/useOrderSkip.ts

@@ -7,6 +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";
 export default function useOrderSkip() {
 	const gotoOrderDetailsPay = (orderInfo) => {
 		// #ifdef MP-WEIXIN
@@ -53,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 == "52010106004") {
+			if (orderInfo.agencyId == agencyId) {
 				const params = encodeURIComponent(JSON.stringify(orderInfo))
 				jump("10", params)
 			} else {
@@ -66,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 == "52010106004") {
+			if (orderInfo.agencyId == agencyId) {
 				const params = encodeURIComponent(JSON.stringify(orderInfo))
 				jump("11", params)
 			} else {
@@ -75,7 +76,7 @@ export default function useOrderSkip() {
 		} else if (orderInfo.orderStep === OrderStatus["审核不通过"]) {  //修改资料
 			url = '/subpackage/orders/changeInformation';
 		} else if (orderInfo.orderStep === OrderStatus["已支付/待签约"]) {  //修改资料
-			if (orderInfo.agencyId == "52010106004") {
+			if (orderInfo.agencyId == agencyId) {
 				const params = encodeURIComponent(JSON.stringify(orderInfo))
 				jump("12", params)
 			} else {
@@ -112,7 +113,7 @@ export default function useOrderSkip() {
 
 	//申请退货
 	const gotoReturnOrder = (orderInfo : any) => {
-		if (orderInfo.agencyId == "52010106004") {
+		if (orderInfo.agencyId == agencyId) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("8", params)
 		} else {
@@ -129,7 +130,7 @@ export default function useOrderSkip() {
 
 	//申请换货
 	const gotoExchangeOrder = (orderInfo : any) => {
-		if (orderInfo.agencyId == "52010106004") {
+		if (orderInfo.agencyId == agencyId) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("7", params)
 		} else {
@@ -138,7 +139,7 @@ export default function useOrderSkip() {
 	}
 	//申请补货
 	const gotoReplenishmentOrder = (orderInfo : any) => {
-		if (orderInfo.agencyId == "52010106004") {
+		if (orderInfo.agencyId == agencyId) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("9", params)
 		}
@@ -146,7 +147,7 @@ export default function useOrderSkip() {
 
 	//去激活订单
 	const gotoActiveOrder = (orderInfo : any) => {
-		if (orderInfo.agencyId == "52010106004") {
+		if (orderInfo.agencyId == agencyId) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("3", params)
 		} else {
@@ -200,13 +201,18 @@ export default function useOrderSkip() {
 	}
 	//去签约
 	const gotoOrderSign = (orderInfo : any) => {
-		//跳转到车辆信息变更界面
-		// #ifdef MP-ALIPAY
-		navTo(`/subpackage/orders/release-products?orderId=${orderInfo.orderId}`);
-		// #endif
-		// #ifdef MP-WEIXIN
-		navTo(`/subpackage/orders/release-products?orderId=${orderInfo.orderId}&&id=${orderInfo.id}&&clientFee=${orderInfo.amount}`);
-		// #endif
+		if (orderInfo.agencyId == agencyId) {
+			const params = encodeURIComponent(JSON.stringify(orderInfo))
+			jump("12", params)
+		} else {
+			//跳转到车辆信息变更界面
+			// #ifdef MP-ALIPAY
+			navTo(`/subpackage/orders/release-products?orderId=${orderInfo.orderId}`);
+			// #endif
+			// #ifdef MP-WEIXIN
+			navTo(`/subpackage/orders/release-products?orderId=${orderInfo.orderId}&&id=${orderInfo.id}&&clientFee=${orderInfo.amount}`);
+			// #endif
+		}
 	}
 	//再次使用订单
 	const gotoAgainUseOrder = (orderInfo : any) => {
@@ -276,7 +282,7 @@ export default function useOrderSkip() {
 	}
 	//异地-邮寄地址填写
 	const gotoAddressOrder=(orderInfo:any)=>{
-		if (orderInfo.agencyId == "52010106004") {
+		if (orderInfo.agencyId == agencyId) {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("13", params)
 		}

manifest.json

@@ -73,7 +73,7 @@
 		"requiredPrivateInfos": ["chooseLocation", "getLocation", "chooseAddress"],
 		"plugins": {
 		  "issuer-plugin": {
-		   "version": "dev-206d4a307ce40780758f0e3fbf5286a6",
+		   "version": "dev-bc64e9cc4e4b9ef2aa1ede4c3b632243",
 		   "provider": "wxa2d9acdd1054e69b"
 		  }
 		 }

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

@@ -94,7 +94,7 @@
 				<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=='52010106004'">申请补货</view>
+					<view class="btn btn-normal" @click.stop="gotoReplenishmentOrder(item)" v-if="item.agencyId==agencyId">申请补货</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>
@@ -118,7 +118,7 @@
 					<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="btns" v-else-if="item.orderStep == OrderStatus.邮寄地址填写 && item.agencyId==agencyId">
 					<view class="btn btn-primary" @click.stop="gotoAddressOrder(item)">邮寄地址填写</view>
 				</view>
 			</view>
@@ -151,6 +151,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 {
 		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";
 	const state = reactive({
 		list: [],
 		type: "",//1 OBU重新激活   2 卡签注销   3 更换设备  4卡签续期  5挂失解挂  6增补设备
@@ -96,7 +96,7 @@
 		console.log(item.cardId);
 		flag.value = i
 		// 判断9901
-		if (item.agencyId == "520101060041") {
+		if (item.agencyId == "agencyId") {
 			// OBU重新激活跳转
 			const params = encodeURIComponent(JSON.stringify(item))
 			jump(state.type, params)

subpackage/after-sale/to-bookkeeping-card/choice-product-new.vue

@@ -59,7 +59,7 @@
 	bgc = "#FFFFFF"
 	// #endif
 	// #ifdef MP-WEIXIN
-	bgc = "#F4F6FA" //52010106004
+	bgc = "#F4F6FA" 
 	// #endif
 	const scrollTop = ref(0); //滚动距离
 

subpackage/orders/choice-product.vue

@@ -82,7 +82,7 @@
 	bgc = "#FFFFFF"
 	// #endif
 	// #ifdef MP-WEIXIN
-	bgc = "#F4F6FA" //52010106004
+	bgc = "#F4F6FA"
 	// #endif
 
 	const scrollTop = ref(0); //滚动距离

subpackage/orders/order-details-new.vue

@@ -450,7 +450,7 @@
 							<view class="btn-green" @click.stop="gotoAgainUseOrder(state.orderInfo)">再次使用订单</view>
 						</view>
 						<!-- 异地-邮寄地址填写 -->
-						<view v-if="state.orderInfo.orderStep == OrderStatus.邮寄地址填写 && state.orderInfo.agencyId=='52010106004'"
+						<view v-if="state.orderInfo.orderStep == OrderStatus.邮寄地址填写 && state.orderInfo.agencyId==agencyId"
 							class="btn-status">
 							<view class="btn-green" @click.stop="gotoAddressOrder(state.orderInfo)">邮寄地址填写</view>
 						</view>
@@ -511,7 +511,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 { source } from "@/utils/network/difference";
+	import {agencyId} from "@/utils/network/difference";
 	const state = reactive({
 		orderInfo: {
 			orderInfoExt: {}

utils/network/difference.js

@@ -21,4 +21,7 @@ export const channelId = "5201010600401140003"
 // #endif
 // #ifdef MP-WEIXIN
 export const channelId = "5201010200601130001" //
-// #endif
+// #endif
+
+// 9901渠道
+export const agencyId = "52010106004"