From b33b66d9bc002715ab7784f81835569a0df2bbee Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Thu, 15 Aug 2024 10:47:32 +0800
Subject: [PATCH] 1

---
 package.json                                     |  4 ++--
 .../trade/goods-list/goods-list.component.html   |  2 +-
 .../trade/goods-list/goods-list.component.ts     |  4 ++--
 .../goods-logistics-list.component.html          |  2 +-
 .../goods-logistics-list.component.ts            |  4 ++--
 src/environments/environment.ts                  | 16 ++++++++--------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 3ee62e8..77ad293 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "ng-zorro-antd": "^17.1.0",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
+    "typescript": "5.4",
     "zone.js": "~0.14.2"
   },
   "devDependencies": {
@@ -39,7 +40,6 @@
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.0",
     "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~5.2.2"
+    "karma-jasmine-html-reporter": "~2.1.0"
   }
 }
diff --git a/src/app/pages/trade/goods-list/goods-list.component.html b/src/app/pages/trade/goods-list/goods-list.component.html
index 3aba1ad..7433a8b 100644
--- a/src/app/pages/trade/goods-list/goods-list.component.html
+++ b/src/app/pages/trade/goods-list/goods-list.component.html
@@ -202,7 +202,7 @@
       </a>
       <nz-dropdown-menu #menu="nzDropdownMenu">
         <ul nz-menu nzSelectable>
-          <li nz-menu-item  (click)="showLogisticsNo(data.id)"><a>查看物流</a></li>
+          <li nz-menu-item  *ngIf="data.logisticsNo != null" (click)="showLogisticsNo(data.logisticsNo)"><a>查看物流</a></li>
         </ul>
       </nz-dropdown-menu>
     </td>
diff --git a/src/app/pages/trade/goods-list/goods-list.component.ts b/src/app/pages/trade/goods-list/goods-list.component.ts
index 18193fc..476eccf 100644
--- a/src/app/pages/trade/goods-list/goods-list.component.ts
+++ b/src/app/pages/trade/goods-list/goods-list.component.ts
@@ -290,9 +290,9 @@ export class GoodsListComponent {
     });
   }
 
-  showLogisticsNo(id: number): void {
+  showLogisticsNo(logisticsNo: string): void {
     let params =  {
-      id:id,
+      logisticsNo:logisticsNo,
       time: new Date().getTime()
     }
 
diff --git a/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html
index 20149b8..f0aba29 100644
--- a/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html
+++ b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html
@@ -188,7 +188,7 @@
       <nz-dropdown-menu #menu="nzDropdownMenu">
         <ul nz-menu nzSelectable>
           <li nz-menu-item (click)="getLogisticsNo(data.id)"><a>录入物流编码</a></li>
-          <li nz-menu-item  (click)="showLogisticsNo(data.id)"><a>查看物流</a></li>
+          <li nz-menu-item *ngIf="data.logisticsNo != null" (click)="showLogisticsNo(data.logisticsNo)"><a>查看物流</a></li>
         </ul>
       </nz-dropdown-menu>
     </td>
diff --git a/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts
index 730395b..488df62 100644
--- a/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts
+++ b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts
@@ -278,9 +278,9 @@ export class GoodsLogisticsListComponent {
     });
   }
 
-  showLogisticsNo(id: number): void {
+  showLogisticsNo(logisticsNo: string): void {
     let params =  {
-      id:id,
+      logisticsNo:logisticsNo,
       time: new Date().getTime()
     }
 
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 6230f92..b8075c0 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,15 +4,15 @@
 
 export const environment = {
   production: false,
-  // baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  // orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
-  // userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
-  // imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/',
+  baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
+  userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
+  imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/',
   //
-  baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址)
-  userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/',
+  // baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
+  // orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址)
+  // userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址)
+  // imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/',
 
 };