静态页面

src/components/AdvLayer/index.jsx

@@ -0,0 +1,48 @@
+import React, { useState, useEffect } from 'react'
+import request, { apis } from '@/utils/request'
+import { Text } from '@tarojs/components'
+import { useModel } from '@/store'
+import '@/assets/css/reset.less'
+import '@/assets/css/iconfont.less'
+import './index.less'
+
+export default function AdvLayer () {
+
+  const { screen, setScreen } = useModel('screen')
+  const [AdvDetail, setAdvDetail] = useState(null)
+  const [ShowIndexAdv, setShowIndexAdv] = useState(false)
+
+  useEffect(() => {
+    if (screen.FirstComing) {
+      request({ ...apis.getIndexAdv, params: { showType: `screen`, showPosition: `index` } }).then((res) => {
+        setScreen({ FirstComing: false })
+        if (res !== null && res.length > 0) {
+          setAdvDetail(res[0])
+          setShowIndexAdv(true)
+        }
+      })
+    }
+  }, [screen])
+
+  const AdvClick = () => {
+    setShowIndexAdv(false)
+    if (AdvDetail.contentType === 'news') {
+      Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${AdvDetail.contentId}` })
+    } else if (AdvDetail.contentType === 'tpNews') {
+      Taro.navigateTo({ url: `/pages/WuYe/FuWuDetail/index?id=${AdvDetail.contentId}` })
+    } else if (AdvDetail.contentType === 'notice') {
+      Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${AdvDetail.contentId}` })
+    } else if (AdvDetail.contentType === 'activity') {
+      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${AdvDetail.contentId}` })
+    }
+  }
+
+  return (
+    <view className='AdvLayer' style={{ display: ShowIndexAdv ? 'block' : 'none' }}>
+      <view className='centerLabel'>
+        <image mode='aspectFit' src={AdvDetail !== null ? AdvDetail.image : null} onClick={AdvClick}></image>
+        <Text className='iconfont iconguanbi' onClick={() => { setShowIndexAdv(false) }}></Text>
+      </view>
+    </view>
+  )
+}

src/components/AdvLayer/index.less

@@ -0,0 +1,36 @@
+.AdvLayer {
+  width: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 20000;
+  background: rgba(0, 0, 0, 0.8);
+
+  >view {
+    width: 100%;
+    height: 100vw;
+    overflow: visible;
+
+    >image {
+      width: 60%;
+      height: 60%;
+      position: relative;
+      z-index: 1;
+      margin: 0 auto;
+      display: block;
+    }
+
+    >text {
+      display: inline-block;
+      color: #fff;
+      font-size: 60px;
+      position: absolute;
+      left: 50%;
+      bottom: -30px;
+      transform: translateX(-50%);
+      -webkit-transform: translateX(-50%);
+      z-index: 2;
+    }
+  }
+}

src/components/YeZhuRenZhengPopup/index.jsx

@@ -0,0 +1,25 @@
+import React, { useState } from 'react'
+import AddYeZhuRenZheng from '@/components/AddYeZhuRenZheng'
+import '@/assets/css/reset.less'
+import '@/assets/css/iconfont.less'
+import './index.less'
+
+export default function YeZhuRenZhengPopup (props) {
+
+  const { Show = false, Close = () => { } } = props
+
+  return (
+    <view className={Show ? 'YeZhuRenZhengPopup active' : 'YeZhuRenZhengPopup'}>
+      <view className='centerLabel'>
+        <view>
+          <scroll-view scroll-y='true'>
+            {
+              Show &&
+              <AddYeZhuRenZheng Close={Close}></AddYeZhuRenZheng>
+            }
+          </scroll-view>
+        </view>
+      </view>
+    </view>
+  )
+}

src/components/YeZhuRenZhengPopup/index.less

@@ -0,0 +1,33 @@
+.YeZhuRenZhengPopup {
+  width: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.8);
+  display: none;
+
+  &.active {
+    display: block;
+  }
+
+  >view {
+    width: 100%;
+
+    >view {
+      padding: 0 30px;
+      position: relative;
+      overflow: hidden;
+
+      >scroll-view {
+        padding: 30px 0;
+        background: #fff;
+        border-radius: 10px;
+        position: relative;
+        max-height: 90vh;
+        overflow-y: scroll;
+        -webkit-overflow-scrolling: touch;
+      }
+    }
+  }
+}

src/components/demo/index.jsx

@@ -6,10 +6,8 @@ import './index.less'
 export default function demo (props) {
 
   return (
-    <Page>
-      <view className='demo'>
+    <view className='demo'>
 
     </view>
-    </Page>
   )
 }

src/layouts/index.jsx

@@ -1,13 +1,12 @@
 import React, { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { useModel } from '@/store'
-import { Text , ScrollView } from '@tarojs/components'
 import Spin from '@/components/Spin'
 import GetUserPhone from '@/components/GetUserPhone/index'
 import GetUserIcon from '@/components/GetUserIcon/index'
-import AddYeZhuRenZheng from '@/components/AddYeZhuRenZheng'
+import AdvLayer from '@/components/AdvLayer'
+import YeZhuRenZhengPopup from '@/components/YeZhuRenZhengPopup'
 import useMountTrack from '@/utils/hooks/useMountTrack'
-import request, { apis } from '@/utils/request'
 import { getPage } from '@/utils'
 import './index.less'
 
@@ -25,9 +24,6 @@ export default function (props) {
   const [showAuthBasic, setShowAuthBasic] = useState(false)
   const [showAuthYeZhu, setShowAuthYeZhu] = useState(false)
   const [showAuthPhone, setShowAuthPhone] = useState(false)
-  const [ShowAdvLayer, setShowAdvLayer] = useState(true)
-  const [AdvDetail, setShowAdvDetail] = useState(null)
-  const [ShowAddLayer, setShowAddLayer] = useState(false)
   const { user, setUser } = useModel('user')
 
   const loading = !user || !user.personId
@@ -40,20 +36,6 @@ export default function (props) {
   const needAuthYeZhu = (page.auth || []).indexOf('yezhu') > -1
   const needAuthPhone = (page.auth || []).indexOf('phone') > -1
 
-  useEffect(() => {
-    if (user !== null && user.FirstComing !== undefined && user.FirstComing) {
-      request({ ...apis.getIndexAdv, params: { showType: `screen`, showPosition: `index` } }).then((res) => {
-        if (res !== null && res.length > 0) {
-          setShowAdvDetail(res[0])
-          setUser({ ...user, ShowIndexAdv: true, FirstComing: false })
-        }
-      })
-    }
-    if (user !== null) {
-      setShowAddLayer(true)
-    }
-  }, [user])
-
   // 埋点
   useMountTrack()
 
@@ -99,51 +81,17 @@ export default function (props) {
     setShowAuthBasic(needShow)
   }, [isAuthedBasic, needAuthBasic, isAuthedPhone, isAuthedYeZhu, needAuthYeZhu])
 
-  const AdvClick = () => { // 首页弹窗点击事件
-    setShowAdvLayer(false)
-    if (AdvDetail.contentType === 'news') {
-      Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${AdvDetail.contentId}` })
-    } else if (AdvDetail.contentType === 'tpNews') {
-      Taro.navigateTo({ url: `/pages/WuYe/FuWuDetail/index?id=${AdvDetail.contentId}` })
-    } else if (AdvDetail.contentType === 'notice') {
-      Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${AdvDetail.contentId}` })
-    } else if (AdvDetail.contentType === 'activity') {
-      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${AdvDetail.contentId}` })
-    }
-  }
-
   return (
     <Spin loading={loading}>
 
       {/* 广告 */}
-      <view className='AdvLayer' style={{ display: user !== null && user.ShowIndexAdv !== undefined && user.ShowIndexAdv ? 'block' : 'none' }}>
-        <view className='centerLabel'>
-          <image mode='aspectFit' src={AdvDetail !== null ? AdvDetail.image : null} onClick={AdvClick}></image>
-          <Text className='iconfont iconguanbi' onClick={() => { setUser({ ...user, ShowIndexAdv: false }) }}></Text>
-        </view>
-      </view>
-
+      <AdvLayer></AdvLayer>
       <GetUserIcon visible={showAuthBasic} onError={err => showError(`授权头像失败: ${err}`)} />
       <GetUserPhone visible={showAuthPhone} onError={err => showError(`授权手机失败: ${err}`)} />
+      <YeZhuRenZhengPopup Show={showAuthYeZhu} Close={() => { setShowAuthYeZhu(false) }}></YeZhuRenZhengPopup>
       {
         props.children
       }
-
-      {
-        user !== null &&
-        <view className={ShowAddLayer ? 'AddRenZhengLayer active' : 'AddRenZhengLayer'}>
-          <view className='centerLabel'>
-            <view>
-              <ScrollView scroll-y='true'>
-                {
-                  ShowAddLayer &&
-                  <AddYeZhuRenZheng Close={() => { setShowAddLayer(false) }}></AddYeZhuRenZheng>
-                }
-              </ScrollView>
-            </view>
-          </view>
-        </view>
-      }
     </Spin>
   )
 }

