@@ -1,5 +1,5 @@ | |||
// 订单跳转统一工具类 | |||
import { msg, navTo,interceptND } from "@/utils/utils"; | |||
import { msg, navTo } from "@/utils/utils"; | |||
import { OrderStatus } from "@/datas/enum"; | |||
import { OrderTypes } from "@/datas/enum"; | |||
import { getItem, setItem } from "@/utils/storage"; | |||
@@ -96,7 +96,6 @@ export default function useOrderSkip() { | |||
//确认收货 | |||
const gotoConfirmReceipt = (orderInfo : any) => { | |||
interceptND(orderInfo.vehicleId).then(()=>{ | |||
const item = { | |||
id: orderInfo.id, | |||
orderId: orderInfo.orderId, | |||
@@ -106,7 +105,6 @@ export default function useOrderSkip() { | |||
obuId: orderInfo.obuId, | |||
} | |||
navTo(`/subpackage/orders/order-confirm-receipt?id=${orderInfo.id}`) | |||
}) | |||
} | |||
@@ -166,14 +164,12 @@ export default function useOrderSkip() { | |||
//去激活订单 | |||
const gotoActiveOrder = (orderInfo : any) => { | |||
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}`); | |||
} | |||
}) | |||
} | |||
//新办订单-去评价 |
@@ -23,7 +23,7 @@ | |||
<script lang="ts" setup> | |||
import { reactive, ref } from "vue"; | |||
import { navTo,interceptND } from "@/utils/utils"; | |||
import { navTo } 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,7 +146,6 @@ import { deviceType } from "@/utils/network/difference"; | |||
const choose = (i, item) => { | |||
console.log(item.cardId); | |||
interceptND(item.vehicleId).then(()=>{ | |||
flag.value = i | |||
// 判断9901 | |||
// 月结单查询 etc通行流水记录 黑名单查询 目前不用跳转到插件 | |||
@@ -196,7 +195,6 @@ import { deviceType } from "@/utils/network/difference"; | |||
} | |||
} | |||
} | |||
}) | |||
} | |||
</script> |
@@ -306,5 +306,4 @@ export const getMailingAddressApi = "1babe3f09d0b458a84c798e89895664f" //更换 | |||
export const addAddressApi = "09d4ba9985394ef8a241acabe888273c" //支付完添加收货地址 | |||
export const oneOreTwo = "3e09b1199e854a91a4d3a9329e734b8d" //判断诺德订单是一次激活还是重新激活 | |||
export const ndActivateVerification = "6aeefd1ec9c1469fae240b9dca3733a4" //诺德激活验证接口 | |||
export const versionVerificationApi = "d4f9dd3758ca41a1baa4f191df728f8b" //卡签版本校验接口 | |||
export const interceptNDApi = "d8445c8b368d4b57bb6774aa51b91bb0" //拦截诺德 | |||
export const versionVerificationApi = "d4f9dd3758ca41a1baa4f191df728f8b" //卡签版本校验接口 |
@@ -1,6 +1,6 @@ | |||
import { getItem, StorageKeys } from "./storage"; | |||
import { OrderStatus, OrderTypes } from "@/datas/enum.ts"; | |||
import { envs,interceptNDApi } from "@/utils/network/api.js"; | |||
import { envs } from "@/utils/network/api.js"; | |||
import { | |||
stringToJson | |||
} from "@/utils/network/encryption"; | |||
@@ -603,34 +603,4 @@ 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); | |||
// on off | |||
// if(data.pass=='off'){ | |||
// resolve(data); | |||
// }else{ | |||
confirm('请到贵州黔通智联九州ETC服务小程序进行办理', () => { | |||
}, '温馨提示', true, '确定'); | |||
// } | |||
console.log("拦截诺德", data) | |||
}).catch((error) => { | |||
reject(error); | |||
}); | |||
} |