Merge branch 'develop'

env/.env.production

 #请求接口地址
-VITE_REQUEST_BASE_URL='https://www.iuav.shop'
-#VITE_REQUEST_BASE_URL='https://test.iuav.shop'
+#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'

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: 90cdb4d81f85ecc96d7ba8dc02bf169ffe425cf1
+  newTag: 2a766cd018a842b19e050285c0698aee550b7b44

src/api/interface/mallManageType.ts

@@ -124,7 +124,7 @@ export type editServiceType = InterFunction<
     shareCard?: string;
     video?: string;
     id: number;
-    companyId: number;
+    companyId?: number;
   },
   any
 >;

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

@@ -21,7 +21,7 @@ const GoodsIntroduce: FC<selfProps> = ({ getRichText, goodsDetail, isDetail }) =
       <div className='goods-introduce-title'>产品介绍图</div>
       <div className='goods-introduce-content'>
         <RichText
-          value={goodsDetail?.goodsDetail.content}
+          richTextContent={goodsDetail?.goodsDetail.content}
           onChange={richTextChange}
           isDetail={isDetail}
         />

src/components/richText/index.tsx

@@ -7,7 +7,7 @@ import { CommonAPI } from '~/api';
 
 interface PropsType {
   onChange?: (html?: string) => void;
-  value: string | undefined;
+  richTextContent: string | undefined;
   // eslint-disable-next-line react/require-default-props
   isDetail?: boolean; //是否禁用
   height?: number;
@@ -16,7 +16,7 @@ interface PropsType {
 }
 const RichText: React.FC<PropsType> = ({
   onChange,
-  value,
+  richTextContent,
   isDetail,
   height,
   imgSize,
@@ -82,14 +82,16 @@ const RichText: React.FC<PropsType> = ({
   }, [editor]);
 
   useEffect(() => {
-    editor?.setHtml(value || '');
-  }, [value]);
+    if (editor) {
+      editor?.setHtml(richTextContent || '');
+    }
+  }, [richTextContent, editor]);
 
   useEffect(() => {
     if (editor && isDetail) {
       editor.disable();
     }
-  }, [isDetail]);
+  }, [isDetail, editor]);
 
   return (
     <>

src/pages/mallManage/produceManage/produceDetail/components/setProduceSpecPriceModal/index.tsx

@@ -51,7 +51,9 @@ const SetProduceSpecPriceModal: FC<ModalProps & PropsType> = ({ open, onCancel,
   // 选择的列表
   const [selectList, setSelectList] = useState<number[]>([]);
   //配置价格参数
-  const [priceParameters, setPriceParameters] = useState<setPriceParametersType>([]);
+  const [priceParameters, setPriceParameters] = useState<
+    Exclude<setPriceParametersType, undefined>
+  >([]);
   //当前租期
   const [currentLeaseTerm, setCurrentLeaseTerm] = useState<number>(0);
 
@@ -84,7 +86,6 @@ const SetProduceSpecPriceModal: FC<ModalProps & PropsType> = ({ open, onCancel,
                 type: type,
               },
             ];
-      console.log('转化数据-->', priceInfoList);
       setPriceParameters([...priceInfoList]);
       const levelNumber: number[] = priceInfoList[0].specPrice
         .filter((v) => v.cooperationTag != 0)
@@ -134,25 +135,23 @@ const SetProduceSpecPriceModal: FC<ModalProps & PropsType> = ({ open, onCancel,
           .reduce((pre: any, cur: string) => {
             return [...pre, { price: values[cur], cooperationTag: Number(cur) }];
           }, []);
-        if (priceParameters) {
-          priceParameters[currentLeaseTerm].specPrice = specPrice;
-          const obj = priceParameters
-            .filter((v) => v.specPrice.length)
-            .find((v) => v.specPrice.some((v) => v.price === undefined));
-          if (obj && !_.isNull(obj.leaseTerm)) {
-            return message.warning(`${rentDateData[obj.leaseTerm!].label}存在价格未配置`);
-          }
-          setPriceParameters([...priceParameters]);
-          ProduceManageAPI['editProductSpecPrice'](
-            priceParameters.filter((v) => v.specPrice.length),
-          ).then(({ code }) => {
-            if (code === '200') {
-              message.success('操作成功');
-              setCurrentLeaseTerm(0);
-              handleClosed();
-            }
-          });
+        priceParameters[currentLeaseTerm].specPrice = specPrice;
+        const obj = priceParameters
+          .filter((v) => v.specPrice.length)
+          .find((v) => v.specPrice.some((v) => v.price === undefined));
+        if (obj && !_.isNull(obj.leaseTerm)) {
+          return message.warning(`${rentDateData[obj.leaseTerm!].label}存在价格未配置`);
         }
+        setPriceParameters([...priceParameters]);
+        ProduceManageAPI['editProductSpecPrice'](
+          priceParameters.filter((v) => v.specPrice.length),
+        ).then(({ code }) => {
+          if (code === '200') {
+            message.success('操作成功');
+            setCurrentLeaseTerm(0);
+            handleClosed();
+          }
+        });
       })
       .catch((err) => {
         message.warning(err.errorFields[0].errors[0]).then();
@@ -180,12 +179,10 @@ const SetProduceSpecPriceModal: FC<ModalProps & PropsType> = ({ open, onCancel,
       .reduce((pre: any, cur: string) => {
         return [...pre, { price: values[cur], cooperationTag: Number(cur) }];
       }, []);
-    if (priceParameters) {
-      priceParameters[currentLeaseTerm].specPrice = specPrice;
-      setPriceParameters([...priceParameters]);
-    }
+    priceParameters[currentLeaseTerm].specPrice = specPrice;
+    setPriceParameters([...priceParameters]);
     setCurrentLeaseTerm(Number(value));
-    if (priceParameters && priceParameters[Number(value)].specPrice.length) {
+    if (priceParameters[Number(value)].specPrice.length) {
       const Obj: any = priceParameters[Number(value)].specPrice.reduce((pre: any, cur) => {
         pre[cur.cooperationTag] = cur.price;
         return { ...pre };

src/pages/mallManage/serviceManage/serviceIntroduce/index.tsx

@@ -53,7 +53,10 @@ const ServiceIntroduce = () => {
       </div>
       <div className='service-introduce-title'></div>
       <div className='service-introduce-rich-text'>
-        <RichText value={serviceDetail?.serviceIntroduction || ''} onChange={richTextChange} />
+        <RichText
+          richTextContent={serviceDetail?.serviceIntroduction || ''}
+          onChange={richTextChange}
+        />
       </div>
     </div>
   );

src/pages/resourceManage/businessCaseManage/comp/addEditModal/index.tsx

@@ -62,8 +62,12 @@ const AddEditModal: FC<propType> = (props) => {
   useEffect(() => {
     if (!open) return;
     if (!data) return;
-    form.setFieldsValue(data);
-  }, [open]);
+    form.setFieldsValue({
+      caseTitle: data.caseTitle,
+      origin: data.origin,
+      caseContents: data.caseContents || undefined,
+    });
+  }, [open, data]);
   return (
     <Modal
       open={open}
@@ -96,7 +100,7 @@ const AddEditModal: FC<propType> = (props) => {
         </Form.Item>
         <Form.Item label='文章详情' name='caseContents'>
           <RichText
-            value={form.getFieldValue('caseContents')}
+            richTextContent={data?.caseContents || ''}
             onChange={(e) => form.setFieldValue('caseContents', e)}
             height={250}
           />

src/pages/resourceManage/businessCaseManage/comp/previewModal/index.tsx

@@ -52,7 +52,7 @@ const PreviewModal: FC<propType> = (props) => {
           {data?.updateTime || data?.createTime}
         </div>
       </div>
-      <RichText value={data?.caseContents} height={350} isDetail={true} />
+      <RichText richTextContent={data?.caseContents} height={350} isDetail={true} />
     </Modal>
   );
 };

src/pages/resourceManage/industryNews/components/addOrEditNewsModal/index.tsx

@@ -138,7 +138,7 @@ const AddOrEditNewsModal: FC<ModalProps & selfProps> = ({
           </Uploader>
         </Form.Item>
         <Form.Item label='主题内容' name='newsContents'>
-          <RichText onChange={richTextChange} value={richTextValue} videoSize={100} />
+          <RichText onChange={richTextChange} richTextContent={richTextValue} videoSize={100} />
         </Form.Item>
       </Form>
     </Modal>

src/pages/resourceManage/tenderManage/comp/addEditDetailModal/index.tsx

@@ -117,7 +117,7 @@ const AddEditDetailModal: React.FC<propType> = (props) => {
           rules={[{ required: true, message: '请输入详情' }]}
         >
           <RichText
-            value={form.getFieldValue('tenderContent')}
+            richTextContent={data?.tenderContent}
             onChange={(e) => form.setFieldValue('tenderContent', e)}
             height={250}
           />

src/pages/systemManage/accountLimit/index.tsx

+const AccountLimit = () => {
+  return <div className='account-limit'></div>;
+};
+export default AccountLimit;

src/router/router.tsx

@@ -109,6 +109,7 @@ import TenderManageFeedback from '~/pages/resourceManage/tenderManage/feedback';
 import BusinessCaseManage from '~/pages/resourceManage/businessCaseManage';
 import CustomIdentityView from '~/pages/customManage/customIdentity';
 import CompanyManageView from '~/pages/systemManage/companyManage';
+// import AccountLimit from '~/pages/systemManage/accountLimit';
 
 // const IndustryListView = React.lazy(() => import('~/pages/mallManage/industryManage/industryList')); //行业列表
 // const IndustryDetailView = React.lazy(
@@ -848,11 +849,20 @@ export const routerList: Array<RouteObjectType> = [
           icon: <UserOutlined />,
         },
       },
+      // {
+      //   path: '/systemManage/accountLimit',
+      //   element: withLoadingComponent(<AccountLimit />),
+      //   meta: {
+      //     id: 28200,
+      //     title: '账号权限',
+      //     icon: <UserOutlined />,
+      //   },
+      // },
       {
         path: '/systemManage/companyManage',
         element: withLoadingComponent(<CompanyManageView />),
         meta: {
-          id: 28200,
+          id: 28300,
           title: '单位管理',
           icon: <BankOutlined />,
         },