From 4d2b83b9509541cfc5dfefb01a7a12b53b59452c Mon Sep 17 00:00:00 2001
From: xing <2229249788@qq.com>
Date: Tue, 5 Sep 2023 21:06:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=96=87=E7=AB=A0=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E5=92=8C=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=202.?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E6=83=85=E5=86=B5=E4=B8=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=8C=BA=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../learningRecord/learningRecord.tsx         | 11 +++-
 src/components/spinner/index.tsx              |  6 +-
 src/pages/my/my.tsx                           | 11 ++--
 src/pages/preview/brand/article/article.tsx   |  2 -
 src/pages/preview/illness/article/article.tsx | 60 ++++++++++++-------
 5 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/src/components/learningRecord/learningRecord.tsx b/src/components/learningRecord/learningRecord.tsx
index c4118e9..4313472 100644
--- a/src/components/learningRecord/learningRecord.tsx
+++ b/src/components/learningRecord/learningRecord.tsx
@@ -6,6 +6,8 @@ import {FC, useEffect, useState} from "react";
 import {StatisticsParam, userApi} from "@/api";
 import styles from './learningRecord.module.scss'
 import Spin from "@/components/spinner";
+import {Profile} from "@/store";
+import Taro from "@tarojs/taro";
 
 const tabList: TabList<any>[] = [
   {
@@ -30,7 +32,7 @@ const tabList: TabList<any>[] = [
 ]
 
 interface Props {
-  userId: string | number
+  userId?: string | number
 }
 
 
@@ -40,9 +42,10 @@ interface Props {
 const LearningRecord: FC<Props> = ({userId}) => {
   const [lineData, setLineData] = useState<any[]>([])
   const [loading, setLoading] = useState(false)
-
+  const {token} = Profile.useContainer()
 
   async function getStatistics(data: StatisticsParam) {
+    if (!userId) return;
     try {
       setLoading(true)
       const res = await userApi.statistics(userId, data)
@@ -55,6 +58,10 @@ const LearningRecord: FC<Props> = ({userId}) => {
   }
 
   function tabChange({tab}: OnChangOpt<StatisticsParam>) {
+    if (!token) {
+      Taro.navigateTo({url: '/pages/login/login'})
+      return
+    }
     getStatistics(tab?.value! as StatisticsParam)
   }
 
diff --git a/src/components/spinner/index.tsx b/src/components/spinner/index.tsx
index a99d6f9..0e08962 100644
--- a/src/components/spinner/index.tsx
+++ b/src/components/spinner/index.tsx
@@ -138,9 +138,9 @@ export default class Spin extends Component<Props, State> {
     this.setState((s) => ({...s, ...state}))
   }
 
-  // componentDidMount(): void {
-  // this.controller.setTick(this.props.enable)
-  // }
+  componentDidMount(): void {
+    this.controller.setTick(this.props.enable)
+  }
 
   componentDidUpdate(): void {
     this.controller.setTick(this.props.enable)
diff --git a/src/pages/my/my.tsx b/src/pages/my/my.tsx
index cf62fcb..2c00ac0 100644
--- a/src/pages/my/my.tsx
+++ b/src/pages/my/my.tsx
@@ -84,12 +84,11 @@ const My: FC = () => {
           </View>
           <Time/>
 
-          {
-            token && user && <View>
-              <LearningRecord userId={user.id}/>
-              <Service/>
-            </View>
-          }
+          <View>
+            <LearningRecord userId={user?.id}/>
+            <Service/>
+          </View>
+
           <PageContainer
             overlayStyle={'background:rgba(0,0,0,0.3)'}
             position='bottom'
diff --git a/src/pages/preview/brand/article/article.tsx b/src/pages/preview/brand/article/article.tsx
index 0c4e87c..25da6a9 100644
--- a/src/pages/preview/brand/article/article.tsx
+++ b/src/pages/preview/brand/article/article.tsx
@@ -25,10 +25,8 @@ const article: FC = () => {
       const query = Taro.createSelectorQuery()
       query.select('#childrenNode').boundingClientRect((res) => {
         if (!Array.isArray(res)) {
-          if (res.height !== 240) {
             console.log({childrenNode: res})
             setUltra(pageHeight * .45 <= res.height)
-          }
         }
       }).exec()
     }, 300)
diff --git a/src/pages/preview/illness/article/article.tsx b/src/pages/preview/illness/article/article.tsx
index 0e096ae..ba0e38e 100644
--- a/src/pages/preview/illness/article/article.tsx
+++ b/src/pages/preview/illness/article/article.tsx
@@ -6,56 +6,64 @@ import styles from './article.module.scss'
 import down from '@/static/img/doubleDown.png'
 import {Profile} from "@/store";
 import {parse} from "@/utils/marked/marked";
+import {formatDate} from "@/utils/time";
 
-const article:FC = () => {
+const article: FC = () => {
   const {token} = Profile.useContainer()
-  const {id} = useRouter().params as unknown as { id: number}
-  const [show,setShow] = useState(false)
-  const [articleInfo,setArticleInfo] = useState<ArticleRecord>()
-  const { children, headings } = useMemo(() => parse(articleInfo?.content || ''), [articleInfo])
-
+  const {id} = useRouter().params as unknown as { id: number }
+  const [show, setShow] = useState(false)
+  const [articleInfo, setArticleInfo] = useState<ArticleRecord>()
+  const {children, headings} = useMemo(() => parse(articleInfo?.content || ''), [articleInfo])
   const query = Taro.createSelectorQuery()
 
-
   useEffect(() => {
     getData()
   }, [id])
 
   const getData = async () => {
-    Taro.setNavigationBarTitle({title:'疾病文章详情'})
+    Taro.setNavigationBarTitle({title: '疾病文章详情'})
     try {
       const data = await brandApi.articleInfo(id)
-      Taro.setNavigationBarTitle({title:data.title})
+      Taro.setNavigationBarTitle({title: data.title})
       setArticleInfo(data)
     } catch (e) {
     }
   }
-  function mao(id: string){
+
+  function mao(id: string) {
     console.log(id)
     setShow(false)
     Taro.nextTick(() => {
       query.select(`#${id}`).boundingClientRect()
       query.exec((res) => {
-        if(res.length){
+        if (res.length) {
           Taro.pageScrollTo({
-            scrollTop: res[res.length-1].top,
-            duration: 300}
+              scrollTop: res[res.length - 1].top,
+              duration: 300
+            }
           )
         }
       })
     })
   }
+
   function helloWorld() {
     return (
       <>
-        {/*<View style={{padding:'10px'}}>*/}
-        {/*  { children }*/}
-        {/*</View>*/}
-        <View className={styles.botmBox} style={{display:show?'none':'flex'}} onClick={()=>{setShow(true)}}>
+        <View className={styles.botmBox} style={{display: show ? 'none' : 'flex'}} onClick={() => setShow(true)}>
           <View>文章导航</View>
         </View>
-        <View style={{padding:'10px',height:!token ? Taro.getWindowInfo().windowHeight-60+'px' : 'auto',overflow:!token ? 'hidden':'auto'}}>
-          { children }
+        <View style={{
+          padding: '10px',
+          height: !token ? Taro.getWindowInfo().windowHeight - 60 + 'px' : 'auto',
+          overflow: !token ? 'hidden' : 'auto'
+        }}>
+          <View className='text-center'>
+            <View className='font-50 font-weight '>{articleInfo?.title}</View>
+            <View className='mt-2'>{formatDate(new Date(articleInfo?.created_at || 0), "YY-mm-dd hh:mm:dd")}</View>
+          </View>
+          <View></View>
+          {children}
         </View>
         {
           !token &&
@@ -64,18 +72,23 @@ const article:FC = () => {
               <View className={styles['fixedBox-inner-icon']}>
                 <Image src={down}></Image>
               </View>
-              <View className={styles['fixedBox-inner-box']} onClick={ ()=> Taro.navigateTo({url: '/pages/login/login'})}>
+              <View className={styles['fixedBox-inner-box']}
+                    onClick={() => Taro.navigateTo({url: '/pages/login/login'})}>
                 <Text>登录查看更多内容</Text>
               </View>
             </View>
           </View>
         }
 
-        <PageContainer onClickOverlay={()=>{ setShow(false)}} show={show} round={true} overlay={true} overlayStyle={'background:rgba(0,0,0,0.3)'} >
+        <PageContainer onClickOverlay={() => {
+          setShow(false)
+        }} show={show} round={true} overlay={true} overlayStyle={'background:rgba(0,0,0,0.3)'}>
           <View className="px-3 py-5">
-            {headings.length > 0  &&
+            {headings.length > 0 &&
               headings.map((d) =>
-                <View className="pb-3" style={{fontSize:'28rpx',fontWeight: '500',color: '#323635'}} onClick={()=>{mao(d.id)}}>{d.text}</View>
+                <View className="pb-3" style={{fontSize: '28rpx', fontWeight: '500', color: '#323635'}} onClick={() => {
+                  mao(d.id)
+                }}>{d.text}</View>
               )
             }
           </View>
@@ -84,6 +97,7 @@ const article:FC = () => {
       </>
     )
   }
+
   return helloWorld()
 }
 export default article