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

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

@@ -250,3 +250,41 @@
         </tbody>
     </nz-table>
 </nz-modal>
+<nz-modal [(nzVisible)]="errorStudentVisible" nzTitle="导入失败数据" (nzOnCancel)="errorStudentVisible = false" nzWidth="1200px" [nzFooter]="null">
+    <nz-table #errorStudentTable [nzData]="importErrorStudentArray"  [nzScroll]="{ x: '1200px' }">
+        <thead>
+        <tr>
+            <th nzWidth="80px">序号</th>
+            <th nzWidth="150px">订单号</th>
+            <th nzWidth="150px">用户昵称</th>
+            <th nzWidth="150px">用户联系方式</th>
+            <th nzWidth="150px">充值类型</th>
+            <th nzWidth="150px">充值内容</th>
+            <th nzWidth="150px">支付方式</th>
+            <th nzWidth="150px">卡号</th>
+            <th nzWidth="150px">订单金额</th>
+            <th nzWidth="150px">应付金额</th>
+            <th nzWidth="150px">订单状态</th>
+            <th nzWidth="150px">支付时间</th>
+            <th nzWidth="300px">原因</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let data of errorStudentTable.data;let i = index">
+            <td>{{ i + 1}}</td>
+            <td>{{data.orderNo}}</td>
+            <td>{{data.userName}}</td>
+            <td>{{data.userPhone}}</td>
+            <td>{{data.rechargeModelName}}</td>
+            <td>{{data.rechargeContent}}</td>
+            <td>{{data.payTypeName}}</td>
+            <td>{{data.cardNo}}</td>
+            <td>{{data.orderPrice}}</td>
+            <td>{{data.payRealPrice}}</td>
+            <td>{{data.statusName}}</td>
+            <td>{{data.payTime}}</td>
+            <td>{{data.errorMessage}}</td>
+        </tr>
+        </tbody>
+    </nz-table>
+</nz-modal>

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

@@ -187,6 +187,7 @@ export class OrderListComponent implements OnInit, OnDestroy {
     }
 
     handleChange(info: NzUploadChangeParam): void {
+        console.log(info);
         if (info.file.status === 'done') {
             if (info.file.response.return_code === '000000') {
                 this.loading = false;

src/environments/environment.ts

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