Browse Source

更新

xz
username 10 months ago
parent
commit
eafe12c741

+ 2
- 2
.env.production View File

# VITE_APP_BASE_URL ='http://192.168.100.63:8087/' # VITE_APP_BASE_URL ='http://192.168.100.63:8087/'
# VITE_APP_BASE_URL = 'https://trial.etcjz.cn/' #测试环境地址 # VITE_APP_BASE_URL = 'https://trial.etcjz.cn/' #测试环境地址
# VITE_APP_BASE_URL = 'https://qtzl.etcjz.cn/dev/' #生成环境地址/试运行环境 # VITE_APP_BASE_URL = 'https://qtzl.etcjz.cn/dev/' #生成环境地址/试运行环境
VITE_APP_BASE_URL = 'http://100.65.11.2:8086/prod/' #线上地址 nDev
VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 nDev
# VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境 # VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境
VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/prod/' # 新地址
VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/ndev/' # 新地址 prod生产 ndev测试
# VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址 # VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址


# VITE_APP_BASE_URL = "http://43.136.169.197:50001/" # VITE_APP_BASE_URL = "http://43.136.169.197:50001/"

+ 3
- 3
src/router/routerData/onlineBusinessHall.js View File

{ {
path: "/views/onlineBusinessHall/publicAccountsManagement/accountManagement", path: "/views/onlineBusinessHall/publicAccountsManagement/accountManagement",
name: "accountManagement", name: "accountManagement",
meta: { title: "账户管理**", isAuth: true }, // 账户密码管理
meta: { title: "账户管理", isAuth: true }, // 账户密码管理
components: { components: {
key: () => key: () =>
import( import(
{ {
path: "/views/onlineBusinessHall/publicAccountsManagement/transactionRecordInquiry", path: "/views/onlineBusinessHall/publicAccountsManagement/transactionRecordInquiry",
name: "transactionRecordInquiry", name: "transactionRecordInquiry",
meta: { title: "交易记录查询**", isAuth: true }, // 交易记录查询
meta: { title: "交易记录查询", isAuth: true }, // 交易记录查询
components: { components: {
key: () => key: () =>
import( import(
{ {
path: "/views/onlineBusinessHall/publicAccountsManagement/advancepaymentaccount", path: "/views/onlineBusinessHall/publicAccountsManagement/advancepaymentaccount",
name: "advancepaymentaccount", name: "advancepaymentaccount",
meta: { title: "对公账户充值管理**", isAuth: true }, // 交易记录查询
meta: { title: "对公账户充值管理", isAuth: true }, // 交易记录查询
components: { components: {
key: () => key: () =>
import( import(

+ 8
- 6
src/utils/dataUtil.js View File

export function compareObjects(obj1, obj2) { export function compareObjects(obj1, obj2) {
var result = {}; var result = {};


if (obj2) {
if (obj1 && obj2) {
// 比较两对象,并补充obj2没有的字段 // 比较两对象,并补充obj2没有的字段
for (var key in obj1) { for (var key in obj1) {
if (obj2.hasOwnProperty(key)) { if (obj2.hasOwnProperty(key)) {
} }
} }
// 补充obj1没有字段 // 补充obj1没有字段
// for (let key in obj2) {
// if (!obj1.hasOwnProperty(key)) {
// result[key] = obj2[key];
// }
// }
for (let key in obj2) {
if (!(obj1.hasOwnProperty(key))) {
result[key] = obj2[key];
} else if (!obj1[key]) {
result[key] = obj2[key];
}
}
} }
return result; return result;
} }

+ 1
- 1
src/utils/http.ts View File

); );
http.interceptors.response.use( http.interceptors.response.use(
(response) => { (response) => {
if (response.data.code === 401) {
if (response.data.code === 401002) {
//自定义业务状态码 //自定义业务状态码
redirectLogin(); redirectLogin();
} }

+ 1
- 1
src/utils/httpN.ts View File

); );
httpN.interceptors.response.use( httpN.interceptors.response.use(
(response) => { (response) => {
if (response.data.code === 401) {
if (response.data.code === 401002) {
//自定义业务状态码 //自定义业务状态码
redirectLogin(); redirectLogin();
} }

+ 3
- 2
src/views/onlineBusinessHall/automobileSeroice/businessAudit/index.vue View File

(res: any) => { (res: any) => {
if (res && res.statusCode === 0) { if (res && res.statusCode === 0) {
let Data = res.data?.beforeChangeData; let Data = res.data?.beforeChangeData;
let InfoData = res.data?.afterChangeData;
let InfoData = res.data?.afterChangeData
// Data = functionName(Data) // Data = functionName(Data)
// InfoData = functionName(InfoData) // InfoData = functionName(InfoData)
InfoData.type = Data.type // 特殊字段单独处理 InfoData.type = Data.type // 特殊字段单独处理
errData.value = compareObjects(Data, InfoData)
console.log(Data, InfoData, 'InfoDataInfoData') console.log(Data, InfoData, 'InfoDataInfoData')
errData.value = compareObjects(Data, InfoData)
console.log(errData.value, 'errData.value1') console.log(errData.value, 'errData.value1')
crudRef.value.form = { ...Data, ...row } crudRef.value.form = { ...Data, ...row }
carInfo.value.forEach(item => { carInfo.value.forEach(item => {
BaseService.post('/managew/api/afterSale/cancel/view', { BaseService.post('/managew/api/afterSale/cancel/view', {
orderId: row.orderNo, orderId: row.orderNo,
orderType: row.orderType, orderType: row.orderType,
id: row.id
}).then((res: any) => { }).then((res: any) => {
if (res && res.statusCode === 0) { if (res && res.statusCode === 0) {
let data: any = res.data let data: any = res.data

+ 1
- 1
src/views/onlineBusinessHall/automobileSeroice/vehicleTypeVerificationManagement/index.vue View File

// 文件上传到minio后触发 // 文件上传到minio后触发
const handleSuccess = (fileUrl: any, reportFileName: any) => { const handleSuccess = (fileUrl: any, reportFileName: any) => {
importFn( importFn(
'c37eb21a09714218ad812ea97596d781',
'/managew/api/generalAudit/importData',
getList(), getList(),
{ {
fileUrl fileUrl

+ 2
- 2
src/views/onlineBusinessHall/productManagement/equityProduct/index.vue View File

formLabelWidth: formLabelWidth, formLabelWidth: formLabelWidth,
type: 'input', type: 'input',
funRuleStarts: true, funRuleStarts: true,
// required: true,
required: true,
}, },
}, },
{ {
width: '45%', width: '45%',
formLabelWidth: formLabelWidth, formLabelWidth: formLabelWidth,
type: 'select', type: 'select',
required: false,
required: true,
listData: WHETHER_TYPE, listData: WHETHER_TYPE,
}, },
}, },

+ 3
- 3
src/views/system/login/Login.vue View File

} else if (formType.value === 'forgetPassword') { } else if (formType.value === 'forgetPassword') {
params = { params = {
mobile: dataForm.value.mobile, mobile: dataForm.value.mobile,
code: dataForm.value.code,
newPassword: dataForm.value.newPassword,
affirmNewPassword: dataForm.value.affirmNewPassword,
verificationCode: dataForm.value.code,
password: dataForm.value.newPassword,
affirmPassword: dataForm.value.affirmNewPassword,
} }
api = '/iaw/portal/changePasswordByCode' api = '/iaw/portal/changePasswordByCode'
} }

+ 6
- 6
src/views/system/updatePassword/index.vue View File

} }
let api = ""; let api = "";
if (formType.value === 'oldPassword') { if (formType.value === 'oldPassword') {
api = '/userw/portal/changepassword';
api = '/iaw/portal/changePassword';
params = { params = {
...params, ...params,
mobile: dataForm.value.mobile, mobile: dataForm.value.mobile,
affirmNewPassword: dataForm.value.affirmNewPassword, affirmNewPassword: dataForm.value.affirmNewPassword,
} }
} else if (formType.value === 'byCode') { } else if (formType.value === 'byCode') {
api = '/iaw/portal/changeMobileByCode';
api = '/iaw/portal/changePasswordByCode';
params = { params = {
...params, ...params,
mobile: dataForm.value.mobile, mobile: dataForm.value.mobile,
code: dataForm.value.code,
newPassword: dataForm.value.newPassword,
affirmNewPassword: dataForm.value.affirmNewPassword,
verificationCode: dataForm.value.code,
password: dataForm.value.newPassword,
affirmPassword: dataForm.value.affirmNewPassword,
} }
} else { } else {
api = '/userw/portal/changepasswordsimple';
api = '/iaw/portal/changePasswordSimple';
params = { params = {
...params, ...params,
newPassword: dataForm.value.newPassword, newPassword: dataForm.value.newPassword,

Loading…
Cancel
Save