From d052aa82d069537c00d36ea2f4853029ad13f4cb Mon Sep 17 00:00:00 2001
From: king <2229249788@qq.com>
Date: Wed, 26 Jul 2023 17:33:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=94=E6=A1=88=E6=A0=B7=E5=BC=8F=20&&=20?=
 =?UTF-8?q?=E7=A9=BA=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request.ts                            | 36 +++++++++++--------
 src/app.scss                                  |  2 --
 src/components/empty/empty.module.scss        | 21 +++++++++++
 src/components/empty/empty.tsx                | 19 ++++++++++
 src/components/topic/judge.tsx                |  3 +-
 src/components/topic/multi.tsx                |  3 +-
 src/components/topic/shortAnswer.tsx          |  2 +-
 src/components/topic/topic.scss               | 10 ++++++
 src/components/video/video.tsx                |  3 +-
 src/pages/business/history/history.tsx        | 12 +++----
 src/pages/business/test/test.tsx              |  4 ++-
 .../business/videoInfo/components/course.tsx  |  1 -
 src/pages/index/components/videoList.tsx      |  5 +--
 src/pages/index/index.tsx                     |  1 -
 src/pages/login/login.module.scss             |  5 +--
 src/pages/login/login.tsx                     | 15 ++++----
 src/pages/manage/addCur/addCur.tsx            |  5 ++-
 src/pages/manage/curriculum/curriculum.tsx    |  4 +--
 src/static/css/module.scss                    |  8 ++---
 19 files changed, 107 insertions(+), 52 deletions(-)
 create mode 100644 src/components/empty/empty.module.scss
 create mode 100644 src/components/empty/empty.tsx

diff --git a/src/api/request.ts b/src/api/request.ts
index 2c15aa8..25a13d9 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -43,7 +43,12 @@ export const ERROR_STATUS: Record<number | string, string> = {
   'INVALID_DATA': '服务器响应异常~',
   'OVERSTEP': '请求越界~'
 }
