From 7da747172467d1e32c72ba604cc6923f679af3a8 Mon Sep 17 00:00:00 2001
From: king <2229249788@qq.com>
Date: Tue, 1 Aug 2023 18:02:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BA=BF=E4=B8=8A=E6=B5=8B=E8=AF=95=E7=89=88?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=83=A8=E7=BD=B2=202.=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=B5=8B=E8=AF=95=E6=90=AD=E5=BB=BA=203.?=
 =?UTF-8?q?=E9=82=80=E7=BA=A6=E7=99=BB=E5=BD=95=E5=AF=B9=E6=8E=A5=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=204.=E8=A7=A3=E5=86=B3=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96=E5=A4=B1=E8=B4=A5=205.=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=BA=95=E9=83=A8=E5=AE=89=E5=85=A8=E8=B7=9D=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |   1 +
 src/api/index.ts                              |   4 +
 src/api/login.ts                              |   4 +
 src/api/meeting.ts                            |   7 ++
 src/app.config.ts                             |   4 +-
 src/components/button/MyButton.tsx            |   2 +-
 src/components/topic/shortAnswer.tsx          |   7 +-
 src/components/videoCover/videoCover.scss     |   1 +
 src/config.ts                                 |   6 +
 .../business/userInfo/userInfo.module.scss    |   5 +-
 src/pages/business/userInfo/userInfo.tsx      |   5 +-
 .../business/videoInfo/components/hours.tsx   |  20 ++--
 src/pages/business/videoInfo/videoInfo.scss   |  28 +++--
 src/pages/business/videoInfo/videoInfo.tsx    |   1 -
 src/pages/index/index.tsx                     |   1 -
 src/pages/login/login.tsx                     |   2 +-
 src/pages/manage/bingUser/bingUser.tsx        |  94 ----------------
 src/pages/manage/depAdmin/depAdmin.tsx        |  10 +-
 src/pages/manage/spotMeeting/spotMeeting.tsx  |  21 +++-
 .../meeting.config.ts}                        |   0
 src/pages/meeting/meeting.tsx                 | 105 ++++++++++++++++++
 src/static/css/module.scss                    |   3 +
 src/static/img/course.png                     | Bin 0 -> 2080 bytes
 src/static/img/lock.png                       | Bin 0 -> 739 bytes
 src/static/img/order.png                      | Bin 0 -> 951 bytes
 src/static/img/userInfo.png                   | Bin 0 -> 2760 bytes
 src/store/profile.ts                          |  11 +-
 27 files changed, 200 insertions(+), 142 deletions(-)
 create mode 100644 src/api/meeting.ts
 create mode 100644 src/config.ts
 delete mode 100644 src/pages/manage/bingUser/bingUser.tsx
 rename src/pages/{manage/bingUser/bingUser.config.ts => meeting/meeting.config.ts} (100%)
 create mode 100644 src/pages/meeting/meeting.tsx
 create mode 100644 src/static/img/course.png
 create mode 100644 src/static/img/lock.png
 create mode 100644 src/static/img/order.png
 create mode 100644 src/static/img/userInfo.png

diff --git a/.env b/.env
index 4a6ee80..e180139 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,3 @@
 TARO_APP_API=https://yjx.dev.yaojiankang.top
 TARO_APP_LGOIN=true
+
diff --git a/src/api/index.ts b/src/api/index.ts
index 768c2df..a1634d3 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,2 +1,6 @@
 export * from './user'
 export * from './curriculum'
