解决冲突

src/app/admin/order/order-h-list/order-h-list.component.html

@@ -89,6 +89,17 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+            <div nz-col nzSpan="8">
+                <nz-form-item>
+                    <nz-form-label [nzSpan]="6">充值类型</nz-form-label>
+                    <nz-form-control [nzSpan]="16">
+                        <nz-select nzShowSearch nzAllowClear formControlName="rechargeType" nzPlaceHolder="请选择充值类型">
+                            <nz-option nzLabel="快充" [nzValue]="1"></nz-option>
+                            <nz-option nzLabel="慢充" [nzValue]="2"></nz-option>
+                        </nz-select>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
             <!--            <div nz-col nzSpan="8">-->
             <!--                <nz-form-item>-->
             <!--                    <nz-form-label [nzSpan]="6">创建时间</nz-form-label>-->

src/app/admin/order/order-h-list/order-h-list.component.ts

@@ -56,6 +56,7 @@ export class OrderHListComponent implements OnInit {
       status: [null],
       orderNo: [null],
       rechargeModel: [null],
+      rechargeType: [null],
       rechargeContent: [null],
       idCard: [null],
       userPhone: [null],

src/app/admin/recharge-order/price-list/price-list.component.html

@@ -21,20 +21,23 @@
             </div>
             <div nz-col nzSpan="8">
                 <nz-form-item>
-<<<<<<< HEAD
-                    <nz-form-label [nzSpan]="6">充值类型</nz-form-label>
-                    <nz-form-control [nzSpan]="16">
-                        <nz-select nzShowSearch nzAllowClear formControlName="rechargeType" nzPlaceHolder="请选择充值类型">
-                            <nz-option nzLabel="快充" nzValue="1"></nz-option>
-                            <nz-option nzLabel="慢充" nzValue="2"></nz-option>
-=======
                     <nz-form-label [nzSpan]="6">展示区域</nz-form-label>
                     <nz-form-control [nzSpan]="16">
                         <nz-select nzShowSearch nzAllowClear formControlName="showType" nzPlaceHolder="请选择展示区域">
                             <nz-option nzLabel="小程序" [nzValue]="1"></nz-option>
                             <nz-option nzLabel="H5" [nzValue]="2"></nz-option>
                             <nz-option nzLabel="银联" [nzValue]="3"></nz-option>
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
+                        </nz-select>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
+            <div nz-col nzSpan="8">
+                <nz-form-item>
+                    <nz-form-label [nzSpan]="6">充值类型</nz-form-label>
+                    <nz-form-control [nzSpan]="16">
+                        <nz-select nzShowSearch nzAllowClear formControlName="rechargeType" nzPlaceHolder="请选择充值类型">
+                            <nz-option nzLabel="快充" [nzValue]="1"></nz-option>
+                            <nz-option nzLabel="慢充" [nzValue]="2"></nz-option>
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>
@@ -76,10 +79,7 @@
         <tr>
             <th>编号</th>
             <th>金额类型</th>
-<<<<<<< HEAD
             <th>充值类型</th>
-=======
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
             <th>展示区域</th>
 <!--            <th>供货商编号</th>-->
 <!--            <th>商品ID</th>-->
@@ -93,14 +93,8 @@
         <tr *ngFor="let data of ajaxTable.data; let i = index">
             <td>{{i + 1}}</td>
             <td>{{data.type | rechargePrice}}</td>
-<<<<<<< HEAD
             <td>{{data.rechargeType== 1? '快充':'慢充'}}</td>
             <td>{{data.showType | showType}}</td>
-=======
-            <td>{{data.showType | priceShow}}</td>
-<!--            <td>{{data.channel}}</td>-->
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
-<!--            <td>{{data.goodsId}}</td>-->
             <td>{{data.price}}</td>
             <td>{{data.realPrice}}</td>
             <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>

src/app/admin/recharge-order/price-list/price-list.component.ts

@@ -50,11 +50,8 @@ export class PriceListComponent implements OnInit {
     public init(): void {
         this.searchForm = this.form.group({
             type: [null],
-<<<<<<< HEAD
             rechargeType: [null],
-=======
             showType: [null],
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
         });
         this.validateForm = this.form.group({
             type: [null, [Validators.required]],
@@ -62,7 +59,6 @@ export class PriceListComponent implements OnInit {
             price: [null, [Validators.required]],
             rechargeType: [null, [Validators.required]],
             realPrice: [{value: null, disabled: true}, [Validators.required]],
-            showType: [null, [Validators.required]],
             discount: [null, [Validators.required]],
             sort: [null, [Validators.required]],
             // channel: [null, [Validators.required]],

src/app/app-common.module.ts

@@ -35,16 +35,11 @@ import {
     PreOrderStatusPipe,
     ButtonPipe,
     DiscountPackageStatusPipe,
-    PriceShowPipe
+    PriceShowPipe,
+    ShowTypePipe
 } from './pipes';
-<<<<<<< HEAD
-import { PreOrderStatusPipe } from './pipes/order/pre-order-status.pipe';
-import { ButtonPipe } from './pipes/commons/button.pipe';
-import { DiscountPackageStatusPipe } from './pipes/discount-package-status.pipe';
-import { ShowTypePipe } from './pipes/show-type.pipe';
-=======
 
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
+
 
 
 
@@ -75,11 +70,8 @@ const PIPES = [
     PreOrderStatusPipe,
     ButtonPipe,
     DiscountPackageStatusPipe,
-<<<<<<< HEAD
     ShowTypePipe,
-=======
     PriceShowPipe,
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
 ];
 
 

src/app/pipes/index.ts

@@ -23,8 +23,5 @@ export * from './audit/refund-status.pipe';
 export * from './order/pre-order-status.pipe';
 export * from './commons/button.pipe';
 export * from './discount-package-status.pipe';
-<<<<<<< HEAD
 export * from './show-type.pipe';
-=======
 export * from './price-show.pipe';
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9

src/environments/environment.ts

@@ -4,17 +4,10 @@
 
 export const environment = {
   production: false,
-<<<<<<< HEAD
   // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
   // imageUrl: 'http://localhost:9302/filesystem/',
-  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
+  imageUrl: 'https://hsg.dctpay.com/filesystem/',
-=======
-  baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'http://localhost:9302/filesystem/',
-  // baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  // imageUrl: 'https://hsg.dctpay.com/filesystem/',
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
   inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
 };