Merge remote-tracking branch 'origin/master'

src/app/pages/trade/goods-list/goods-list.component.html

@@ -93,7 +93,7 @@
     <th nzWidth="100px">物流单号</th>
     <th nzWidth="50px">创建时间</th>
     <th nzWidth="50px">更新时间</th>
-    <th nzWidth="50px">状态</th>
+    <th nzWidth="50px">物流状态</th>
     <th nzWidth="70px">操作</th>
   </tr>
   </thead>
@@ -108,7 +108,10 @@
     <td>{{data.logisticsNo}}</td>
     <td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
     <td>{{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}}</td>
-    <td>{{data.status | orderGoodsStatus}}</td>
+    <td>
+      <span *ngIf="data.logisticsStatusDesc == null">{{data.status | orderGoodsStatus}}</span>
+      <span *ngIf="data.logisticsStatusDesc != null">{{data.logisticsStatusDesc}}</span>
+    </td>
     <td>
       <a (click)="showDetail(data)">详情</a>
       <nz-divider nzType="vertical"></nz-divider>
@@ -145,13 +148,18 @@
               </nz-image-group>
             </nz-descriptions-item>
             <nz-descriptions-item nzTitle="物流状态" [nzSpan]="3">
-              <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'DELIVERING'" nzColor="cyan" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'TRANSPORT'" nzColor="lime" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'AGENT_SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'ACCEPT'" nzStatus="processing" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'FAILED'" nzStatus="error" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'WAIT_ACCEPT'" nzStatus="default" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
+              <span *ngIf="orderGoodsData?.logisticsStatusDesc == null">
+                {{orderGoodsData.status | orderGoodsStatus}}
+              </span>
+              <span *ngIf="orderGoodsData?.logisticsStatusDesc != null">
+                <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'DELIVERING'" nzColor="cyan" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
+                <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'TRANSPORT'" nzColor="lime" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
+                <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'AGENT_SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
+                <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
+                <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'ACCEPT'" nzStatus="processing" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
+                <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'FAILED'" nzStatus="error" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
+                <nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'WAIT_ACCEPT'" nzStatus="default" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge>
+              </span>
             </nz-descriptions-item>
           </nz-descriptions>
         </nz-tab>

src/app/pages/trade/goods-list/goods-list.component.ts

@@ -195,6 +195,7 @@ export class GoodsListComponent {
   }
 
   getLogisticsNo(id: number): void {
+    this.getRequest(false);
     this.goodsOrderId = id;
     this.isVisible = true;
   }
@@ -215,7 +216,7 @@ export class GoodsListComponent {
     this.orderGoodsService.updateLogisticsNo(params , (data: any) => {
       if (data['return_code'] == '000000') {
         this.isVisible = false;
-        this.getRequest(false);
+
         this.msg.success("成功")
       } else {
         this.msg.error(data['return_msg']);
@@ -232,6 +233,7 @@ export class GoodsListComponent {
     this.orderGoodsService.getLogisticsMsg(params , (data: any) => {
       if (data['return_code'] == '000000') {
         this.orderDetailModalChild = true;
+        this.getRequest(false);
         this.logisticsTraceDetails = data['return_data']['logisticsTraceDetails'];
       } else {
         this.msg.error(data['return_msg']);