qiubinghui
/
zhywpt-sp
Seguir 1
Destacar 0
Fork 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Actividad
Explorar el Código

提交修改

yxb
DESKTOP-2IO5MST\huting hace 1 año
padre
f384418b2c
commit
2d98db932e
Se han modificado 10 ficheros con 60 adiciones y 38 borrados
Dividir vista Mostrar estadísticas de diff
  1. 6
    6
      datas/fileURL.js
  2. 2
    3
      login/login.vue
  3. 8
    3
      subpackage/after-sale/card-loss-reporting/cardloss.vue
  4. 2
    2
      subpackage/after-sale/rescind-carId/rescind-carId-select.vue
  5. 9
    6
      subpackage/orders/car-release.vue
  6. 6
    8
      subpackage/orders/order_payment.vue
  7. 16
    2
      subpackage/orders/sign-up.vue
  8. 8
    6
      utils/network/api.js
  9. 3
    1
      utils/network/encryption.js
  10. 0
    1
      utils/network/request.js

+ 6
- 6
datas/fileURL.js Ver fichero

@@ -5,10 +5,10 @@ import {
// export const fileURL = 'http://47.94.96.52/'
// export const fileURL = 'http://222.85.144.89:19002/default-bucket/'

// export const downloadFileURL = envs[process.env.NODE_ENV].baseUrl + '/user-export-excel/'
// export const fileURL = envs[process.env.NODE_ENV].baseUrl + '/default-bucket/'
// export const fileURLList = envs[process.env.NODE_ENV].baseUrl + "/"
export const downloadFileURL = envs[process.env.NODE_ENV].baseUrl + '/user-export-excel/'
export const fileURL = envs[process.env.NODE_ENV].baseUrl + '/default-bucket/'
export const fileURLList = envs[process.env.NODE_ENV].baseUrl + "/"

export const downloadFileURL = "http://192.168.100.63:8087/user-export-excel/"
export const fileURL = "http://192.168.100.63:8087/default-bucket/"
export const fileURLList = "http://192.168.100.63:8087/"
// export const downloadFileURL = "http://192.168.100.63:8087/user-export-excel/"
// export const fileURL = "http://192.168.100.63:8087/default-bucket/"
// export const fileURLList = "http://192.168.100.63:8087/"

+ 2
- 3
login/login.vue Ver fichero

@@ -74,7 +74,7 @@
import { reactive } from "vue";
import { checkStr, msg, navTo } from "@/utils/utils";
import { onLoad, onUnload } from "@dcloudio/uni-app";
import { login, loginCode, loginTime,wechatAppID } from "@/utils/network/api.js";
import { login, loginCode, loginTime, wechatAppID } from "@/utils/network/api.js";
import { request } from "@/utils/network/request.js";
import { stringToJson } from "@/utils/network/encryption";
import { useUserStore } from "@/stores/user";
@@ -148,7 +148,7 @@
loginTime: loginTime,
});
}
};
};

/* 执行登录 */
const reqLogin = (code : string, data : object) => {
@@ -182,7 +182,6 @@
}
})
}
</script>

<style lang="scss" scoped>

+ 8
- 3
subpackage/after-sale/card-loss-reporting/cardloss.vue Ver fichero

