Merge branch 'main' of https://git.yaojiankang.top/xing/video

src/api/request.ts

@@ -83,14 +83,14 @@ export function request<T = unknown>(
           if (data?.code === 0 && res?.statusCode === 200) {
             resolve(data?.data)
           } else if (res.statusCode === 401) {
-            Taro.showModal({
+            // Taro.showModal({
-              title: "登录过期,需重新登陆",
+            //   title: "登录过期,需重新登陆",
-              showCancel: false,
+            //   showCancel: false,
-              success() {
+            //   success() {
-                Taro.clearStorageSync()
+            Taro.clearStorageSync()
-                Taro.reLaunch({url: '/pages/login/login'})
+            Taro.reLaunch({url: '/pages/login/login'})
-              }
+            // }
-            })
+            // })
           } else {
             reject(null)
             Taro.showToast({

src/app.config.ts

@@ -1,11 +1,11 @@
 export default defineAppConfig({
   pages: [
+    'pages/home/home',
     'pages/index/index',
     'pages/meeting/meeting',
     'pages/login/login',
     'pages/check/check',
     'pages/my/my',
-    'pages/preview/preview',
   ],
   window: {
     backgroundTextStyle: 'light',
@@ -18,7 +18,13 @@ export default defineAppConfig({
     selectedColor: '#45D4A8',
     list: [
       {
-        text: '课题',
+        text: '首页',
+        pagePath: 'pages/home/home',
+        iconPath: "static/tabs/home-unselect.png",
+        selectedIconPath: "static/tabs/home-selected.png",
+      },
+      {
+        text: '学习',
         pagePath: 'pages/index/index',
         iconPath: "static/tabs/home-unselect.png",
         selectedIconPath: "static/tabs/home-selected.png",

src/pages/home/home.config.ts

@@ -0,0 +1,4 @@
+export default definePageConfig({
+  navigationBarTitleText: '首页',
+  navigationStyle: 'custom',
+})

src/pages/home/home.tsx

@@ -0,0 +1,10 @@
+import {FC} from "react";
+import {View} from "@tarojs/components";
+
+const Home: FC = () => {
+  return (
+    <View>2</View>
+  )
+}
+
+export default Home

src/pages/index/components/videoList.tsx

@@ -11,10 +11,9 @@ import eventsIndex from "@/hooks/eventsIndex";
 
 interface Props {
   categoryKey: CoursesKey
-  ready: boolean
 }
 
-export const VideoList: FC<Props> = ({categoryKey, ready}) => {
+export const VideoList: FC<Props> = ({categoryKey}) => {
   const [data, setData] = useState<Courses>({
     is_finished: [],
     is_required: [],
@@ -94,18 +93,14 @@ export const VideoList: FC<Props> = ({categoryKey, ready}) => {
   })
 
   useDidShow(() => {
-    if (ready) {
+    getData().then()
-      getData().then()
+    getRecords().then()
-      getRecords().then()
-    }
   })
 
   useEffect(() => {
-    if (ready) {
+    getData().then()
-      getData().then()
+    getRecords().then()
-      getRecords().then()
+  }, [page])
-    }
-  }, [page, ready])
   return (
     <View className={'py-2 flex justify-between flex-wrap ' + styles.videoListBox}>
       {data?.[categoryKey]?.length ? data?.[categoryKey]?.map(c =>

src/pages/index/index.tsx

@@ -5,9 +5,6 @@ import {VideoList} from "@/pages/index/components/videoList";
 import Tabs, {OnChangOpt, TabList} from "@/components/tabs/tabs";
 import {CoursesKey} from "@/api/public";
 import Taro from '@tarojs/taro'
-import {Profile} from '@/store'
-// import {Search} from "./components/search";
-
 
 const Index: FC = () => {
   const globalData = Taro.getApp().globalData
@@ -18,7 +15,6 @@ const Index: FC = () => {
     {title: "未完成", value: 'is_not_finished'},
   ]
   const [categoryKey, setCategoryKey] = useState<CoursesKey>('is_required')
-  const {token} = Profile.useContainer()
 
   function tabChange(data: OnChangOpt) {
     setCategoryKey(data.tab?.value as CoursesKey)
@@ -28,9 +24,8 @@ const Index: FC = () => {
     <>
       <View className={styles.content} style={`paddingTop:${globalData.statusBarHeight}px`}>
         {process.env.TARO_ENV !== "h5" && <View className='text-center font-weight font-34 mt-3'>医学道</View>}
-        {/*<Search/>*/}
         <Tabs tabList={category} onChange={tabChange} current={categoryKey}/>
-        <VideoList categoryKey={categoryKey} ready={!!token}/>
+        <VideoList categoryKey={categoryKey}/>
       </View>
     </>
   )

src/pages/login/login.tsx

@@ -61,7 +61,7 @@ const Login: FC = () => {
               setToken(token)
               setCompany(company)
               setLoading(false)
-              Taro.switchTab({url: '/pages/index/index'})
+              Taro.switchTab({url: '/pages/home/home'})
             } else {
               Taro.setStorageSync('openid', catch_key)
               Taro.reLaunch({url: '/pages/check/check'})
@@ -81,7 +81,7 @@ const Login: FC = () => {
   async function TESTLOGIN() {
     const res = await loginApi.testLogin()
     Taro.setStorageSync('profile', JSON.stringify(res))
-    Taro.reLaunch({url: '/pages/index/index'})
+    Taro.reLaunch({url: '/pages/home/home'})
   }
 
   return (

src/pages/preview/preview.config.ts

@@ -1,4 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText:'医学道',
-  onReachBottomDistance: 30
-})

src/pages/preview/preview.tsx

@@ -1,14 +0,0 @@
-import {FC} from "react";
-import {View, Navigator} from "@tarojs/components";
-
-const Preview: FC = () => {
-  return (
-    <View>
-      预览.....
-
-      <Navigator url='/pages/login/login'>登录</Navigator>
-    </View>
-  )
-}
-
-export default Preview

src/store/profile.ts

@@ -1,7 +1,7 @@
 import {useEffect, useState} from "react";
 import {createContainer} from "unstated-next";
 import Taro from "@tarojs/taro";
-import {whiteList} from "@/config";
+// import {whiteList} from "@/config";
 
 
 function DataKey(data: any) {
@@ -40,11 +40,11 @@ function useProfile() {
     }
   }
 
-  if (data?.token == null) {
+  // if (data?.token == null) {
-    if (!whiteList.includes(Taro.getCurrentInstance().router?.path?.split('?')?.[0] || '')) {
+  //   if (!whiteList.includes(Taro.getCurrentInstance().router?.path?.split('?')?.[0] || '')) {
-      Taro.reLaunch({url: '/pages/preview/preview'})
+  //     Taro.reLaunch({url: '/pages/login/login'})
-    }
+  //   }
-  }
+  // }
 
   const [role, setRole] = useState<UserRole | null>(data?.role || null)
   const [user, setUser] = useState<User | null>(data?.user || null)