Merge branch 'master' of http://139.159.177.244:3000/yuanye/high-web

src/app/admin/merchant/merchant-edit/merchant-edit.component.html

@@ -22,7 +22,7 @@
                 </nz-form-item>
             </div>
             <div nz-col [nzSpan]="8">
-                <nz-form-item>
+                <nz-form-item>77
                     <nz-form-label [nzFor]="'password'" nzRequired>登录密码</nz-form-label>
                     <nz-form-control nzErrorTip="请输入登录密码!">
                         <nz-input-group [nzSuffix]="suffixTemplate">

src/app/admin/order/order-detail/order-detail.component.html

@@ -0,0 +1 @@
+<p>order-detail works!</p>

src/app/admin/order/order-detail/order-detail.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-order-detail',
+  templateUrl: './order-detail.component.html',
+  styleUrls: ['./order-detail.component.scss']
+})
+export class OrderDetailComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}

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

@@ -18,7 +18,7 @@
                 <nz-form-item>
                     <nz-form-label [nzSpan]="6">客户手机号</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <input nz-input formControlName="phone"/>
+                        <input nz-input formControlName="memPhone"/>
                     </nz-form-control>
                 </nz-form-item>
             </div>
@@ -26,7 +26,7 @@
                 <nz-form-item>
                     <nz-form-label [nzSpan]="6">状态</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择订单状态" formControlName="status">
+                        <nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择订单状态" formControlName="orderStatus">
                             <nz-option nzLabel="待支付" nzValue="1"></nz-option>
                             <nz-option nzLabel="已支付" nzValue="2"></nz-option>
                             <nz-option nzLabel="已完成" nzValue="3"></nz-option>
@@ -70,13 +70,12 @@
             <th nzWidth="180px">支付流水号</th>
             <th nzWidth="120px">客户名称</th>
             <th nzWidth="130px">客户电话</th>
-            <th nzWidth="100px">支付模式</th>
+            <th nzWidth="110px">支付模式</th>
             <th nzWidth="100px">支付方式</th>
             <th nzWidth="100px">支付金额</th>
-            <th nzWidth="140px">支付时间</th>
-            <th nzWidth="140px">取消时间</th>
             <th nzWidth="140px">创建时间</th>
             <th nzWidth="80px">状态</th>
+<!--            <th nzWidth="150px" nzRight="0px">操作</th>-->
         </tr>
         </thead>
         <tbody>
@@ -86,13 +85,14 @@
             <td>{{data.paySerialNo == null ? '暂无': data.paySerialNo}}</td>
             <td>{{data.memName == null ? '暂无': data.memName}}</td>
             <td>{{data.memPhone == null ? '暂无': data.memPhone}}</td>
-            <td>{{data.payModel == null ? '暂无': data.payModel}}</td>
-            <td>{{data.payType == null ? '暂无': data.payType}}</td>
+            <td>{{data.payModel == null ? '暂无': data.payModel | paymodel}}</td>
+            <td>{{data.payType == null ? '暂无': data.payType | paytype}}</td>
             <td>{{data.payPrice == null ? '暂无': data.payPrice}}</td>
-            <td>{{data.payTime | date: 'yyyy-MM-dd HH:mm'}}</td>
-            <td>{{data.cancelTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.orderStatus | orderCouponStatus}}</td>
+<!--            <td nzRight="0px" class="table-td-operation">-->
+<!--                <a *ngIf="data.status !== 101" (click)="getDetail(data.id)">订单详情</a>-->
+<!--            </td>-->
         </tbody>
     </nz-table>
 </div>

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

@@ -39,9 +39,9 @@ export class OrderListComponent implements OnInit {
 
   public init(): void {
     this.searchForm = this.form.group({
-      phone: [null],
+      memPhone: [null],
       orderNo: [null],
-      status: [null],
+      orderStatus: [null],
     });
     this.getRequest(true, this.searchForm.value);
   }
@@ -74,7 +74,7 @@ export class OrderListComponent implements OnInit {
 
   // 查看详情
   public getDetail(id: number): void {
-    this.router.navigate(['/admin/merchant/merchant-detail'], {
+    this.router.navigate(['/admin/order/order-detail'], {
       queryParams: {
         merchantId: id
       }

src/app/admin/order/order-routing.module.ts

@@ -1,10 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import {OrderListComponent} from './order-list/order-list.component';
+import {OrderDetailComponent} from './order-detail/order-detail.component';
 
 
 const routes: Routes = [
   { path: 'order-list', component: OrderListComponent },
+  { path: 'order-detail', component: OrderDetailComponent },
 ];
 
 @NgModule({

src/app/admin/order/order.module.ts

@@ -9,10 +9,11 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
 import {AppCommonModule} from "../../app-common.module";
+import { OrderDetailComponent } from './order-detail/order-detail.component';
 
 
 @NgModule({
-  declarations: [OrderListComponent],
+  declarations: [OrderListComponent, OrderDetailComponent],
   imports: [
     CommonModule,
     OrderRoutingModule,

src/app/app-common.module.ts

@@ -19,6 +19,8 @@ import {
     AuditStatusPipe
 } from './pipes';
 import { OrderCouponStatusPipe } from './pipes/order/order-coupon-status.pipe';
+import { PaymodelPipe } from './pipes/paymodel.pipe';
+import { PaytypePipe } from './pipes/paytype.pipe';
 
 const PIPES = [
     TimesPipe,
@@ -42,10 +44,14 @@ const PIPES = [
     ],
     declarations: [
         ...PIPES,
+        PaymodelPipe,
+        PaytypePipe,
     ],
 
     exports: [
         ...PIPES,
+        PaymodelPipe,
+        PaytypePipe,
     ],
 })
 

src/app/pipes/index.ts

@@ -6,3 +6,5 @@ export * from './coupon-code.pipe';
 export * from './audit-status.pipe';
 export * from './audit-type.pipe';
 export * from './order/order-coupon-status.pipe';
+export * from './paymodel.pipe';
+export * from './paytype.pipe';

src/app/pipes/paymodel.pipe.ts

@@ -0,0 +1,18 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'paymodel'
+})
+export class PaymodelPipe implements PipeTransform {
+
+  transform(value: number): string {
+    switch (value) {
+      case 1:
+        return '金币支付';
+      case 2:
+        return '第三方支付';
+      case 3:
+        return '混合支付';
+    }
+  }
+}

src/app/pipes/paytype.pipe.ts

@@ -0,0 +1,18 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'paytype'
+})
+export class PaytypePipe implements PipeTransform {
+
+  transform(value: number): string {
+    switch (value) {
+      case 1:
+        return '支付宝';
+      case 2:
+        return '微信';
+      case 3:
+        return '金币';
+    }
+  }
+}