@@ -11,7 +11,7 @@
<u-form-item prop="code">
<view class="from_item">
<text><text style="color: red"></text>验证码：</text>
<u-input v-model="form.code" placeholder="请输入验证码" class="input" />
<u-input v-model="form.code" placeholder="请输入验证码" class="input" type="number" />
<view class="hint2">
<view class="green">{{ codeDuration === 0 ? "" : codeDuration }}</view>
<view class="grey" @click="getCode">{{
@@ -106,6 +106,10 @@

//下一步
const toPage = () => {
if (!form.code) {
msg("请输入正确的验证码");
return;
}
const options = {
type: 2,
data: {
@@ -230,7 +234,8 @@
::v-deep .input {
text-align: left;
flex: 1;
background: transparent;
background: transparent;

input {
text-align: left;
}
@@ -275,4 +280,4 @@
bottom: 60rpx;
font-size: 32rpx;
}
</style>
</style>

+ 2
- 2
subpackage/after-sale/rescind-carId/rescind-carId-select.vue Ver fichero

@@ -99,8 +99,8 @@
<view class="picture-wrapper" @click="cardDbImageOcr('2')">
<view class="bg">
<view class="">
<view class="name"> 行驶证副业 </view>
<view class="value"> 上传行驶证副业 </view>
<view class="name"> 行驶证副页 </view>
<view class="value"> 上传行驶证副页 </view>
<view class="tip">
<view class="tip-value"> 拍摄规范 </view>
</view>

+ 9
- 6
subpackage/orders/car-release.vue Ver fichero

@@ -99,11 +99,11 @@
<!-- <u-input inputAlign="right" placeholder="请输入发证日期" v-model="state.form.issueDate" :disabled="state.isEnableChangeOCRCarInfo"/> -->
</u-form-item>
<u-form-item label="核定载人数">
<u-input inputAlign="right" placeholder="请输入核定载人数" v-model="state.form.approvedCount"
<u-input inputAlign="right" placeholder="请输入核定载人数" v-model="state.form.approvedCountShow"
:disabled="state.isEnableChangeOCRCarInfo" />
</u-form-item>
<u-form-item label="整备质量">
<u-input inputAlign="right" placeholder="请输入整备质量" v-model="state.form.maintenaceMass"
<u-input inputAlign="right" placeholder="请输入整备质量" v-model="state.form.maintenaceMassShow"
:disabled="state.isEnableChangeOCRCarInfo" />
</u-form-item>
<!-- <u-form-item label="外廊尺寸">
@@ -127,7 +127,7 @@
</view>
</view>
<u-form-item label="总质量">
<u-input inputAlign="right" placeholder="请输入总质量" v-model="state.form.totalMass"
<u-input inputAlign="right" placeholder="请输入总质量" v-model="state.form.totalMassShow"
:disabled="state.isEnableChangeOCRCarInfo" />
</u-form-item>
<u-form-item label="车轴数">
@@ -395,8 +395,11 @@
vehicleType: "", //车辆类型
vehicleModel: "", //行驶证品牌型号
approvedCount: undefined, //核定人数
approvedCountShow: undefined,//展示的
totalMass: undefined, //总质量
totalMassShow: undefined, //总质量
maintenaceMass: undefined, //整备质量
maintenaceMassShow: undefined, //整备质量展示的
permittedWeight: "", //核定载质量
vehicleDimensions: "", //车辆尺寸
permittedTowWeight: "", //准牵引总质量
@@ -509,17 +512,17 @@
state.form.permittedWeight = data.alc ? data.alc : 0;
state.form.permittedTowWeight = data.towing ? data.towing : 0;
} else {
// state.form.approvedCount = parseFloat(data.apc);
// state.form.maintenaceMass = parseFloat(data.unladen);
state.form.approvedCount = data.apc;
state.form.approvedCountShow = data.apc;
state.form.maintenaceMass = data.unladen;
state.form.maintenaceMassShow = data.unladen;
state.form.vehicleDimensions = data.overall.replaceAll("x", "X");
let arr = data.overall.split("x");
state.outlineL = arr[0]; //外廓 长
state.outlineW = arr[1]; //外廓 宽
state.outlineH = arr[2].substring(0, arr[2].length - 2); //外廓 高
// state.form.totalMass = parseFloat(data.gross);
state.form.totalMass = data.gross;
state.form.totalMassShow = data.gross;
state.form.vehNegImgUrl = data.imageUrl;
}
});

+ 6
- 8
subpackage/orders/order_payment.vue Ver fichero

@@ -283,10 +283,9 @@
// PRESTORE("预存金",3){},
// EQUITY("权益费",4){},
for (let i = 0; i < state.dataArray.length; i++) {
// if (state.dataArray[i].payType === 'HANDLE') {
// state.dataArray[i].payName = '办理费'
// } else
if (state.dataArray[i].payType === 'MARGIN') {
if (state.dataArray[i].payType === 'HANDLE') {
state.dataArray[i].payName = '权益金'
} else if (state.dataArray[i].payType === 'MARGIN') {
state.dataArray[i].payName = '保证金'
} else if (state.dataArray[i].payType === 'PRESTORE') {
state.dataArray[i].payName = '预存金'
@@ -383,10 +382,9 @@
// PRESTORE("预存金",3){},
// EQUITY("权益费",4){},
for (let i = 0; i < state.dataArray.length; i++) {
// if (state.dataArray[i].payType === 'HANDLE') {
// state.dataArray[i].payName = '办理费'
// } else
if (state.dataArray[i].payType === 'MARGIN') {
if (state.dataArray[i].payType === 'HANDLE') {
state.dataArray[i].payName = '权益金'
} else if (state.dataArray[i].payType === 'MARGIN') {
state.dataArray[i].payName = '保证金'
} else if (state.dataArray[i].payType === 'PRESTORE') {
state.dataArray[i].payName = '预存金'

+ 16
- 2
subpackage/orders/sign-up.vue Ver fichero

@@ -186,8 +186,9 @@
//如果获取openId成功
if (state.openid) {
var data = {
orderId: state.orderId,
// orderId: "20231012114651162505354",
// orderId: state.orderId,
orderId: "20231012114651162505354",
// orderId: "20231121174825916656609",
subOpenId: state.openid,
};
const options = {
@@ -215,6 +216,19 @@
sub_openid: data.subOpenId,
sign: data.sign,
},
// extraData: {
// appid: "wxe5572b2938f35c09",
// channel_type: "ETC", //没有
// mch_id: "1641444218",
// nonce_str: "e9eb7a02533947389f8f4e7cb9394fb5",
// plate_number: "贵ZBYD09",
// sign: "B926E47DF8DE6B5FE53FF7AC3CCB5FA7C5CDB3459A4C1AFC0CDC8B143EC68DDA",
// sign_type: "HMAC-SHA256",
// sub_appid: "wx008c60533388527a",
// sub_mch_id: "1648725759",
// sub_openid: "oHQtp5C8821AImJa1ibf6rZ6xc60",
// trade_scene: "HIGHWAY"
// },
success(res) {
console.log(res);
},

+ 8
- 6
utils/network/api.js Ver fichero

@@ -1,8 +1,8 @@
/* 接口中常量 */
// export const URL = "192.168.100.63";
// export const URL = "trial.etcjz.cn";
export const URL = "trial.etcjz.cn";
// export const URL = "qtzl.etcjz.cn";
export const URL = "192.168.100.63";
// export const URL = "qtzl.etcjz.cn/test";
// http://192.168.100.63:50001
/**
* 配置信息,针对不同的平台进行配置
@@ -10,19 +10,21 @@ export const URL = "192.168.100.63";
export const envs = {
//开发环境配置
development: {
baseUrl: "https://trial.etcjz.cn",
// baseUrl: "https://qtzl.etcjz.cn",
// baseUrl: "https://trial.etcjz.cn",
// baseUrl: "https://qtzl.etcjz.cn/test",
// baseUrl: "http://192.168.100.158:8085",
baseUrl: "http://192.168.100.63:50001",
// baseUrl: "http://192.168.100.63:50001",
},
//生产环境配置
production: {
// baseUrl: "http://192.168.124.6:8087",
// baseUrl: "http://222.85.144.89:19002",
// baseUrl: "https://qtzl.etcjz.cn",
// baseUrl: "https://trial.etcjz.cn",
// baseUrl: "https://qtzl.etcjz.cn/test",
baseUrl: "https://trial.etcjz.cn",
// baseUrl: "http://192.168.100.158:8085",
baseUrl: "http://192.168.100.63:50001",
// baseUrl: "http://192.168.100.63:50001",
},
}

+ 3
- 1
utils/network/encryption.js Ver fichero

@@ -116,7 +116,9 @@ export function arrayToJsonString(array) {
*json字符串转换成json对象
*/
export function stringToJson(data) {
return JSON.parse(data);
let index = data.lastIndexOf("}")
let content = data.substring(0, index + 1);
return JSON.parse(content);
}

//array转json对象

+ 0
- 1
utils/network/request.js Ver fichero

@@ -163,7 +163,6 @@ export function request(code, options = {}, start = false) {
let content = s4.decryptData_CBC(res, sm4Key)
// console.log(content);
// content.data.bizContent = JSON.stringify(content.data.bizContent)
// console.log(content.data);
resolve(content.data)
}
}

Escribir Vista previa
Cargando…
Cancelar
Guardar