src/layouts/index.less

@@ -1,39 +1,4 @@
-.AdvLayer {
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  z-index: 20000;
-  background: rgba(0, 0, 0, 0.8);
 
-  >view {
-    width: 100%;
-    height: 100vw;
-    overflow: visible;
-
-    >image {
-      width: 60%;
-      height: 60%;
-      position: relative;
-      z-index: 1;
-      margin: 0 auto;
-      display: block;
-    }
-
-    >text {
-      display: inline-block;
-      color: #fff;
-      font-size: 60px;
-      position: absolute;
-      left: 50%;
-      bottom: -30px;
-      transform: translateX(-50%);
-      -webkit-transform: translateX(-50%);
-      z-index: 2;
-    }
-  }
-}
 
 .AddRenZhengLayer {
   width: 100%;

src/pages/WuYe/BaoXiuDetail/index.jsx

@@ -95,7 +95,10 @@ export default function BaoXiuDetail () {
 
           {/* 更多操作 */}
           <view className='BottomBtn active'>
-            <text onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/BaoXiuFeiYong/index?id=${CurrnetBaoXiuId}` }) }}>费用详情</text>
+            {
+              DetailInfo !== null && DetailInfo.billInvoiceId !== null &&
+              <text onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/BaoXiuFeiYong/index?id=${CurrnetBaoXiuId}` }) }}>费用详情</text>
+            }
           </view>
 
           {/* 更多操作 */}

src/store/models/index.js

@@ -1,11 +1,13 @@
 import useSystem from './useSystem'
 import useAppRouter from './useAppRouter'
 import useUser from './useUser'
+import useScreen from './useScreen'
 
 const models = {
   'appRouter': useAppRouter,
   'sys': useSystem,
   'user': useUser,
+  'screen': useScreen
 }
 
 export default models

src/store/models/useScreen.js

@@ -0,0 +1,25 @@
+import React, { useEffect, useState } from 'react'
+import Taro from '@tarojs/taro'
+
+export default function useScreen () {
+  const [screen, setScreen] = useState({ FirstComing: true })
+
+  // const updateUser = data => {
+  //   // 固化到本地
+  //   Taro.setStorage({ key: 'user', data })
+  //   setUser(data)
+  // }
+
+  // useEffect(() => {
+  //   // 如果本地存在, 则读取本地信息
+  //   const u = Taro.getStorageSync('user')
+  //   if (u) {
+  //     setUser(u)
+  //   }
+  // }, [])
+
+  return {
+    screen,
+    setScreen
+  }
+}