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

src/pages/home/components/feature.tsx

@@ -20,7 +20,7 @@ const Feature: FC = () => {
   }
 
   return (
-    <View className='flex justify-around' style={{marginBottom: '25px'}}>
+    <View className='flex justify-around' style={{marginBottom: '20px'}}>
       {
         list.map(d => <View className='text-center' onClick={() => jump(d.url)}>
           <Image src={d.image} style={{width: '48px', height: '48px'}}/>

src/pages/home/home.module.scss

@@ -15,18 +15,32 @@
   font-weight: 500;
 }
 
-.header{
+.header {
-
+  position: fixed;
-}
+  top: 0;
+  left: 0;
+  right: 0;
+  width: 100%;
+  padding-left: 20rpx;
+  z-index: 99999999999;
+  overflow: hidden;
 
-.logo{
+  &:after {
-  width: 80rpx;
+    min-height: 100vh;
-  height: 80rpx;
+    position: absolute;
+    top: 0;
+    left: -10%;
+    width: 120%;
+    content: '';
+    display: block;
+    background: linear-gradient(to right, #DBF3F5, #B9ECD7, #C1EEDA) no-repeat;
+    min-height: 100vh;
+    background-size: 100% 600rpx;
+    z-index: -1;
+  }
 }
 
-
 .content {
-  position: relative;
   padding: 0 20px;
   min-height: 90vh;
   box-sizing: border-box;
@@ -41,8 +55,9 @@
     height: 400rpx;
     content: '';
     display: block;
-    background: linear-gradient(to bottom, #92ecc5, #f1f8f6) no-repeat;
+    background: linear-gradient(to right, #DBF3F5, #B9ECD7, #C1EEDA) no-repeat;
     z-index: -1;
+    filter: blur(50px);
   }
 }
 
@@ -72,8 +87,8 @@
 
 .featureList {
   font-size: 28rpx;
-  font-family: PingFang SC-Medium, PingFang SC;
+  font-family: PingFang SC-Bold, PingFang SC;
-  font-weight: 500;
+  font-weight: bold;
   color: #323635;
   margin-top: 10px;
 }
@@ -90,14 +105,14 @@
   color: #323635;
   background: #fff;
   padding: 30rpx 0 30rpx 30rpx;
-  margin-bottom: 50rpx;
+  margin-bottom: 40rpx;
   border-radius: 30rpx;
 }
 
 .featureTitle {
   max-width: 212px;
-  height: 42rpx;
+  height: 50rpx;
-  padding-bottom: 30rpx;
+  padding-bottom: 20rpx;
 }
 
 .featureText {
@@ -105,7 +120,7 @@
 }
 
 .featureTextTitle {
-  font-size: 30rpx;
+  font-size: 32rpx;
   font-family: PingFang SC-Medium, PingFang SC;
   font-weight: 500;
   color: #323635;
@@ -113,11 +128,10 @@
   white-space: nowrap;
   text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
-  line-height: 2;
 }
 
 .featureTextDescription {
-  font-size: 24rpx;
+  font-size: 28rpx;
   font-family: PingFang SC-Medium, PingFang SC;
   font-weight: 500;
   color: #909795;
@@ -125,6 +139,7 @@
   white-space: nowrap;
   text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
+  line-height: 2;
 }
 
 .ranking {
@@ -142,4 +157,5 @@
   border-radius: 12rpx;
   overflow: hidden;
   margin-right: 20rpx;
+  vertical-align: middle;
 }

src/pages/home/home.tsx

@@ -15,9 +15,11 @@ import Spin from "@/components/spinner";
 
 const Home: FC = () => {
   const globalData = Taro.getApp().globalData
+  const {bottom, top} = Taro.getMenuButtonBoundingClientRect()
   const {token} = Profile.useContainer()
   const [data, setData] = useState<null | HomeData>(null)
   const [enable, setEnable] = useState(true)
+  const titleBarHeight = bottom + top - (globalData.statusBarHeight * 2)
 
   function unLogin() {
     Taro.clearStorage()
@@ -34,10 +36,13 @@ const Home: FC = () => {
   })
 
   return (
-    <View className={styles.content}>
+    <View className={styles.content} style={{paddingTop: `${globalData.statusBarHeight + 60}px`}}>
       <Spin enable={enable} overlay/>
-      <View className={styles.header} style={{padding: `${globalData.statusBarHeight}px 0 10px 0`}}>
+      <View className={styles.header}
-        <Image src={logo} className={styles.logo} mode='aspectFit'/>
+            style={{padding: `${globalData.statusBarHeight + 5}px 0 5px 20rpx`, height: `${titleBarHeight - 10}px`}}>
+        <Image style={{width: `${titleBarHeight - 10}px`, height: `${titleBarHeight - 10}px`}}
+               src={logo}
+               mode='aspectFit'/>
       </View>
       <Adware data={data?.adverts || []} only_flag='routine_home_top_banner' width={710}/>
       <Feature/>

src/pages/manage/spotMeeting/spotMeeting.tsx

@@ -25,6 +25,7 @@ const SpotMeeting: FC = () => {
   const [loading, setLoading] = useState(false)
   const [status, setStatus] = useState(0)  // 状态
   const [id, setId] = useState<number | undefined>(params.id ? Number(params.id) : undefined)
+  const pathUrl = process.env.TARO_ENV === 'h5' ? '/official/qrcode' : '/wechat/link'
   const {company} = Profile.useContainer()
 
   function setData(res: Meeting | null) {
@@ -119,6 +120,9 @@ const SpotMeeting: FC = () => {
                 //存储二维码
                 handleWriteFile()
               },
+              fail() {
+                Taro.showToast({title: '保存授权失败', icon: "error"})
+              }
             });
           } else {
             handleWriteFile()
@@ -133,7 +137,7 @@ const SpotMeeting: FC = () => {
   /** 获取二维码地址 */
   const downUrl = (id: number, down = true) => {
     Taro.showLoading({title: '加载二维码'})
-    const url = process.env.TARO_APP_API + '/official/qrcode?' + 'meeting_id=' + id + '&path=' + path
+    const url = process.env.TARO_APP_API + pathUrl + '?meeting_id=' + id + '&path=' + path
 
     if (process.env.TARO_ENV !== 'h5') {
       Taro.downloadFile({
@@ -302,17 +306,6 @@ const SpotMeeting: FC = () => {
               <PopPut title='选择部门' content={manages?.find(x => x.id == depid)?.name}/>
             </Picker>
 
-            {/*<Textarea*/}
-            {/*  value={description}*/}
-            {/*  className='Textarea'*/}
-            {/*  disabled={!!params.id || status === 1}*/}
-            {/*  placeholder='请输入描述'*/}
-            {/*  maxlength={255}*/}
-            {/*  name='description'*/}
-            {/*  onInput={(e) => setDescription(e.detail.value)}*/}
-            {/*  style={{height: '60px'}}>*/}
-            {/*</Textarea>*/}
-
             <View className='flex justify-between'>
               {
                 id !== undefined && <>

src/pages/preview/videoFull/videoFull.tsx

@@ -54,7 +54,7 @@ const VideoFull: FC = () => {
         onClick={click}
         className={styles.video}
         controls
-        poster={params.poster}
+        // poster={params.poster}
         src={params.url}
         autoplay
         showCenterPlayBtn

src/static/css/module.scss

@@ -1,13 +1,10 @@
 page,
 .taro_router .taro_page {
-  background-color: #f1f8f6 !important;
+  background-color: #f2f8f6 !important;
   font-family: PingFang SC-Bold, PingFang SC;
   -webkit-overflow-scrolling: touch;
   box-sizing: border-box;
   padding-bottom: env(safe-area-inset-bottom);
-}
-
-body {
   font-size: 32rpx;
 }