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

# Conflicts:
#	src/pages/preview/search/search/components/list.tsx
#	src/pages/preview/search/search/index.config.ts
#	src/pages/preview/search/search/index.module.scss
#	src/pages/preview/search/search/index.tsx

src/components/learningRecord/learningRecord.tsx

@@ -8,6 +8,7 @@ import styles from './learningRecord.module.scss'
 // import Spin from "@/components/spinner";
 import {Profile} from "@/store";
 import Taro from "@tarojs/taro";
+import debounce from "@/utils/debounce";
 
 const tabList: TabList<any>[] = [
   {
@@ -63,11 +64,15 @@ const LearningRecord: FC<Props> = ({userId, style, className}) => {
       Taro.navigateTo({url: '/pages/login/login'})
       return
     }
+    // getStatistics(tab?.value! as StatisticsParam)
+    debounce(()=>{
+      // console.log(this,'this')
       getStatistics(tab?.value! as StatisticsParam)
+    })
   }
 
   useEffect(() => {
-    userId && getStatistics(tabList[0].value)
+    userId && setTimeout(() => {getStatistics(tabList[0].value)},500)
   }, [userId])
 
   return (<View className={[styles.box, className].filter(Boolean).join(' ')} style={{display: 'block', ...style}}>

src/pages/my/my.tsx

@@ -21,7 +21,6 @@ interface List {
   src: string,
   type?: number
 }
-
 function jump(token: string | null, type?: number) {
   if (!token) {
     Taro.navigateTo({url: '/pages/login/login'})
@@ -169,6 +168,7 @@ const My: FC = () => {
         </PageContainer>
       </View>
     </View>
+
   )
 }
 

src/pages/preview/search/search/components/list.tsx

@@ -14,6 +14,7 @@ type Props = {
   clear:boolean
 }
 const SearchList: FC<Props> = ({name,clear}) => {
+  console.log(name,'name')
   const globalData = Taro.getApp().globalData
   const [page, setPage] = useState(1)
   const [brands, setBrands] = useState<any[]>([])
@@ -96,7 +97,7 @@ const SearchList: FC<Props> = ({name, clear}) => {
       className='scrollview'
       scrollY
       scrollWithAnimation
-      style={{height: `${globalData.pageHeight - 20}px`, backgroundColor: `#f5f5f5`}}
+      style={{height:`${globalData.windowHeight-140}px`,backgroundColor:`#f5f5f5`}}
       onScrollToLower={onScrollToLower}
     >
       { loading && <AtLoadMore status={'loading'}/>}
@@ -104,8 +105,7 @@ const SearchList: FC<Props> = ({name, clear}) => {
         brands.length >= 1 && !loading &&
           <>
             {brands.map((d) =>
-            <View onClick={() => jumpInfo(d.data.id, d.data.table, d.data['@data'])} className={styles.box}
+              <View onClick={() => jumpInfo(d.data.id,d.data.table,d.data['@data'])} className={styles.box} key={d.data.id}>
-                  key={d.data.id}>
                 {
                   d.data.table === 'brand' &&
                   <>
@@ -121,8 +121,7 @@ const SearchList: FC<Props> = ({name, clear}) => {
                   <>
                     <View className={styles.articleLeftBox}>
                       <View className='font-weight mb-2 font-28 lh-40'>{d.data['@data'].title}</View>
-                    <View
+                      <View className={styles.desc}>{rfc33392time(d.data['@data'].created_at)} {d.data['@data'].page_view}阅读</View>
-                      className={styles.desc}>{rfc33392time(d.data['@data'].created_at)} {d.data['@data'].page_view}阅读</View>
                     </View>
                     <Img width={172} height={128} src={d.data['@data'].logo} mode='aspectFill' className={styles.image}/>
                   </>
@@ -130,8 +129,7 @@ const SearchList: FC<Props> = ({name, clear}) => {
                 {
                   d.data.table === 'video_records' &&
                   <>
-                  <Img width={192} height={192} src={d.data['@data'].url_path} mode='aspectFill'
+                    <Img width={192} height={192} src={d.data['@data'].url_path} mode='aspectFill' className={styles.image}/>
-                       className={styles.image}/>
                     <Image src={play} className={styles.play} mode='aspectFit'/>
                     <View className={styles.videoRightBox}>
                       <View className='font-weight mb-2 font-28 lh-40'>{d.data['@data'].title}</View>
@@ -146,18 +144,18 @@ const SearchList: FC<Props> = ({name, clear}) => {
                     <Img width={192} height={138} src={d.data['@data'].thumb} mode='aspectFill' className={styles.image}/>
                     <View className={styles.articleLeftBox}>
                       <View className='font-weight mb-2 font-28 lh-40'>{d.data['@data'].title}</View>
-                    <View className={styles.desc}>课时:{d.data['@data'].class_hour}节
+                      <View className={styles.desc}>课时:{d.data['@data'].class_hour}节   销量：{d.data['@data'].charge}</View>
-                      销量：{d.data['@data'].charge}</View>
                     </View>
                   </>
                 }
 
 
+
+
               </View>
             )
             }
-          <View style={{width: '750rpx', textAlign: 'center', color: '#999'}}
+            <View style={{width: '750rpx', textAlign: 'center', color: '#999'}} className="font-28 mt-3 mb-3">{text}</View>
-                className="font-28 mt-3 mb-3">{text}</View>
           </>
       }
       { !loading && brands.length === 0 && <Empty name='空空如也'/>}

src/pages/preview/search/search/index.config.ts

@@ -1,6 +1,3 @@
 export default definePageConfig({
-  navigationBarTitleText: '搜索',
+  navigationStyle: 'custom'
-  navigationBarBackgroundColor: '#F2F8F6',
-  onReachBottomDistance: 50,
-  navigationStyle: 'custom',
 })

src/pages/preview/search/search/index.module.scss

@@ -1,35 +1,26 @@
 page{
   background-color:#F2F8F6;
 
-  .searchHeader {
+  .navBox{
-    margin-top: 10px;
+    position: fixed;
-    padding: 0 20rpx;
+    width:750rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    transition: all 200ms;
-    position: sticky;
-    z-index: 200 ;
-    overflow: hidden;
   }
-
   .searchBox{
-    flex: 1;
+    width: 690rpx;
     height: 68rpx;
     background: #FFFFFF;
-    border-radius: 32rpx;
+    border-radius: 32rpx 32rpx 32rpx 32rpx;
     box-sizing: border-box;
     display: flex;
     align-items: center;
     padding:0 24rpx;
-
     .input{
       font-size: 28rpx;
-      margin-left: 20rpx;
+      font-weight: 500;
+      margin-left: 24rpx;
       flex:1;
     }
   }
-
   .titleBox{
     margin-top: 60rpx;
     width: 100%;
@@ -37,18 +28,15 @@ page {
     box-sizing: border-box;
     padding-right: 30rpx;
     justify-content: space-between;
-
     .title{
       font-size: 28rpx;
       font-weight: bold;
       color: #323635;
     }
   }
-
   .contentBox{
     display: flex;
     flex-wrap: wrap;
-
     .items{
       display: inline-block;
       background: #FFFFFF;

src/pages/preview/search/search/index.tsx

@@ -1,22 +1,25 @@
-import {Input, View, Text, PageContainer, Image} from "@tarojs/components";
+import {Input, View, Text, PageContainer} from "@tarojs/components";
-import React, {FC, useEffect, useMemo, useState} from "react";
+import {FC, useEffect, useState} from "react";
+import { AtIcon } from 'taro-ui'
 import styles from './index.module.scss'
 import Taro from "@tarojs/taro";
-import {useDidShow} from '@tarojs/taro'
+import { useReady, useDidShow } from '@tarojs/taro'
 import SearchList from './components/list'
-import search from '@/static/img/search.png'
-import NavigationBar from "@/components/navigationBar/navigationBar";
-import del from '@/static/img/del.png'
 
 
 const Search:FC = () => {
+  const globalData = Taro.getApp().globalData
   const [value, setValue] = useState('')
   const [recentSearch, setRecentSearch] = useState<string[]>([])
-  const [hotSearch] = useState<any[]>([])
+  const [hotSearch,setHotSearch] = useState<any[]>([])
   const [show, setShow] = useState(false)
-  const [focus, setFocus] = useState(false)
 
-  useDidShow(getRecentSearch)
+  useReady(()=>{
+    console.log('onReady')
+  })
+  useDidShow(()=>{
+    getRecentSearch()
+  })
 
   useEffect(()=>{
     if(!show){
@@ -36,9 +39,11 @@ const Search: FC = () => {
   function getRecentSearch () {
     setRecentSearch(Taro.getStorageSync('recentSearch'))
   }
-
   function getSearchItem(value) {
     setValue(value)
+    // Taro.navigateTo({
+    //   url:`/pages/preview/search/list/index?name=${value}`
+    // })
     setShow(true)
   }
 
@@ -51,48 +56,46 @@ const Search: FC = () => {
    Taro.setStorageSync('recentSearch', [...new Set(recentSearch)])
  }
 
-  const searchStyles = useMemo((): React.CSSProperties | undefined => {
+ function navBack(){
-    if (focus || show) {
+    Taro.navigateBack()
-      return {
-        transform: "translateY(-43px)",
-        width: "70%",
  }
-    }
-  }, [focus, show])
 
-  return (
-    <>
-      <NavigationBar text='搜索'/>
-      <View className={styles.searchHeader} style={searchStyles}>
-        <View className={styles.searchBox}>
-          <Image src={search} style={{width: '32rpx', height: '32rpx'}} mode='widthFix'/>
-          <Input
-            onFocus={() => setFocus(true)}
-            onBlur={() => setFocus(false)}
-            className={styles.input}
-            placeholder={(focus || show) ? '' : "输入关键字搜索"}
-            type='text'
-            confirmType='search'
-            onInput={inpFn}
-            onConfirm={searchInput}/>
 
+  return (
+    <View className="flex flex-column">
+        <View className={styles.navBox} style={{height:`${globalData.statusBarHeight+globalData.textBarHeight}px`}}>
+          <View style={{height:`${globalData.statusBarHeight}px`}}></View>
+          <View  style={{height:`${globalData.textBarHeight}px`,display:'flex',alignItems:'center'}}>
+            <View className="flex justify-end" style={{width:'40px'}}>
+              <AtIcon value='chevron-left' size='25' color='#333' onClick={navBack}></AtIcon>
+            </View>
+            <View className="font-28 font-weight flex-1" style={{display:'flex',justifyContent:'center',paddingRight:'40px',boxSizing:'border-box'}}>搜索</View>
           </View>
-        {focus || show ? <View className='px-2 text-dark' onClick={() => setShow(false)}>取消</View> : null}
         </View>
 
-      <View className="flex flex-column px-2">
+        <View style={{paddingLeft: '30rpx'}}>
+        <View style={{height:`${globalData.statusBarHeight+globalData.textBarHeight}px`}}></View>
+        <View className={styles.searchBox}>
+          <AtIcon value='search' size='20' color='#ccc'></AtIcon>
+          { show ?
+            <Text className={styles.input} >{value}</Text>:
+            <Input className={styles.input} placeholder="输入关键字搜索" type={'text'} confirmType={'search'} onInput={inpFn} onConfirm={searchInput} />
+          }
+        </View>
+
       {
         recentSearch.length >= 1 && !show &&
         <>
           <View className={styles.titleBox} >
-              <Text className={styles.title}>搜索历史</Text>
+            <Text className={styles.title}>最近搜索</Text>
-              <Image src={del} mode='widthFix' style={{width: '16px'}} onClick={clearSearch}/>
+            <AtIcon onClick={clearSearch} value='trash' size='16' color='#909795'></AtIcon>
           </View>
             <View className={styles.contentBox}>
               {
                 recentSearch.length &&
-                recentSearch?.map(d => <View className={styles.items}>
+                recentSearch?.map(d =>
-                  <View onClick={() => getSearchItem(d)} className="font-28">{d}</View>
+                  <View className={styles.items}>
+                    <View onClick={()=>{getSearchItem(d)}} className="font-28" >{d}</View>
                   </View>)
               }
             </View>
@@ -111,9 +114,7 @@ const Search: FC = () => {
                 hotSearch.length &&
                 hotSearch.map(d =>
                   <View className="py-1 px-2 rounded-40 mr-2 mb-2 bg-warning text-white">
-                      <View onClick={() => {
+                    <View onClick={()=>{getSearchItem(d)}} className="font-28" >{d}</View>
-                        getSearchItem(d)
-                      }} className="font-28">{d}</View>
                   </View>)
               }
             </View>
@@ -121,16 +122,12 @@ const Search: FC = () => {
         </>
       }
 
-        <PageContainer
+      <PageContainer onBeforeLeave={() => {setShow(false)}}  onClickOverlay={()=>{ setShow(false)}} show={show} round={true} overlay={true} overlayStyle={'background:rgba(0,0,0,0)'} >
-          onClickOverlay={() => setShow(false)}
-          show={show}
-          overlay
-          overlayStyle={'background:rgba(0,0,0,0)'}>
         <SearchList name={value} clear={show} />
       </PageContainer>
         </View>
-    </>
 
+    </View>
   )
 }
 export default Search

src/utils/debounce.ts

@@ -0,0 +1,12 @@
+let timeout:any = null
+function debounce(func, wait = 500) {
+  console.log(arguments[0],'arguments')
+  timeout && clearTimeout(timeout)
+  timeout = setTimeout(() => {
+    console.log('执行')
+    typeof func === 'function' && func()
+  }, wait)
+}
+
+export default debounce
+