-let isOverdue = false
+
+const whitelist = [
+  '/api/v1/auth/login/code',
+  '/api/v1/auth/login/checkout',
+  '/api/v1/auth/login/wechat'
+]
 
 export function request<T = unknown>(
   url: string,
@@ -63,6 +68,13 @@ export function request<T = unknown>(
   if (token) {
     option.header ??= {}
     option.header['Authorization'] = `Bearer ${token}`
+  } else {
+    /** 登录页面白名单 */
+    if (Taro.getCurrentInstance().router?.path === '/pages/login/login') {
+      if (!whitelist.includes(url)) {
+        return new Promise((_, reject) => reject())
+      }
+    }
   }
   if (method === 'GET' && data) {
     let parameter = ''
@@ -71,11 +83,10 @@ export function request<T = unknown>(
     })
     option.url += parameter
   }
-  if (isOverdue) {
-    isOverdue = false
-  }
   data && (option.data = data)
   return new Promise<T>((resolve, reject) => {
+
+
     Taro.request<T>({
       ...option,
       success(res) {
@@ -84,16 +95,13 @@ export function request<T = unknown>(
           if (data?.code === 0 && res.statusCode === 200) {
             resolve(data.data || [])
           } else if (res.statusCode === 401) {
-            if (!isOverdue) {
-              isOverdue = true
-              Taro.showModal({
-                title: "登录过期,需重新登陆",
-                showCancel: false,
-                success({confirm}) {
-                  confirm && Taro.reLaunch({url: '/pages/login/login'})
-                }
-              })
-            }
+            Taro.showModal({
+              title: "登录过期,需重新登陆",
+              showCancel: false,
+              success({confirm}) {
+                confirm && Taro.reLaunch({url: '/pages/login/login'})
+              }
+            })
           } else {
             Taro.showToast({title: data.msg || ERROR_STATUS[res.statusCode] || '请求错误~', icon: 'error'})
             reject(null)
diff --git a/src/app.scss b/src/app.scss
index dd4ecb0..1b4a95c 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -249,8 +249,6 @@
 .bg-gray{ background-color: gray;}
 .bg-transparent { background-color: transparent;}
 
-
-
 /* 文字颜色 */
 .text-white {color: #ffffff }
 .text-primary {color: #007bff;}
diff --git a/src/components/empty/empty.module.scss b/src/components/empty/empty.module.scss
new file mode 100644
index 0000000..40f4e3d
--- /dev/null
+++ b/src/components/empty/empty.module.scss
@@ -0,0 +1,21 @@
+.empty {
+  width: 750rpx;
+  text-align: center;
+  color: #6c757d;
+  position: relative;
+
+  Image {
+    display: block;
+    margin: auto;
+    width: 400px;
+    margin-bottom: 10px;
+  }
+
+  View {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 40px;
+    margin: auto;
+  }
+}
diff --git a/src/components/empty/empty.tsx b/src/components/empty/empty.tsx
new file mode 100644
index 0000000..05df872
--- /dev/null
+++ b/src/components/empty/empty.tsx
@@ -0,0 +1,19 @@
+import {FC} from "react";
+import {Image, View} from "@tarojs/components";
+import emptyImg from '@/static/img/empty.png'
+import styles from './empty.module.scss'
+
+interface Props {
+  name: string
+}
+
+const Empty: FC<Props> = ({name}) => {
+  return (
+    <View className={styles.empty}>
+      <Image src={emptyImg} mode='widthFix'/>
+      <View>{name}</View>
+    </View>
+  )
+}
+
+export default Empty
diff --git a/src/components/topic/judge.tsx b/src/components/topic/judge.tsx
index 47337dc..396b792 100644
--- a/src/components/topic/judge.tsx
+++ b/src/components/topic/judge.tsx
@@ -73,7 +73,8 @@ const Judge: FC<Props> = ({data, onAnswer, onUpAndDown, index, validate, frequen
 
 
       {error && frequency == 0 && <View className='mt-3'>
-        <View className='font-weight mb-3'>错误答案解析</View>
+        <View className='right_answer'>正确答案：{data.right_answer ? '正确' : '错误'}</View>
+        <View className='font-weight my-3'>题目解析</View>
         <View>{data.analysis}</View>
       </View>}
     </View>
diff --git a/src/components/topic/multi.tsx b/src/components/topic/multi.tsx
index 0f2a3cc..71f8238 100644
--- a/src/components/topic/multi.tsx
+++ b/src/components/topic/multi.tsx
@@ -88,7 +88,8 @@ const Multi: FC<Props> = ({data, onAnswer, onUpAndDown, index, validate, frequen
 
 
       {error && frequency == 0 && <View className='mt-3'>
-        <View className='font-weight mb-3'>错误答案解析</View>
+        <View className='right_answer'>正确答案：{data.right_answer}</View>
+        <View className='font-weight my-3'>题目解析</View>
         <View>{data.analysis}</View>
       </View>}
     </View>
diff --git a/src/components/topic/shortAnswer.tsx b/src/components/topic/shortAnswer.tsx
index 2f817ba..d3d2b1d 100644
--- a/src/components/topic/shortAnswer.tsx
+++ b/src/components/topic/shortAnswer.tsx
@@ -63,7 +63,7 @@ const ShortAnswer: FC<Props> = ({data, onAnswer, onUpAndDown, index, validate, f
 
 
       {frequency == 0 && <View className='mt-3'>
-        <View className='font-weight mb-3'>解析</View>
+        <View className='font-weight my-3'>题目解析</View>
         <View>{data.analysis}</View>
       </View>}
 
diff --git a/src/components/topic/topic.scss b/src/components/topic/topic.scss
index 1b1e306..ddf9069 100644
--- a/src/components/topic/topic.scss
+++ b/src/components/topic/topic.scss
@@ -1,10 +1,12 @@
 .topic {
   padding: 40rpx;
   box-sizing: border-box;
+  background: #FFF;
 
   .option {
     display: block;
     margin-bottom: 10px;
+    line-height: 2;
   }
 }
 
@@ -23,3 +25,11 @@
     width: 40%;
   }
 }
+
+
+.right_answer{
+  font-weight: bold;
+  color: #FF9E5F;
+  line-height: 40rpx;
+  font-size: 32px;
+}
diff --git a/src/components/video/video.tsx b/src/components/video/video.tsx
index d66dc1f..1e5fdd4 100644
--- a/src/components/video/video.tsx
+++ b/src/components/video/video.tsx
@@ -53,7 +53,8 @@ const HVideo: FC<HVideoOptions> = (opt: HVideoOptions) => {
   return (
     <Video
       id={'myVideo'}
-      style={{width:'100%',height:'100%'}}
+      autoplay
+      style={{width: '100%', height: '100%'}}
       poster={opt?.poster || ''}
       src={opt.src}
       enableProgressGesture={false}
diff --git a/src/pages/business/history/history.tsx b/src/pages/business/history/history.tsx
index 3b175f6..9eebb05 100644
--- a/src/pages/business/history/history.tsx
+++ b/src/pages/business/history/history.tsx
@@ -6,6 +6,7 @@ import Taro from "@tarojs/taro";
 import {userApi} from "@/api";
 import {useState} from "react";
 import {formatMinute} from "@/utils/time";
+import Empty from "@/components/empty/empty";
 
 const History = () => {
   const [data, setData] = useState<userRecord[]>([])
@@ -25,18 +26,17 @@ const History = () => {
       <CategoryTabs changeTabs={getData}/>
 
       <View className='mt-3'>
-        {data.map(d => <View className={styles.category} onClick={() => jump(d.course_id, d.course.title)}>
+        {data.length ? data.map(d => <View className={styles.category}
+                                           onClick={() => jump(d.course_id, d.course.title)}>
           <View className={styles.thumb}>
-            <Image src={d.course.thumb} />
+            <Image src={d.course.thumb}/>
             <View>共{d.total_hour_count}节/已学{d.finished_count}节</View>
           </View>
           <View className={styles.text}>
             <View>{d.course.title}</View>
-            <View>{formatMinute(d.duration)}</View>
+            <View>观看{formatMinute(d.duration)}</View>
           </View>
-        </View>)}
-
-        <View className='text-center text-muted mt-3'>- 暂无更多数据 -</View>
+        </View>) : <Empty name='无观看记录'/>}
       </View>
     </View>
   )
diff --git a/src/pages/business/test/test.tsx b/src/pages/business/test/test.tsx
index 597a686..b6b59ca 100644
--- a/src/pages/business/test/test.tsx
+++ b/src/pages/business/test/test.tsx
@@ -104,7 +104,9 @@ const Test = () => {
           validate={validate}/>)
       }
 
-      <Button className='button' onClick={onSubmit}>交卷</Button>
+      <View className='bg-white pb-3'>
+        <Button className='button' onClick={onSubmit}>交卷</Button>
+      </View>
     </View>
   )
 }
diff --git a/src/pages/business/videoInfo/components/course.tsx b/src/pages/business/videoInfo/components/course.tsx
index cf45e06..d309e07 100644
--- a/src/pages/business/videoInfo/components/course.tsx
+++ b/src/pages/business/videoInfo/components/course.tsx
@@ -62,7 +62,6 @@ const Course: FC<Props> = ({id, courseId, preview, curEnd}: Props) => {
     setShow(true)
   }
 
-
   async function getData() {
     unique_ident.put()
 
diff --git a/src/pages/index/components/videoList.tsx b/src/pages/index/components/videoList.tsx
index a2e56e6..941fa79 100644
--- a/src/pages/index/components/videoList.tsx
+++ b/src/pages/index/components/videoList.tsx
@@ -6,6 +6,7 @@ import VideoCover from "@/components/videoCover/videoCover";
 import styles from '../index.module.scss'
 import {formatMinute} from "@/utils/time";
 import {userApi} from "@/api";
+import Empty from "@/components/empty/empty";
 
 interface Props {
   categoryKey: CoursesKey
@@ -114,7 +115,7 @@ export const VideoList: FC<Props> = ({categoryKey}) => {
   }, [page])
   return (
     <View className={'py-2 flex justify-between flex-wrap ' + styles.videoListBox}>
-      {data?.[categoryKey]?.map(c =>
+      {data?.[categoryKey]?.length ? data?.[categoryKey]?.map(c =>
         <VideoCover
           thumb={c.thumb}
           title={c.title}
@@ -122,7 +123,7 @@ export const VideoList: FC<Props> = ({categoryKey}) => {
           depId={c.id}
           time={formatMinute(c.course_duration)}
           content={rateOfLearning(c.id, c.class_hour)}
-        />)}
+        />) : <Empty name='暂无数据'/>}
     </View>
   )
 }
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index 11cdb79..119045b 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -30,7 +30,6 @@ const Index: FC = () => {
         {/*<Search/>*/}
         <Tabs tabList={category} onChange={tabChange} current={categoryKey}/>
         <VideoList categoryKey={categoryKey}/>
-        <View className='text-center text-muted my-3'>- 暂无更多 -</View>
       </View>
     </Profile.Provider>
   )
diff --git a/src/pages/login/login.module.scss b/src/pages/login/login.module.scss
index b4be1f3..3a5e6ae 100644
--- a/src/pages/login/login.module.scss
+++ b/src/pages/login/login.module.scss
@@ -39,10 +39,7 @@
   justify-content: center;
   align-items: center;
   gap: 12px;
-  background: red;
-  color: #fff;
-  border-radius: 20px;
-  margin: 0 56px;
+  margin: 0 auto;
 }
 
 
diff --git a/src/pages/login/login.tsx b/src/pages/login/login.tsx
index e89bdd6..68da046 100644
--- a/src/pages/login/login.tsx
+++ b/src/pages/login/login.tsx
@@ -1,6 +1,6 @@
 import {FC, useEffect, useRef, useState} from "react";
 import {Profile} from "@/store";
-import {Button, CustomWrapper, Form, Image, Input, PageContainer, Text, View} from "@tarojs/components";
+import {Button, Form, Image, Input, PageContainer, Text, View} from "@tarojs/components";
 import Taro from "@tarojs/taro";
 import styles from './login.module.scss'
 import Loading from "@/components/loading";
@@ -72,7 +72,8 @@ const Bing: FC<BingProps> = ({code, catch_key}: BingProps) => {
           </View>
         </View>
 
-        <Button className={styles.submit} style='margin:30px 0' formType='submit' disabled={loading}>提交</Button>
+        <Button className={'button ' + styles.submit} style='margin:30px auto' formType='submit'
+                disabled={loading}>提交</Button>
       </Form>
     </View>
   )
@@ -138,7 +139,7 @@ const Login = () => {
       <View className={styles.loginTips}>
         <Text>请完成微信授权以继续使用！</Text>
       </View>
-      <Button className={styles.submit} onClick={login} disabled={isLoading}>
+      <Button className={'button ' + styles.submit} onClick={login} disabled={isLoading}>
         {isLoading ? <Loading/> : null}
         <Text>微信授权登录</Text>
       </Button>
@@ -148,11 +149,9 @@ const Login = () => {
 
 const Index: FC = () => {
   return (
-    <CustomWrapper>
-      <Profile.Provider>
-        <Login/>
-      </Profile.Provider>
-    </CustomWrapper>
+    <Profile.Provider>
+      <Login/>
+    </Profile.Provider>
   )
 }
 export default Index
diff --git a/src/pages/manage/addCur/addCur.tsx b/src/pages/manage/addCur/addCur.tsx
index 9b939c0..1260efe 100644
--- a/src/pages/manage/addCur/addCur.tsx
+++ b/src/pages/manage/addCur/addCur.tsx
@@ -6,6 +6,7 @@ import Tabs, {TabList} from "@/components/tabs/tabs";
 import {Category, publicApi} from "@/api/public";
 import Taro from "@tarojs/taro";
 import VideoCover from "@/components/videoCover/videoCover";
+import Empty from "@/components/empty/empty";
 
 interface AddProps {
   cur_id: number,
@@ -117,10 +118,8 @@ const AddCur = () => {
               />
             ))}
           </View>
-          : null
+          : <Empty name='无更多课程'/>
       }
-
-      <View className='text-center mt-3'>- 暂无更多 -</View>
     </CustomWrapper>
   )
 }
diff --git a/src/pages/manage/curriculum/curriculum.tsx b/src/pages/manage/curriculum/curriculum.tsx
index 213db28..dbd4c1c 100644
--- a/src/pages/manage/curriculum/curriculum.tsx
+++ b/src/pages/manage/curriculum/curriculum.tsx
@@ -4,6 +4,7 @@ import VideoCover from "@/components/videoCover/videoCover";
 import styles from './curriculum.module.scss'
 import {ManageApi} from "@/api/manage";
 import Taro from "@tarojs/taro";
+import Empty from "@/components/empty/empty";
 
 
 const Curriculum = () => {
@@ -56,9 +57,8 @@ const Curriculum = () => {
               content={d.title}/>
           ))}
         </View>
-        : null
+        : <Empty name='无购买课程'/>
       }
-      <View className='text-center mt-3'>- 暂无更多数据 -</View>
     </CustomWrapper>
   )
 }
diff --git a/src/static/css/module.scss b/src/static/css/module.scss
index 39cecca..a36a973 100644
--- a/src/static/css/module.scss
+++ b/src/static/css/module.scss
@@ -1,17 +1,17 @@
 page {
   background-color: #efeff7;
   font-family: PingFang SC-Bold, PingFang SC;
+  -webkit-overflow-scrolling: touch
 }
 
 .input {
   height: 84rpx;
   background: #F5F8F7;
-  border-radius:8px;
+  border-radius: 8px;
   padding: 0 20px;
 }
 
 .form {
-
   .item {
     margin-bottom: 10px;
     display: flex;
@@ -54,7 +54,7 @@ page {
   }
 }
 
-.Textarea{
+.Textarea {
   width: 100%;
   border-radius: 10px;
   overflow: hidden;
@@ -63,7 +63,7 @@ page {
   border: 1px solid #ddd;
 }
 
-.button{
+.button {
   width: 690rpx;
   line-height: 76rpx;
   background: #45D4A8;