袁野 3 months ago
parent bf3a35390d
commit b33b66d9bc
  1. 4
      package.json
  2. 2
      src/app/pages/trade/goods-list/goods-list.component.html
  3. 4
      src/app/pages/trade/goods-list/goods-list.component.ts
  4. 2
      src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html
  5. 4
      src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts
  6. 16
      src/environments/environment.ts

@ -25,6 +25,7 @@
"ng-zorro-antd": "^17.1.0", "ng-zorro-antd": "^17.1.0",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"typescript": "5.4",
"zone.js": "~0.14.2" "zone.js": "~0.14.2"
}, },
"devDependencies": { "devDependencies": {
@ -39,7 +40,6 @@
"karma-chrome-launcher": "~3.2.0", "karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0", "karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0", "karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0", "karma-jasmine-html-reporter": "~2.1.0"
"typescript": "~5.2.2"
} }
} }

@ -202,7 +202,7 @@
</a> </a>
<nz-dropdown-menu #menu="nzDropdownMenu"> <nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu nzSelectable> <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> </ul>
</nz-dropdown-menu> </nz-dropdown-menu>
</td> </td>

@ -290,9 +290,9 @@ export class GoodsListComponent {
}); });
} }
showLogisticsNo(id: number): void { showLogisticsNo(logisticsNo: string): void {
let params = { let params = {
id:id, logisticsNo:logisticsNo,
time: new Date().getTime() time: new Date().getTime()
} }

@ -188,7 +188,7 @@
<nz-dropdown-menu #menu="nzDropdownMenu"> <nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu nzSelectable> <ul nz-menu nzSelectable>
<li nz-menu-item (click)="getLogisticsNo(data.id)"><a>录入物流编码</a></li> <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> </ul>
</nz-dropdown-menu> </nz-dropdown-menu>
</td> </td>

@ -278,9 +278,9 @@ export class GoodsLogisticsListComponent {
}); });
} }
showLogisticsNo(id: number): void { showLogisticsNo(logisticsNo: string): void {
let params = { let params = {
id:id, logisticsNo:logisticsNo,
time: new Date().getTime() time: new Date().getTime()
} }

@ -4,15 +4,15 @@
export const environment = { export const environment = {
production: false, production: false,
// baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
// orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
// userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址) userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
// imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/', imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/',
// //
baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址) // baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址) // orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址)
userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址) // userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/', // imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/',
}; };

Loading…
Cancel
Save