diff --git a/src/app/admin/recharge-order/order-list/order-list.component.html b/src/app/admin/recharge-order/order-list/order-list.component.html
index 6f6d80f..b31b608 100644
--- a/src/app/admin/recharge-order/order-list/order-list.component.html
+++ b/src/app/admin/recharge-order/order-list/order-list.component.html
@@ -6,42 +6,45 @@
 <div class="inner-content">
     <form nz-form [formGroup]="searchForm" (ngSubmit)="getRequest(true , searchForm.value)">
         <div nz-row>
-
             <div nz-col nzSpan="8">
                 <nz-form-item>
-                    <nz-form-label [nzSpan]="6">订单状态</nz-form-label>
+                    <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-option nzLabel="退款中" nzValue="6"></nz-option>
-                        </nz-select>
+                        <input nz-input placeholder="请输入充值内容..." [formControlName]="'rechargeContent'"/>
                     </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-label [nzSpan]="6">订单号</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <nz-select nzShowSearch nzAllowClear formControlName="rechargeModel" nzPlaceHolder="请选择订单状态">
-                            <nz-option nzLabel="电信充值" nzValue="1"></nz-option>
-                            <nz-option nzLabel="移动充值" nzValue="2"></nz-option>
-                            <nz-option nzLabel="联通充值" nzValue="3"></nz-option>
+                        <input nz-input placeholder="请输入订单号..." [formControlName]="'orderNo'"/>
+                    </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="payStatus" nzPlaceHolder="请选择订单状态">
+                            <nz-option nzLabel="待支付" nzValue="101"></nz-option>
+                            <nz-option nzLabel="已支付" nzValue="102"></nz-option>
+                            <nz-option nzLabel="已完成" nzValue="100"></nz-option>
+                            <nz-option nzLabel="已取消" nzValue="104"></nz-option>
+                            <nz-option nzLabel="已退款" nzValue="105"></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>
+                    <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 nzShowSearch nzAllowClear formControlName="rechargeStatus" nzPlaceHolder="请选择充值状态">
+                            <nz-option nzLabel="充值中" nzValue="201"></nz-option>
+                            <nz-option nzLabel="充值成功" nzValue="202"></nz-option>
+                            <nz-option nzLabel="充值失败" nzValue="203"></nz-option>
+                            <nz-option nzLabel="未充值" nzValue="204"></nz-option>
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>
@@ -49,38 +52,46 @@
 
             <div nz-col nzSpan="8">
                 <nz-form-item>
-                    <nz-form-label [nzSpan]="6">支付方式</nz-form-label>
+                    <nz-form-label [nzSpan]="6">运营商类型</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <nz-select nzShowSearch nzAllowClear formControlName="payType" 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-select nzShowSearch nzAllowClear formControlName="operatorType" nzPlaceHolder="请选择运营商类型">
+                            <nz-option nzLabel="电信运营商" nzValue="1"></nz-option>
+                            <nz-option nzLabel="移动运营商" nzValue="2"></nz-option>
+                            <nz-option nzLabel="联通运营商" nzValue="3"></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>
+                    <nz-form-label [nzSpan]="6">充值类型</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <input nz-input placeholder="请输入充值号码..." [formControlName]="'rechargeContent'"/>
+                        <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>
+                    <nz-form-label [nzSpan]="6">支付方式</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <input nz-input placeholder="请输入订单号..." [formControlName]="'orderNo'"/>
+                        <nz-select nzShowSearch nzAllowClear formControlName="payType" nzPlaceHolder="支付方式">
+                            <nz-option nzLabel="微信支付" nzValue="2"></nz-option>
+                            <nz-option nzLabel="工会卡支付" nzValue="3"></nz-option>
+                            <nz-option nzLabel="银联支付" nzValue="4"></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>
                     <nz-form-control [nzSpan]="16">
-                        <input nz-input placeholder="请输入工会卡卡号..." [formControlName]="'idCard'"/>
+                        <input nz-input placeholder="请输入工会卡卡号..." [formControlName]="'laborUnionCard'"/>
                     </nz-form-control>
                 </nz-form-item>
             </div>
@@ -93,6 +104,15 @@
                     </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-range-picker [nzShowTime]="{ nzFormat: 'HH:mm' }"
+                                         formControlName="createTime"></nz-range-picker>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
         </div>
         <div nz-row>
             <div nz-col nzSpan="24" class="search-button">
@@ -108,10 +128,16 @@
 <div class="inner-content">
     <span>共计 {{total}} 条数据</span>
     <div class="operating-button">
