From 35e9efb839cbfc90987c925366742fa15a871604 Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Fri, 24 May 2024 13:42:02 +0800
Subject: [PATCH] 1

---
 src/app/pages/audit/audit-list/audit-list.component.html  | 4 ++--
 src/app/pages/goods/goods-list/goods-list.component.html  | 8 ++++----
 src/app/pages/goods/goods-list/goods-list.component.ts    | 5 -----
 .../coupon-discount-list.component.html                   | 6 +++---
 src/environments/environment.prod.ts                      | 8 ++++----
 src/environments/environment.ts                           | 8 ++++----
 6 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/app/pages/audit/audit-list/audit-list.component.html b/src/app/pages/audit/audit-list/audit-list.component.html
index 17419f4..171770e 100644
--- a/src/app/pages/audit/audit-list/audit-list.component.html
+++ b/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>
diff --git a/src/app/pages/goods/goods-list/goods-list.component.html b/src/app/pages/goods/goods-list/goods-list.component.html
index 425f920..d285820 100644
--- a/src/app/pages/goods/goods-list/goods-list.component.html
+++ b/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>
diff --git a/src/app/pages/goods/goods-list/goods-list.component.ts b/src/app/pages/goods/goods-list/goods-list.component.ts
index 728ac05..c5304c1 100644
--- a/src/app/pages/goods/goods-list/goods-list.component.ts
+++ b/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();
   }
 
diff --git a/src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.html b/src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.html
index cf4390f..41d8de9 100644
--- a/src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.html
+++ b/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>
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index d57d853..d7d5461 100644
--- a/src/environments/environment.prod.ts
+++ b/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/',
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 548d026..efdd6ff 100644
--- a/src/environments/environment.ts
+++ b/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/', // 测试环境服务器地址(请求数据地址)