提交diam

src/app/admin/index/index/index.component.html

@@ -7,7 +7,7 @@
 <!-- end 面包屑 -->
 
 <!--条件搜索-->
-<div class="inner-content" *ngIf="gasCountData.history.length != 0">
+<div class="inner-content" *ngIf="adminInfoObject['merchantStore'] != null && adminInfoObject['merchantStore']['type'] == 1">
     <div *ngIf="adminInfoObject['merchantStore']['prestoreType'] == 1" style="width: 100%;text-align: center;">
         <nz-row [nzGutter]="16">
             <nz-col [nzSpan]="24">

src/app/admin/order/oil-station-order/oil-station-order.component.html

@@ -79,7 +79,6 @@
             <th nzWidth="50px">编号</th>
             <th nzWidth="200px">订单号</th>
             <th nzWidth="180px">油站名称</th>
-            <th nzWidth="180px">油站地址</th>
             <th nzWidth="90px">类型</th>
             <th nzWidth="90px">油号</th>
             <th nzWidth="90px">油枪号</th>
@@ -99,7 +98,6 @@
             <td>{{i + 1}}</td>
             <td>{{data.orderNo}}</td>
             <td>{{data.gasName}}</td>
-            <td>{{data.gasAddress}}</td>
             <td>{{data.gasOilType == 1 ? '汽油': '柴油'}}</td>
             <td>{{data.gasOilNo + "#"}}</td>
             <td>{{data.gasGunNo + "号"}}</td>
@@ -131,7 +129,7 @@
 </nz-modal>
 
 <nz-modal [(nzVisible)]="isVisibleDetail" nzTitle="订单详情" nzWidth="900"   (nzOnCancel)="isVisibleDetail= false" (nzOnOk)="isVisibleDetail= false">
-    <nz-descriptions  nzBordered [nzColumn]="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }">
+    <nz-descriptions  nzBordered [nzColumn]="{ xxl: 3, xl: 2, lg: 2, md: 2, sm: 2, xs: 1 }">
         <nz-descriptions-item nzTitle="油站名称">{{data['gasName']}}</nz-descriptions-item>
         <nz-descriptions-item nzTitle="油站地址">{{data['gasAddress']}}</nz-descriptions-item>
         <nz-descriptions-item nzTitle="订单号">{{data['orderNo']}}</nz-descriptions-item>

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=',
   inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
 };