Przeglądaj źródła

feat: 文件路径调整

贺智杰 4 dni temu
rodzic
commit
2b479e5a3b
27 zmienionych plików z 37 dodań i 42 usunięć
  1. 1 1
      .env.development
  2. 10 20
      pages.json
  3. 4 4
      pages/home/home.vue
  4. 12 7
      traceCodePackages/request/index.js
  5. 0 0
      traceCodePackages/static/images/bg.png
  6. 0 0
      traceCodePackages/static/images/camera.png
  7. 0 0
      traceCodePackages/static/images/copy.png
  8. 0 0
      traceCodePackages/static/images/empty.png
  9. 0 0
      traceCodePackages/static/images/filter.png
  10. 0 0
      traceCodePackages/static/images/loading.png
  11. 0 0
      traceCodePackages/static/images/report.png
  12. 0 0
      traceCodePackages/static/images/scan.png
  13. 0 0
      traceCodePackages/static/images/search.png
  14. 0 0
      traceCodePackages/static/images/warehousing.png
  15. 0 0
      traceCodePackages/traceabilityCodeQuery/pages/detail/index.vue
  16. 2 2
      traceCodePackages/traceabilityCodeQuery/pages/index.vue
  17. 0 0
      traceCodePackages/traceabilityCodeQuery/pages/scanRange/index.vue
  18. 0 0
      traceCodePackages/traceabilityReport/pages/blacklist/index.vue
  19. 0 0
      traceCodePackages/traceabilityReport/pages/customerScanningRate/detail/index.vue
  20. 0 0
      traceCodePackages/traceabilityReport/pages/customerScanningRate/index.vue
  21. 1 1
      traceCodePackages/traceabilityReport/pages/customerScanningRate/wigets/ScanRateTable.vue
  22. 1 1
      traceCodePackages/traceabilityReport/pages/index.vue
  23. 0 0
      traceCodePackages/traceabilityReport/pages/reportExport/detail/index.vue
  24. 6 6
      traceCodePackages/traceabilityReport/pages/reportExport/index.vue
  25. 0 0
      traceCodePackages/utils/utils.js
  26. 0 0
      traceCodePackages/wigets/empty.vue
  27. 0 0
      traceCodePackages/wigets/select.vue

+ 1 - 1
.env.development

@@ -3,7 +3,7 @@ VITE_NODE_ENV = dev
 
 VITE_APP_API_BASEURL4='http://192.168.96.208:8001'
 
-VITE_APP_API_BASEURL3='http://120.24.148.97:443'
+VITE_APP_API_BASEURL3='http://120.24.26.108:8001'
 
 VITE_APP_API_BASEURL2='http://192.168.0.59:8250'
 

+ 10 - 20
pages.json

