Merge pull request #29 from HXTIA/revert-26-feat-mp-clip-page

Revert "feat: 新增详情页、海报保存分享 & 修改storage类型推断"

src/app.tsx

@@ -4,6 +4,7 @@ import Error from 'src/components/baseBuiltComp/Error'
 import { store } from './store'
 import './app.scss'
 import { Get, getStorage, preloadResource, requestUrlCreator } from './utils'
+import { IUserInfo } from './common-model'
 import { JSON_MAP } from './static/SVG/lottie-map'
 
 function App(props) {
@@ -14,7 +15,7 @@ function App(props) {
 
   useLaunch(async () => {
     /** 1. 校验登陆态 */
-    const token = getStorage('userInfo')?.token
+    const token = getStorage<IUserInfo>('userInfo')?.token
 
     /** 2. 校验获取用户信息 */
     /** TODO: 需和后端确定响应体 */

src/common-model.ts

@@ -35,7 +35,7 @@ export interface ICommonState {
 
 /** 默认store值 从storage中激活 */
 export const defaultValue: ICommonState = {
-  userInfo: getStorage('userInfo') || {},
+  userInfo: getStorage<IUserInfo>('userInfo') || {},
   system: {
     coolStartSuccess: false,
     hasAccountCompleted: false,

src/components/baseBuiltComp/FORBIDDEN/index.module.scss

@@ -5,8 +5,8 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  width: 100%;
-  height: 100%;
+  width: 100vw;
+  height: 100vh;
 
   &__bgContainer {
     position: relative;
@@ -16,8 +16,8 @@
     height: 70%;
     align-items: center;
 
-    &__canvas {
-    }
+
+    &__canvas {}
 
     &__title {
       text-align: center;
@@ -27,4 +27,5 @@
       color: $base-element-color;
     }
   }
-}
+
+}

src/components/baseBuiltComp/FORBIDDEN/index.tsx

@@ -1,31 +1,22 @@
 import { Button, Canvas, CoverView, View } from '@tarojs/components'
-import { $, URL, goTo } from 'src/utils'
+import { $ } from 'src/utils'
 import useAnimation from 'src/hooks/useAnimation'
 import { JSON_MAP } from 'src/static/SVG/lottie-map'
-import { useCallback, useEffect } from 'react'
+import { useEffect } from 'react'
 import './index.module.scss'
 
-const Index = (props) => {
+const Index = () => {
   const { run, instance } = useAnimation({
     node: $('#ForbiddenContainer__bgContainer__canvas'),
     template: JSON_MAP['forbidden'],
     isAutoRun: false,
   })
-
-  const goToIndex = useCallback(() => {
-    goTo({
-      url: URL.Index,
-      methodType: 'reLaunch',
-      options: { authorize: false },
-    })
-  }, [])
-
   useEffect(() => {
     run()
     // setTimeout(() => {
     //   instance?.pause()
     // }, 4000);
-  }, [instance, run])
+  }, [instance])
   return (
     <View className='ForbiddenContainer'>
       <View className='ForbiddenContainer__bgContainer'>
@@ -37,11 +28,7 @@ const Index = (props) => {
         <CoverView className='ForbiddenContainer__bgContainer__title'>
           SRY 你没有权限访问该页面
         </CoverView>
-        {props.children ? (
-          <props.children />
-        ) : (
-          <Button onClick={goToIndex}>返回主页（退一步海阔天空）</Button>
-        )}
+        <Button>返回主页（退一步海阔天空）</Button>
       </View>
     </View>
   )

src/components/baseBuiltComp/HocWrap/index.tsx

@@ -21,14 +21,14 @@ export const Authorize = (Component) => {
 }
 
 /** @HOC 禁止页面要求必须是已授权的 */
-export const Forbidden = (Component, props?: any) => {
+export const Forbidden = (Component) => {
   return React.memo(() => {
     const state = useSelector((root: RootState) => root.common)
     if (!state.system.coolStartSuccess) {
       return <Loading isShow />
     } else {
       if (state.userInfo.isBindManage) return <Component />
-      return <ForbiddenComp>{props}</ForbiddenComp>
+      return <ForbiddenComp />
     }
   })
 }

src/components/baseBuiltComp/Loading/index.module.scss

@@ -14,10 +14,10 @@
   align-items: center;
   width: 100%;
   height: 100%;
-  z-index: 1000;
 
   &__canvas {
     width: 100%;
     // height: 40%;
   }
-}
+
+}

src/config.ts

@@ -6,6 +6,7 @@ export const config: Config = {
     'pages/main/Index/index',
     'pages/main/Calendar/index',
     'pages/main/Manage/index',
+    'pages/main/Manage/Publish/index',
     'pages/main/My/index',
     // 'pages/Detail/index',
     // 'pages/Initial/index',

src/hooks/useRequest.ts

@@ -71,8 +71,6 @@ const useRequest = <T>(requestFn: TRequestFn, options?: TRequestOptions) => {
       /** 请求开始 */
       PerfTackerInstance.requestBegin()
       res = await fn<T>({ url, data: req, silent })
-      console.log(res.extraData?.count)
-
       /* __PURE__ */ console.log(' === 响应返回 === ', res)
 
       /** 校验是否成功 */

src/pages/Detail/index.config.ts

@@ -8,7 +8,7 @@ export default definePageConfig({
   /** 开启朋友分享 */
   enableShareAppMessage: true,
   /** 开启朋友圈分享 */
-  enableShareTimeline: false,
+  enableShareTimeline: true,
   /** 自定义背景颜色 */
   backgroundColor: '#ffffff',
   /** 非首页设置返回Home */