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

index.html

@@ -4,6 +4,8 @@
     <meta charset="utf-8" />
     <link rel="shortcut icon" href="./favicon.ico" />
     <style href="//at.alicdn.com/t/font_2996579_ubjq74uy5wj.css"></style><!--GIC3.0 客户    -->
+    <!-- 3.0 组件库 -->
+    <script src="//at.alicdn.com/t/font_2859043_ckil7xvsqi.js"></script>
     <!-- <style href="//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css"></style>GIC后台3.0    -->
     <!-- <script src="//at.alicdn.com/t/font_688955_2dxzdzrb3a7.js"></script> -->
     <script src="//web-1251519181.file.myqcloud.com/lib/lodash.min.js"></script>

src/components/allCustomers/order-list.vue

@@ -101,6 +101,8 @@ export default {
 
 <style lang="scss" scoped>
 .order-tab {
+  height: 100%;
+
   /deep/ .el-tabs__header {
     margin-bottom: 20px;
     .el-tabs__nav-wrap {
@@ -109,6 +111,9 @@ export default {
   }
   /deep/ .el-tabs__content {
     padding: 0 20px 20px;
+    height: calc(100% - 60px);
+    overflow-y: auto;
+    box-sizing: border-box;
   }
 }
 .order-report {

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

@@ -42,7 +42,7 @@
     <div class="order-list" v-for="el in tableData" :key="el">
       <!-- 订单号、订单时间、门店等信息 -->
       <el-table class="order-info-box" :data="[{}]" :span-method="orderInfoSpan" :show-header="false">
-        <el-table-column label="商品信息" min-width="350px">
+        <el-table-column label="商品信息" min-width="350px" >
           <div class="order-info">
             <!-- orderType	订单类型 -1 所有，1 销售，2.退货，4.退换货 -->
             <!-- 购买单、销售单为绿色背景 order-buy -->
@@ -51,11 +51,15 @@
             <!-- 线下订单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>
+            <div v-if="el.orderType == 4" class="order-type-tag order-exchange">退换单</div>
             <!-- 购买单、销售单为订单号 -->
             <!-- 退款单为退款单号 -->
             <!-- 退换单为退换单号 -->
-            <div class="order-num">订单号：{{ el.orderNumber }}</div>
+            <div>
+            <div v-if="el.orderType == 4" class="order-num">退换单号：{{ el.orderNumber }}</div>
+            <div v-else-if="el.orderType == 2" class="order-num">退款单号：{{ el.orderNumber }}</div>
+            <div v-else class="order-num">订单号：{{ el.orderNumber }}</div>
+            </div>
             <!-- 退款单、退换单才有原始单号 -->
             <div class="connect-order-num">{{ el.orderType == 2 || el.orderType == 4 ? `原始订单号：${ el.oorderNumber }` : ''}}</div>
           </div>
@@ -87,7 +91,15 @@
         <el-table-column label="商品信息" min-width="350px" show-overflow-tooltip>
           <div class="goods-info-box" slot-scope="{ row }">
             <div class="goods-logo">
-              <img class="goods-logo-icon" :src="row.imageUrl ? row.imageUrl : defaultGoodsIcon" alt="">
+              <!-- <img class="goods-logo-icon" :src="row.imageUrl ? row.imageUrl : defaultGoodsIcon" alt=""> -->
+              <el-image class="goods-logo-icon" :src="row.imageUrl ? row.imageUrl : defaultGoodsIcon" alt="">
+                <div slot="error" class="image-slot">
+                  <!-- <i class="iconfont-components3 icon-cp-pic-error errorimage"></i> -->
+                  <svg aria-hidden="true" width="60px" height="60px" style="border-radius:4px;">
+                    <use xlink:href="#icon-cp-pic-error"></use>
+                  </svg>
+                </div>
+              </el-image>
               <!-- productType	商品类型 1正常 2赠品 3换购 -->
               <div v-if="row.productType == 2" class="goods-type-icon gift">赠品</div>
               <div v-if="row.productType == 3" class="goods-type-icon swap">换购</div>
@@ -513,6 +525,13 @@ export default {
         width: 100%;
         height: 100%;
         vertical-align: middle;
+        .errorimage {
+          display: inline-block;
+          margin-top: 18px;
+          font-size: 60px;
+          // color: #f8fafe;
+          border-radius: 2px;
+        }
       }
       .goods-type-icon {
         position: absolute;