Merge branch 'master' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP

src/hooks/userCrud.ts

@@ -50,17 +50,23 @@ export const useCrud = (config?: UseCrudConfig) => {
   const toDeleteIds = ref<Array<string>>([]);
 
   const save = async (config?: UseCrudConfig) => {
-    const path = config?.isEdit ? "/update" : "/add";
-    const res = (await request({
-      url: `${url.value}${path}`,
-      method: "post",
-      data: form.value,
-    })) as any;
-    if (res?.code == 200) {
-      Methords.dataList();
-      config?.done && config?.done();
-    } else {
-      ElMessage.error(res?.msg ?? "");
+    try {
+      const path = config?.isEdit ? "/update" : "/add";
+      const res = (await request({
+        url: `${url.value}${path}`,
+        method: "post",
+        data: form.value,
+      })) as any;
+      if (res?.code == 200) {
+        Methords.dataList();
+        config?.done && config?.done();
+        ElMessage.success(res?.msg ?? "");
+      } else {
+        config?.loading && config?.loading();
+        ElMessage.error(res?.msg ?? "");
+      }
+    } catch (err) {
+      config?.loading && config?.loading();
     }
   };
 

src/plugins/ele_avue.ts

@@ -4,11 +4,11 @@ import ElementPlus from "element-plus";
 import "element-plus/dist/index.css";
 import Avue from "@smallwei/avue";
 import "@smallwei/avue/lib/index.css";
-import axios from "axios";
-
+// import axios from "axios";
+import request from "@/utils/request";
 // 注册所有图标
 export function setupEleAvue(app: App<Element>) {
   app.use(ElementPlus);
-  window.axios = axios;
+  window.axios = request;
   app.use(Avue);
 }

src/views/demo/hooksDemo.vue

@@ -46,7 +46,10 @@
             </el-dropdown-menu>
           </template>
         </el-dropdown>
-        <el-button class="ml-3" @click="exportData">
+        <el-button
+          class="ml-3"
+          @click="exportData('/api/v1/plan/order/export')"
+        >
           <template #icon> <i-ep-download /> </template>导出
         </el-button>
       </template>