提交代理商订单页面

src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.html

@@ -157,7 +157,6 @@
             <th nzWidth="100px">订单金额</th>
             <th nzWidth="100px">支付金额</th>
             <th nzWidth="100px">支付方式</th>
-            <th nzWidth="140px">支付卡号</th>
             <th nzWidth="100px">订单状态</th>
             <th nzWidth="180px">创建时间</th>
             <th nzWidth="110px" nzRight="0px">操作</th>
@@ -171,7 +170,6 @@
             <td>￥{{data.totalPrice}}</td>
             <td>￥{{data.payPrice}}</td>
             <td>{{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}}</td>
-            <td>{{data.memCardNo}}</td>
             <td>{{data.orderStatus | orderStatus}}</td>
             <td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight="0px" class="table-td-operation">

src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts

@@ -7,7 +7,7 @@ import {CommonsService} from '../../../../services/commons.service';
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {NzMessageService} from 'ng-zorro-antd';
 import {OrderThirdPartyService} from '../../../../services/order/order-third-party.service';
-import {environment} from "../../../../../environments/environment";
+import {environment} from '../../../../../environments/environment';
 
 
 @Component({

src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html

@@ -158,7 +158,6 @@
             <th nzWidth="100px">订单金额</th>
             <th nzWidth="100px">支付金额</th>
             <th nzWidth="100px">支付方式</th>
-            <th nzWidth="140px">支付卡号</th>
             <th nzWidth="100px">订单状态</th>
             <th nzWidth="180px">创建时间</th>
             <th nzWidth="110px" nzRight="0px">操作</th>
@@ -172,7 +171,6 @@
             <td>￥{{data.totalPrice}}</td>
             <td>￥{{data.payPrice}}</td>
             <td>{{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}}</td>
-            <td>{{data.memCardNo}}</td>
             <td>{{data.orderStatus | orderStatus}}</td>
             <td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight="0px" class="table-td-operation">

src/app/admin/order-manage/order-manage-routing.module.ts

@@ -10,7 +10,7 @@ import {MemberChargeOrderListComponent} from './member-charge-order/member-charg
 import {PreOrderComponent} from '../order/pre-order/pre-order.component';
 import {DiscountUseConditionListComponent} from '../order/discount-use-condition-list/discount-use-condition-list.component';
 import {DicountPackageOrderListComponent} from '../order/dicount-package-order-list/dicount-package-order-list.component';
-import {OrderListComponent} from '../recharge-order/order-list/order-list.component';
+import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mobile-recharge-order-list.component';
 
 
 const routes: Routes = [
@@ -21,7 +21,7 @@ const routes: Routes = [
   { path: 'order-kfc-list', component: KfcOrderListComponent},
   { path: 'order-starbucks--list', component: StarbucksOrderListComponent},
   { path: 'order-member-charge--list', component: MemberChargeOrderListComponent},
-  { path: 'mobile-recharge-order-list', component: OrderListComponent },
+  { path: 'mobile-recharge-order-list', component: MobileRechargeOrderListComponent },
   { path: 'pre-order', component: PreOrderComponent },
   { path: 'discount-use-condition-list', component: DiscountUseConditionListComponent },
   { path: 'discount-package-order-list', component: DicountPackageOrderListComponent},

src/app/admin/order-manage/order-manage.module.ts

@@ -13,9 +13,10 @@ import { OrderRefundListComponent } from './order-refund-list/order-refund-list.
 import {KfcOrderListComponent} from './kfc-order/kfc-order-list/kfc-order-list.component';
 import { StarbucksOrderListComponent } from './starbucks-order/starbucks-order-list/starbucks-order-list.component';
 import { MemberChargeOrderListComponent } from './member-charge-order/member-charge-order-list/member-charge-order-list.component';
+import { MobileRechargeOrderListComponent } from './mobile-recharge-order-list/mobile-recharge-order-list.component';
 
 @NgModule({
-  declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent],
+  declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent],
   imports: [
     CommonModule,
     OrderManageRoutingModule,

src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.html

@@ -158,7 +158,6 @@
             <th nzWidth="100px">订单金额</th>
             <th nzWidth="100px">支付金额</th>
             <th nzWidth="100px">支付方式</th>
-            <th nzWidth="140px">支付卡号</th>
             <th nzWidth="100px">订单状态</th>
             <th nzWidth="180px">创建时间</th>
             <th nzWidth="110px" nzRight="0px">操作</th>
@@ -172,7 +171,6 @@
             <td>￥{{data.totalPrice}}</td>
             <td>￥{{data.payPrice}}</td>
             <td>{{data.orderStatus == 1 || data.orderStatus == 5 ? '未支付' : data.payType | orderPayType}}</td>
-            <td>{{data.memCardNo}}</td>
             <td>{{data.orderStatus | orderStatus}}</td>
             <td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight="0px" class="table-td-operation">

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

@@ -8,9 +8,9 @@ import {IconService} from '../../../services/icon.service';
 import {RechargeService} from '../../../services/recharge.service';
 import {NzMessageService, NzModalService, NzUploadChangeParam} from 'ng-zorro-antd';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {ADMIN_INFO_OBJECT} from "../../../services/local-storage.namespace";
+import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
-import {CompanyService} from "../../../services/company.service";
+import {CompanyService} from '../../../services/company.service';
-import {LocalStorageService} from "../../../services/local-storage.service";
+import {LocalStorageService} from '../../../services/local-storage.service';
 
 @Component({
     selector: 'app-order-list',

src/app/pipes/recharge-status.pipe.ts

@@ -15,6 +15,8 @@ export class RechargeStatusPipe implements PipeTransform {
         return '充值失败';
       case 204:
         return '未充值';
+        case 205:
+        return '充值异常';
     }
   }
 

src/environments/environment.ts

@@ -5,13 +5,10 @@
 export const environment = {
   production: false,
   baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
-  // imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
+  orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
-  // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  // orderUrl: 'https://hsgcs.dctpay.com/order/',
   imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
   // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
+  // orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
-  // 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=',
 };