Ver código fonte

fix:“修复订单导出失败问题”

soobin 1 ano atrás
pai
commit
c94b555827

+ 3 - 2
src/utils/axios.js

@@ -1,7 +1,7 @@
 import Qs from 'qs';
 import axios from 'axios';
 // import { Toast } from 'vant';
-import { showLoadingToast, showFailToast  } from 'vant';
+import { showLoadingToast, showFailToast, closeToast } from 'vant';
 import router from '../router';
 // 导入配置
 import kConfig from './config';
@@ -22,7 +22,7 @@ service.interceptors.request.use(config => {
   showLoadingToast({
     message: curLang === 'zh' ? '加载中...' : 'Loading...',
     forbidClick: true,
-    duration: 100,
+    duration: 0,
   });
   // 把localStorage的token放在Authorization里
   let loginUser = localStorage.getItem('loginUser');
@@ -35,6 +35,7 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
+  closeToast();
   if (res.config.url.indexOf('/tAdmin/getRelationAdminUsername') > -1) {
     return Promise.resolve(res);
   }

+ 10 - 4
src/views/orderCenter/index.vue

@@ -643,22 +643,28 @@ export default {
 
     // 跳转订单导出
     const gotoOrderExcel = async () => {
+      if (searchParams.type == null ) {
+        searchParams.type = user.ifForeign;
+      }
+      console.log("searchParams", searchParams);
+      console.log("user", user);
       // 显示加载框
-      const loadingInstance = showLoadingToast({
-        message: '加载中...',
+      const downloadOrder =  showLoadingToast({
+        // message: '加载中...',
         forbidClick: true,
+        duration: 0,
       });
       try {
         const { headers, data } = await Api_getOnlineExport(searchParams);
         // 请求完成后隐藏加载框
-        loadingInstance.clear();
         $M_ExportFile(data, headers);
         // 处理返回的数据
       } catch (error) {
         // 请求发生错误时隐藏加载框
-        loadingInstance.clear();
         // 处理错误情况
         console.error(error);
+      } finally {
+        downloadOrder.close();
       }
     };
     // 订单详情-退款弹窗

+ 5 - 3
src/views/settlement/index.vue

@@ -438,7 +438,7 @@
 <script>
 import { onMounted, reactive, toRefs, ref } from "vue";
 import sHeader from "../../components/SimpleHeader";
-import { showFailToast, showSuccessToast, showToast, showLoadingToast, closeToast } from "vant";
+import { showFailToast, showSuccessToast, showToast, showLoadingToast } from "vant";
 import { areaList } from "@vant/area-data";
 import {
   getOneJoinPayMch, updateJoinPayMchCheck, altMchSign, updateConStat,
@@ -970,7 +970,7 @@ export default {
     }
     // 图片上传表单提交
     const sentImageFun = async () => {
-      showLoadingToast({
+      const loadingUp = showLoadingToast({
         message: '上传中...',
         forbidClick: true,
         duration: 0,
@@ -1002,17 +1002,19 @@ export default {
           response = await openAccount({ id: huifuMchID.value });
           if (response.data.code === "00000") {
             console.log("response", response);
-            closeToast();
+            loadingUp.close();
             showSuccessToast(t('joinpayMch.uploadSucceeded'));
             setTimeout(() => {
               location.reload();
             }, 1500);
           } else {
             console.log("response", response);
+            loadingUp.close();
             showFailToast(`${response.message}`);
           }
         } else { showFailToast(t('joinpayMch.submitFailed')); }
       } catch (error) {
+        loadingUp.close();
         console.error('请求发生错误:', error);
         showFailToast(t('joinpayMch.submitFailed'));
       }