浏览代码

Merge branch 'master' of http://192.168.40.220/dmc/jz_applet into master

yxb
wq 1年前
父节点
当前提交
8b4845dabd
共有 3 个文件被更改,包括 6 次插入5 次删除
  1. 3
    3
      composables/order/useOrderSkip.ts
  2. 1
    0
      utils/network/api.js
  3. 2
    2
      utils/network/request.js

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

// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
url = `/subpackage/orders/essential-information`; url = `/subpackage/orders/essential-information`;
// #endif // #endif
} }
console.log("url", url) console.log("url", url)
navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`); navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`);
const gotoEvaluateSalesman = (orderInfo : any) => { const gotoEvaluateSalesman = (orderInfo : any) => {
navTo(`/subpackage/orders/order-evaluate-salesman?id=${orderInfo.id}&orderId=${orderInfo.orderId}`); navTo(`/subpackage/orders/order-evaluate-salesman?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
} }


//查看物流 //查看物流
const gotoCheckLogistics = (orderInfo : any) => { const gotoCheckLogistics = (orderInfo : any) => {

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

}, },
//生产环境配置 //生产环境配置
production: { production: {
// baseUrl: "http://192.168.124.6:8087",
// baseUrl: "http://222.85.144.89:19002", // baseUrl: "http://222.85.144.89:19002",
// baseUrl: "http://192.168.100.158:8085/html/", // baseUrl: "http://192.168.100.158:8085/html/",
// baseUrl: "https://qtzl.etcjz.cn", // baseUrl: "https://qtzl.etcjz.cn",

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

rbacSource: 'MINI_PROGRAM', rbacSource: 'MINI_PROGRAM',
accessToken: getItem(StorageKeys.Token) accessToken: getItem(StorageKeys.Token)
} }
// options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
options.url = envs[process.env.NODE_ENV].baseUrl + '/ifzt/api/interfaceMidGroundIn'
options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
// options.url = envs[process.env.NODE_ENV].baseUrl + '/ifzt/api/interfaceMidGroundIn'
//默认json数据格式提交` //默认json数据格式提交`
let contentType = 'application/x-www-form-urlencoded' let contentType = 'application/x-www-form-urlencoded'



正在加载...
取消
保存