Merge branch 'feature/6月迭代-抖音' into test

src/components/allCustomers/order-list.vue

@@ -12,7 +12,7 @@
       </div>
       <order-table tab="store"></order-table>
     </el-tab-pane>
-    <el-tab-pane :label="`达摩微商城{${orderCount.wechatMallNum || 0}}`" name="demo">
+    <el-tab-pane :label="`达摩微商城(${orderCount.wechatMallNum || 0})`" name="demo">
       <order-table tab="demo"></order-table>
     </el-tab-pane>
     <el-tab-pane :label="`微盟订单(${orderCount.weimobMallNum || 0})`" name="weimob">

src/components/allCustomers/order-list/order-table.vue

@@ -3,7 +3,7 @@
     <div class="search-bar">
       <el-input v-model="params.orderNumber" @change="onSearch" prefix-icon="el-icon-search" clearable placeholder="请输入订单/退款/退换单号" style="width: 260px"></el-input>
       <el-select v-model="params.orderType" @change="onSearch" clearable placeholder="全部订单类型" style="margin-left: 10px;width: 160px">
-        <el-option label="销售单" value="1"></el-option>
+        <el-option :label="params.channelType == 3 ? '销售单' : '购买单'" value="1"></el-option>
         <el-option label="退款单" value="2"></el-option>
         <el-option label="退换货单" value="4"></el-option>
       </el-select>
@@ -43,13 +43,10 @@
           <!-- 购买单、销售单为绿色背景 order-buy -->
           <!-- 退款单背景色为红色 order-refund -->
           <!-- 退换单背景色为黄色 order-exchange -->
-          <!-- 线下订单为销售单 -->
-          <div v-if="el.channelType == 3" class="order-type-tag order-buy">销售单</div>
-          <template v-else>
-            <div v-if="el.orderType == 1" class="order-type-tag order-buy">购买单</div>
-            <div v-if="el.orderType == 2" class="order-type-tag order-refund">退款单</div>
-            <div v-if="el.orderType == 4" class="order-type-tag order-exchange">退换货单</div>
-          </template>
+          <!-- 线下订单orderType=1时为销售单 -->
+          <div v-if="el.orderType == 1" class="order-type-tag order-buy">{{ el.channelType == 3 ? '销售单' : '购买单' }}</div>
+          <div v-if="el.orderType == 2" class="order-type-tag order-refund">退款单</div>
+          <div v-if="el.orderType == 4" class="order-type-tag order-exchange">退换货单</div>
           <!-- 购买单、销售单为订单号 -->
           <!-- 退款单为退款单号 -->
           <!-- 退换单为退换单号 -->
@@ -94,6 +91,13 @@
         <el-table-column label="订单金额(元)" class-name="order-amount" min-width="210px">
           <div class="order-descript">
             <!-- 购买单、退换单、销售单显示应收金额 -->
+            <!-- 退款单不显示商品合计 -->
+            <div v-if="el.orderType != 2" class="order-descript-item gray">
+              <div class="order-descript-label">
+                <div class="order-descript-label-text">商品合计</div>：
+              </div>
+              <div class="order-descript-content">{{ el.paidAmount - el.deliveryPaymentAmount | fomatFloat }}</div>
+            </div>
             <!-- 退款单显示应退金额 -->
             <div class="order-descript-item gray">
               <div class="order-descript-label">
@@ -133,7 +137,7 @@
         </el-table-column>
         <el-table-column label="收货/导购信息" min-width="244px">
           <div class="order-descript">
-            <!-- 门店订单单只显示导购，其他单不显示导购 -->
+            <!-- 门店订单单只显示导购，其他单显示收货信息 -->
             <div v-if="el.channelType == 3" class="order-descript-item">
               <div class="order-descript-label">
                 <div class="order-descript-label-text">导购</div>：
@@ -146,24 +150,28 @@
               </div>
             </div>
             <template v-else>
-              <div class="order-descript-item">
-                <div class="order-descript-label">
-                  <div class="order-descript-label-text">收件人</div>：
+              <!-- 收货人、手机号、收货地址都无数据时，只显示一个-- -->
+              <template v-if="!el.receiverName && !el.phoneNumber && !el.receiverAddress">--</template>
+              <template v-else>
+                <div class="order-descript-item">
+                  <div class="order-descript-label">
+                    <div class="order-descript-label-text">收件人</div>：
+                  </div>
+                  <div class="order-descript-content">{{ el.receiverName || '--' }}</div>
                 </div>
-                <div class="order-descript-content">{{ el.receiverName || '--' }}</div>
-              </div>
-              <div class="order-descript-item">
-                <div class="order-descript-label">
-                  <div class="order-descript-label-text">手机号</div>：
+                <div class="order-descript-item">
+                  <div class="order-descript-label">
+                    <div class="order-descript-label-text">手机号</div>：
+                  </div>
+                  <div class="order-descript-content">{{ el.phoneNumber || '--' }}</div>
                 </div>
-                <div class="order-descript-content">{{ el.phoneNumber || '--' }}</div>
-              </div>
-              <div class="order-descript-item">
-                <div class="order-descript-label">
-                  <div class="order-descript-label-text">收货地址</div>：
+                <div class="order-descript-item">
+                  <div class="order-descript-label">
+                    <div class="order-descript-label-text">收货地址</div>：
+                  </div>
+                  <div class="order-descript-content">{{ el.receiverAddress || '--' }}</div>
                 </div>
-                <div class="order-descript-content">{{ el.receiverAddress }}</div>
-              </div>
+              </template>
             </template>
           </div>
         </el-table-column>
@@ -297,7 +305,10 @@ export default {
         if (Object.prototype.toString.call(page) != '[object Object]') {
           page = {};
         }
-        this.tableData = page.result;
+        this.tableData = page.result.map(el => {
+          el.payInfo = typeof el.payInfo == 'string' ? JSON.parse(el.payInfo) : null;
+          return el;
+        });
         this.params.total = page.totalCount;
       });
     },