Merge branch 'feature/11月迭代' of http://git.gicdev.com/gicmember/member

src/components/allCustomers/consumption.vue

@@ -121,13 +121,12 @@
                           <el-image fit="cover"
                             :src="row.imageUrl ? row.imageUrl : './static/img/default-goods.png'">
                             <div slot="error" class="image-slot">
-                              <img width="60" :src="require('../../../static/img/broke-img.png')"
-                                alt="">
+                              <img width="60" :src="brokeImg" alt="">
                             </div>
                           </el-image>
                           <div class="info-detail">
                             <p class="good-name">
-                              <span class="name">{{ row.productName }}</span>
+                              <span class="name">{{ 'Saucony索康尼2020年新品慢跑训练鞋 ECHELON梯队8 女子跑鞋'||row.productName }}</span>
                               <el-tag type="warning" v-if="[2,3].includes(row.productType)">
                                 {{ row.productType===2?'赠品':'换购'}}
                               </el-tag>
@@ -182,6 +181,7 @@ import {
   checkFalse,
   checkStatus,
 } from '../../../static/js/checkStatus';
+import brokeImg from '../../../static/img/broke-img.png'
 
 export default {
   name: 'Consumption',
@@ -265,6 +265,7 @@ export default {
         { label: '导购', width: '120', prop: 'clerkName' },
         { label: '小计（实付）', width: '120', prop: 'payAmount' },
       ],
+      brokeImg,
     };
   },
   created() {
@@ -496,16 +497,20 @@ p {
         }
       }
       .good-info {
-        display: flex;
+        position: relative;
+        padding-left: 70px;
         height: 60px;
         overflow-y: hidden;
         .el-image {
+          position: absolute;
+          top: 0;
+          left: 0;
           width: 60px;
           height: 60px;
-          margin-right: 10px;
           border-radius: 2px;
         }
         .info-detail {
+          flex: 1;
           .good-name {
             display: flex;
             width: 100%;