Merge branch 'feature/12月迭代'

# Conflicts:
#	src/components/allCustomers/customerDetail.vue

src/components/allCustomers/customerDetail.vue

@@ -502,9 +502,15 @@
                     <template v-for="item in tagAndRemarkInfo.dictFigureList">
                       <li :key="item" class="dictFigure-item">
                         <div v-if="item.imageUrl" class="img-wrap">
-                          <el-image style="width: 68px; height: 68px"
-                            :src="require(`../../../static/img/body-shape-${member.memberGender===1?'man':'woman'}/${item.imageUrl}`)"
-                            fit="contain"></el-image>
+                          <el-image
+                            style="width: 68px; height: 68px"
+                            :src="require(`../../../static/img/body-shape-woman/${item.imageUrl}`)"
+                            fit="contain"
+                          >
+                            <div slot="error" class="image-slot">
+                              <img style="width:100%;height:100%;" :src="require('../../../static/img/failed-load_img.png')" alt="">
+                            </div>
+                          </el-image>
                         </div>
                         <div class="right">
                           <p class="dict-name">