feat: 代码更新

packages/request/index.js

@@ -6,16 +6,17 @@ import {
 } from '@/service/storage'
 const storage = new Storage()
 
-const _baseUrl = import.meta.env.VITE_APP_API_BASEURL4
+const _baseUrl = import.meta.env.VITE_APP_API_BASEURL
 
 export function downloadFile(url, data = {}) {
-    const baseUrl = data.baseUrl || _baseUrl
+    // const baseUrl = data.baseUrl || _baseUrl
+    const baseUrl = _baseUrl
     uni.downloadFile({
-        url: baseUrl + url,
+        url: baseUrl + `` + url, //添加三九分配的子域名
         data,
         success: (res) => {
-            console.log(`${data?.path}，${baseUrl + url}，请求头`, data);
-            console.log(`${data?.path}，${baseUrl + url}，数据`, res);
+            console.log(`${data?.path}，${baseUrl + `` + url}，请求头`, data);
+            console.log(`${data?.path}，${baseUrl + `` + url}，数据`, res);
             if (res.statusCode === 200) {
                 uni.saveFile({
                     tempFilePath: res.tempFilePath,
@@ -40,8 +41,8 @@ export function downloadFile(url, data = {}) {
             }
         },
         fail: (err) => {
-            console.log(`${data?.path}，${baseUrl + url}，请求头`, data);
-            console.log(`${data?.path}，${baseUrl + url}，数据`, err);
+            console.log(`${data?.path}，${baseUrl + `` + url}，请求头`, data);
+            console.log(`${data?.path}，${baseUrl + `` + url}，数据`, err);
             uni.showToast({
                 title: '下载失败',
                 icon: 'error',
@@ -53,15 +54,16 @@ export function downloadFile(url, data = {}) {
 export default function request(url, data = {}, method = 'post') {
     const uid = (storage.getStorageSync('userInfo') || { ldap: '' }).ldap
     const d = { ...data, uid }
-    const baseUrl = data.baseUrl || _baseUrl
+    // const baseUrl = data.baseUrl || _baseUrl
+    const baseUrl = _baseUrl
     return Request({
-        url,
+        url: `` + url, //添加三九分配的子域名
         method,
         data: JSON.stringify(d),
-        baseUrl
+        // baseUrl
     }).then(res => {
-        console.log(`${data?.path}，${baseUrl + url}，请求头`, d);
-        console.log(`${data?.path}，${baseUrl + url}，数据`, res);
+        console.log(`${data?.path}，${baseUrl + `` + url}，请求头`, d);
+        console.log(`${data?.path}，${baseUrl + `` + url}，数据`, res);
         return res
     })
 }

packages/traceabilityReport/pages/blacklist/index.vue

@@ -94,18 +94,18 @@ export default {
 				},
 			],
 			category: "1",
-			loading: true,
+			loading: false,
 			rows: [],
 			totalCount: 0,
 			fetchLoading: false,
-			hasMore: true,
+			hasMore: false,
 			pageNum: 1,
 			pageSize: 15,
 		};
 	},
 	created() {
 		this.tableBodyHeight = 14 * 80;
-		this.fetchList();
+		// this.fetchList();
 	},
 	computed: {
 		showEmptyData() {

packages/traceabilityReport/pages/index.vue

@@ -3,7 +3,7 @@
     <view class="tabs-container">
       <view class="tabs">
         <view class="tab" :class="{ active: activeTab === 'scan' }" @click="activeTab = 'scan'">扫码率</view>
-        <view v-if="!hasReportFunction" class="tab" :class="{ active: activeTab === 'export' }" @click="activeTab = 'export'">报表导出</view>
+        <view v-if="hasReportFunction" class="tab" :class="{ active: activeTab === 'export' }" @click="activeTab = 'export'">报表导出</view>
         <view class="tab" :class="{ active: activeTab === 'blacklist' }" @click="activeTab = 'blacklist'">黑名单汇总</view>
       </view>
     </view>

packages/utils/utils.js

@@ -1,4 +1,6 @@
-import request from '../request/index.js'
+import {
+  Request
+} from '@/service/request/index.js'
 
 //格式化日期
 //data: 日期对象或时间戳
@@ -41,18 +43,16 @@ let permissions = []
 
 //判断是否有某个功能权限
 export function hasFunction(key) {
-  const baseUrl = import.meta.env.VITE_APP_API_BASEURL
   return new Promise((resolve, reject) => {
     if (permissions.length) {
       resolve(permissions.includes(key))
       return
     }
-    request(
-      "/v1/api/basic/home/menu?type=3",
+    Request(
       {
-        baseUrl
-      },
-      'GET'
+        url: "/v1/api/basic/home/menu?type=3",
+        method,
+      }
     ).then((res) => {
       permissions = res.data?.permissions || []
       resolve(permissions.includes(key))