Merge branch 'develop' of http://git.mmcuav.cn/root/sharefly-admin-uav into develop

env/.env.development

 #请求接口地址
-#VITE_REQUEST_BASE_URL='https://www.iuav.shop'
-#VITE_REQUEST_BASE_URL='https://test.iuav.shop'
-VITE_REQUEST_BASE_URL='/api'
+#VITE_REQUEST_BASE_URL='https://iuav.mmcuav.cn'
+VITE_REQUEST_BASE_URL='https://test.iuav.shop'
+#VITE_REQUEST_BASE_URL='/api'
 #旧版接口地址
 #VITE_REQUEST_BASE_URL='https://iuav.mmcuav.cn'
 #VITE_REQUEST_BASE_URL='https://test.iuav.mmcuav.cn'

env/.env.production

 #请求接口地址
-#VITE_REQUEST_BASE_URL='https://www.iuav.shop'
-VITE_REQUEST_BASE_URL='https://test.iuav.shop'
+VITE_REQUEST_BASE_URL='https://iuav.mmcuav.cn'
+#VITE_REQUEST_BASE_URL='https://test.iuav.shop'
 #VITE_REQUEST_BASE_URL='/api'
 #旧版接口地址
 #VITE_REQUEST_BASE_URL='https://iuav.mmcuav.cn'

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: 465e507b3079097b231424c6de372ba1ba672b14
+  newTag: 4eea4419752ffd6b50165774c140a413e69f726d

kustomization/overlays/prod/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/admin
-  newTag: 7075ed8a992197acf49f443b0694ae9b9bd8ad5b
+  newTag: 2ff6198c465d9b427c0a9b9bf38a06823810daff

src/components/goods/commonAddOrEdit/baseInfo/index.tsx

@@ -244,6 +244,7 @@ const BaseInfo: React.FC<selfProps> = forwardRef(
                   fileUpload
                   onChange={videoUploadSuccess}
                   defaultFileList={videoList}
+                  fileSize={50}
                 >
                   {isDetail ? (
                     videoList.length ? (

src/pages/mallManage/courseManage/comp/addEditModal/index.tsx

@@ -79,13 +79,14 @@ const AddEditModal: React.FC<propType> = (props) => {
       type: 3,
     });
     if (res && res.code === '200') {
-      const arr = res.result
-        ?.filter((i) => i.categoriesInfoListDTO)
-        .map((i) => ({
-          label: i.name,
-          value: i.directoryId,
-          children: i.categoriesInfoListDTO?.map((j) => ({ label: j.name, value: j.id })),
-        }));
+      const arr =
+        res.result
+          ?.filter((i) => i.categoriesInfoListDTO)
+          .map((i) => ({
+            label: i.name,
+            value: i.directoryId,
+            children: i.categoriesInfoListDTO?.map((j) => ({ label: j.name, value: j.id })),
+          })) || [];
       setCurriculumSkillList(arr);
       // 回显数据
       // 回显数据

src/pages/mallManage/courseManage/index.tsx

@@ -102,7 +102,7 @@ const CourseManageView = () => {
             label: i.name,
             value: i.directoryId,
             children: i.categoriesInfoListDTO?.map((j) => ({ label: j.name, value: j.id })),
-          })),
+          })) || [],
       );
     }
   };
@@ -121,7 +121,7 @@ const CourseManageView = () => {
       width: '150px',
       render: (text) => {
         // 反向找数据回显
-        const item = curriculumSkillList.find((i) => i.children?.find((j) => j.value === text));
+        const item = curriculumSkillList?.find((i) => i.children?.find((j) => j.value === text));
         const childrenItem = item?.children?.find((i) => i.value === text);
         return `${item?.label}/${childrenItem?.label}`;
       },