Merge branch 'master' of http://gitea.dctpay.com/yuanye/puhui-go-web

src/app/pages/trade/comp-order/comp-order.component.html

@@ -106,7 +106,7 @@
   <thead>
   <tr>
     <th rowspan="2" nzWidth="180px">交易单号</th>
-    <th rowspan="2" nzWidth="150px">子交易单号</th>
+    <th rowspan="2" nzWidth="150px">商品订单号</th>
     <th rowspan="2" nzWidth="120px">用户手机号</th>
     <th rowspan="2" nzWidth="120px">商品key</th>
     <th rowspan="2" nzWidth="180px">商品名称</th>
@@ -134,23 +134,23 @@
   </thead>
   <tbody>
   <tr *ngFor="let data of basicTable.data;index as i">
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.orderNo}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.orderNo}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.childOrderNo}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.childOrderNo}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.userPhone}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.userPhone}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.goodsKey}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.goodsKey}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.goodsName}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.goodsName}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.goodsSpecsName}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.goodsSpecsName}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.goodsPrice}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.goodsPrice}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.goodsCount}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.goodsCount}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.totalPrice}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.totalPrice}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.couponDiscountPrice}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.couponDiscountPrice}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.integralDiscountPrice}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.integralDiscountPrice}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.payRealPrice}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.payRealPrice}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.payChannel | dictionary: 'ORDER_PAY_CHANNEL'}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.payChannel | dictionary: 'ORDER_PAY_CHANNEL'}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.payType | dictionary: 'ORDER_PAY_TYPE'}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.payType | dictionary: 'ORDER_PAY_TYPE'}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.tradeStatus | dictionary: 'ORDER_CHILD_STATUS'}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.tradeStatus | dictionary: 'ORDER_CHILD_STATUS'}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
-      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.goodsCount}}">{{data.payTime  | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
+      <td *ngIf="basicTable.data[i-1]?.orderNo != data['orderNo']" rowSpan="{{data.rowSpan}}">{{data.payTime  | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
       <td nzEllipsis nz-tooltip nzTooltipTitle="{{data.channelOrderNo}}">{{data.channelOrderNo}}</td>
       <td nzEllipsis nz-tooltip nzTooltipTitle="{{data.couNo}}">{{data.couNo}}</td>
       <td>{{data.expireTime | date: 'yyyy-MM-dd HH:mm'}}</td>
@@ -181,7 +181,7 @@
           <nz-descriptions nzBordered [nzColumn]="{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 2, xs: 1 }">
             <nz-descriptions-item nzTitle="用户手机号">{{orderDetail.order.userPhone}}</nz-descriptions-item>
             <nz-descriptions-item nzTitle="交易单号">{{orderDetail.order.orderNo}}</nz-descriptions-item>
-            <nz-descriptions-item nzTitle="子订单号">{{orderDetail.order.childOrderNo}}</nz-descriptions-item>
+            <nz-descriptions-item nzTitle="商品订单号">{{orderDetail.order.childOrderNo}}</nz-descriptions-item>
             <nz-descriptions-item nzTitle="交易金额">{{orderDetail.order.totalPrice}}</nz-descriptions-item>
             <nz-descriptions-item nzTitle="总优惠金额">{{orderDetail.order.totalDeductionPrice}}</nz-descriptions-item>
             <nz-descriptions-item nzTitle="优惠券优惠">{{orderDetail.order.couponDiscountPrice}}</nz-descriptions-item>

src/app/pages/trade/comp-order/comp-order.component.ts

@@ -156,6 +156,9 @@ export class CompOrderComponent {
     this.orderService.queryList(this.searchForm.value, (data: any) => {
       if (data['return_code'] == '000000') {
         this.tableData = data['return_data'];
+        for (let data of this.tableData.list) {
+          data['rowSpan'] = this.tableData.list.filter((s: { orderNo: any; }) => s.orderNo == data.orderNo).length;
+        }
       }
     });
   }
@@ -194,7 +197,6 @@ export class CompOrderComponent {
     this.orderService.queryDetail(childOrderNo,(data: any) => {
       if (data['return_code'] == '000000') {
         this.orderDetail = data['return_data'];
-        console.log(this.orderDetail);
       }
     });
     this.orderDetailVisible = true;

src/app/pages/trade/order-after-sales/order-after-sales.component.html

@@ -132,10 +132,12 @@
           <nz-descriptions-item nzTitle="产品规格">{{applyDetail.applyDetail.productSpecName}}</nz-descriptions-item>
           <nz-descriptions-item nzTitle="申请产品数量">{{applyDetail.applyDetail.productCount}}</nz-descriptions-item>
           <nz-descriptions-item nzTitle="申请时间">{{applyDetail.applyDetail.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
+          <nz-descriptions-item nzTitle="申请退款金额">{{applyDetail.applyDetail.refundPrice}}</nz-descriptions-item>
+          <nz-descriptions-item nzTitle="申请退款积分">{{applyDetail.applyDetail.refundIntegral}}</nz-descriptions-item>
           <nz-descriptions-item nzTitle="快递单号" [nzSpan]="3">{{applyDetail.applyDetail.sendExpressNo}}</nz-descriptions-item>
           <nz-descriptions-item nzTitle="图片" [nzSpan]="3">
             <div nz-row *ngIf="applyDetail.applyDetail.photo != null && applyDetail.applyDetail.photo != ''">
-              <div *ngFor="let img of applyDetail.applyDetail.photo.split(',')" nz-col class="gutter-row" [nzSpan]="4">
+              <div *ngFor="let img of applyDetail.applyDetail.photo.split(';')" nz-col class="gutter-row" [nzSpan]="4">
                 <img nz-image width="100px"  height="100px" nzSrc="{{imageUrl + img}}" alt="" src=""/>
               </div>
             </div>
@@ -165,7 +167,7 @@
           <nz-timeline-item *ngFor="let item of applyDetail.applyOpRecord">
             {{item.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}【{{item.status | dictionary: 'ORDER_AFTER_SALES_APPLY_STATUS'}}】 操作人：{{item.opUserName}}
             <div nz-row *ngIf="item.photo != null && item.photo != ''">
-              <div *ngFor="let img of item.photo.split(',')" nz-col class="gutter-row" [nzSpan]="2">
+              <div *ngFor="let img of item.photo.split(';')" nz-col class="gutter-row" [nzSpan]="2">
                 <img nz-image width="50px"  height="50px" nzSrc="{{imageUrl + img}}" alt="" src=""/>
               </div>
             </div>

src/app/pages/trade/order-refund/order-refund.component.html

@@ -92,7 +92,7 @@
     <td>{{data.orderNo}}</td>
     <td>{{data.orderChildNo}}</td>
     <td>{{data.refundPayChannel  | dictionary: 'ORDER_PAY_CHANNEL'}}</td>
-    <td>{{data.refundPayType | dictionary: 'ORDER_PAY_TYPE'}}</td>
+    <td>{{data.reufndPayType | dictionary: 'ORDER_PAY_TYPE'}}</td>
     <td>{{data.refundPrice}}</td>
     <td>{{data.refundIntegral}}</td>
     <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>