瀏覽代碼

拦截诺德

master
yangteng 10 月之前
父節點
當前提交
659447637b

+ 21
- 16
composables/order/useOrderSkip.ts 查看文件

@@ -1,5 +1,5 @@
// 订单跳转统一工具类
import { msg, navTo } from "@/utils/utils";
import { msg, navTo,interceptND } from "@/utils/utils";
import { OrderStatus } from "@/datas/enum";
import { OrderTypes } from "@/datas/enum";
import { getItem, setItem } from "@/utils/storage";
@@ -96,15 +96,17 @@ export default function useOrderSkip() {

//确认收货
const gotoConfirmReceipt = (orderInfo : any) => {
const item = {
id: orderInfo.id,
orderId: orderInfo.orderId,
vehiclePlate: orderInfo.vehiclePlate,
orderStep: orderInfo.orderStep,
cardId: orderInfo.cardId,
obuId: orderInfo.obuId,
}
navTo(`/subpackage/orders/order-confirm-receipt?id=${orderInfo.id}`)
interceptND(orderInfo.vehicleId).then(()=>{
const item = {
id: orderInfo.id,
orderId: orderInfo.orderId,
vehiclePlate: orderInfo.vehiclePlate,
orderStep: orderInfo.orderStep,
cardId: orderInfo.cardId,
obuId: orderInfo.obuId,
}
navTo(`/subpackage/orders/order-confirm-receipt?id=${orderInfo.id}`)
})
}

//去支付-选择产品
@@ -163,12 +165,15 @@ export default function useOrderSkip() {

//去激活订单
const gotoActiveOrder = (orderInfo : any) => {
if (orderInfo.deviceType == deviceType) {
const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("14", params)
} else {
navTo(`/subpackage/after-sale/activation/operation-tips?id=${orderInfo.id}&orderId=${orderInfo.orderId}&cardStatus=${orderInfo.cardStatus}&obuStatus=${orderInfo.obuStatus}&transfer=${orderInfo.transfer}`);
}
interceptND(orderInfo.vehicleId).then(()=>{
if (orderInfo.deviceType == deviceType) {
const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("14", params)
} else {
navTo(`/subpackage/after-sale/activation/operation-tips?id=${orderInfo.id}&orderId=${orderInfo.orderId}&cardStatus=${orderInfo.cardStatus}&obuStatus=${orderInfo.obuStatus}&transfer=${orderInfo.transfer}`);
}
})
}

//新办订单-去评价

+ 51
- 48
subpackage/after-sale/activation-once-again/select-car.vue 查看文件

@@ -23,7 +23,7 @@

<script lang="ts" setup>
import { reactive, ref } from "vue";
import { navTo } from "@/utils/utils";
import { navTo,interceptND} from "@/utils/utils";
import { onLoad, onShow } from "@dcloudio/uni-app";
import { orderList } from "@/utils/network/api.js";
import { request } from "@/utils/network/request.js";
@@ -146,55 +146,58 @@ import { deviceType } from "@/utils/network/difference";

const choose = (i, item) => {
console.log(item.cardId);
flag.value = i
// 判断9901
// 月结单查询 etc通行流水记录 黑名单查询 目前不用跳转到插件
if (state.type == "34") {
navTo(`/subpackage/after-sale/month-statement/month-statement-query-list?vehicleId=${item.vehicleId}`)
}else if (state.type == "35") {
navTo(`/subpackage/personal-center/search/select-card?vehicleId=${item.vehicleId}`)
}else if (state.type == "36") {
uni.navigateTo({
url: `/subpackage/after-sale/blacklist-query/list?vehiclePlate=${item.vehiclePlate}&vehiclePlateColor=${item.vehiclePlateColor}`
})
}else{
if (item.deviceType == deviceType) {
// OBU重新激活跳转
const params = encodeURIComponent(JSON.stringify(item))
jump(state.type, params)
} else {
if (state.type == "1") {
// #ifdef MP-WEIXIN
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again?id=${item.id}`
);
// #endif
// #ifdef MP-ALIPAY
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again-ali?id=${item.id}`
);
// #endif
} else if (state.type == "2") {
navTo(`/subpackage/after-sale/ETC-log-off/log-off-confirm?id=${item.id}`)
} else if (state.type == "3") {
navTo(`/subpackage/after-sale/replace-equipment/replace-equipment-confirm?id=${item.id}`)
} else if (state.type == "4") {
navTo(`/subpackage/after-sale/card-Renewal/renewal-confirm?id=${item.id}&orderId=${item.orderId}`)
} else if (state.type == "5") {
navTo(`/subpackage/after-sale/card-loss-reporting/cardloss-confirm?id=${item.id}`)
}else if (state.type == "6") {
navTo(`/subpackage/after-sale/additional-equipment/additional-equipment-confirm?id=${item.id}`)
}else if (state.type == "30") {
navTo(`/subpackage/after-sale/to-bookkeeping-card/confirm?id=${item.id}`)
}else if (state.type == "31") {
navTo(`/subpackage/after-sale/pin-code-deblocking/pin-code-confirm?id=${item.id}`);
}else if (state.type == "32") {
navTo(`/subpackage/after-sale/transfer-ownership/transfer-confirm?id=${item.id}`)
}else if (state.type == "33") {
navTo(`/subpackage/after-sale/card-deactivation-activation/deactivation-activation-confirm?id=${item.id}`)
interceptND(item.vehicleId).then(()=>{
flag.value = i
// 判断9901
// 月结单查询 etc通行流水记录 黑名单查询 目前不用跳转到插件
if (state.type == "34") {
navTo(`/subpackage/after-sale/month-statement/month-statement-query-list?vehicleId=${item.vehicleId}`)
}else if (state.type == "35") {
navTo(`/subpackage/personal-center/search/select-card?vehicleId=${item.vehicleId}`)
}else if (state.type == "36") {
uni.navigateTo({
url: `/subpackage/after-sale/blacklist-query/list?vehiclePlate=${item.vehiclePlate}&vehiclePlateColor=${item.vehiclePlateColor}`
})
}else{
if (item.deviceType == deviceType) {
// OBU重新激活跳转
const params = encodeURIComponent(JSON.stringify(item))
jump(state.type, params)
} else {
if (state.type == "1") {
// #ifdef MP-WEIXIN
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again?id=${item.id}`
);
// #endif
// #ifdef MP-ALIPAY
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again-ali?id=${item.id}`
);
// #endif
} else if (state.type == "2") {
navTo(`/subpackage/after-sale/ETC-log-off/log-off-confirm?id=${item.id}`)
} else if (state.type == "3") {
navTo(`/subpackage/after-sale/replace-equipment/replace-equipment-confirm?id=${item.id}`)
} else if (state.type == "4") {
navTo(`/subpackage/after-sale/card-Renewal/renewal-confirm?id=${item.id}&orderId=${item.orderId}`)
} else if (state.type == "5") {
navTo(`/subpackage/after-sale/card-loss-reporting/cardloss-confirm?id=${item.id}`)
}else if (state.type == "6") {
navTo(`/subpackage/after-sale/additional-equipment/additional-equipment-confirm?id=${item.id}`)
}else if (state.type == "30") {
navTo(`/subpackage/after-sale/to-bookkeeping-card/confirm?id=${item.id}`)
}else if (state.type == "31") {
navTo(`/subpackage/after-sale/pin-code-deblocking/pin-code-confirm?id=${item.id}`);
}else if (state.type == "32") {
navTo(`/subpackage/after-sale/transfer-ownership/transfer-confirm?id=${item.id}`)
}else if (state.type == "33") {
navTo(`/subpackage/after-sale/card-deactivation-activation/deactivation-activation-confirm?id=${item.id}`)
}
}
}
}
})
}
</script>


+ 20
- 17
subpackage/after-sale/equipment-upgrade/select-car.vue 查看文件

@@ -29,7 +29,7 @@
ref
} from "vue"
import {
navTo, msg
navTo, msg,interceptND
} from "@/utils/utils"
import {
onLoad,
@@ -124,23 +124,26 @@
const flag = ref('0')

const choose = (i, item) => {
let id = item.id
searchVehicleInfoQuery(item.vehicleId).then((item : any) => {
console.log("====", item.vehicles[0])
state.customerId = item.vehicles[0]['customerId']
state.vehiclePlate = item.vehicles[0]['vehiclePlate']
state.vehiclePlateColor = item.vehicles[0]['vehiclePlateColor']
isWorkOrder().then((item : any) => {
console.log("查询是否有工单", item)
if (item.data) {
if (item.data[0]['status'] == '0') {
navTo(`/subpackage/after-sale/equipment-upgrade/upgrade-confirm?id=${id}&workId=${item.data[0]['id']}`)
}
} else {
msg('暂无工单')
}
})
interceptND(item.vehicleId).then(()=>{
let id = item.id
searchVehicleInfoQuery(item.vehicleId).then((item : any) => {
console.log("====", item.vehicles[0])
state.customerId = item.vehicles[0]['customerId']
state.vehiclePlate = item.vehicles[0]['vehiclePlate']
state.vehiclePlateColor = item.vehicles[0]['vehiclePlateColor']
isWorkOrder().then((item : any) => {
console.log("查询是否有工单", item)
if (item.data) {
if (item.data[0]['status'] == '0') {
navTo(`/subpackage/after-sale/equipment-upgrade/upgrade-confirm?id=${id}&workId=${item.data[0]['id']}`)
}
} else {
msg('暂无工单')
}
})
})
})
}
const isWorkOrder = () => {
var data = {

+ 14
- 11
subpackage/personal-center/install-activation-order.vue 查看文件

@@ -51,7 +51,7 @@
import { stringToJson } from "@/utils/network/encryption";
import { onLoad, onUnload, onReachBottom, onPullDownRefresh } from "@dcloudio/uni-app";
import { getItem, StorageKeys,setItem } from "@/utils/storage";
import { hasLogin, msg, getOrderStatusName, getOrderTypeName, navTo } from "@/utils/utils";
import { hasLogin, msg, getOrderStatusName, getOrderTypeName, navTo,interceptND } from "@/utils/utils";
import { noActivationOrder,ndActivateVerification,silentLoginApi} from "@/utils/network/api";
import { PageData } from "@/datas/enum";
import useOrderSkip from "@/composables/order/useOrderSkip";
@@ -59,16 +59,19 @@
//跳转
const { gotoActiveOrder, gotoConfirmReceipt } = useOrderSkip();
const gotoOnceActivate = (item) => {
// #ifdef MP-WEIXIN
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again?id=${item.id}`
);
// #endif
// #ifdef MP-ALIPAY
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again-ali?id=${item.id}`
);
// #endif
interceptND(item.vehicleId).then(()=>{
// #ifdef MP-WEIXIN
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again?id=${item.id}`
);
// #endif
// #ifdef MP-ALIPAY
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again-ali?id=${item.id}`
);
// #endif
})
}
const config = {
emptyHint: {

+ 2
- 1
utils/network/api.js 查看文件

@@ -306,4 +306,5 @@ export const getMailingAddressApi = "1babe3f09d0b458a84c798e89895664f" //更换
export const addAddressApi = "09d4ba9985394ef8a241acabe888273c" //支付完添加收货地址
export const oneOreTwo = "3e09b1199e854a91a4d3a9329e734b8d" //判断诺德订单是一次激活还是重新激活
export const ndActivateVerification = "6aeefd1ec9c1469fae240b9dca3733a4" //诺德激活验证接口
export const versionVerificationApi = "d4f9dd3758ca41a1baa4f191df728f8b" //卡签版本校验接口
export const versionVerificationApi = "d4f9dd3758ca41a1baa4f191df728f8b" //卡签版本校验接口
export const interceptNDApi = "d8445c8b368d4b57bb6774aa51b91bb0" //拦截诺德

+ 27
- 1
utils/utils.ts 查看文件

@@ -1,6 +1,6 @@
import { getItem, StorageKeys } from "./storage";
import { OrderStatus, OrderTypes } from "@/datas/enum.ts";
import { envs } from "@/utils/network/api.js";
import { envs,interceptNDApi } from "@/utils/network/api.js";
import {
stringToJson
} from "@/utils/network/encryption";
@@ -603,4 +603,30 @@ export const chooseImageCompress = ( callback : Function) => {
// }
},
})
}
export const interceptND = (vehicleId) => {
var data = {
vehicleId: vehicleId,
source:"MINI_PROGRAM"
};
console.log("data==",data)
const options = {
type: 2,
data: data,
method: "POST",
showLoading: true,
};
return new Promise(async (resolve, reject) => {
const res = await request(interceptNDApi, options);
const data = stringToJson(res.bizContent);
if(data.pass='on'){
confirm('请到贵州黔通智联九州ETC服务小程序进行办理', () => {
}, '温馨提示', true, '确定');
}else{
resolve(data);
}
console.log("获取邮寄地址", data)
}).catch((error) => {
reject(error);
});
}

Loading…
取消
儲存