@@ -11,12 +11,6 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
-		},
-		{
-			"path": "packages/wigets/select",
-			"style": {
-				"navigationBarTitleText": ""
-			}
 		}
 	],
 	"subPackages": [{
@@ -31,51 +25,47 @@
 		},
 
 		{
-			"root": "packages/traceabilityCodeQuery",
+			"root": "traceCodePackages",
 			"pages": [{
-					"path": "pages/index",
+					"path": "traceabilityCodeQuery/pages/index",
 					"style": {
 						"navigationBarTitleText": "药品追溯码查询",
 						"navigationStyle": "custom"
 					}
 				},
 				{
-					"path": "pages/detail/index",
+					"path": "traceabilityCodeQuery/pages/detail/index",
 					"style": {
 						"navigationBarTitleText": "追溯码详情"
 					}
 				},
 				{
-					"path": "pages/scanRange/index",
+					"path": "traceabilityCodeQuery/pages/scanRange/index",
 					"style": {
 						"navigationBarTitleText": "可扫码生产企业及药品"
 					}
-				}
-			]
-		},
-		{
-			"root": "packages/traceabilityReport",
-			"pages": [{
-					"path": "pages/index",
+				},
+				{
+					"path": "traceabilityReport/pages/index",
 					"style": {
 						"navigationBarTitleText": "溯源报表"
 					}
 				},
 				{
-					"path": "pages/customerScanningRate/detail/index",
+					"path": "traceabilityReport/pages/customerScanningRate/detail/index",
 					"style": {
 						"navigationBarTitleText": "客户扫码率",
 						"navigationStyle": "custom"
 					}
 				},
 				{
-					"path": "pages/reportExport/index",
+					"path": "traceabilityReport/pages/reportExport/index",
 					"style": {
 						"navigationBarTitleText": ""
 					}
 				},
 				{
-					"path": "pages/reportExport/detail/index",
+					"path": "traceabilityReport/pages/reportExport/detail/index",
 					"style": {
 						"navigationBarTitleText": ""
 					}

+ 4 - 4
pages/home/home.vue

@@ -117,7 +117,7 @@
 				<uni-grid-item>
 					<view class="grid-item-box" @click="goScan">
 						<view class="img-box">
-							<image src="@/static/scan.png" class="img" mode=""></image>
+							<image src="@/traceCodePackages/static/images/scan.png" class="img" mode=""></image>
 						</view>
 						<text class="text">溯源扫码</text>
 					</view>
@@ -126,7 +126,7 @@
 				<uni-grid-item>
 					<view class="grid-item-box" @click="goReport">
 						<view class="img-box">
-							<image src="@/static/report.png" class="img" mode=""></image>
+							<image src="@/traceCodePackages/static/images/report.png" class="img" mode=""></image>
 						</view>
 						<text class="text">溯源报表</text>
 					</view>
@@ -215,13 +215,13 @@ const skip = (url) => {
 // 跳转溯源扫码
 const goScan = () => {
 	uni.navigateTo({
-		url: '/packages/traceabilityCodeQuery/pages/index'
+		url: '/traceCodePackages/traceabilityCodeQuery/pages/index'
 	})
 }
 // 跳转溯源报表
 const goReport = () => {
 	uni.navigateTo({
-		url: "/packages/traceabilityReport/pages/index",
+		url: "/traceCodePackages/traceabilityReport/pages/index",
 	});
 }
 </script>

+ 12 - 7
packages/request/index.js → traceCodePackages/request/index.js

@@ -7,30 +7,35 @@ import {
 const storage = new Storage()
 
 const _baseUrl = import.meta.env.VITE_APP_API_BASEURL
+const subdomain = '/yylm'
 
 export function downloadFile(url, data = {}) {
     // const baseUrl = data.baseUrl || _baseUrl
     const baseUrl = _baseUrl
     uni.downloadFile({
-        url: baseUrl + `` + url, //添加三九分配的子域名
+        url: baseUrl + subdomain + url, //添加三九分配的子域名
         data,
         success: (res) => {
-            console.log(`${data?.path},${baseUrl + `` + url},请求头`, data);
-            console.log(`${data?.path},${baseUrl + `` + url},数据`, res);
+            console.log(`${data?.path},${baseUrl + subdomain + url},请求头`, data);
+            console.log(`${data?.path},${baseUrl + subdomain + url},数据`, res);
             if (res.statusCode === 200) {
                 uni.saveFile({
                     tempFilePath: res.tempFilePath,
-                    success: (res) => {
+                    success: (r) => {
                         uni.showToast({
                             title: '下载成功',
                             icon: 'success',
                         });
+                        console.log(`${data?.path},${baseUrl + subdomain + url},uni.saveFile请求头`, res.tempFilePath);
+                        console.log(`${data?.path},${baseUrl + subdomain + url},uni.saveFile数据`, r);
                     },
                     fail: (err) => {
                         uni.showToast({
                             title: '保存失败',
                             icon: 'error',
                         });
+                        console.log(`${data?.path},${baseUrl + subdomain + url},uni.saveFile请求头`, res.tempFilePath);
+                        console.log(`${data?.path},${baseUrl + subdomain + url},uni.saveFile数据`, err);
                     },
                 });
             } else {
@@ -57,13 +62,13 @@ export default function request(url, data = {}, method = 'post') {
     // const baseUrl = data.baseUrl || _baseUrl
     const baseUrl = _baseUrl
     return Request({
-        url: `` + url, //添加三九分配的子域名
+        url: subdomain + url, //添加三九分配的子域名
         method,
         data: JSON.stringify(d),
         // baseUrl
     }).then(res => {
-        console.log(`${data?.path},${baseUrl + `` + url},请求头`, d);
-        console.log(`${data?.path},${baseUrl + `` + url},数据`, res);
+        console.log(`${data?.path},${baseUrl + subdomain + url},请求头`, d);
+        console.log(`${data?.path},${baseUrl + subdomain + url},数据`, res);
         return res
     })
 }

+ 0 - 0
packages/static/images/bg.png → traceCodePackages/static/images/bg.png


+ 0 - 0
packages/static/images/camera.png → traceCodePackages/static/images/camera.png


+ 0 - 0
packages/static/images/copy.png → traceCodePackages/static/images/copy.png


+ 0 - 0
packages/static/images/empty.png → traceCodePackages/static/images/empty.png


+ 0 - 0
packages/static/images/filter.png → traceCodePackages/static/images/filter.png


+ 0 - 0
packages/static/images/loading.png → traceCodePackages/static/images/loading.png


+ 0 - 0
static/report.png → traceCodePackages/static/images/report.png


+ 0 - 0
static/scan.png → traceCodePackages/static/images/scan.png


+ 0 - 0
packages/static/images/search.png → traceCodePackages/static/images/search.png


+ 0 - 0
packages/static/images/warehousing.png → traceCodePackages/static/images/warehousing.png


+ 0 - 0
packages/traceabilityCodeQuery/pages/detail/index.vue → traceCodePackages/traceabilityCodeQuery/pages/detail/index.vue


+ 2 - 2
packages/traceabilityCodeQuery/pages/index.vue → traceCodePackages/traceabilityCodeQuery/pages/index.vue

@@ -96,7 +96,7 @@ export default {
     },
     handleScanTipClick() {
       uni.navigateTo({
-        url: "/packages/traceabilityCodeQuery/pages/scanRange/index",
+        url: "/traceCodePackages/traceabilityCodeQuery/pages/scanRange/index",
       });
     },
     formatTraceCode(code) {
@@ -182,7 +182,7 @@ export default {
     onTapHistory(item) {
       uni.navigateTo({
         url:
-          "/packages/traceabilityCodeQuery/pages/detail/index" +
+          "/traceCodePackages/traceabilityCodeQuery/pages/detail/index" +
           (item ? "?traceCode=" + item.tracCode : ""),
       });
     },

+ 0 - 0
packages/traceabilityCodeQuery/pages/scanRange/index.vue → traceCodePackages/traceabilityCodeQuery/pages/scanRange/index.vue


+ 0 - 0
packages/traceabilityReport/pages/blacklist/index.vue → traceCodePackages/traceabilityReport/pages/blacklist/index.vue


+ 0 - 0
packages/traceabilityReport/pages/customerScanningRate/detail/index.vue → traceCodePackages/traceabilityReport/pages/customerScanningRate/detail/index.vue


+ 0 - 0
packages/traceabilityReport/pages/customerScanningRate/index.vue → traceCodePackages/traceabilityReport/pages/customerScanningRate/index.vue


+ 1 - 1
packages/traceabilityReport/pages/customerScanningRate/wigets/ScanRateTable.vue → traceCodePackages/traceabilityReport/pages/customerScanningRate/wigets/ScanRateTable.vue

@@ -643,7 +643,7 @@ export default {
 
       uni.navigateTo({
         url:
-          "/packages/traceabilityReport/pages/customerScanningRate/detail/index?regionCode=" +
+          "/traceCodePackages/traceabilityReport/pages/customerScanningRate/detail/index?regionCode=" +
           data.regionCode +
           "&regionName=" +
           encodeURIComponent(data.regionName) +

+ 1 - 1
packages/traceabilityReport/pages/index.vue → traceCodePackages/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 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>

+ 0 - 0
packages/traceabilityReport/pages/reportExport/detail/index.vue → traceCodePackages/traceabilityReport/pages/reportExport/detail/index.vue


+ 6 - 6
packages/traceabilityReport/pages/reportExport/index.vue → traceCodePackages/traceabilityReport/pages/reportExport/index.vue

@@ -652,11 +652,11 @@ export default {
           //   ...this.list[1],
           //   status: 3,
           // });
-          this.list.push({
-            ...this.list[0],
-            finishTime: "2025-12-15",
-            status: 3,
-          });
+          // this.list.push({
+          //   ...this.list[0],
+          //   finishTime: "2025-12-15",
+          //   status: 3,
+          // });
           // this.animateAll();
         }
         this.fetchLoading = false;
@@ -672,7 +672,7 @@ export default {
     },
     toDetail(item) {
       uni.navigateTo({
-        url: `/packages/traceabilityReport/pages/reportExport/detail/index?id=${item.id
+        url: `/traceCodePackages/traceabilityReport/pages/reportExport/detail/index?id=${item.id
           }&title=${encodeURIComponent(
             this.getCustomerName(item.customerName)
           )}`,

+ 0 - 0
packages/utils/utils.js → traceCodePackages/utils/utils.js


+ 0 - 0
packages/wigets/empty.vue → traceCodePackages/wigets/empty.vue


+ 0 - 0
packages/wigets/select.vue → traceCodePackages/wigets/select.vue