修改话费订单导出问题

src/app/admin/config-manage/integral-rebate/integral-rebate.component.html

@@ -205,6 +205,40 @@
                 ></nz-input-number>
             </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+            <nz-form-label [nzSpan]="6" >一级分销比例</nz-form-label>
+            <nz-form-control [nzSpan]="16">
+                <nz-input-number
+                        style="width: 200px"
+                        formControlName="firstDistribution"
+                        [nzMin]="0"
+                        [nzMax]="100"
+                        [nzStep]="1"
+                        [nzPrecision]="2"
+                        nzPrecisionMode="cut"
+                        nzPlaceHolder="请输入积分支付比例!"
+                        [nzFormatter]="formatterPercent"
+                        [nzParser]="parserPercent"
+                ></nz-input-number>
+            </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+            <nz-form-label [nzSpan]="6" >二级分销比例</nz-form-label>
+            <nz-form-control [nzSpan]="16">
+                <nz-input-number
+                        style="width: 200px"
+                        formControlName="secondDistribution"
+                        [nzMin]="0"
+                        [nzMax]="100"
+                        [nzStep]="1"
+                        [nzPrecision]="2"
+                        nzPrecisionMode="cut"
+                        nzPlaceHolder="请输入积分支付比例!"
+                        [nzFormatter]="formatterPercent"
+                        [nzParser]="parserPercent"
+                ></nz-input-number>
+            </nz-form-control>
+        </nz-form-item>
     </form>
 </nz-modal>
 

src/app/admin/config-manage/integral-rebate/integral-rebate.component.ts

@@ -71,6 +71,8 @@ export class IntegralRebateComponent implements OnInit {
         });
         this.validateForm = this.form.group({
             productId: [null],
+            firstDistribution: [null],
+            secondDistribution: [null],
             type: [null, [Validators.required]],
             percentage: [null, [Validators.required]],
             time: [null, [Validators.required]],

src/app/admin/discount-package/discount-package-edit/discount-package-edit.component.html

@@ -66,7 +66,7 @@
                 </div>
                 <div nz-col class="gutter-row" [nzSpan]="24">
                     <nz-form-item>
-                        <nz-form-label  [nzSpan]="3"  nzRequired>列表展示图</nz-form-label>
+                        <nz-form-label  [nzSpan]="3"  >列表展示图</nz-form-label>
                         <nz-form-control [nzSpan]="8">
                             <nz-upload
                                     nzAction="{{POST_URL}}/fileUpload/uploadfile"
@@ -89,7 +89,7 @@
 
                 <div nz-col [nzSpan]="24">
                     <nz-form-item>
-                        <nz-form-label [nzSpan]="3" nzRequired>轮播展示图</nz-form-label>
+                        <nz-form-label [nzSpan]="3" >轮播展示图</nz-form-label>
                         <nz-form-control [nzSpan]="8">
                             <nz-upload
                                     nzAction="{{POST_URL}}/fileUpload/uploadfile"
@@ -112,7 +112,7 @@
                 </div>
                 <div nz-col [nzSpan]="24">
                     <nz-form-item>
-                        <nz-form-label [nzSpan]="3" nzRequired>详情展示图</nz-form-label>
+                        <nz-form-label [nzSpan]="3" >详情展示图</nz-form-label>
                         <nz-form-control [nzSpan]="8">
                             <nz-upload
                                     nzAction="{{POST_URL}}/fileUpload/uploadfile"

src/app/admin/discount-package/discount-package-edit/discount-package-edit.component.ts

@@ -131,7 +131,7 @@ export class DiscountPackageEditComponent implements OnInit {
     }
 
     // 图片判断
-    this.imgIsPost();
+    // this.imgIsPost();
 
 
     if (this.editFlag) {

src/app/admin/order/pre-order/pre-order.component.html

@@ -173,7 +173,7 @@
 </div>
 
 
-<nz-modal [(nzVisible)]="isVisible" nzTitle="发起预约" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()">
+<nz-modal [(nzVisible)]="isVisible" nzTitle="发起预约" (nzOnCancel)="isVisible = false" (nzOnOk)="handleOk()">
     <nz-form-item>
         <nz-form-label  nzRequired>预计时间</nz-form-label>
         <nz-form-control nzErrorTip="请选择预计时间!">
@@ -204,7 +204,7 @@
 </nz-modal>
 
 
-<nz-modal [(nzVisible)]="isVisibleDetail" nzTitle="订单详情" nzWidth="1200"  (nzOnCancel)="handleCancelOrder()" (nzOnOk)="handleCancelOrder()">
+<nz-modal [(nzVisible)]="isVisibleDetail" nzTitle="订单详情" nzWidth="1200"  (nzOnCancel)="isVisibleDetail = false" (nzOnOk)="isVisibleDetail = false">
     <nz-descriptions  nzTitle="支付订单详情" nzBordered [nzColumn]="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }">
         <nz-descriptions-item nzTitle="商品名称">{{orderDetail['highChildOrderList'][0]['goodsName']}}</nz-descriptions-item>
         <nz-descriptions-item nzTitle="支付类型">{{orderDetail['payType'] | paytype}}</nz-descriptions-item>

src/app/admin/order/pre-order/pre-order.component.ts

@@ -169,7 +169,8 @@ export class PreOrderComponent implements OnInit {
   public getDetail(orderId: number , id: number): void {
     this.order.getOrderById(orderId , data => {
       if (data['return_code'] === '000000') {
-        this.orderDetail = data['return_data'];
+          console.log(data);
+          this.orderDetail = data['return_data'];
       } else {
         this.message.error(data['return_msg']);
       }
@@ -257,13 +258,6 @@ export class PreOrderComponent implements OnInit {
     });
   }
 
-  handleCancel(): void {
-    this.isVisible = false;
-  }
-
-  handleCancelOrder(): void {
-    this.isVisibleDetail = false;
-  }
 
   public postRefund(orderNo): void {
     this.common.showConfirm('确认订单申请退款', item => {

src/app/pipes/commons/button.pipe.ts

@@ -13,7 +13,6 @@ export class ButtonPipe implements PipeTransform {
   transform(button: string): boolean {
     const buttonArray = new Set<string>();
     buttonArray.add(button);
-    console.log(this.store.get(ADMIN_INFO_OBJECT)['buttonList']);
     return this.store.get(ADMIN_INFO_OBJECT)['buttonList'].filter(i => buttonArray.has(i.permissionCode)).length > 0;
   }
 }