Sfoglia il codice sorgente

替换接口

master
yangteng 7 mesi fa
parent
commit
1a0147d660
47 ha cambiato i file con 197 aggiunte e 355 eliminazioni
  1. 2
    4
      App.vue
  2. 7
    5
      composables/order/useOrderSkip.ts
  3. 2
    9
      pages/index/index.vue
  4. 8
    13
      pages/service/service.vue
  5. 0
    6
      pages/user/user.vue
  6. 0
    1
      subpackage/after-sale/ETC-log-off/upload-card.vue
  7. 3
    3
      subpackage/after-sale/account-change/release-products.vue
  8. 0
    1
      subpackage/after-sale/account-recharge/open-account.vue
  9. 3
    3
      subpackage/after-sale/account-recharge/recharge-weixin.vue
  10. 0
    1
      subpackage/after-sale/activation-once-again/activation-once-again-ali.vue
  11. 0
    1
      subpackage/after-sale/activation-once-again/activation-once-again.vue
  12. 1
    2
      subpackage/after-sale/add-equity/add-equity-details.vue
  13. 4
    4
      subpackage/after-sale/add-equity/equity-list.vue
  14. 0
    1
      subpackage/after-sale/replace-equipment/order-payment.vue
  15. 3
    5
      subpackage/after-sale/replace-equipment/release-products.vue
  16. 4
    4
      subpackage/after-sale/to-bookkeeping-card/detail.vue
  17. 5
    6
      subpackage/after-sale/to-bookkeeping-card/mailing_information.vue
  18. 3
    5
      subpackage/after-sale/to-bookkeeping-card/release-products.vue
  19. 4
    4
      subpackage/carPark/etc/etcDeviceInfo.vue
  20. 4
    4
      subpackage/carPark/recharge/recharge-weixin.vue
  21. 7
    6
      subpackage/orders/apply-return-goods.vue
  22. 1
    39
      subpackage/orders/car-release.vue
  23. 7
    9
      subpackage/orders/changeInformation.vue
  24. 9
    2
      subpackage/orders/choice-product.vue
  25. 1
    1
      subpackage/orders/essential-information-two.vue
  26. 28
    28
      subpackage/orders/essential-information.vue
  27. 3
    1
      subpackage/orders/interestsList.vue
  28. 0
    2
      subpackage/orders/opening-account-people.vue
  29. 5
    4
      subpackage/orders/order-detail-logistics.vue
  30. 4
    3
      subpackage/orders/order-details-new.vue
  31. 0
    1
      subpackage/orders/order_payment.vue
  32. 4
    4
      subpackage/orders/payment.vue
  33. 3
    3
      subpackage/orders/product-detail.vue
  34. 3
    5
      subpackage/orders/release-products.vue
  35. 0
    1
      subpackage/orders/sign-up.vue
  36. 0
    1
      subpackage/orders/verify/verify-phone-code/verify-phone-code.vue
  37. 5
    104
      subpackage/personal-center/car-message-change.vue
  38. 0
    2
      subpackage/personal-center/install-activation-order.vue
  39. 1
    12
      subpackage/personal-center/setting/change-phone-code-ali.vue
  40. 1
    1
      subpackage/personal-center/setting/change-phone-code.vue
  41. 2
    2
      subpackage/personal-center/setting/personal-information/user-card.vue
  42. 4
    4
      subpackage/personal-center/trapping-and-repairing-account/recharge-two.vue
  43. 4
    4
      subpackage/personal-center/trapping-and-repairing/recharge-two.vue
  44. 2
    2
      subpackage/service/equityList/equityList.vue
  45. 12
    14
      utils/network/api.js
  46. 31
    2
      utils/network/request.js
  47. 7
    16
      utils/utils.ts

+ 2
- 4
App.vue Vedi File

