Merge branch 'master' of http://gitea.dctpay.com/yuanye/puhui-go-web

src/app/pages/audit/audit-list/audit-list.component.html

@@ -131,7 +131,7 @@
           <th nzLeft rowspan="2">规格名称</th>
           <th colspan="2">价格（RMB）</th>
           <th rowspan="2">图片</th>
-          <th rowspan="2">限购（个）</th>
+<!--          <th rowspan="2">限购（个）</th>-->
           <th rowspan="2">库存（个）</th>
           <th colspan="2">时间</th>
           <th colspan="7" *ngIf="auditDetail['goodsModel']?.type == 2">虚拟产品</th>
@@ -163,7 +163,7 @@
           <td>
             <img nz-image width="60px" height="60px" nzSrc="{{imageUrl + data.showImg }}" [nzFallback]="fallbackImg" alt="" />
           </td>
-          <td>{{data.purLimit}}</td>
+<!--          <td>{{data.purLimit}}</td>-->
           <td>{{data.stock}}</td>
           <td>{{ data.salesEndTime | date: 'yyyy-MM-dd HH:mm'}}</td>
           <td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>

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

@@ -274,7 +274,7 @@
           <th nzLeft rowspan="2">规格名称</th>
           <th colspan="2">价格（RMB）</th>
           <th rowspan="2">图片</th>
-          <th rowspan="2">限购（个）</th>
+<!--          <th rowspan="2">限购（个）</th>-->
           <th rowspan="2">库存（个）</th>
           <th colspan="2">时间</th>
           <th colspan="7" *ngIf="goodsMsg?.type == 2">虚拟产品</th>
@@ -307,7 +307,7 @@
           <td>
             <img nz-image width="60px" height="60px" nzSrc="{{imageUrl + data.showImg }}" [nzFallback]="fallbackImg" alt="" />
           </td>
-          <td>{{data.purLimit}}</td>
+<!--          <td>{{data.purLimit}}</td>-->
           <td>{{data.stock}}</td>
           <td>{{ data.salesEndTime | date: 'yyyy-MM-dd HH:mm'}}</td>
           <td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
@@ -419,8 +419,8 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item *ngIf="editSpecsForm.value.type == 2">
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>跳转地址</nz-form-label>
-          <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入跳转地址!">
+          <nz-form-label [nzSm]="6" [nzXs]="24" >跳转地址</nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24" >
             <input  nzSize="large"  nz-input formControlName="jumpUrl"  placeholder="请输入" />
           </nz-form-control>
         </nz-form-item>

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

@@ -427,18 +427,13 @@ export class GoodsListComponent {
       this.editSpecsForm.controls['jumpType'].clearValidators();
       this.editSpecsForm.controls['jumpType'].markAsPristine();
 
-      this.editSpecsForm.controls['jumpUrl'].clearValidators();
-      this.editSpecsForm.controls['jumpUrl'].markAsPristine();
 
     } else {
       this.editSpecsForm.controls['jumpType'].setValidators(Validators.required);
       this.editSpecsForm.controls['jumpType'].markAsDirty();
 
-      this.editSpecsForm.controls['jumpUrl'].setValidators(Validators.required);
-      this.editSpecsForm.controls['jumpUrl'].markAsDirty();
 
     }
-    this.editSpecsForm.controls['jumpUrl'].updateValueAndValidity();
     this.editSpecsForm.controls['jumpType'].updateValueAndValidity();
   }
 

src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.html

@@ -101,7 +101,7 @@
     </ng-container>
   </nz-modal>
 
-  <nz-modal  [nzWidth]="1200" [(nzVisible)]="isVisibleDetail" nzTitle="绑定商品" (nzOnCancel)="isVisibleDetail= false" (nzOnOk)="isVisibleDetail= false" >
+  <nz-modal  [nzWidth]="1200" [(nzVisible)]="isVisibleDetail" nzTitle="绑定优惠券" (nzOnCancel)="isVisibleDetail= false" (nzOnOk)="isVisibleDetail= false" >
     <!--列表-->
     <ng-container *nzModalContent>
       <button nz-button (click)="showEditDetail()" nzType="primary">创建</button>
@@ -143,8 +143,8 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item >
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>数量</nz-form-label>
-          <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入数量!">
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>赠送数量</nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入赠送数量 !">
             <nz-input-number  style="width: 100%" formControlName="num" [nzSize]="'large'" [nzMin]="1" [nzMax]="99999" [nzStep]="1" ></nz-input-number>
           </nz-form-control>
         </nz-form-item>

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

@@ -144,15 +144,14 @@
                 <img nz-image width="80px" [nzFallback]="fallbackImg" nzSrc="{{imageUrl + orderGoodsData.img }}" alt="" />
               </nz-image-group>
             </nz-descriptions-item>
-            <nz-descriptions-item nzTitle="状态" [nzSpan]="3">
-              <nz-badge *ngIf="orderGoodsData?.status == 1" nzStatus="warning" nzText="{{orderGoodsData.status | orderGoodsStatus}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.status == 2" nzColor="lime" nzText="{{orderGoodsData.status | orderGoodsStatus}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.status == 4" nzStatus="success" nzText="{{orderGoodsData.status | orderGoodsStatus}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.status == 3" nzStatus="processing" nzText="{{orderGoodsData.status | orderGoodsStatus}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.status == 5" nzStatus="error" nzText="{{orderGoodsData.status | orderGoodsStatus}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.status == 6" nzColor="volcano" nzText="{{orderGoodsData.status | orderGoodsStatus}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.status == 7" nzColor="orange" nzText="{{orderGoodsData.status | orderGoodsStatus}}"></nz-badge>
-              <nz-badge *ngIf="orderGoodsData?.status == 8" nzStatus="default" nzText="{{orderGoodsData.status | orderGoodsStatus}}"></nz-badge>
+            <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>
             </nz-descriptions-item>
           </nz-descriptions>
         </nz-tab>

src/environments/environment.prod.ts

@@ -1,7 +1,7 @@
 export const environment = {
   production: true,
-  baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
-  orderUrl: 'https://hsg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://hsg.dctpay.com/filesystem/',
-  userUrl: 'https://hsg.dctpay.com/User/',
+  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/',
 };

src/environments/environment.ts

@@ -4,10 +4,10 @@
 
 export const environment = {
   production: false,
-  baseUrl: 'https://phgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'https://phgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
-  userUrl: 'https://phgcs.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://phg-test.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/', // 测试环境服务器地址(请求数据地址)