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

* 'dev' of http://139.159.177.244:3000/yuanye/high-web:
  提交代码

# Conflicts:
#	src/environments/environment.ts

src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html

@@ -60,6 +60,7 @@
 <div class="inner-content">
     <span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span>
     <div class="operating-button">
+        <button nz-button nzType="primary" class="right-btn" (click)="excelOrder()"><i nz-icon nzType="plus" nzTheme="outline"></i>导出订单</button>
     </div>
 
     <!--数组表格 -->

src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts

@@ -4,6 +4,7 @@ import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-an
 import {TyAgentOilStationService} from '../../../../services/ty-agent-oil-station.service';
 import {ADMIN_INFO_OBJECT} from "../../../../services/local-storage.namespace";
 import {LocalStorageService} from "../../../../services/local-storage.service";
+import {environment} from "../../../../../environments/environment";
 
 @Component({
   selector: 'app-ty-order-list',
@@ -11,6 +12,7 @@ import {LocalStorageService} from "../../../../services/local-storage.service";
   styleUrls: ['./ty-order-list.component.scss']
 })
 export class TyOrderListComponent implements OnInit {
+  FILE_URL = environment.imageUrl;
   roleType;
   adminFlag;
 
@@ -72,4 +74,21 @@ export class TyOrderListComponent implements OnInit {
   resetForm(): void {
     this.searchForm.reset();
   }
+
+  /**
+   * 导出订单
+   */
+  excelOrder() {
+    this.tyAgentOilStationService.excelOrder(this.whereObject, data => {
+      if (data['return_code'] === '000000') {
+        window.location.href = this.FILE_URL + 'temporary/' + data['return_data'];
+      } else {
+        this.modal.error({
+          nzTitle: '提示',
+          nzContent: data['return_msg']
+        });
+      }
+    });
+  }
+
 }

src/app/services/ty-agent-oil-station.service.ts

@@ -100,4 +100,16 @@ export class TyAgentOilStationService {
     });
   }
 
+
+  /**
+   * 查询订单列表
+   * @param paramObject 参数
+   * @param callBack
+   */
+  excelOrder(paramObject: object, callBack) {
+    this.http.get(environment.baseUrl + 'tyAgentOilStation/excelOrder?' + this.common.getWhereCondition(paramObject)).subscribe(data => {
+      callBack(data);
+    });
+  }
+
 }

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://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
-    imageUrl: 'https://hsg.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=',
 };