@@ -6,7 +6,6 @@
getGlobalParam,
wechatAppID,
wechatSecret,
getOpenidApi,
getZfbOpenid,getOpenId
} from "@/utils/network/api.js";
import {
@@ -65,7 +64,6 @@
};
request(getZfbOpenid, options).then((res) => {
const result = stringToJson(res.bizContent);
console.log("getOpenidApi====", result, result.data, result.userId)
if (result.data) {
setItem("zfbOpenId", result.data);
} else {
@@ -137,7 +135,7 @@
showLoading: true,
};

request(getGlobalParam, options).then((res) => {
requestNew(getGlobalParam, options).then((res) => {
const result = stringToJson(res.bizContent);
setItem('globalParam', result.data)
});
@@ -153,7 +151,7 @@
// #ifdef MP-WEIXIN
requestNew(getOpenId, options).then((res) => {
const result =res;
console.log("getOpenidApi", result)
console.log("getOpenId===",result)
const openidData = stringToJson(result.data);
setItem("QYorder", openidData);
});

+ 7
- 5
composables/order/useOrderSkip.ts Vedi File

@@ -46,9 +46,10 @@ export default function useOrderSkip() {

//取消订单
const gotoCancelOrder = (orderInfo : any) => {
console.log("取消订单",orderInfo)
const item = {
id: orderInfo.id,
orderId: orderInfo.orderId,
orderId: orderInfo.orderId?orderInfo.orderId:orderInfo.orderNo,
vehiclePlate: orderInfo.vehiclePlate,
orderStep: orderInfo.orderStep,
deviceType:orderInfo.deviceType
@@ -60,7 +61,7 @@ export default function useOrderSkip() {
const gotoEditUserOrUnitInfo = (orderInfo : any) => {
console.log("********555555555555**********", orderInfo, OrderStatus["已支付/待签约"]);
let url = '';
if (orderInfo.orderStep == OrderStatus.完成填写基本信息 || orderInfo.orderStep == OrderStatus.待支付3) {
if (orderInfo.orderStep == OrderStatus.完成填写基本信息 || orderInfo.orderStep == OrderStatus.待支付3 || orderInfo.orderStep === OrderStatus["审核不通过"]) {
if (orderInfo.deviceType == deviceType) {
const params = encodeURIComponent(JSON.stringify(orderInfo))
jump("10", params)
@@ -80,8 +81,6 @@ export default function useOrderSkip() {
} else {
url = '/subpackage/orders/order-payment';
}
} else if (orderInfo.orderStep === OrderStatus["审核不通过"]) { //修改资料
url = '/subpackage/orders/changeInformation';
} else if (orderInfo.orderStep === OrderStatus["已支付/待签约"]) { //修改资料
if (orderInfo.deviceType == deviceType) {
const params = encodeURIComponent(JSON.stringify(orderInfo))
@@ -91,8 +90,11 @@ export default function useOrderSkip() {
}

}
// if (orderInfo.orderStep === OrderStatus["审核不通过"]) { //修改资料
// url = '/subpackage/orders/changeInformation';
// } else
console.log("url", url)
navTo(`${url}?orderId=${orderInfo.orderId?orderInfo.orderId:orderInfo.orderNo}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&vanType=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}&vehicleId=${orderInfo.vehicleId}`);
navTo(`${url}?orderId=${orderInfo.orderId?orderInfo.orderId:orderInfo.orderNo}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&vanType=${orderInfo.type?orderInfo.type:orderInfo.vanType}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}&vehicleId=${orderInfo.vehicleId}`);
}

//确认收货

+ 2
- 9
pages/index/index.vue Vedi File

@@ -205,19 +205,13 @@
} from "@dcloudio/uni-app";
import flowPathList from "./components/flow-path-list.vue";
import filter from '@/components/filter/filter.vue';
import {
request, requestNew
} from "@/utils/network/request.js";
import {
stringToJson
} from "@/utils/network/encryption.js";
import { requestNew} from "@/utils/network/request.js";
import {
setItem,
} from "@/utils/storage";
import {
queryKey,
querySwiper,
envs,
infoQuery,
queryHighMsg
} from "@/utils/network/api.js";
@@ -227,8 +221,7 @@
} from "@/datas/fileURL.js";
import {
navTo,
msg,
noticeUser,hasLogin,confirm
msg,hasLogin,confirm
} from "@/utils/utils";
import {
getCodeName

+ 8
- 13
pages/service/service.vue Vedi File

@@ -40,27 +40,19 @@
reactive,
} from "vue";
import {
onLoad
onShow
} from "@dcloudio/uni-app";
import {
fileURL, fileURLList
} from "@/datas/fileURL.js";
import {
msg
} from "@/utils/utils";
import {
queryMenuConfig
} from "@/utils/network/api.js";
import {
request
} from "@/utils/network/request.js";
import {requestNew} from "@/utils/network/request.js";
import {
getItem,
StorageKeys,
} from "@/utils/storage";
import {
stringToJson
} from "@/utils/network/encryption";
const bgOn = `url(${fileURL}image/newHome/bg-on.png) center center no-repeat`;
import {hasLogin,confirm} from "@/utils/utils";
const activeTab = ref("");
@@ -81,14 +73,17 @@
searchVal: '', //input输入值
newArr: []
});
onLoad(() => {
onShow(() => {
console.log("1")
if (!hasLogin()) {
console.log("2")
confirm('您需要登录过后才能使用此功能', () => {
uni.navigateTo({
url: '/login/login',
});
}, '温馨提示', true, '去登录');
} else {
console.log("请求")
queryMenuConfigAction().then((val : any) => {
menu.list = val.menuList ? val.menuList : [],
menu.list = deepClone(menu.list)
@@ -154,8 +149,8 @@
};
return new Promise(async (resolve, reject) => {
const res = await request(queryMenuConfig, options);
const data = stringToJson(res.bizContent);
const res = await requestNew(queryMenuConfig, options);
const data = res;
console.log("dataqueryMenuConfigAction", data.menuList)
resolve(data);
}).catch((error) => {

+ 0
- 6
pages/user/user.vue Vedi File

@@ -427,13 +427,7 @@
})
}
const goEquity = () => {
// if (state.equityNumber) {
// navTo('/subpackage/after-sale/add-equity/equity-list') //潘兵写的权益
navTo('/subpackage/service/equityList/equityList')

// } else {
// msg("暂无购买权益记录")
// }
}
</script>
<style>

+ 0
- 1
subpackage/after-sale/ETC-log-off/upload-card.vue Vedi File

@@ -400,7 +400,6 @@
state.phoneType = 0
state.isTakePhotoModeShow = false
uploadFile(val.tempImagePath, imageType, vehicleLicenseOcr).then((data) => {
// uploadFile(val.tempImagePath, state.choiceIndex, ocrAllQuery).then((data) => {
console.log('输出内容=====================', state.choiceIndex,data)
if (state.choiceIndex === "3") {
form.licenseFrontUrl = data.imageUrl;

+ 3
- 3
subpackage/after-sale/account-change/release-products.vue Vedi File

@@ -31,7 +31,7 @@
import { onLoad, onShow } from "@dcloudio/uni-app";
import { reactive } from "vue";
import { etcQyList } from "@/utils/network/api.js";
import { request } from "@/utils/network/request.js";
import { request,requestNew } from "@/utils/network/request.js";

import { stringToJson } from "@/utils/network/encryption";
import { fileURL } from "@/datas/fileURL.js";
@@ -78,8 +78,8 @@
method: "POST",
showLoading: true,
};
request(etcQyList, options).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(etcQyList, options).then((res) => {
const data =res;
state.list = [
{
bg: imgURL + "applyCard/product-bg.png",

+ 0
- 1
subpackage/after-sale/account-recharge/open-account.vue Vedi File

@@ -102,7 +102,6 @@
<script setup lang="ts">
import { reactive } from "vue";
import { etcOcrCard, envs, ocrAllQuery, fileUpload, openRecharge } from "@/utils/network/api.js";
import { pathToBase64 } from "@/utils/image-tools/index.js";
import { navTo } from "@/utils/utils";
import { request } from "@/utils/network/request.js";
import { stringToJson } from "@/utils/network/encryption.js";

+ 3
- 3
subpackage/after-sale/account-recharge/recharge-weixin.vue Vedi File

@@ -43,11 +43,11 @@
wechatPayConfigId,
aliPayConfigId,
obtainUserId,
getOpenidApi,
getOpenId,
accountMoneyApi
} from "@/utils/network/api.js";
import {
request
request, requestNew
} from "@/utils/network/request.js";
import {
reactive
@@ -566,7 +566,7 @@
showLoading: true,
};
// #ifdef MP-WEIXIN
request(getOpenidApi, options).then((res) => {
requestNew(getOpenId, options).then((res) => {
const result = stringToJson(res.bizContent);
console.log("获取微信小程序openid", result);
const openidData = stringToJson(result.data);

+ 0
- 1
subpackage/after-sale/activation-once-again/activation-once-again-ali.vue Vedi File

@@ -461,7 +461,6 @@
state.phoneType = 0
state.isTakePhotoModeShow = false
uploadFile(val.tempImagePath, imageType, IFCODE.etcCarOcrCard).then((data : any) => {
// uploadFile(val.tempImagePath, state.choiceIndex, ocrAllQuery).then((data) => {
console.log('输出内容=====================', state.choiceIndex)
if (state.choiceIndex == "3") {
if (data.plate_a.length > 8) {

+ 0
- 1
subpackage/after-sale/activation-once-again/activation-once-again.vue Vedi File

@@ -457,7 +457,6 @@
state.phoneType = 0
state.isTakePhotoModeShow = false
uploadFile(val.tempImagePath, imageType, IFCODE.vehicleLicenseOcr).then((data) => {
// uploadFile(val.tempImagePath, state.choiceIndex, ocrAllQuery).then((data) => {
console.log('输出内容=====================', state.choiceIndex)
if (state.choiceIndex === "3") {
if (data.plate_a.length > 8) {

+ 1
- 2
subpackage/after-sale/add-equity/add-equity-details.vue Vedi File

@@ -123,8 +123,7 @@
data: {
id: state.id,
payType: "EQUITY",
// wxOpenid: openidData.openid,
openId: openidData.openid,
wxOpenid: openidData.openid
},
method: 'POST',
showLoading: true,

+ 4
- 4
subpackage/after-sale/add-equity/equity-list.vue Vedi File

@@ -36,10 +36,10 @@
onLoad, onReachBottom, onShow
} from "@dcloudio/uni-app";
import {
showEquityListApi, getOpenidApi, equityPaymentOrderApi, equityPaymentTestApi, obtainUserId, aliPayConfigIdTwo
showEquityListApi, getOpenId, equityPaymentOrderApi, equityPaymentTestApi, obtainUserId, aliPayConfigIdTwo
} from "@/utils/network/api.js";
import {
request
request, requestNew
} from "@/utils/network/request.js";
import {
getItem,
@@ -119,8 +119,8 @@
method: "POST",
showLoading: true,
};
request(getOpenidApi, options1).then((res) => {
const result = stringToJson(res.bizContent);
requestNew(getOpenId, options1).then((res) => {
const result = res;
const openidData = stringToJson(result.data);
const options = {
type: 2,

+ 0
- 1
subpackage/after-sale/replace-equipment/order-payment.vue Vedi File

@@ -136,7 +136,6 @@
};
requestNew(getOpenId, options1).then((res) => {
const result =res;
console.log("getOpenidApi", result)
const openidData = stringToJson(result.data);
console.log("获取openId", openidData)
const options = {

+ 3
- 5
subpackage/after-sale/replace-equipment/release-products.vue Vedi File

@@ -30,9 +30,7 @@
import { onLoad, onShow } from "@dcloudio/uni-app";
import { reactive } from "vue";
import { etcQyList } from "@/utils/network/api.js";
import { request } from "@/utils/network/request.js";

import { stringToJson } from "@/utils/network/encryption";
import { request,requestNew } from "@/utils/network/request.js";
import { fileURL } from "@/datas/fileURL.js";
const imgURL = `${fileURL}image/`;

@@ -77,8 +75,8 @@
method: "POST",
showLoading: true,
};
request(etcQyList, options).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(etcQyList, options).then((res) => {
const data = res;
state.list = [
{
bg: imgURL + "applyCard/product-bg.png",

+ 4
- 4
subpackage/after-sale/to-bookkeeping-card/detail.vue Vedi File

@@ -122,8 +122,8 @@
<script setup lang="ts">
import { onLoad, onShow } from "@dcloudio/uni-app";
import { reactive, ref } from "vue";
import { etcQueryProduct, getOpenidApi } from "@/utils/network/api.js";
import { request } from "@/utils/network/request.js";
import { etcQueryProduct, getOpenId } from "@/utils/network/api.js";
import { request, requestNew } from "@/utils/network/request.js";

import { stringToJson } from "@/utils/network/encryption";
import { fileURL } from "@/datas/fileURL.js";
@@ -167,8 +167,8 @@
showLoading: true,
};
// #ifdef MP-WEIXIN
request(getOpenidApi, options).then((res) => {
const result = stringToJson(res.bizContent);
requestNew(getOpenId, options).then((res) => {
const result = res;
console.log("获取微信小程序openid", result);
const openidData = stringToJson(result.data);
state.openid = openidData.openid

+ 5
- 6
subpackage/after-sale/to-bookkeeping-card/mailing_information.vue Vedi File

@@ -125,14 +125,13 @@
onReady
} from "@dcloudio/uni-app";
import {
navTo,
checkStr, msg
navTo, msg
} from "@/utils/utils";
import {
request
request,requestNew
} from "@/utils/network/request.js";
import {
getLogistics,
commQueryCourier,
addressQuery,
cckChangejzCardInfo
} from "@/utils/network/api.js";
@@ -273,9 +272,9 @@
};

//调用方式
request(getLogistics, options)
requestNew(commQueryCourier, options)
.then((res) => {
stringToJson(res.bizContent).forEach((item) => {
res.forEach((item) => {
list.push({
value: item,
label: item,

+ 3
- 5
subpackage/after-sale/to-bookkeeping-card/release-products.vue Vedi File

@@ -30,9 +30,7 @@
import { onLoad, onShow } from "@dcloudio/uni-app";
import { reactive } from "vue";
import { etcQyList } from "@/utils/network/api.js";
import { request } from "@/utils/network/request.js";

import { stringToJson } from "@/utils/network/encryption";
import { request,requestNew } from "@/utils/network/request.js";
import { fileURL } from "@/datas/fileURL.js";
const imgURL = `${fileURL}image/`;

@@ -77,8 +75,8 @@
method: "POST",
showLoading: true,
};
request(etcQyList, options).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(etcQyList, options).then((res) => {
const data = res;
state.list = [
{
bg: imgURL + "applyCard/product-bg.png",

+ 4
- 4
subpackage/carPark/etc/etcDeviceInfo.vue Vedi File

@@ -138,13 +138,13 @@
onUnload
} from "@dcloudio/uni-app";
import {
request
request,requestNew
} from "@/utils/network/request";
import {
decrypt9901,
cardList,
searchObuInfo,
getOpenidApi
getOpenId
} from "@/utils/network/api";
import {
stringToJson
@@ -236,8 +236,8 @@ import {
showLoading: true,
};
// #ifdef MP-WEIXIN
request(getOpenidApi, options).then((res) => {
const result = stringToJson(res.bizContent);
requestNew(getOpenId, options).then((res) => {
const result = res;
console.log("获取微信小程序openid", result);
const openidData = stringToJson(result.data);
state.openid = openidData.openid

+ 4
- 4
subpackage/carPark/recharge/recharge-weixin.vue Vedi File

@@ -53,10 +53,10 @@
wechatPayConfigId,
aliPayConfigId,
obtainUserId,
getOpenidApi
getOpenId
} from "@/utils/network/api.js";
import {
request
request,requestNew
} from "@/utils/network/request.js";
import {
reactive
@@ -732,8 +732,8 @@
showLoading: true,
};
// #ifdef MP-WEIXIN
request(getOpenidApi, options).then((res) => {
const result = stringToJson(res.bizContent);
requestNew(getOpenId, options).then((res) => {
const result = res;
console.log("获取微信小程序openid", result);
const openidData = stringToJson(result.data);
state.openid = openidData.openid

+ 7
- 6
subpackage/orders/apply-return-goods.vue Vedi File

@@ -11,8 +11,7 @@
import { onLoad } from "@dcloudio/uni-app";
import { msg, confirm, getOrderStatusName } from "@/utils/utils";
import { request,requestNew } from "@/utils/network/request";
import { getLogistics, orderReturn, outletList } from "@/utils/network/api";
import { stringToJson } from "@/utils/network/encryption";
import { commQueryCourier, orderReturn, outletList } from "@/utils/network/api";
import { getItem, StorageKeys } from "@/utils/storage";
import {
getMailingAddress
@@ -146,8 +145,8 @@
showLoading: true,
};

request(getLogistics, options).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(commQueryCourier, options).then((res) => {
const data = res;
state.formData[4].itemData = data;
});
};
@@ -156,7 +155,9 @@
const getOutletList = () => {
const options = {
type: 2,
data: {},
data: {
},
method: "POST",
showLoading: true,
};
@@ -237,7 +238,7 @@

//获取退货网点
getOutletList();
getMailingAddress(state.orderInfo.orderId).then((address) => {
getMailingAddress(state.orderInfo.orderId,state.orderInfo.id).then((address) => {
console.log("address",address)
config.address=address
})

+ 1
- 39
subpackage/orders/car-release.vue Vedi File

@@ -239,7 +239,6 @@
etcCarCardInfoSubmit,
queryGuoHuJianCe,
queryGuoHuCaoZuo,
ocrAllQuery,
carMessageApi,
vehicleUpload,vehicleLicenseOcr
} from "@/utils/network/api.js";
@@ -367,41 +366,6 @@
uni.redirectTo({
url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
});
// queryGuoHuJianCeAction().then((value) => { //接口不调用了
// console.log("过户检测", value)
// if (value.transferLogs && value.transferLogs.length > 0) {
// let arr = value.transferLogs;
// state.data.transferLogs = []
// for (var k = 0; k < arr.length; k++) {
// if (arr[k]['status'] == "WAITING") {
// state.data.transferLogs.push(arr[k])
// }
// }
// console.log("state.data.transferLogs", state.data.transferLogs)
// console.log("state.data.transferLogs", state.data.transferLogs.length)
// setTimeout(() => {
// if (state.data.transferLogs.length > 0) {
// state.show = true;
// } else {
// uni.redirectTo({
// url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
// });
// }
// }, 1000)
// } else {
// if (!hasLogin()) {
// uni.redirectTo({
// url: `/subpackage/orders/addAddress?orderId=${state.form.orderId
// }&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
// });
// } else {
// uni.redirectTo({
// url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
// });

// }
// }
// });
})
.catch((res) => {
console.log(res);
@@ -764,7 +728,6 @@
state.phoneType = 0
state.isTakePhotoModeShow = false
uploadFile(val.tempImagePath, imageType, vehicleLicenseOcr).then((data) => {
// uploadFile(val.tempImagePath, state.choiceIndex, ocrAllQuery).then((data) => {
console.log('输出内容=====================', state.choiceIndex)
if (state.choiceIndex === "3") {
if (data.plate_a.length > 8) {
@@ -774,8 +737,7 @@
}
state.form.ownerName = data.man;
state.form.vehicleType = data.vehicle;
// state.form.character = data.character;
state.form.character = 2;
state.form.character = data.character;
state.form.vin = data.vin;
state.form.engineNum = data.engine;
state.form.registerDate = data.register;

+ 7
- 9
subpackage/orders/changeInformation.vue Vedi File

@@ -235,16 +235,14 @@
onPageScroll,
} from "@dcloudio/uni-app";
import {
etcOcrCard,
etcUserCardInfoSubmit,
fileUpload,
register,
envs,
getUserMsg,idCardOcr
registerFull,
getUserMsg,idCardOcr,userUpload
} from "@/utils/network/api.js";

import {
request
request, requestNew
} from "@/utils/network/request.js";

import {
@@ -363,8 +361,8 @@
method: "POST",
showLoading: true,
};
request(register, options).then((res) => {
let result = stringToJson(res.bizContent);
requestNew(registerFull, options).then((res) => {
let result = res;
if (result.accessToken && result.openId) {
setItem('token', result.accessToken)
setItem('openId', result.openId)
@@ -377,7 +375,7 @@
method: "POST",
showLoading: true,
};
request(etcUserCardInfoSubmit, options).then((res) => {
requestNew(userUpload, options).then((res) => {
console.log(res);
uni.redirectTo({
url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}`,
@@ -395,7 +393,7 @@
method: "POST",
showLoading: true,
};
request(etcUserCardInfoSubmit, options).then((res) => {
requestNew(userUpload, options).then((res) => {
console.log(res);
uni.redirectTo({
url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}`,

+ 9
- 2
subpackage/orders/choice-product.vue Vedi File

@@ -90,14 +90,17 @@
console.log('radioChange', n);
if (n == '记账卡') {
state.isValueCard = 2
state.cardType = 1
} else if (n == '储值卡') {
state.isValueCard = 1
state.cardType = 2
} else {
state.isValueCard = 2
state.cardType = 3
}
setItem("isValueCard", state.isValueCard);
uni.navigateTo({
url: `/subpackage/orders/interestsList?userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${Number(state.fee)}&equityId=${state.equityId}&fee=${state.fee}&signAgencyId=${state.signAgencyId}`,
url: `/subpackage/orders/interestsList?userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&cardType=${state.cardType}&fee=${Number(state.fee)}&equityId=${state.equityId}&fee=${state.fee}&signAgencyId=${state.signAgencyId}`,
});
}
const savaHandle = (val, idx) => {
@@ -115,15 +118,18 @@
if (val['cardTypeArr'].split(",").length == 1) {
if (val['cardTypeArr'].split(",")[0] == "记账卡") {
state.isValueCard = 2
state.cardType = 1
} else if (val['cardTypeArr'].split(",")[0] == '储值卡') {
state.isValueCard = 1
state.cardType = 2
} else {
state.isValueCard = 2
state.cardType = 3
}
console.log("state.isValueCard", state.isValueCard)
setItem("isValueCard", state.isValueCard);
uni.navigateTo({
url: `/subpackage/orders/interestsList?equityId=${val.equityList[idx].equityId}&userType=${state.userType}&vanType=${state.vanType}&isValueCard=${state.isValueCard}&fee=${state.fee}&signAgencyId=${val['deviceType']}&productId=${val['productId']}`,
url: `/subpackage/orders/interestsList?equityId=${val.equityList[idx].equityId}&userType=${state.userType}&vanType=${state.vanType}&cardType=${state.cardType}&isValueCard=${state.isValueCard}&fee=${state.fee}&signAgencyId=${val['deviceType']}&productId=${val['productId']}`,
});
} else {
state.radiolist1 = [];
@@ -238,6 +244,7 @@
fee: 0, //产品金额
equityId: "",
signAgencyId:"",//渠道标识
cardType:""
});
const closeMask = () => {
state.choiceCardShow = false;

+ 1
- 1
subpackage/orders/essential-information-two.vue Vedi File

@@ -257,7 +257,7 @@
state.data.vehiclePlate = option.vehiclePlate;
state.data.vehiclePlateColor = option.vehiclePlateColor;
state.isValueCard = option.isValueCard
state.data.cardType = option.isValueCard
state.data.cardType = option.cardType
state.totalAmount = option.totalAmount;
state.equityId = option.equityId;
console.log("订单选择推广发行产品接口", option)

+ 28
- 28
subpackage/orders/essential-information.vue Vedi File

@@ -164,9 +164,9 @@
return;
}
//1.优先车牌校验 2.在进行订单创建
isSubmitOrderRequest(state.data.vehiclePlate, state.data.vehiclePlateColor).then((item) => {
console.log("item.data.data.canSubmit", item.data.data.canSubmit)
if (item.data.data.canSubmit == 1) {
// isSubmitOrderRequest(state.data.vehiclePlate, state.data.vehiclePlateColor).then((item) => {
// console.log("item.data.data.canSubmit", item.data.data.canSubmit)
// if (item.data.data.canSubmit == 1) {
var vehicleData = {
vehiclePlate: state.data.vehiclePlate,
vehiclePlateColor: state.data.vehiclePlateColor,
@@ -182,13 +182,13 @@
// 车牌校验有问题 还没改好
requestNew(plateCheck, options).then((res) => {
uni.redirectTo({
url: `/subpackage/orders/essential-information-two?userType=${state.data.userType}&vanType=${state.data.vanType}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}&vehiclePlate=${state.data.vehiclePlate}&vehiclePlateColor=${state.data.vehiclePlateColor}&productId=${state.data.productId}`,
url: `/subpackage/orders/essential-information-two?userType=${state.data.userType}&vanType=${state.data.vanType}&isValueCard=${state.isValueCard}&cardType=${state.data.cardType}&totalAmount=${state.totalAmount}&equityId=${state.equityId}&vehiclePlate=${state.data.vehiclePlate}&vehiclePlateColor=${state.data.vehiclePlateColor}&productId=${state.data.productId}`,
});
});
} else {
msg(item.data.data.canSubmitMsg);
}
})
// } else {
// msg(item.data.data.canSubmitMsg);
// }
// })
}
onLoad((option : any) => {
state.data.vanType = option.vanType; //1客车 2货车
@@ -196,7 +196,7 @@
state.data.userType = option.userType;
state.data.productId = option.productId;
state.isValueCard = option.isValueCard
state.data.cardType = option.isValueCard
state.data.cardType = option.cardType
state.totalAmount = option.totalAmount;
state.equityId = option.equityId;
console.log("订单选择推广发行产品接口", option)
@@ -229,25 +229,25 @@
})
// 老中台-检测能否提交订单
const isSubmitOrderRequest = (vehiclePlate, vehiclePlateColor) => {
const options = {
type: 2,
data: {
vehicleId: vehiclePlate + "_" + vehiclePlateColor
},
method: "POST",
showLoading: true,
};
return new Promise(async (resolve, reject) => {
const res = await request(isSubmitOrderApi, options);
const data = stringToJson(res.bizContent);
console.log("111")
resolve(data);
}).catch((error) => {
console.log("222")
reject(error);
});
}
// const isSubmitOrderRequest = (vehiclePlate, vehiclePlateColor) => {
// const options = {
// type: 2,
// data: {
// vehicleId: vehiclePlate + "_" + vehiclePlateColor
// },
// method: "POST",
// showLoading: true,
// };
// return new Promise(async (resolve, reject) => {
// const res = await request(isSubmitOrderApi, options);
// const data = stringToJson(res.bizContent);
// console.log("111")
// resolve(data);
// }).catch((error) => {
// console.log("222")
// reject(error);
// });
// }
</script>

<style lang="scss" scoped>

+ 3
- 1
subpackage/orders/interestsList.vue Vedi File

@@ -40,6 +40,7 @@ import { deviceType } from "@/utils/network/difference";
sysType: "",
signAgencyId:"",
productId:"",//产品编号
cardType:""
})

let richText = ref('')
@@ -57,6 +58,7 @@ import { deviceType } from "@/utils/network/difference";
state.userType = option.userType;
state.vanType = option.vanType;
state.isValueCard = option.isValueCard;
state.cardType = option.cardType;
state.productId = option.productId;
state.totalAmount = option.fee;
// 储值卡转记账卡传过来的参数
@@ -85,7 +87,7 @@ import { deviceType } from "@/utils/network/difference";
} else {
// 正常流程
uni.redirectTo({
url: `/subpackage/orders/essential-information?userType=${state.userType}&vanType=${state.vanType}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}&equityId=${state.equityId}&productId=${state.productId}`,
url: `/subpackage/orders/essential-information?userType=${state.userType}&vanType=${state.vanType}&isValueCard=${state.isValueCard}&cardType=${state.cardType}&totalAmount=${state.totalAmount}&equityId=${state.equityId}&productId=${state.productId}`,
});
}
}

+ 0
- 2
subpackage/orders/opening-account-people.vue Vedi File

@@ -245,7 +245,6 @@
} from "@dcloudio/uni-app";
import {
getUserMsg,
ocrAllQuery,
userUpload,idCardOcr,registerFull
} from "@/utils/network/api.js";

@@ -570,7 +569,6 @@
state.phoneType = 0
state.isTakePhotoModeShow = false
var imageType = state.choiceIndex;
// uploadFile(val.tempImagePath, imageType, ocrAllQuery).then((data) => {
uploadFile(val.tempImagePath, imageType, idCardOcr).then((data) => {
console.log("身份证上传", data)
if (state.isMy == "my") {

+ 5
- 4
subpackage/orders/order-detail-logistics.vue Vedi File

@@ -151,12 +151,13 @@ import {getCodeName} from "@/datas/queryKey.js";
}
onLoad((options) => {
state.orderInfo = JSON.parse(options.orderInfo);
console.log("state.orderInfo", options.orderInfo)
state.orderShowInfo[0].value = state.orderInfo['orderId']
state.orderShowInfo[1].value = getOrderTypeName(state.orderInfo['orderType'])
console.log("state.orderInfo", state.orderInfo)
state.orderShowInfo[0].value = state.orderInfo['orderId']?state.orderInfo['orderId']:state.orderInfo['orderNo']
// state.orderShowInfo[1].value = getOrderTypeName(state.orderInfo['orderType'])
state.orderShowInfo[1].value = '新办'
state.orderShowInfo[2].value = state.orderInfo['vehiclePlate']
state.orderShowInfo[3].value = state.orderInfo['userType'] === 'UNIT_USER' ? '单位' : '个人'
state.orderShowInfo[4].value = getCarTypeName(state.orderInfo["type"])
state.orderShowInfo[4].value = getCarTypeName(state.orderInfo["type"]?state.orderInfo["type"]:state.orderInfo["vanType"])
state.orderShowInfo[5].value = getOrderStatusName(state.orderInfo['orderStep'])

state.orderShowInfo[6].value = getOrderTime(state.orderInfo['insertTime'])

+ 4
- 3
subpackage/orders/order-details-new.vue Vedi File

@@ -410,8 +410,9 @@
v-if="state.orderInfo.orderStep == OrderStatus.审核不通过 || state.orderInfo.orderStep == OrderStatus.待审核"
class="btn-status">
<view class="btn space" @click="gotoCancelOrder(state.orderInfo)">取消订单</view>
<view class="btn space" v-if="state.orderInfo.orderStep == OrderStatus.审核不通过"
@click="gotoEditUserOrUnitInfo(state.orderInfo)">修改资料</view>
<view class="btn space" @click="gotoEditUserOrUnitInfo(state.orderInfo)" v-if="state.orderInfo.orderStep == OrderStatus.审核不通过">修改资料</view>
<!-- <view class="btn space" v-if="state.orderInfo.orderStep == OrderStatus.审核不通过"
@click="gotoEditUserOrUnitInfo(state.orderInfo)">修改资料</view> -->
<view class="btn-green" @click="gotoEditAddress(state.orderInfo)">修改地址</view>
</view>
<!-- 待支付 -->
@@ -548,7 +549,7 @@
//按钮跳转业务逻辑
const { gotoEditAddress, gotoCancelOrder, gotoEditUserOrUnitInfo,
gotoConfirmReceipt, gotoCheckLogistics, gotoEvaluateProduct,
gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoPay, gotoOrderSign, gotoOrderDetailsPay, gotoEvaluateSalesman, closeOrder, gotoAgainUseOrder,gotoAddressOrder,placeAnOrder,gotoReplenishmentOrder } = useOrderSkip();
gotoActiveOrder, gotoReturnOrder, gotoExchangeOrder, gotoOrderSign, gotoOrderDetailsPay, gotoEvaluateSalesman, closeOrder, gotoAgainUseOrder,gotoAddressOrder,placeAnOrder,gotoReplenishmentOrder } = useOrderSkip();


//获取订单详情

+ 0
- 1
subpackage/orders/order_payment.vue Vedi File

@@ -136,7 +136,6 @@
};
requestNew(getOpenId, options1).then((res) => {
const result =res;
console.log("getOpenidApi", result)
const openidData = stringToJson(result.data);
console.log("获取openId", openidData)
const options = {

+ 4
- 4
subpackage/orders/payment.vue Vedi File

@@ -83,7 +83,7 @@
<script setup lang="ts">
import navBar from "@/components/nav-bar/nav-bar.vue";
import { reactive } from "vue";
import { request } from "@/utils/network/request.js";
import { request,requestNew } from "@/utils/network/request.js";
import {
checkOrderStatus,
orderPay,
@@ -92,7 +92,7 @@
aliPayConfigId,
obtainUserId,
wechatSecret,
getOpenidApi
getOpenId
} from "@/utils/network/api";
import { stringToJson } from "@/utils/network/encryption";
import { onLoad } from "@dcloudio/uni-app";
@@ -255,8 +255,8 @@
showLoading: true,
};
// #ifdef MP-WEIXIN
request(getOpenidApi, options).then((res) => {
const result = stringToJson(res.bizContent);
requestNew(getOpenId, options).then((res) => {
const result = res;
console.log("获取微信小程序openid", result);
const openidData = stringToJson(result.data);
state.openid = openidData.openid;

+ 3
- 3
subpackage/orders/product-detail.vue Vedi File

@@ -46,7 +46,7 @@
ref
} from "vue";
import {
getOpenidApi,
getOpenId,
envs,payQuery,agreementInSertOrder,agreeOrderProdcut
} from "@/utils/network/api.js";
import {
@@ -145,8 +145,8 @@ console.log("fileType",fileType)
showLoading: true,
};
// #ifdef MP-WEIXIN
request(getOpenidApi, options).then((res) => {
const result = stringToJson(res.bizContent);
requestNew(getOpenId, options).then((res) => {
const result = res;
console.log("获取微信小程序openid", result);
const openidData = stringToJson(result.data);
state.openid = openidData.openid;

+ 3
- 5
subpackage/orders/release-products.vue Vedi File

@@ -32,9 +32,7 @@
import { onLoad} from "@dcloudio/uni-app";
import { reactive } from "vue";
import { etcQyList } from "@/utils/network/api.js";
import { request } from "@/utils/network/request.js";

import { stringToJson } from "@/utils/network/encryption";
import { request,requestNew } from "@/utils/network/request.js";
import { fileURL } from "@/datas/fileURL.js";
import navBar from "@/components/nav-bar/nav-bar2.vue";
import navBgCar from "./components/nav-bg-car5";
@@ -95,8 +93,8 @@
method: "POST",
showLoading: true,
};
request(etcQyList, options).then((res) => {
const data = stringToJson(res.bizContent);
requestNew(etcQyList, options).then((res) => {
const data = res;
// #ifdef MP-ALIPAY
state.list = [
{

+ 0
- 1
subpackage/orders/sign-up.vue Vedi File

@@ -41,7 +41,6 @@
import { setItem } from "@/utils/storage";
import { msg } from "@/utils/utils";
import {
getOpenidApi,
infoQuery,
envs, channelSingQueryApi,userSign,getOpenId
} from "@/utils/network/api";

+ 0
- 1
subpackage/orders/verify/verify-phone-code/verify-phone-code.vue Vedi File

@@ -36,7 +36,6 @@
} from "@/utils/network/request";
import {
sendMessage,
changePhone
} from "@/utils/network/api.js";
import {
useUserStore

+ 5
- 104
subpackage/personal-center/car-message-change.vue Vedi File

@@ -4,50 +4,6 @@
<view class="title"> 上传后请核对识别信息 </view>
<view class="tip"> 如有错误请及时手动修改 </view>
</view>
<!-- <view class="picture-wrapper" @click="takePhotoMode('1','my')">
<view class="bg">
<view class="">
<view class="name"> 人像面 </view>
<view class="value"> 上传身份证的人像面 </view>
<view class="tip">
<view class="tip-value"> 拍摄规范 </view>
</view>
</view>
<image v-if="!state.form.ownPosImgUrl" class="icon" :src="`${$imgUrl}applyCard/renxiang.png`">
</image>
<image v-else class="icon" :src="strReplace(state.form.ownPosImgUrl)"></image>
</view>
</view>
<view class="picture-wrapper" @click="takePhotoMode('2','my')">
<view class="bg">
<view class="">
<view class="name"> 国徽面 </view>
<view class="value"> 上传身份证的国徽面 </view>
<view class="tip">
<view class="tip-value"> 拍摄规范 </view>
</view>
</view>
<image v-if="!state.form.ownNegImgUrl" class="icon" :src="`${$imgUrl}applyCard/guohui.png`">
</image>
<image v-else class="icon" :src="strReplace(state.form.ownNegImgUrl)"></image>
</view>
</view>
<view class="shibie-wrapper">
<view class="title"> 识别内容如下 </view>
<u-form label-width="230" :model="state.form" ref="uForm">
<u-form-item label="身份证号">
<u-input placeholder='请输入身份证' type="idcard" v-model="state.form.userIdNum"
:disabled="state.isEnableOCRData" maxlength="18" />
</u-form-item>
<u-form-item label="地址">
<u-input placeholder='请输入地址' :autoHeight='true' v-model="state.form.address"
:disabled="state.isEnableOCRData" maxlength="50" />
</u-form-item>
<u-form-item label="联系方式">
<u-input placeholder='请输入联系方式' type="number" v-model="state.form.tel" maxlength="11" />
</u-form-item>
</u-form>
</view> -->
<view class="picture-wrapper" @click="takePhotoMode('3')">
<view class="bg">
<view class="">
@@ -532,7 +488,6 @@
return;
}
if(res.cardCheckPass && res.obuCheckPass){
// getGlobalParam(); //全局配置数据
console.log("option")
searchVehicleInfoQuery(); //车辆信息查询
state.businessType = getItem('key')['DASP_PUSH_TYPE'][0]['code']
@@ -561,46 +516,6 @@
}
console.log("event.replace(screeningStr, '')", event.replace(screeningStr, ''), event, state.form.userName)
}

const getGlobalParam = () => {
const data = getItem('globalParam')
console.log("全局配置数据", getCodeName('IS_ENABLE', data.miniSupportOther), getCodeName('IS_ENABLE', data.otherUploadProxy), getCodeName('IS_ENABLE', data.miniInfoShow), getCodeName('IS_ENABLE', data.changeOCRData))
// 小程序是否支持他人办理
if (getCodeName('IS_ENABLE', data.miniSupportOther) == '启用') {
state.isEnableOther = true;
} else {
state.isEnableOther = false;
}
// 他人办理时是否上传委托书
if (getCodeName('IS_ENABLE', data.otherUploadProxy) == '启用') {
state.isEnableBook = true;
} else {
state.isEnableBook = false;
}
// 小程序信息带出
if (getCodeName('IS_ENABLE', data.miniInfoShow) == '启用') {
state.isEnableInfo = true;
uni.showModal({
// title: '提示',
content: '是否允许带出用户信息',
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else {
state.isEnableInfo = false;
}
// 允许修改OCR识别出来的数据
if (getCodeName('IS_ENABLE', data.changeOCRData) == '启用') {
state.isEnableOCRData = false;
} else {
state.isEnableOCRData = true;
}
}
const takePhotoMode = (index, isMy) => {
console.log("index", index, isMy)
state.isTakePhotoModeShow = true
@@ -647,22 +562,7 @@
var imageType = 2;
var queryCode = vehicleLicenseOcr
}
// uploadFile(val.tempImagePath, imageType, ocrAllQuery).then((data) => {
uploadFile(val.tempImagePath, imageType, queryCode).then((data) => {
if (state.isMy == "my") {
if (state.choiceIndex == "1") {
console.log("身份证上传", data)
state.form.userName = data.name;
state.form.gender = data.gender;
state.form.userIdNum = data.idno;
state.form.ownPosImgUrl = data.imageUrl;
state.form.address = data.address;
} else {
state.form.customerIdVld = data.enddate;
state.form.ownNegImgUrl = data.imageUrl;
}
state.isTakePhotoModeShow = false
} else {
if (state.choiceIndex == "1") {
state.form.agentName = data.name;
state.form.agentGender = data.gender;
@@ -724,7 +624,6 @@
console.log('=====================', state.form.vehNegImgUrl, state)
}
state.isTakePhotoModeShow = false
}
})
}
const cancle = () => {
@@ -737,9 +636,7 @@
};
//提交车辆信息
const savaHandleCar = () => {
if(state.form.vehiclePlate==state.form.vehiclePlateNew){
state.form.vehiclePlateNew=""
}
// if (!checkStr(state.form.userIdNum, 'card')) {
// msg('请输入正确身份证');
// return;
@@ -777,6 +674,10 @@
state.form.totalMass = parseFloat(state.form.totalMass);
state.form.permittedWeight = parseFloat(state.form.permittedWeight);
state.form.permittedTowWeight = parseFloat(state.form.permittedTowWeight);
console.log("state.form.vehiclePlate",state.form.vehiclePlate,1,state.form.vehiclePlateNew,state.form.vehiclePlate == state.form.vehiclePlateNew)
if(state.form.vehiclePlate == state.form.vehiclePlateNew){
state.form.vehiclePlateNew=""
}
console.log("state.form",state.form)
const options = {
type: 2,

+ 0
- 2
subpackage/personal-center/install-activation-order.vue Vedi File

@@ -71,7 +71,6 @@
jump("1", params)
} else {
let vehicleId=item.vehiclePlate+"_"+item.vehiclePlateColor
// interceptND(vehicleId).then(()=>{
// #ifdef MP-WEIXIN
navTo(
`/subpackage/after-sale/activation-once-again/activation-once-again?vehicleId=${item.vehicleId}`
@@ -82,7 +81,6 @@
`/subpackage/after-sale/activation-once-again/activation-once-again-ali?vehicleId=${item.vehicleId}`
);
// #endif
// })
}

+ 1
- 12
subpackage/personal-center/setting/change-phone-code-ali.vue Vedi File

@@ -1,17 +1,6 @@
<!-- 注册第2步 -->
<template>
<view class="register-main">
<!-- <view class="title">请输入验证码</view>
<view class="hint">验证码已发送至:{{ phone }}</view>
<view class="input-code">
<verification-code-input v-model="code"></verification-code-input>
</view>
<view class="hint2">
<view class="green">{{ codeDuration === 0 ? "" : codeDuration }}</view>
<view class="grey" @click="sendRegisterCode">{{
codeDuration === 0 ? "重新发送验证码" : "秒后可重新发送验证码"
}}</view>
</view> -->
<view class="title">验证码</view>
<view class="input-code">
<input class="input" v-model="code" placeholder="请输入验证码" placeholder-class="form-placeholder"
@@ -111,7 +100,7 @@
method: "POST",
showLoading: true,
};
request(changePhone, options).then((res) => {
requestNew(changePhone, options).then((res) => {
msg("更改手机号成功");
codeInterval();
var pages = getCurrentPages().length;

+ 1
- 1
subpackage/personal-center/setting/change-phone-code.vue Vedi File

@@ -105,7 +105,7 @@
method: "POST",
showLoading: true,
};
request(changePhone, options).then((res) => {
requestNew(changePhone, options).then((res) => {
msg("更改手机号成功");
codeInterval();
var pages = getCurrentPages().length;

+ 2
- 2
subpackage/personal-center/setting/personal-information/user-card.vue Vedi File

@@ -233,8 +233,8 @@
showLoading: true,
};
requestNew(changeApply, options).then((res) => {
const data = JSON.parse(res.bizContent)
msg('个人信息变更成功')
const data = res
msg('用户信息变更申请成功')
setTimeout(() => {
uni.navigateBack({
delta: 1

+ 4
- 4
subpackage/personal-center/trapping-and-repairing-account/recharge-two.vue Vedi File

@@ -34,10 +34,10 @@
wechatSecret,
aliPayConfigId,
obtainUserId,
getOpenidApi
getOpenId
} from "@/utils/network/api.js";
import {
request
request,requestNew
} from "@/utils/network/request.js";
import {
reactive
@@ -626,8 +626,8 @@
showLoading: true,
};
// #ifdef MP-WEIXIN
request(getOpenidApi, options).then((res) => {
const result = stringToJson(res.bizContent);
requestNew(getOpenId, options).then((res) => {
const result = res;
console.log("获取微信小程序openid", result);
const openidData = stringToJson(result.data);
state.openid = openidData.openid

+ 4
- 4
subpackage/personal-center/trapping-and-repairing/recharge-two.vue Vedi File

@@ -37,10 +37,10 @@
wechatPayConfigId,
aliPayConfigId,
obtainUserId,
getOpenidApi
getOpenId
} from "@/utils/network/api.js";
import {
request
request,requestNew
} from "@/utils/network/request.js";
import {
reactive
@@ -718,8 +718,8 @@
showLoading: true,
};
// #ifdef MP-WEIXIN
request(getOpenidApi, options).then((res) => {
const result = stringToJson(res.bizContent);
requestNew(getOpenId, options).then((res) => {
const result = res;
console.log("获取微信小程序openid", result);
const openidData = stringToJson(result.data);
state.openid = openidData.openid

+ 2
- 2
subpackage/service/equityList/equityList.vue Vedi File

@@ -105,8 +105,8 @@
data: {
id: state.id,
payType: "EQUITY",
// wxOpenid: openidData.openid,
openId: openidData.openid,
wxOpenid: openidData.openid,
// openId: openidData.openid,
},
method: 'POST',
showLoading: true,

+ 12
- 14
utils/network/api.js Vedi File

@@ -9,12 +9,10 @@ export const envs = {
//开发环境配置
development: {
baseUrl: "https://qtzl.etcjz.cn",
// baseUrl: "http://100.64.2.104:8087",
},
//生产环境配置
production: {
baseUrl: "https://qtzl.etcjz.cn",
// baseUrl: "http://100.64.2.104:8087",
},
}

@@ -36,10 +34,6 @@ export const sm4Key =




//菜单配置
export const queryMenuConfig = '1032'

/*统一 会员平台*/
export const sendCode = "1001"; //统一会员平台发送验证码接口
export const updateToken = "225aa780a91b40f0b44e7e5fe204fc9a"; //统一会员平台登录确认接口(用于换取openId和token)
@@ -60,12 +54,10 @@ export const etcCreatOrder = "6"; //CSMSN-创建订单
export const searchOrder = "156"; //8.54.CSMSN-根据车辆ID、操作人、来源获取未完成办理订单
export const etcOcrCard = "15"; //CSMSN-OCR识别身份证
export const etcCarOcrCard = "16"; //CSMSN-OCR识别行驶证
export const ocrAllQuery = '91'; //8.76.BDS-OCR证照识别接口
export const etcUserCardInfoSubmit = "22"; // CSMSN-提交个人用户信息
export const etcUserCardInfoChange = "21"; // CSMSN-更改个人用户信息
export const etcCompanyCardInfoSubmit = "20"; // CSMSN-提交单位用户信息
export const etcCarCardInfoSubmit = "18"; // CSMSN-提交车辆信息
export const etcQyList = "66"; // 统一会员平台可签约渠道列表查询接口
export const exchangeApply = '888' //8.99.ASS-换货/换卡签申请接口
export const exchangeProcess = '886' //8.101.ASS-换货/换卡签审核接口

@@ -104,7 +96,7 @@ export const checkOrderStatus = "57"; //订单支付结果查询接口
export const cancelOrder = "7"; //取消订单
export const cancelOrderNew = "7fba19ba5d354c0ea5c443f9b5c66cdf"; //取消订单(新)
export const receiveOrder = "155"; //订单完成收货
export const getLogistics = "30"; //获取所有的快递公司信息
// export const getLogistics = "30"; //获取所有的快递公司信息
export const editOrderAddr = '164'; //订单修改收货地址
export const orderReturn = '165'; //订单申请退货
export const orderExchange = '167'; //订单申请换货
@@ -114,7 +106,6 @@ export const salesmanMsg = '9f19be89a03e475b903b88d4bc91cbb4' //订单查询业

//个人中心
export const changePassword = "94"; //重置密码
export const changePhone = "220"; //修改手机号
export const changeCarInfo = "1029"; //车辆管理信息修改
export const createCarInfo = "1028"; //车辆管理信息添加
export const selectCarInfo = "1030"; //车辆管理信息查询
@@ -203,7 +194,6 @@ export const addEvaluation = "64ed1fdff3b44138ba30d183b613bc7f" //满意度评
export const satisfactionEvaluation = "746b5e0375b8474eb3e133b8c79586d8" //满意度评价-分页查询
export const judageSalesman = "35744a8e282a42ddbc63814303e9e441" //判断是否有业务员
export const judageQuanProduct = "fe71273c1a394eaa999825afe7daa59b" //判断是否有权益产品
export const getGlobalParam = "d0579171c82443cb9b243c113309119a" //全局配置
export const getUserMsg = "c4a499a2a63042b9a2d4e88fc77d3fc0" //通过opneId查询用户信息

// 单位账户充值
@@ -229,7 +219,7 @@ export const PAYMENTORDERAPPLY = "377421d6ed4f48a29575aa126838a4d2" //CSMSN-订

export const businessApi = "b275644e586b447791eede4ad6a41640" //业务完成日志
export const inventoryEquipmentApi = "5570160d4b8d46408664b6c289de6b57" //库存设备统计
export const getOpenidApi = "53c0698b512a44539ea05cc88157e68b" //获取微信小程序openid
// export const getOpenidApi = "53c0698b512a44539ea05cc88157e68b" //获取微信小程序openid
export const getAgreementApi = "a8b7a57c7e7546848c1c0cc4c3dfe19a" //根据订单编号获取渠道产品的补充协议(新)
export const transferRecordApi = "323bc6e1f3304c83921155fc220e9e37" //过户记录查询
export const agreementConfirmApi = "96fa039a85f54655af06d980c8ddc057" //协议确认接口
@@ -240,7 +230,7 @@ export const finishUseOrderApi = "6eb10e968aac40f8bf4549cd05c8f5eb" //结束订
export const ETCProductStatusListQueryApi = "448e81a599fe49b5b7f90f4af3ecae06" //ETC产品状态名单查询
export const ETCProductStatusListQueryDetailsApi = "3b8fdabde0aa4db59be440cd3d688d72" //ETC产品状态名单查询详情
export const DataSynchronizationApi = "1ed5f05a48d24ee8985a4fa104e8ef3e" //订单数据同步到老系统接口
export const isSubmitOrderApi = "3cec5ab7db63439186bda5a054c5fab7" //老中台-检测能否提交订单
// export const isSubmitOrderApi = "3cec5ab7db63439186bda5a054c5fab7" //老中台-检测能否提交订单
export const activationRecordApi = "1be22d30f08a4f10958a4b76dcfae6cf" //查询重新激活记录限制
export const submitVehicleApi = "e35daf84891549afabcbf86b4ed7e2e3" //重新激活提交车辆信息
export const getEquityListApi = "a2656146d9c24c86b8ea7aabbe3dbf97" //获取全部加购权益列表
@@ -324,12 +314,14 @@ export const singleEquityDetail= "/iaw/ass/equity/singleEquityDetail" //单项
export const obuFileDataDecrypt= "/iaw/ass/issueBase/obuFileDataDecrypt" //OBU系统信息在线解密
export const updateShippingAddress= "/iaw/issue/order/updateShippingAddress" //订单修改收货地址
export const vehicleInfoQuery= "/iaw/app/issue/vehicleInfo/query" //获取车辆信息
export const etcQyList = "/iaw/sign/signChannelQuery"; // 统一会员平台可签约渠道列表查询接口
// 业务审核进度查询
export const generalAuditQuery= "/iaw/api/afterSale/generalAudit/query" //业务审核查询
export const generalAuditListVehicle= "/iaw/api/afterSale/generalAudit/listVehicle" //业务审核查询车辆列表
// ocr
export const idCardOcr= "/iaw/ocr/idCardOcr" //身份证OCR识别
export const vehicleLicenseOcr= "/iaw/ocr/vehicleLicenseOcr" //车辆行驶证OCR识别
export const ocrAllQuery = '/iaw/ocr/businessLicenseOcr'; //8.76.BDS-OCR证照识别接口
// 公用得接口
export const commQueryCourier= "/iaw/api/afterSale/comm/queryCourier" //获取快递公司列表
// 收货地址管理
@@ -453,4 +445,10 @@ export const mobileIsRepeatApi = "/iaw/portal/registerCheck" //个人账号重
export const regist = "/iaw/portal/register"; // 统一会员平台个人账号注册
// 我的页面
export const userInfoIndex = "/iaw/portal/getAccountInfoSimple"; //USER-获取用户个人简单信息
export const appPage = "/iaw/issue/order/wchatorderapppage" //app分页
export const appPage = "/iaw/issue/order/wchatorderapppage" //app分页
//菜单配置
export const queryMenuConfig = '/iaw/rbac/menuListBySystemTypeAndOpenId'
export const getGlobalParam = "/iaw/rbac/portalConfigLoginSource" //全局配置
export const updateTokenNew = "/iaw/portal/phoneLogin"; //统一会员平台登录确认接口(用于换取openId和token)
// 设置
export const changePhone = "/iaw/portal/changeMobileByCode"; //修改手机号

+ 31
- 2
utils/network/request.js Vedi File

@@ -21,7 +21,7 @@ import {
channelId
} from "@/utils/network/difference";
import {
updateToken
updateToken,updateTokenNew
} from "@/utils/network/api";
import orderJump from "@/composables/order/orderJump";
const {
@@ -74,7 +74,7 @@ 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 + '/ndev/api/interfaceMidGroundIn'
//默认json数据格式提交`
let contentType = 'application/x-www-form-urlencoded'

@@ -299,6 +299,30 @@ export function request(code, options = {}, start = false) {
});
});
}
/* 刷新token */
function updateGetTokenNew() {
const options = {
type: 2,
data: {
openId: getItem("openId"),
accessToken: getItem(StorageKeys.Token)
},
method: "POST",
showLoading: false,
};
//刷新token
return new Promise(async (resolve, reject) => {
const res = await requestNew(updateTokenNew, options);
const data = res;
console.log("data", data)
setItem('accessToken', data.accessToken);
setItem(StorageKeys.Token, data.accessToken);
setItem('openId', data.openId);
resolve(data);
}).catch((error) => {
reject(error);
});
}
//请求
export function requestNew(code, options = {}, start = false) {
//公参
@@ -377,6 +401,11 @@ export function requestNew(code, options = {}, start = false) {
}
}
});
}else if(res.data.code == 401001 || res.data.code == 401002){
updateGetTokenNew().then((data) => {
console.log("token刷新", data);
requestNew(code, options, true)
})
}else{
uni.showModal({
title: '提示',

+ 7
- 16
utils/utils.ts Vedi File

@@ -462,7 +462,7 @@ export const uploadFile = (tempImagePath, imageType, code) => {
console.log("17", uploadFileImage)
resolve(uploadFileImage)
return;
} else if (code == '91') { //营业执照
} else if (code == '/iaw/ocr/businessLicenseOcr') { //营业执照
var data = {
type: 'business_license',
url: uploadFileImage
@@ -477,21 +477,12 @@ export const uploadFile = (tempImagePath, imageType, code) => {
method: "POST",
showLoading: true,
};
if(code=="" || code=="91"){
request(code, options).then((res) => {
const data = stringToJson(res.bizContent);
console.log('输出内容=====123', data)
resolve(data)
});
}else{
requestNew(code, options).then((res) => {
const data = stringToJson(res.bizContent);
console.log('输出内容=====123', data)
resolve(data)
});
}
requestNew(code, options).then((res) => {
console.log("res===",res)
const data = res;
console.log('输出内容=====123', data)
resolve(data)
});
}
});

Loading…
Annulla
Salva