Merge branch 'dev'

src/pages/carouselFigure/editCarousel.jsx

@@ -164,7 +164,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           name: 'image',
           type: FieldTypes.ImageUploader,
           value: data.image,
-          help: () => (locationType ? '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播'),
+          help: () => (locationType ? '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播'),
           rules: [
             { required: true, message: '请上传轮播图' },
           ],

src/pages/customer/drift/index.jsx

@@ -80,6 +80,7 @@ function costomerDrift(props) {
       title: '用户来源',
       dataIndex: 'sceneAlias',
       key: 'sceneAlias',
+      render: (_, record) => <><span>{ record.sceneAlias ? record.sceneAlias : '其他'}</span></>,
     },
   ];
   

src/pages/style/GoodsList.less

@@ -11,7 +11,7 @@
 
 .imgPerfect {
   width: 120px;
-  height: 67.5px;
+  height: 40px;
 }
 
 .imgIndex {