+export * from './login'
+export * from './meeting'
+export * from './public'
+export * from './manage'
diff --git a/src/api/login.ts b/src/api/login.ts
index 9a3e5a6..8ff1394 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -6,9 +6,13 @@ export interface LoginParams {
 }
 
 export const loginApi = {
+  /** 公众号登录参数 */
   getParams() {
     return request<LoginParams>("/api/v1/auth/login/app", "GET");
   },
+  getMeetingParams() {
+    return request<LoginParams>("/api/v1/auth/login/meeting", "GET");
+  },
   testLogin() {
     return request('/token/18708100736', "GET")
   }
diff --git a/src/api/meeting.ts b/src/api/meeting.ts
new file mode 100644
index 0000000..0f519bf
--- /dev/null
+++ b/src/api/meeting.ts
@@ -0,0 +1,7 @@
+import {request} from "@/api/request";
+
+export const meetingAPi={
+  qrcodeKey() {
+    return request('/api/v1/auth/login/qrcode/key', "GET")
+  }
+}
diff --git a/src/app.config.ts b/src/app.config.ts
index faea8ab..f72eb8c 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -1,9 +1,10 @@
 export default defineAppConfig({
   pages: [
     'pages/index/index',
+    'pages/meeting/meeting',
     'pages/login/login',
     'pages/check/check',
-    'pages/my/my'
+    'pages/my/my',
   ],
   window: {
     backgroundTextStyle: 'light',
@@ -60,7 +61,6 @@ export default defineAppConfig({
         'depCur/depCur',
         'addCur/addCur',
         'spotMeeting/spotMeeting',
-        'bingUser/bingUser',
       ]
     }
   ],
diff --git a/src/components/button/MyButton.tsx b/src/components/button/MyButton.tsx
index 896a26d..1554561 100644
--- a/src/components/button/MyButton.tsx
+++ b/src/components/button/MyButton.tsx
@@ -36,7 +36,7 @@ const MyButton: FC<Props> = (props) => {
     <Button
       {...props}
       style={buttonStyle()}
-      className={styles.Mybutton}>
+      className={`${styles.Mybutton} ${props.className}`}>
       {props.children}
     </Button>
   )
diff --git a/src/components/topic/shortAnswer.tsx b/src/components/topic/shortAnswer.tsx
index 60c3660..466b9bd 100644
--- a/src/components/topic/shortAnswer.tsx
+++ b/src/components/topic/shortAnswer.tsx
@@ -38,15 +38,14 @@ const ShortAnswer: FC<Props> = ({data, onAnswer, onUpAndDown, index, validate, f
         <Text className='topicType'>简答题</Text>
         <Text>{data.question}</Text>
       </View>
+
       <Textarea
         placeholder='请输入答案'
-        adjustPosition
-        autoHeight
         className='Textarea'
         onBlur={onBlur}
         maxlength={255}
-        value={value}
-        onInput={(e) => setValue((e.target as HTMLTextAreaElement).value)}/>
+        onInput={(e) => setValue(e.detail.value)}/>
+
       <View className='text-muted mt-2'>最少3个字</View>
 
       {onUpAndDown && <View className='upAndDown'>
diff --git a/src/components/videoCover/videoCover.scss b/src/components/videoCover/videoCover.scss
index 6dc5926..a5ce44b 100644
--- a/src/components/videoCover/videoCover.scss
+++ b/src/components/videoCover/videoCover.scss
@@ -29,6 +29,7 @@
       white-space: nowrap;
       background: rgba(#000, .5);
       text-align: center;
+      padding: 0;
     }
 
     .marker {
diff --git a/src/config.ts b/src/config.ts
new file mode 100644
index 0000000..2446555
--- /dev/null
+++ b/src/config.ts
@@ -0,0 +1,6 @@
+/** 白名单 */
+export const whiteList: string[] = [
+  '/pages/check/check',
+  '/pages/login/login',
+  '/pages/meeting/meeting'
+]
diff --git a/src/pages/business/userInfo/userInfo.module.scss b/src/pages/business/userInfo/userInfo.module.scss
index ea24c69..2fb21da 100644
--- a/src/pages/business/userInfo/userInfo.module.scss
+++ b/src/pages/business/userInfo/userInfo.module.scss
@@ -12,5 +12,8 @@
 .buttonFixed {
   position: fixed;
   bottom: 100px;
-  left: 30rpx;
+  left: 0;
+  width: 100%;
+  padding: 0 30rpx;
+  box-sizing: border-box;
 }
diff --git a/src/pages/business/userInfo/userInfo.tsx b/src/pages/business/userInfo/userInfo.tsx
index d15c1cf..b86aaeb 100644
--- a/src/pages/business/userInfo/userInfo.tsx
+++ b/src/pages/business/userInfo/userInfo.tsx
@@ -6,6 +6,7 @@ import {Button, Input, View} from "@tarojs/components";
 import Taro from "@tarojs/taro";
 import {userApi} from "@/api";
 import styles from './userInfo.module.scss'
+import MyButton from "@/components/button/MyButton";
 
 
 const List = () => {
@@ -62,7 +63,9 @@ const List = () => {
 
         <PopPut title='解绑微信' onClick={unbind} no_border/>
       </View>
-      <Button className={`button ${styles.buttonFixed}`} onClick={empty}>退出登录</Button>
+      <View className={styles.buttonFixed}>
+        <MyButton onClick={empty}>退出登录</MyButton>
+      </View>
     </>
   )
 }
diff --git a/src/pages/business/videoInfo/components/hours.tsx b/src/pages/business/videoInfo/components/hours.tsx
index 8f296cd..768e5e2 100644
--- a/src/pages/business/videoInfo/components/hours.tsx
+++ b/src/pages/business/videoInfo/components/hours.tsx
@@ -6,6 +6,7 @@ import play from "@/static/img/play.png";
 import {formatMinute} from "@/utils/time";
 import Taro from "@tarojs/taro";
 import {curriculum} from "@/api";
+import lock from '@/static/img/lock.png'
 
 interface Props {
   data?: Hour[] | null
@@ -63,19 +64,20 @@ const Hours: FC<Props> = ({data, click, learn_hour_records}) => {
 
   return (
     <>
-      {
-        data?.map((d, index) =>
-          <View className={'hor' + ` ${complete(d.id) ? 'complete' : null}`}
-                key={index}
-                onClick={() => onClick(d.id, complete(d.id), d, data?.[index - 1]?.id,)}>
-            <Image src={complete(d.id) ? playOk : play} mode="scaleToFill" className='image'/>
-            <View>
+      {data?.map((d, index) =>
+        <View className={'hor' + ` ${complete(d.id) ? 'complete' : null}`}
+              key={index}
+              onClick={() => onClick(d.id, complete(d.id), d, data?.[index - 1]?.id,)}>
+          <Image src={complete(d.id) ? playOk : play} mode="scaleToFill" className='image'/>
+          <View className='title'>
+            <View className='text'>
               <View>{index + 1}.{d.title}</View>
               <View className='font-26'>时长{formatMinute(d.duration)}</View>
               {complete(d.id) === 0 && <View className='font-26 text-danger'>考卷未完成</View>}
             </View>
-          </View>)
-      }
+            {complete(d.id) == null && <Image className='lock' src={lock} mode='aspectFit'/>}
+          </View>
+        </View>)}
     </>
   )
 }
diff --git a/src/pages/business/videoInfo/videoInfo.scss b/src/pages/business/videoInfo/videoInfo.scss
index 63dcc6f..e9e8d33 100644
--- a/src/pages/business/videoInfo/videoInfo.scss
+++ b/src/pages/business/videoInfo/videoInfo.scss
@@ -1,4 +1,6 @@
 .content {
+  padding-bottom: 30rpx;
+  box-sizing: border-box;
 
   .content-video {
     width: 100%;
@@ -23,9 +25,8 @@
 .catalogue {
   background: #fff;
   border-radius: 40rpx;
-  padding: 0 24px 10px 24px;
+  padding: 0 24px 0 24px;
   margin-top: 20rpx;
-  margin-bottom: env(safe-area-inset-bottom);
 
   .short_desc {
     color: #606563;
@@ -41,19 +42,30 @@
   .image {
     width: 40rpx;
     height: 40rpx;
-    margin: 10px;
+    margin-top: 10rpx;
   }
 
-  & > View {
+
+  .title {
     flex: 1;
-    margin-left: 20px;
+    width: 710rpx;
+    padding: 0 0 20rpx 20rpx;
+    display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
     border-bottom: 1px solid #ddd;
 
-    View {
-      width: 630rpx;
-      margin-bottom: 20px;
+    .text {
+      width: 600rpx;
       word-wrap: break-word;
     }
+
+    .lock {
+      width: 30rpx;
+      margin-left: 10rpx;
+      margin-top: 10rpx;
+    }
+
   }
 }
 
diff --git a/src/pages/business/videoInfo/videoInfo.tsx b/src/pages/business/videoInfo/videoInfo.tsx
index 299ea44..664ac69 100644
--- a/src/pages/business/videoInfo/videoInfo.tsx
+++ b/src/pages/business/videoInfo/videoInfo.tsx
@@ -14,7 +14,6 @@ const VideoInfo: FC = () => {
   const [playId, setPlayId] = useState<number | null>(null)
   const [preview, setPreview] = useState(false)
 
-  // eventsIndex.trigger(12)
 
   const getData = async () => {
     const res = await curriculum.courseDep(id, depId)
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index de99a57..6d3c813 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -6,7 +6,6 @@ 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 "@/pages/index/components/search";
 
 
diff --git a/src/pages/login/login.tsx b/src/pages/login/login.tsx
index 6077058..fe947e1 100644
--- a/src/pages/login/login.tsx
+++ b/src/pages/login/login.tsx
@@ -177,7 +177,7 @@ const Login: FC = () => {
   async function TESTLOGIN() {
     const res = await loginApi.testLogin()
     Taro.setStorageSync('profile', JSON.stringify(res))
-    Taro.switchTab({url: '/pages/index/index'})
+    Taro.reLaunch({url: '/pages/index/index'})
   }
 
 
diff --git a/src/pages/manage/bingUser/bingUser.tsx b/src/pages/manage/bingUser/bingUser.tsx
deleted file mode 100644
index cea0f0b..0000000
--- a/src/pages/manage/bingUser/bingUser.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import {FC} from "react";
-import {Button, Form, Input, View} from "@tarojs/components";
-import Taro, {useLoad, useRouter} from "@tarojs/taro";
-import {userApi} from "@/api";
-import {Profile} from '@/store'
-
-const BingUser: FC = () => {
-  // const {depid, start_time, end_time} = getCurrentInstance()?.router?.params as unknown as Offline
-  const {setUser, setToken, setCompany} = Profile.useContainer()
-  const router = useRouter()
-
-  useLoad(() => {
-    if (!router.params.ticket) {
-      Taro.reLaunch({
-        url: "/pages/index/index"
-      })
-    }
-  })
-
-
-  // Taro.useLoad(() => {
-  //   const time = Date.now()
-  //   if (!depid
-  //     || !start_time
-  //     || !end_time
-  //     || time > new Date(end_time).getTime()
-  //     || time < new Date(start_time).getTime()) {
-  //     Taro.showModal({
-  //       title: '二维码已过期',
-  //       success() {
-  //         Taro.reLaunch({url: '/pages/login/login'})
-  //       }
-  //     })
-  //     return
-  //   }
-  // })
-
-  function submit(e) {
-    const value = e.detail.value
-    // if (!value.user_name || !value.phone_number) {
-    //   Taro.showToast({title: '请认真填写', icon: "error"})
-    //   return
-    // }
-    //
-    // if (!regexTel.exec(value.phone_number)) {
-    //   Taro.showToast({title: '手机号错误', icon: 'error'})
-    //   return
-    // }
-
-    Taro.showLoading()
-
-    Taro.login({
-      success: async (res) => {
-        const data = await userApi.meetingSave({
-          ...value,
-          code: res.code,
-          ticket: router.params.ticket,
-        })
-        setCompany(data.company)
-        setUser(data.user)
-        setToken(data.token)
-        Taro.switchTab({url: '/pages/index/index'})
-      },
-      fail: () => {
-        Taro.showToast({title: '获取微信登录失败', icon: "error"})
-      },
-      complete() {
-        Taro.hideLoading()
-      }
-    })
-  }
-
-  return (
-    <View className='h-10 bg-white p-2'>
-      <Form className='form' onSubmit={submit}>
-
-        <View className='item'>
-          <View>用户名</View>
-          <Input placeholder='请输入用户名' focus name='user_name'/>
-        </View>
-
-        <View className='item'>
-          <View>手机号</View>
-          <Input type='number' placeholder='请输入手机号' name='phone_number'/>
-        </View>
-
-        <Button className='button mt-3' formType='submit'>登记</Button>
-      </Form>
-    </View>
-  )
-}
-
-
-export default BingUser
diff --git a/src/pages/manage/depAdmin/depAdmin.tsx b/src/pages/manage/depAdmin/depAdmin.tsx
index 1f54fdb..d7a5520 100644
--- a/src/pages/manage/depAdmin/depAdmin.tsx
+++ b/src/pages/manage/depAdmin/depAdmin.tsx
@@ -62,8 +62,8 @@ const DepAdmin: FC = () => {
       itemList: [
         '查看部门课程',
         '查看子部门和学员',
-        '修改',
-        '删除'
+        '修改部门',
+        '删除部门'
       ],
       success({tapIndex}) {
         switch (tapIndex) {
@@ -99,9 +99,9 @@ const DepAdmin: FC = () => {
 
   function userManagesSheet(user: User) {
     const itemList = [
-      '修改',
-      '删除',
-      "日学习记录",
+      '修改学员',
+      '删除学员',
+      "学习记录",
     ]
     if (user.role_type === 1) {
       itemList.push('取消管理员')
diff --git a/src/pages/manage/spotMeeting/spotMeeting.tsx b/src/pages/manage/spotMeeting/spotMeeting.tsx
index 84a8dd5..f7a8499 100644
--- a/src/pages/manage/spotMeeting/spotMeeting.tsx
+++ b/src/pages/manage/spotMeeting/spotMeeting.tsx
@@ -2,7 +2,7 @@ import {FC, useCallback, useEffect, useState} from "react";
 import {Image, Picker, View} from "@tarojs/components";
 import styles from './spotMeeting.module.scss'
 import Taro from "@tarojs/taro";
-import {curriculum} from "@/api";
+import {curriculum, meetingAPi} from "@/api";
 import {formatDate} from "@/utils/time";
 import {getSetting, authorize} from "@tarojs/taro";
 import PopPut from "@/components/popPut/popPut";
@@ -18,10 +18,22 @@ const SpotMeeting: FC = () => {
   const [isDownloading, setDownloading] = useState(false)
 
 
+  const change = useCallback((e) => {
+    setDepid(() => manages[Number(e.detail.value)]?.id)
+  }, [manages])
+
   useEffect(() => {
     curriculum.department().then(res => {
       setManages(res.data)
     })
+
+    meetingAPi.qrcodeKey().then((res: any) => {
+      if (res.dep_id && res.end_time && res.start_time) {
+        setDepid(res.dep_id)
+        setEnd(formatDate(new Date(res.end_time), "YY-MM-dd 18:00:00"))
+        setStart(formatDate(new Date(res.start_time), "YY-MM-dd 08:00:00"))
+      }
+    })
   }, [])
 
   useEffect(() => {
@@ -55,11 +67,8 @@ const SpotMeeting: FC = () => {
       })
     }
     Taro.hideLoading()
-  }, [depid])
+  }, [depid, end, start])
 
-  function change(e) {
-    setDepid(() => manages[Number(e.detail.value)]?.id)
-  }
 
   const handleWriteFile = useCallback(() => {
     if (tempFilePath == null) {
@@ -116,7 +125,7 @@ const SpotMeeting: FC = () => {
 
       <View>
         <Picker mode='selector' range={manages} onChange={change} rangeKey='name'>
-          <PopPut title='部门' content={manages?.find(x => x.id === depid)?.name}/>
+          <PopPut title='部门' content={manages?.find(x => x.id == depid)?.name}/>
         </Picker>
       </View>
 
diff --git a/src/pages/manage/bingUser/bingUser.config.ts b/src/pages/meeting/meeting.config.ts
similarity index 100%
rename from src/pages/manage/bingUser/bingUser.config.ts
rename to src/pages/meeting/meeting.config.ts
diff --git a/src/pages/meeting/meeting.tsx b/src/pages/meeting/meeting.tsx
new file mode 100644
index 0000000..1c0cb9d
--- /dev/null
+++ b/src/pages/meeting/meeting.tsx
@@ -0,0 +1,105 @@
+import {FC, useEffect, useState} from "react";
+import {Button, Form, Input, View} from "@tarojs/components";
+import Taro, {useRouter} from "@tarojs/taro";
+import {userApi, loginApi, LoginParams} from "@/api";
+import {Profile} from '@/store'
+import {getCurrentInstance} from "@tarojs/runtime";
+import {regexTel} from "@/utils/regu";
+
+const Meeting: FC = () => {
+  const {depid, start_time, end_time} = getCurrentInstance()?.router?.params as unknown as Offline
+  const {setUser, setToken, setCompany} = Profile.useContainer()
+  const [h5params, setH5Params] = useState<LoginParams | null>(null)
+  const router = useRouter()
+
+  useEffect(() => {
+    loginApi.getMeetingParams().then((res) => {
+      setH5Params(res)
+    })
+  }, [])
+
+
+  Taro.useLoad(() => {
+    const time = Date.now()
+    if (!depid
+      || !start_time
+      || !end_time
+      || time > new Date(end_time).getTime()
+      || time < new Date(start_time).getTime()) {
+      Taro.showModal({
+        title: '二维码已过期',
+        success() {
+          Taro.reLaunch({url: '/pages/login/login'})
+        }
+      })
+      return
+    }
+  })
+
+  function submit(e) {
+    const value = e.detail.value
+    if (!value.user_name || !value.phone_number) {
+      Taro.showToast({title: '请认真填写', icon: "error"})
+      return
+    }
+
+    if (!regexTel.exec(value.phone_number)) {
+      Taro.showToast({title: '手机号错误', icon: 'error'})
+      return
+    }
+
+    if (process.env.TARO_ENV === 'h5') {
+      if (h5params == null) {
+        Taro.showToast({title: '页面参数错误，请刷新页面！', icon: 'error'})
+        return;
+      }
+      location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?" +
+        "appid=" + h5params!.appid +
+        "&redirect_uri=" + encodeURIComponent(h5params!.route + `?depid=1&phone_number=${value.phone_number}&user_name=${value.user_name}`) +
+        "&response_type=code" +
+        "&scope=snsapi_userinfo" +
+        "#wechat_redirect";
+
+    } else {
+      Taro.login({
+        success: async (res) => {
+          const data = await userApi.meetingSave({
+            ...value,
+            code: res.code,
+            ticket: router.params.ticket,
+          })
+          setCompany(data.company)
+          setUser(data.user)
+          setToken(data.token)
+          Taro.switchTab({url: '/pages/index/index'})
+        },
+        fail: () => {
+          Taro.showToast({title: '获取微信登录失败', icon: "error"})
+        }
+      })
+
+    }
+  }
+
+  return (
+    <View className='h-10 bg-white p-2'>
+      <Form className='form' onSubmit={submit}>
+
+        <View className='item'>
+          <View>用户名</View>
+          <Input placeholder='请输入用户名' focus name='user_name'/>
+        </View>
+
+        <View className='item'>
+          <View>手机号</View>
+          <Input type='number' placeholder='请输入手机号' name='phone_number'/>
+        </View>
+
+        <Button className='button mt-3' formType='submit'>登记</Button>
+      </Form>
+    </View>
+  )
+}
+
+
+export default Meeting
diff --git a/src/static/css/module.scss b/src/static/css/module.scss
index 92770a2..33e1f73 100644
--- a/src/static/css/module.scss
+++ b/src/static/css/module.scss
@@ -3,6 +3,9 @@ page,
   background-color: #efeff7 !important;
   font-family: PingFang SC-Bold, PingFang SC;
   -webkit-overflow-scrolling: touch;
+  box-sizing: border-box;
+  padding-bottom: env(safe-area-inset-bottom);
+  min-height: 100vh;
 }
 
 body {
diff --git a/src/static/img/course.png b/src/static/img/course.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0d2412f3a1990f2ed549dfd3cb476b9a51a8495
GIT binary patch
literal 2080
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
KMNUMnLSTX?eE2B<

literal 0
HcmV?d00001

diff --git a/src/static/img/lock.png b/src/static/img/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4a3e62c2b9557c127f2007df0f7db33d716ba67
GIT binary patch
literal 739
zcmV<90v!E`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%ok>JNR9HvtmcMHhK@`Wo@AeK-NIZ-I3kwCU_SemwiG_+TDx?uoC@Mryj1cf&
zh?V&hEEFSJ1cGQ0ut^bF1Vv4_o9yjgrJ#j{pn)@31U7q5_L75`-0hEWN19Bt#k_gn
z&wOXz>?7>)pgq>dK0qo5Y}@YZ9~`(#j8P_N1RM#Ekb$4X@R%^S`fKHxWm#)Uk2Wzt
zrRH2@rkR##CxIpm@mNtc-zI@b1hDM7*8?<Wh$st29fZdm@Vf@^BNWL1M@gacU`&9J
zXXbSUnX!Vdzl?*31z2(%Eu+v90et}G$q#M{A?ocCODXf5Q)U5-FtFALcxcEpy(oxS
zfQnbO0bBs%)1Tif=Pb)wk4k9UcJ|=lz()Y5z*s2i#^qfDlxyV^#JMkFf^`bSuqu}0
zEDh%uYqF4KMK&)e`6o+i>1(HTkq$_&dY^$u%<xLOp(hb<#gyHuO9YJx6D8GnvMYd!
zSA7Uzk_a<GHEyK=sCe!yz&8L)6*c3*t^lN0ea^sb0$vEsxRVAT>DsnOVApB~`kBuF
z!6bpsGWdN4m`(%G0LEKu0cC2H=!2!If4Aq@0pQe}(?J9CAj+o^jE!ZkD;bQKs`+_q
z><)m6=SYAGn-5OgdXE*`9>B<l4-~-5Ma>j3099_5ogau{k*w_EfEJ}JWOEy3S=5aG
zHr>X74FK|k<3fn<amka+ODT_WPWjeVfbhlZKYXaUtCDU;z7ahE*qSuXt$l!=I1rw_
z^xQY$S7`c`sLR+hfFu>r1nor?Bo*HWNbNw`b^MLylgFXt7SdSVF*fiofoM8xR!h2>
zi~AS60&uk}!aI|^E^5ZLNPx}G_9-)uHl66g2zO3IbL0p2ws+LAU2zxmBU9`-z&~Kc
VbTEWQ%TWLT002ovPDHLkV1jSPPVE2y

literal 0
HcmV?d00001

diff --git a/src/static/img/order.png b/src/static/img/order.png
new file mode 100644
index 0000000000000000000000000000000000000000..027a869f9b252b1d3d9e3b6e8cee9a220076aa66
GIT binary patch
literal 951
zcmV;o14#UdP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&aY;l$RA@u(S}|x7VHAEZm!=ge2-?XGPEw&Xx#aHb;1IE+&bGVIDhPrV92^u2
z4k`$OZE<q4yN;1&=uj`0Tv8E>lS7>v(V@^b?cI}0a`lqCB>&~VD;Dmyg!jJpzW2TV
z|8xHf0>_g~CeOzP2VMa|77@?+fg++R0OZWt!F;7s`RT{kX^Z_jPE1UU#s?ER_)Odt
zkEnXMUlTVrHn#f7r6&PV6q6tbbBK@y#0vm0)CfcX(9@kMCn5sGBdk3j`auMFFpMQ#
z*DKvXx@8a-WqA=1Zg~MXgD$^W1SykYO4c^giba^cbGuQBRst<JWYUtZX?FqO&?`VE
z0`Zh0t;PVauw+&Itg@K7Y%-S>CO;Est*mNSy-0Wx5M}wTv+_igH_?2#YvB6#V$oWB
zkXB@?hw4ud1WIb5p3B8d=G-ZPCSw%4kBC`2MpKD~WRAy0AeBm`Vu=C$pA9`OsoIlv
z$FwYM+Y6Ytg@CA9Drh6^F+^E@iU^PF@6FnQST2{#T?vSaw1|Ln&ECxGg}QXEN0g=a
zh&avE13iq0Xhkn*Gacfr+DZ`6lCEkkD!3F#%hESM9J9a-Fm6=T(nl}g<Jv}(O8UA0
z!iRbeM4P38cB!iZX+_?(x5^#E9I<=86A583@f-oBe4htIRRYKv`?Uw%&H!so3=6UC
zdj3E=x~iS-Mc`<0+6ya)HsQf=ZW!%3xm(DwyF>(d%I@%u6bPu0eZxcw^j*4u93ut1
z3VH48$}AEsAozO|YsVsjKZJPi)A-GIodgR-fvGPmzY*a~5M4q*)!g`u>&KjpeF6wT
zH8(zeyaXC81Pch@>t+7GX`vumhZQ4~7Gez^gk3}+h$`}6L<;a!F9_dI6o^h@hcwYi
z?CjHS{pPfbPGTRcJCsH2BR;ojM1Z@5oB)vmoCV}|_p1Q&<t}$-3;_NwcNwqO8Da-w
z;`@4?b-)owb_^h*EcqL7u#T7*Vso2_viuAY9@;=mBPPq(se<*{8uAg+i#-t5H&yi)
zcV=Ax#uVl35Ezq4INvhl^B6B#FdfINX+>HE#xZM{gc{hiR`N4uZ6*{K73sA-@C!dl
z?+DGop6@~T5t_9oFcG)zfU<-zih#pmlCkDsNU%i+d8!>Qw~tlZV+ZqRhcFrSz&`N=
Z{sJ^eWlwf?`QHEl002ovPDHLkV1nIJs9XR5

literal 0
HcmV?d00001

diff --git a/src/static/img/userInfo.png b/src/static/img/userInfo.png
new file mode 100644
index 0000000000000000000000000000000000000000..85fbc4848dcadb41893e4c1047b268af1e4a343d
GIT binary patch
literal 2760
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
O0000<MNUMnLSTa1@j3DU

literal 0
HcmV?d00001

diff --git a/src/store/profile.ts b/src/store/profile.ts
index 817fa8a..425e13e 100644
--- a/src/store/profile.ts
+++ b/src/store/profile.ts
@@ -1,6 +1,7 @@
 import {useEffect, useState} from "react";
 import {createContainer} from "unstated-next";
 import Taro from "@tarojs/taro";
+import {whiteList} from "@/config";
 
 
 function DataKey(data: any) {
@@ -12,12 +13,6 @@ function DataKey(data: any) {
     && 'company' in data.data
 }
 
-const whitelist = [
-  '/pages/check/check',
-  '/pages/login/login',
-]
-
-
 function useProfile() {
   let data
 
@@ -27,7 +22,7 @@ function useProfile() {
       if (DataKey(profileCopy)) {
         data = profileCopy.data || null
         localStorage.removeItem("profileCopy")
-        Taro.switchTab({url: '/pages/index/index'})
+        Taro.reLaunch({url: '/pages/index/index'})
       }
     } catch (e) {
       console.error(e)
@@ -46,7 +41,7 @@ function useProfile() {
   }
 
   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/login/login'})
     }
   }