提交修改

src/app/admin/recharge-order/order-statistical/order-statistical.component.html

@@ -14,6 +14,20 @@
                     </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="status" nzPlaceHolder="请选择订单状态">
+                            <nz-option nzLabel="待支付" nzValue="1"></nz-option>
+                            <nz-option nzLabel="已支付" nzValue="2"></nz-option>
+                            <nz-option nzLabel="已完成" nzValue="3"></nz-option>
+                            <nz-option nzLabel="已取消" nzValue="4"></nz-option>
+                            <nz-option nzLabel="已退款" nzValue="5"></nz-option>
+                        </nz-select>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
         </div>
 
         <div nz-row>
@@ -50,6 +64,7 @@
             <th nzWidth="180px">数量</th>
             <th nzWidth="180px">支付金额</th>
             <th nzWidth="180px">充值金额</th>
+            <th nzWidth="180px">订单状态</th>
         </tr>
         </thead>
         <tbody>
@@ -59,6 +74,7 @@
             <td>{{data.count}}</td>
             <td>{{data.payPrice}}</td>
             <td>{{data.orderPrice}}</td>
+            <td>{{data.status | rechargeStatus}}</td>
         </tbody>
     </nz-table>
 </div>

src/app/admin/recharge-order/order-statistical/order-statistical.component.ts

@@ -27,6 +27,7 @@ export class OrderStatisticalComponent implements OnInit {
   ngOnInit(): void {
     this.searchForm = this.form.group({
       finishTime: [null],
+      status: ['3'],
     });
     this.getRequest(true, this.searchForm.value);
   }
@@ -47,7 +48,6 @@ export class OrderStatisticalComponent implements OnInit {
     whereObject['pageNum'] = this.pageNum;
     whereObject['pageSize'] = this.pageSize;
     this.recharge.getOrderCountList(whereObject, data => {
-      console.log(data);
       if (data['return_code'] === '000000') {
         this.requestData = data['return_data'].list;
         this.total = data['return_data'].total;

src/environments/environment.ts

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