Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into v3.5.1

src/pages/carouselFigure/carouselFigureList.jsx

@@ -46,7 +46,7 @@ const toEditCarouse = (contentId) => () => {
       dataIndex: 'image',
       key: 'image',
       align: 'center',
-      render: (image) => <img src={image} className={styles.imgPerfect} />,
+      render: (x, row) => <img src={row.image} className={row.showPosition === 'index' ? styles.imgIndex : row.showPosition === 'mall' ? styles.imgPerfect : ''} />,
     },
     {
       title: '类型',

src/pages/style/GoodsList.less

@@ -14,6 +14,11 @@
   height: 67.5px;
 }
 
+.imgIndex {
+  width: 120px;
+  height: 96px;
+}
+
 .imgSmall {
   width: 90px;
   height: 135px;