部分细节修改

src/api/login.ts

@@ -21,7 +21,7 @@ export function login(data: LoginData): AxiosPromise<LoginResult> {
     headers: {
       isToken: false,
       isEncrypt: true,
-      repeatSubmit: false
+      validateRepeat: true // 校验重复提交
     },
     method: 'post',
     data: params
@@ -40,7 +40,7 @@ export function register(data: any) {
     headers: {
       isToken: false,
       isEncrypt: true,
-      repeatSubmit: false
+      validateRepeat: true // 校验重复提交
     },
     method: 'post',
     data: params

src/api/oms/order.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 // 查询订单表列表
 export function listOmsOrder(query, pageReq) {
@@ -7,7 +7,7 @@ export function listOmsOrder(query, pageReq) {
     method: 'post',
     data: query,
     params: pageReq
-  })
+  });
 }
 
 // 查询订单表详细
@@ -15,14 +15,14 @@ export function getOmsOrder(id) {
   return request({
     url: '/oms/order/' + id,
     method: 'get'
-  })
+  });
 }
 // 查询订单手机号密文
 export function getDecryptPhone(id) {
   return request({
     url: '/oms/order/decryptPhone/' + id,
     method: 'get'
-  })
+  });
 }
 // 新增订单表
 export function addOmsOrder(data) {
@@ -30,7 +30,7 @@ export function addOmsOrder(data) {
     url: '/oms/order',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 修改订单表
@@ -39,7 +39,7 @@ export function updateOmsOrder(data) {
     url: '/oms/order',
     method: 'put',
     data: data
-  })
+  });
 }
 
 // 删除订单表
@@ -47,7 +47,7 @@ export function delOmsOrder(id) {
   return request({
     url: '/oms/order/' + id,
     method: 'delete'
-  })
+  });
 }
 
 // 导出订单表
@@ -56,39 +56,39 @@ export function exportOmsOrder(query) {
     url: '/oms/order/export',
     method: 'get',
     params: query
-  })
+  });
 }
 
 // 保存商家备注
-export function saveMerchantNote(data){
+export function saveMerchantNote(data) {
   return request({
     url: '/oms/order/merchantNote/add',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 发货
-export function deliverProduct(data){
+export function deliverProduct(data) {
   return request({
     url: '/oms/order/deliverProduct',
     method: 'post',
     data: data
-  })
+  });
 }
 
-export function updateReceiverAddress(data){
+export function updateReceiverAddress(data) {
   return request({
     url: '/oms/order/receiver/update',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 查看订单操作日志
-export function viewLog(orderId){
+export function viewLog(orderId) {
   return request({
-    url:`/oms/order/log/` + orderId,
+    url: `/oms/order/log/` + orderId,
     method: 'get'
-  })
+  });
 }

src/api/system/tenant/index.ts

@@ -26,7 +26,7 @@ export function addTenant(data: TenantForm) {
     method: 'post',
     headers: {
       isEncrypt: true,
-      repeatSubmit: false
+      validateRepeat: true // 校验重复提交
     },
     data: data
   });

src/api/system/user/index.ts

@@ -87,7 +87,7 @@ export const resetUserPwd = (userId: string | number, password: string) => {
     method: 'put',
     headers: {
       isEncrypt: true,
-      repeatSubmit: false
+      validateRepeat: true // 校验重复提交
     },
     data: data
   });
@@ -147,7 +147,7 @@ export const updateUserPwd = (oldPassword: string, newPassword: string) => {
     method: 'put',
     headers: {
       isEncrypt: true,
-      repeatSubmit: false
+      validateRepeat: true // 校验重复提交
     },
     data: data
   });

src/api/workflow/definition/index.ts

@@ -78,7 +78,7 @@ export function importDef(data: any) {
     method: 'post',
     data: data,
     headers: {
-      repeatSubmit: false
+      validateRepeat: true // 校验重复提交
     }
   });
 }

src/utils/request.ts

@@ -39,7 +39,7 @@ service.interceptors.request.use(
 
     const isToken = config.headers?.isToken === false;
     // 是否需要防止数据重复提交
-    const isRepeatSubmit = config.headers?.repeatSubmit === false;
+    const isRepeatSubmit = config.headers?.repeatSubmit === true;
     // 是否需要加密
     const isEncrypt = config.headers?.isEncrypt === 'true';
 
@@ -54,7 +54,7 @@ service.interceptors.request.use(
       config.url = url;
     }
 
-    if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+    if (isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
       const requestObj = {
         url: config.url,
         data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,

src/views/oms/order/index.vue

@@ -156,7 +156,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @size-change="getList"  @current-change="getList" />
     <!-- 发货对话框 -->
     <el-dialog :title="deliveryObj.title" v-model="deliveryObj.open" width="500px" append-to-body>
       <el-form ref="deliveryForm" :model="deliveryObj.form" :rules="deliveryObj.rules" label-width="100px">
@@ -402,11 +402,11 @@ export default {
         query.receiverCity = null;
         query.receiverDistrict = null;
       }
-      const pageReq = { page: pageNum - 1, size: pageSize };
+      const pageReq = { current: pageNum - 1, size: pageSize };
       listOmsOrder(query, pageReq).then((response) => {
-        const { content, totalElements } = response;
+        const { records, total } = response.data || {};
-        this.omsOrderList = content;
+        this.omsOrderList = records;
-        this.total = totalElements;
+        this.total = total;
         this.loading = false;
       });
     },
@@ -660,11 +660,9 @@ export default {
     //备注保存
     submitNoteForm() {
       saveMerchantNote(this.noteObj.form).then((resp) => {
-        if (resp > 0) {
+        this.$modal.msgSuccess('修改成功');
-          this.$modal.msgSuccess('修改成功');
+        this.cancelNote();
-          this.cancelNote();
+        this.getList();
-          this.getList();
-        }
       });
     },
     cancelNote() {

vite.config.ts

@@ -25,8 +25,8 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         [env.VITE_APP_BASE_API]: {
           // target: 'http://192.168.1.13:8080',
-          // target: 'http://192.168.1.250:8080',
+          target: 'http://192.168.1.250:8080',
-          target: 'http://111.62.22.190:8080', // 测试环境
+          // target: 'http://111.62.22.190:8080', // 测试环境
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), ''),