Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 3d547a4152af42cf1dd71e4be02169813d6c577b
+  newTag: 08fc0665d8a868456bb6f81244d7566c30404020

src/pages/resourceManage/storeDecorate/comp/storeFormView/index.tsx

@@ -170,27 +170,24 @@ const StoreFormView: React.FC<{
             选择位置
           </Button>
         </Form.Item>
-        <Form.Item label='店铺图片' name='imageList'>
+        <Form.Item label='店铺logo' name='brandLogo'>
           <Uploader
             fileUpload
             listType='picture-card'
-            defaultFileList={imageList}
-            onChange={imageListChange}
-            fileLength={6}
-            fileSize={50}
+            defaultFileList={logoFileList}
+            onChange={brandLogoChange}
           >
             <UploadOutlined />
           </Uploader>
         </Form.Item>
-        <Form.Item label='公司宣传片' name='videoList'>
+        <Form.Item label='店铺图片' name='imageList'>
           <Uploader
             fileUpload
             listType='picture-card'
-            defaultFileList={videoList}
-            onChange={videoListChange}
-            fileLength={1}
-            fileType={['video/mp4', 'video/avi', 'video/wmv', 'video/rmvb']}
-            fileSize={100}
+            defaultFileList={imageList}
+            onChange={imageListChange}
+            fileLength={6}
+            fileSize={50}
           >
             <UploadOutlined />
           </Uploader>
@@ -201,18 +198,21 @@ const StoreFormView: React.FC<{
           rules={[{ required: true, message: '请输入公司简介' }]}
         >
           <Input.TextArea
-            placeholder={'请输入服务资质（“；”号换行）'}
+            placeholder={'请输入公司简介（“；”号换行）'}
             maxLength={140}
             allowClear
             showCount
           />
         </Form.Item>
-        <Form.Item label='品牌logo' name='brandLogo'>
+        <Form.Item label='公司宣传片' name='videoList'>
           <Uploader
             fileUpload
             listType='picture-card'
-            defaultFileList={logoFileList}
-            onChange={brandLogoChange}
+            defaultFileList={videoList}
+            onChange={videoListChange}
+            fileLength={1}
+            fileType={['video/mp4', 'video/avi', 'video/wmv', 'video/rmvb']}
+            fileSize={100}
           >
             <UploadOutlined />
           </Uploader>