Merge branch 'feature/develop_0713' of...

Merge branch 'feature/develop_0713' of http://gitlab.wanwudezhi.work/quanku/qk_admin into feature/develop_0713

src/views/goods/list.vue

@@ -38,7 +38,7 @@
 
       <el-table-column align="center" property="iconUrl" label="图片">
         <template slot-scope="scope">
-          <img :src="scope.row.topImage" width="100%">
+          <img v-if="scope.row.topImage" :src="scope.row.topImage" width="100%">
         </template>
       </el-table-column>
 
@@ -142,7 +142,7 @@ export default {
         this.list = (response.data.data.items || []).map((e, index) => {
           return {
             ...e,
-            imageList: e.topImage && e.images.indexOf(e.topImage) === -1 ? [e.topImage].concat(e.images) : e.images
+            imageList: e.topImage && e.images.indexOf(e.topImage) === -1 ? [e.topImage].concat(e.images) : e.images || []
           }
         })
         this.total = response.data.data.total