提交代码

src/app/admin/config-manage/brand/brand.component.html

@@ -90,14 +90,14 @@
                 <input nz-input placeholder="请输入标题..."  [formControlName]="'title'" />
             </nz-form-control>
         </nz-form-item>
-<!--        <nz-form-item>-->
+        <nz-form-item>
-<!--            <nz-form-label [nzSpan]="4" nzRequired>商品类别</nz-form-label>-->
+            <nz-form-label [nzSpan]="4" nzRequired>商品类别</nz-form-label>
-<!--            <nz-form-control [nzSpan]="12" nzErrorTip="请选择商品类别!">-->
+            <nz-form-control [nzSpan]="12" nzErrorTip="请选择商品类别!">
-<!--                <nz-select nzShowSearch nzAllowClear formControlName="goodTypeId" nzPlaceHolder="请选择商品类别">-->
+                <nz-select nzShowSearch nzAllowClear formControlName="goodTypeId" nzPlaceHolder="请选择商品类别">
-<!--                    <nz-option *ngFor="let item of goodTypData" nzLabel="{{item.title}}" nzValue="{{item.id}}"></nz-option>-->
+                    <nz-option *ngFor="let item of goodTypData" nzLabel="{{item.title}}" nzValue="{{item.id}}"></nz-option>
-<!--                </nz-select>-->
+                </nz-select>
-<!--            </nz-form-control>-->
+            </nz-form-control>
-<!--        </nz-form-item>-->
+        </nz-form-item>
         <nz-form-item>
             <nz-form-label [nzSpan]="4" nzRequired>图片</nz-form-label>
             <nz-form-control [nzSpan]="20" nzErrorTip="请上传图片!">

src/app/admin/config-manage/brand/brand.component.ts

@@ -61,6 +61,7 @@ export class BrandComponent implements OnInit {
         });
         this.validateForm = this.fb.group({
             title: [null, [Validators.required]],
+            goodTypeId: [null, [Validators.required]],
         });
         this.getRequest(true, this.searchForm.value);
 
@@ -162,6 +163,7 @@ export class BrandComponent implements OnInit {
                 this.validateForm.value.img = this.imgFile[0].name;
             }
         }
+        console.log(this.validateForm.value);
         if (this.editFlag) {
             this.validateForm.value.id = this.id;
             this.config.updateBrand(this.validateForm.value, data => {
@@ -174,7 +176,6 @@ export class BrandComponent implements OnInit {
                 }
             });
         } else {
-            console.log('123');
             this.config.insertBrand(this.validateForm.value, data => {
                 if (data['return_code'] === '000000') {
                     this.isVisible = false;

src/app/admin/goods/list/list.component.html

@@ -10,7 +10,7 @@
                 <nz-form-item>
                     <nz-form-label [nzSpan]="6">商品名称</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <input nz-input formControlName="name"/>
+                        <input nz-input formControlName="title"/>
                     </nz-form-control>
                 </nz-form-item>
             </div>

src/app/admin/goods/list/list.component.ts

@@ -110,7 +110,7 @@ export class ListComponent implements OnInit {
 
         // 初始化搜索表单
         this.searchForm = this.form.group({
-            name: [null],
+            title: [null],
             status: [null],
             goodsLabel: [null],
         });

src/app/admin/statistics/coupon-use/coupon-use.component.html

@@ -71,8 +71,8 @@
             <td>{{ data.codeStart + ' - ' + data.codeEnd}}</td>
             <td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td><span *ngIf="data.mailTime != null">{{ data.mailTime | date: 'yyyy-MM-dd'}}</span></td>
-            <td>{{ (data.batchNum!=null?data.useRate:0)}}</td>
+            <td>{{ (data.batchNum!=null?data.batchNum:0)}}</td>
-            <td>{{ (data.useNum!=null?data.useRate:0)}}</td>
+            <td>{{ (data.useNum!=null?data.useNum:0)}}</td>
             <td>{{ (data.useRate!=null?data.useRate:0) + '%' }}</td>
             <td>
                 <a nz-dropdown [nzDropdownMenu]="menu">

src/environments/environment.ts

@@ -4,11 +4,11 @@
 
 export const environment = {
   production: false,
-  baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+  // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
+  // orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
   //   baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  //   baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
+    baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
-  //   orderUrl: 'https://hsg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
+    orderUrl: 'https://hsg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
     // orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
   imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',