更新

.env.production

@@ -10,9 +10,9 @@ ENV = 'production'
 # VITE_APP_BASE_URL ='http://192.168.100.63:8087/'
 # VITE_APP_BASE_URL = 'https://trial.etcjz.cn/' #测试环境地址
 # 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_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 = "http://43.136.169.197:50001/"

src/router/routerData/onlineBusinessHall.js

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

src/utils/dataUtil.js

@@ -1,7 +1,7 @@
 export function compareObjects(obj1, obj2) {
   var result = {};
 
-  if (obj2) {
+  if (obj1 && obj2) {
     // 比较两对象，并补充obj2没有的字段
     for (var key in obj1) {
       if (obj2.hasOwnProperty(key)) {
@@ -22,11 +22,13 @@ export function compareObjects(obj1, obj2) {
       }
     }
     // 补充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;
 }

src/utils/http.ts

@@ -47,7 +47,7 @@ http.interceptors.request.use(
 );
 http.interceptors.response.use(
   (response) => {
-    if (response.data.code === 401) {
+    if (response.data.code === 401002) {
       //自定义业务状态码
       redirectLogin();
     }

src/utils/httpN.ts

@@ -46,7 +46,7 @@ httpN.interceptors.request.use(
 );
 httpN.interceptors.response.use(
   (response) => {
-    if (response.data.code === 401) {
+    if (response.data.code === 401002) {
       //自定义业务状态码
       redirectLogin();
     }

src/views/onlineBusinessHall/automobileSeroice/businessAudit/index.vue

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

src/views/onlineBusinessHall/automobileSeroice/vehicleTypeVerificationManagement/index.vue

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

src/views/onlineBusinessHall/productManagement/equityProduct/index.vue

@@ -711,7 +711,7 @@ let field = ref({
         formLabelWidth: formLabelWidth,
         type: 'input',
         funRuleStarts: true,
-        // required: true,
+        required: true,
       },
     },
     {
@@ -864,7 +864,7 @@ let field = ref({
         width: '45%',
         formLabelWidth: formLabelWidth,
         type: 'select',
-        required: false,
+        required: true,
         listData: WHETHER_TYPE,
       },
     },

src/views/system/login/Login.vue

@@ -324,9 +324,9 @@ const submitForm = () => {
     } else if (formType.value === 'forgetPassword') {
       params = {
         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'
     }

src/views/system/updatePassword/index.vue

@@ -153,7 +153,7 @@
             }
             let api = "";
             if (formType.value === 'oldPassword') {
-                api = '/userw/portal/changepassword';
+                api = '/iaw/portal/changePassword';
                 params = {
                     ...params,
                     mobile: dataForm.value.mobile,
@@ -162,16 +162,16 @@
                     affirmNewPassword: dataForm.value.affirmNewPassword,
                 }
             } else if (formType.value === 'byCode') {
-                api = '/iaw/portal/changeMobileByCode';
+                api = '/iaw/portal/changePasswordByCode'; 
                 params = {
                     ...params,
                     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 {
-                api = '/userw/portal/changepasswordsimple';
+                api = '/iaw/portal/changePasswordSimple';
                 params = {
                     ...params,
                     newPassword: dataForm.value.newPassword,