Merge branch 'fix_mvp_24-6-1' of https://github.com/HXTIA/notifyBoard_C…

… into fix_mvp_24-6-1

src/components/baseBuiltComp/Forb/index.tsx

@@ -8,7 +8,7 @@ import './index.module.scss'
 const Index = (props) => {
   const { run, instance } = useAnimation({
     node: $('#ForbiddenContainer__bgContainer__canvas'),
-    template: JSON_MAP['loading_smog'],
+    template: JSON_MAP['forbidden'],
     isAutoRun: false,
   })
 

src/pages/Detail/index.module.scss

@@ -56,31 +56,20 @@
 
     &__deadline {
       margin: 25rpx 0;
-      border-style: none;
-      border-top-width: 3px;
-      border-bottom-width: 3px;
-      border-right-width: 3px;
-      border-top-color: rgba(0, 0, 0, 0.4);
-      border-bottom-color: rgba(0, 0, 0, 0.4);
-      border-right-color: rgba(0, 0, 0, 0.4);
-      // width: auto;
-      // height: auto;
-      // box-shadow: rgb(132, 168, 132) 0px 5px 15px;
-      // overflow: auto;
       border: 4rpx dashed #c6c6c6;
       border-left-width: initial;
       border-left-color: initial;
       padding: 10rpx 30rpx;
       line-height: 1.8;
       border-radius: 0px 20rpx 20rpx 20rpx;
-      color: rgb(0, 0, 0);
-      // background: rgb(0, 0, 0);
       visibility: visible;
+      color: gray;
+      font-size: 27rpx;
     }
 
     .font-line {
-      font-size: 26rpx;
-      color: #000000;
+      font-size: 27rpx;
+      color: gray;
       margin: 5rpx 0 5rpx 0;
     }
 

src/pages/Initial/components/orgInit.tsx

@@ -26,18 +26,21 @@ const Index = () => {
   const [inputValue, setInputValue] = useState<{ id?: number; name: string }>()
   const userState = useSelector((root: RootState) => root.userinfoModel)
 
+  /** loading */
+  const [isLoad, showLoading] = useState(true)
+
   /** 特定loading */
-  // const { run } = useAnimation({
-  //   node: $('#orgLoading__bgContainer__canvas'),
-  //   template: JSON_MAP['loading_smog'],
-  //   _options: { loop: true },
-  // })
-
-  // useEffect(() => {
-  //   if (true) {
-  //     run()
-  //   }
-  // }, [])
+  const { run } = useAnimation({
+    node: $('#orgLoading__bgContainer__canvas'),
+    template: JSON_MAP['loading_smog'],
+    _options: { loop: true },
+  })
+
+  useEffect(() => {
+    if (true) {
+      run()
+    }
+  }, [])
 
   const reqFn = useCallback(
     ({ currentPage, size = SIZE, keyword = '' }) =>
@@ -48,7 +51,7 @@ const Index = () => {
           size,
           keyword,
         },
-        silent: false,
+        silent: true,
         loadingNeedMask: true,
       })
         .then((res) => {
@@ -57,6 +60,9 @@ const Index = () => {
           if (!isSuccess || !data) {
             throw Error(errMsg)
           }
+
+          showLoading(false)
+
           return {
             data,
             extraData,
@@ -155,31 +161,50 @@ const Index = () => {
           />
         </Field>
       </Cell.Group> */}
-      {/* <Canvas
-        className='orgLoading__bgContainer__canvas'
-        id='orgLoading__bgContainer__canvas'
-        type='2d'
-      ></Canvas> */}
-      <InputMenu
-        onPageScrollToLower={onPageScrollToLower}
-        handleInputChange={handleInputChange}
-        clickMark={clickMark}
-        menuLists={orgList}
-        pageNum={pageNum}
-        pageNumTotal={pagesTotal}
-        segmentNum={SIZE}
-        title='选择组织  |'
-        inputPlace='请输入组织名称'
-      ></InputMenu>
-      <Button
-        variant='contained'
-        color='success'
-        shape='round'
-        className='OrgContainer__button'
-        onClick={checkOrgToGrade}
-      >
-        下一步
-      </Button>
+
+      {!isLoad && (
+        <>
+          <InputMenu
+            onPageScrollToLower={onPageScrollToLower}
+            handleInputChange={handleInputChange}
+            clickMark={clickMark}
+            menuLists={orgList}
+            pageNum={pageNum}
+            pageNumTotal={pagesTotal}
+            segmentNum={SIZE}
+            title='选择组织  |'
+            inputPlace='请输入组织名称'
+          ></InputMenu>
+          <Button
+            variant='contained'
+            color='success'
+            shape='round'
+            className='OrgContainer__button'
+            onClick={checkOrgToGrade}
+          >
+            下一步
+          </Button>
+        </>
+      )}
+
+      {isLoad && (
+        <>
+          <Canvas
+            className='orgLoading__bgContainer__canvas'
+            id='orgLoading__bgContainer__canvas'
+            type='2d'
+            style={{ marginTop: '-200rpx' }}
+          ></Canvas>
+          <Button
+            variant='contained'
+            color='success'
+            shape='round'
+            className='OrgContainer__button'
+          >
+            加载中...
+          </Button>
+        </>
+      )}
     </View>
   )
 }

src/pages/Initial/index.tsx

@@ -165,7 +165,7 @@ const Index = () => {
 
   const notHaveOrg = !hasOrg
   const onlyHasOrg = hasOrg && !hasGrade
-  if (isLoading) return <Loading isCover isShow />
+  // if (isLoading) return <Loading isCover isShow />
   if (notHaveOrg) return <OrgInit />
   if (onlyHasOrg || !hasClass) return <GradeInit />
   return <InitAccomplish />