-        <button nz-button nzType="primary" class="right-btn" (click)="downloadTemplate(searchForm.value)"><i nz-icon
-                                                                                                             nzType="download"
-                                                                                                             nzTheme="outline"></i>导出订单
-        </button>
+        <nz-upload
+                [nzAccept]="'.xls,.xlsx'"
+                nzAction="{{WEB_SERVE_URL}}outRechargeOrder/importRechargeOrder"
+                [nzHeaders]="{ authorization: 'authorization-text' }"
+                (nzChange)="handleChange($event)"
+                [nzShowUploadList]="false"
+        >
+            <button  nz-button nzType="primary" ><i nz-icon nzType="import" nzTheme="outline"></i>导入充值订单</button>
+        </nz-upload>
+        <button nz-button nzType="primary" class="right-btn" (click)="downloadTemplate(searchForm.value)" ><i nz-icon nzType="download" nzTheme="outline"></i>导出订单</button>
     </div>
     <nz-table
             class="table"
@@ -136,6 +162,7 @@
             <th nzWidth="180px">充值订单号</th>
             <th nzWidth="120px">客户名称</th>
             <th nzWidth="140px">生成时间</th>
+            <th nzWidth="140px">支付时间</th>
             <th nzWidth="100px" nzRight>支付方式</th>
             <th nzWidth="90px" nzRight>充值状态</th>
             <th nzWidth="100px" nzRight>支付状态</th>
@@ -152,6 +179,7 @@
             <td>{{data.orderNo}}</td>
             <td>{{data.userName == null ? '暂无' : data.userName}}</td>
             <td>{{data.createTimed | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
+            <td>{{data.payTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight>{{data.payType  | rechargePayType}}</td>
             <td nzRight>{{data.rechargeStatus | rechargeStatus}}</td>
             <td nzRight>{{data.payStatus | payStatus}}</td>
diff --git a/src/app/admin/recharge-order/order-list/order-list.component.ts b/src/app/admin/recharge-order/order-list/order-list.component.ts
index 3e8b8e6..87ae816 100644
--- a/src/app/admin/recharge-order/order-list/order-list.component.ts
+++ b/src/app/admin/recharge-order/order-list/order-list.component.ts
@@ -76,16 +76,17 @@ export class OrderListComponent implements OnInit , OnDestroy {
 
   public init(): void {
     this.searchForm = this.form.group({
-      status: [null],
-      orderNo: [null],
-      rechargeModel: [null],
-      idCard: [null],
-      rechargeContent: [null],
-      userPhone: [null],
-      rechargeType: [null],
-      payTime: [null],
-      payType: [null],
-      createTime: [null],
+      payStatus: [null], // 支付状态
+      rechargeStatus: [null], // 充值状态
+      orderNo: [null], // 订单号
+      operatorType: [null], // 运营商类型
+      laborUnionCard: [null],  // 工会卡号
+      rechargeContent: [null], // 充值内容
+      userPhone: [null],   // 用户电话
+      rechargeType: [null], // 充值类型
+      payTime: [null],   // 支付时间
+      payType: [null], // 支付方式
+      createTime: [null],  // 创建时间
     });
     this.validateForm = this.form.group({
       type: [null, [Validators.required]],
@@ -149,57 +150,6 @@ export class OrderListComponent implements OnInit , OnDestroy {
   }
 
 
-  public getMobileRechargeByOrderId(id: number): void {
-    this.common.showConfirm('确认订单是否再次充值', item => {
-      if (item) {
-        this.recharge.getMobileRechargeByOrderId(id, data => {
-          if (data['return_code'] === '000000') {
-            this.getRequest(false, this.searchForm.value);
-            this.isVisible = false;
-            this.message.success('充值成功');
-          } else {
-            this.message.error(data['return_msg']);
-          }
-        });
-      }
-    });
-
-  }
-
-  public orderToRefund(id): void {
-    this.common.showConfirm('确认订单是否退款', item => {
-      if (item) {
-        this.recharge.orderToRefund(id, data => {
-          if (data['return_code'] === '000000') {
-            this.message.success('退款成功');
-            this.getRequest(false, this.searchForm.value);
-          } else {
-            this.message.error(data['return_msg']);
-          }
-        });
-      }
-    });
-  }
-
-  public postRefund(orderNo): void {
-    this.common.showConfirm('确认订单申请退款', item => {
-      if (item) {
-        this.recharge.postRefund({
-          refundSource: 1 ,
-          sourceOrderNo: orderNo
-        }, data => {
-          if (data['return_code'] === '000000') {
-            this.message.success('申请成功');
-            this.getRequest(false, this.searchForm.value);
-          } else {
-            this.message.error(data['return_msg']);
-          }
-        });
-      }
-    });
-  }
-
-
 
   // 下载模板
   downloadTemplate(whereObject) {
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 0f97376..a2d6d6f 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -6,8 +6,8 @@ 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: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  // imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
   inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
 };