静态页面

project.config.json

@@ -5,30 +5,30 @@
 	"appid": "wxe44244d1a5ea3364",
 	"setting": {
 		"urlCheck": true,
+		"scopeDataCheck": false,
+		"coverView": true,
 		"es6": false,
-		"enhance": false,
 		"postcss": false,
+		"compileHotReLoad": false,
 		"preloadBackgroundData": false,
 		"minified": false,
+		"autoAudits": false,
 		"newFeature": false,
-		"coverView": true,
+		"uglifyFileName": false,
+		"uploadWithSourceMap": true,
+		"useIsolateContext": true,
 		"nodeModules": false,
-		"autoAudits": false,
+		"enhance": false,
+		"useCompilerModule": false,
+		"userConfirmedUseCompilerModuleSwitch": false,
 		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"uglifyFileName": false,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
-		},
-		"useIsolateContext": true,
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+		}
 	},
 	"compileType": "miniprogram",
 	"simulatorType": "wechat",

src/components/ActivityListItem/index.jsx

@@ -41,6 +41,6 @@ export default function ActivityListItem (props) {
         </view>
         <text className={BtnStatus() === '未开始' || BtnStatus() === '去报名' ? 'active' : ''}>{BtnStatus()}</text>
       </view>
-    </view >
+    </view>
   )
 }

src/components/NavHeader/index.jsx

@@ -9,7 +9,7 @@ export default function NavHeader (props) {
   const [MarginTop, setMarginTop] = useState(0)
   const [LineHeight, setLineHeight] = useState(0)
   const { BgColor = '#fff', IsFixed = false, Title = '香颂蔚澜' } = props
-  
+
   if (MarginTop === 0) {
     setMarginTop(Taro.getMenuButtonBoundingClientRect().top)
   }

src/components/NewsListItem/index.jsx

@@ -21,6 +21,6 @@ export default function NewsListItem (props) {
         <text>{Data.newsName}</text>
         <text>于{Data.createDate}发布</text>
       </view>
-    </view >
+    </view>
   )
 }

src/components/PrizeListItem/index.jsx

@@ -22,6 +22,6 @@ export default function PrizeListItem (props) {
           <view><text>积分</text></view>
         </view>
       </view>
-    </view >
+    </view>
   )
 }

src/components/ScrollPage/index.jsx

@@ -5,7 +5,7 @@ import './index.less'
 
 export default function ScrollPage (props) {
 
-  const {IsPullDown = false, IsPullUp = false, HasMore = true, OnRefresh = () => {}, OnPullUp = () => {}} = props
+  const { IsPullDown = false, IsPullUp = false, HasMore = true, OnRefresh = () => { }, OnPullUp = () => { } } = props
 
   return (
     <view className='ScrollPage'>

src/components/Spin/index.jsx

@@ -15,15 +15,15 @@ export default props => {
     <>
       {
         props.loading ? (
-          <View className="cubes-box">
-            <View className="cubes">
+          <View className='cubes-box'>
+            <View className='cubes'>
               {
                 new Array(cubeLen).fill(0).map((_, inx) => (
                   <View key={inx} class={`sk-cube sk-cube${inx + 1}`} style={cubeStyle}></View>
                 ))
               }
             </View>
-            <View className="cubes-tip" style={tipStyle}>{tipText}</View>
+            <View className='cubes-tip' style={tipStyle}>{tipText}</View>
           </View>
         ) : props.children
       }

src/components/TabPageCutNav/index.jsx

@@ -19,6 +19,6 @@ export default function (props) {
           }
         </view>
       </view>
-    </view >
+    </view>
   )
 }

src/components/WuYeFuWu/index.jsx

@@ -21,7 +21,7 @@ export default function WuYeFuWu () {
 
   return (
     <view className='WuYeFuWu'>
-      <ScrollPageRefresh ApiName={`getMessageList`} ListName={`list`} RequestUrlData={{ orgId: user.orgId }} Refresh={Refresh} Push={Push}>
+      <ScrollPageRefresh ApiName={`getWuYeFuWuList`} Refresh={Refresh} Push={Push}>
         {/* 大图 */}
         <view className='BigImg'>
           <image mode='aspectFill' src={null} className='centerLabel'></image>

src/components/WuYeFuWuItem/index.jsx

@@ -1,37 +1,23 @@
-import React, { Component } from 'react'
+import React, { useState } from 'react'
 import Taro from '@tarojs/taro'
-import '../../assets/css/reset.less'
-import '../../assets/css/iconfont.less'
+import toolclass from '@/utils/toolclass.js'
+import '@/assets/css/reset.less'
+import '@/assets/css/iconfont.less'
 import './index.less'
 
-export default class WuYeFuWuItem extends Component {
+export default function WuYeFuWuItem (props) {
 
-  state = {
-    TestImg: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1606120989360&di=8610f1678b51e26de6d4c6af39d1cf63&imgtype=0&src=http%3A%2F%2Fattachments.gfan.com%2Fforum%2F201503%2F19%2F211608ztcq7higicydxhsy.jpg'
-  }
+  const { Data } = props
 
-  componentWillMount () { }
-
-  componentDidMount () { }
-
-  componentWillUnmount () { }
-
-  componentDidShow () { }
-
-  componentDidHide () { }
-
-  render () {
-    const { TestImg } = this.state
-    return (
-      <view className='WuYeFuWuItem flex-h' onClick={() => { Taro.navigateTo({ url: '/pages/WuYe/FuWuDetail/index' }) }}>
-        <view className='Img'>
-          <image mode='aspectFill' src={TestImg} className='centerLabel'></image>
-        </view>
-        <view className='flex-item'>
-          <text>业主收楼办理手续</text>
-          <text>于2019-12-12 14:20:30发布</text>
-        </view>
+  return (
+    <view className='WuYeFuWuItem flex-h' onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/FuWuDetail/index?id=${Data.newsId}` }) }}>
+      <view className='Img'>
+        <image mode='aspectFill' src={Data.newsImg} className='centerLabel'></image>
+      </view>
+      <view className='flex-item'>
+        <text>{Data.newsName}</text>
+        <text>于{toolclass.FormatDate(Data.createDate)}发布</text>
       </view>
-    )
-  }
+    </view>
+  )
 }

src/components/WuYeJiaoFei/index.jsx

@@ -6,7 +6,7 @@ import '@/assets/css/iconfont.less'
 import './index.less'
 
 export default function WuYeJiaoFei () {
-  
+
   const [PageList, setPageList] = useState([])
 
   const Refresh = (e) => { // 下拉刷新

src/components/demo/index.jsx

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

src/layouts/index.jsx

@@ -17,7 +17,7 @@ const showError = err => {
   })
 }
 
-export default function(props) {
+export default function (props) {
   const [showAuthBasic, setShowAuthBasic] = useState(false)
   const [showAuthYeZhu, setShowAuthYeZhu] = useState(false)
   const [showAuthPhone, setShowAuthPhone] = useState(false)
@@ -32,7 +32,7 @@ export default function(props) {
   const needAuthBasic = (page.auth || []).indexOf('avatar') > -1
   const needAuthYeZhu = (page.auth || []).indexOf('yezhu') > -1
   const needAuthPhone = (page.auth || []).indexOf('phone') > -1
-  
+
   // 埋点
   useMountTrack()
 
@@ -82,7 +82,9 @@ export default function(props) {
     <Spin loading={loading}>
       <GetUserIcon visible={showAuthBasic} onError={err => showError(`授权头像失败: ${err}`)} />
       <GetUserPhone visible={showAuthPhone} onError={err => showError(`授权手机失败: ${err}`)} />
-      { props.children }
+      {
+        props.children
+      }
     </Spin>
   )
 }

src/pages/FuLi/JiFenGuiZe/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import CustomHeader from '@/components/CustomHeader/index'
 import request, { apis } from '@/utils/request'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -20,47 +21,49 @@ export default function JiFenGuiZe () {
   }
 
   return (
-    <view className='JiFenGuiZe'>
-      <CustomHeader IsFixed={true} BgColor='none' Title='积分规则'></CustomHeader>
+    <Page>
+      <view className='JiFenGuiZe'>
+        <CustomHeader IsFixed={true} BgColor='none' Title='积分规则'></CustomHeader>
 
-      <view className='JiFenContent'>
-        <view>
-          <view className='Img'>
-            <image mode='widthFix' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/img.png'></image>
-          </view>
-          <view className='Title'>
-            <text>积分兑换时间</text>
-          </view>
-          <text>2020年11月30日09:00-2020年12月30日15:00</text>
-          <view className='Title'>
-            <text>积分兑换规则</text>
-          </view>
-          <text>1）积分仅兑换积分商城中的商品，不能折算现金；</text>
-          <text>2）兑换商品中所要求的积分需达到要求方可兑换；</text>
-          <text>3）兑换商品图片仅供参考，商品以实际领取为准。</text>
-          {
-            RuleList.length > 0 &&
-            <view className='RuleList'>
-              <view className='flex-h'>
-                <view className='flex-item'>
-                  <text style={{textAlign: 'center'}}>途径</text>
+        <view className='JiFenContent'>
+          <view>
+            <view className='Img'>
+              <image mode='widthFix' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/img.png'></image>
+            </view>
+            <view className='Title'>
+              <text>积分兑换时间</text>
+            </view>
+            <text>2020年11月30日09:00-2020年12月30日15:00</text>
+            <view className='Title'>
+              <text>积分兑换规则</text>
+            </view>
+            <text>1）积分仅兑换积分商城中的商品，不能折算现金；</text>
+            <text>2）兑换商品中所要求的积分需达到要求方可兑换；</text>
+            <text>3）兑换商品图片仅供参考，商品以实际领取为准。</text>
+            {
+              RuleList.length > 0 &&
+              <view className='RuleList'>
+                <view className='flex-h'>
+                  <view className='flex-item'>
+                    <text style={{ textAlign: 'center' }}>途径</text>
+                  </view>
+                  <view>分数</view>
                 </view>
-                <view>分数</view>
-              </view>
-              {
-                RuleList.map((item, index) => (
-                  <view className='flex-h' key={`RuleList-${index}`}>
-                    <view className='flex-item'>
-                      <text>{item.remark}</text>
+                {
+                  RuleList.map((item, index) => (
+                    <view className='flex-h' key={`RuleList-${index}`}>
+                      <view className='flex-item'>
+                        <text>{item.remark}</text>
+                      </view>
+                      <view>{item.pointsAmount}</view>
                     </view>
-                    <view>{item.pointsAmount}</view>
-                  </view>
-                ))
-              }
-            </view>
-          }
+                  ))
+                }
+              </view>
+            }
+          </view>
         </view>
       </view>
-    </view>
+    </Page>
   )
 }

src/pages/FuLi/JiFenMingXi/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
 import CustomHeader from '@/components/CustomHeader'
 import Taro from '@tarojs/taro'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -26,80 +27,82 @@ export default function JiFenMingXi (props) {
   }
 
   return (
-    <view className='JiFenMingXi flex-v'>
-      <CustomHeader IsFixed={true} BgColor='none' Title='积分明细'></CustomHeader>
-      <view className='TopContainer'>
-        <view className='centerLabel'>
-          <view className='flex-h'>
-            <view className='flex-item'>
-              <text>当前积分</text>
-              <text>300</text>
+    <Page>
+      <view className='JiFenMingXi flex-v'>
+        <CustomHeader IsFixed={true} BgColor='none' Title='积分明细'></CustomHeader>
+        <view className='TopContainer'>
+          <view className='centerLabel'>
+            <view className='flex-h'>
+              <view className='flex-item'>
+                <text>当前积分</text>
+                <text>300</text>
+              </view>
+              <text onClick={() => { Taro.navigateTo({ url: `/pages/FuLi/JiFenGuiZe/index` }) }}>积分规则</text>
+              <text className='iconfont iconjiantouright'></text>
             </view>
-            <text onClick={() => { Taro.navigateTo({ url: `/pages/FuLi/JiFenGuiZe/index` }) }}>积分规则</text>
-            <text className='iconfont iconjiantouright'></text>
           </view>
         </view>
-      </view>
-      <view className='NavList flex-h'>
-        {
-          NavList.map((item, index) => (
-            <view key={`Nav-${index}`} className='flex-item' onClick={CutNav(item)}>
-              <text className={CurrentNavId - 0 === item.id - 0 ? 'active' : ''}>{item.name}</text>
-            </view>
-          ))
-        }
-      </view>
-      <view className='flex-item'>
-        <view>
-          <scroll-view scroll-y='true' style='height: 100%;' refresher-enabled={true} onrefresherrefresh={OnRefresh} refresher-triggered={IsPull} refresher-background='none'>
-            <view className='List'>
+        <view className='NavList flex-h'>
+          {
+            NavList.map((item, index) => (
+              <view key={`Nav-${index}`} className='flex-item' onClick={CutNav(item)}>
+                <text className={CurrentNavId - 0 === item.id - 0 ? 'active' : ''}>{item.name}</text>
+              </view>
+            ))
+          }
+        </view>
+        <view className='flex-item'>
+          <view>
+            <scroll-view scroll-y='true' style='height: 100%;' refresher-enabled={true} onrefresherrefresh={OnRefresh} refresher-triggered={IsPull} refresher-background='none'>
+              <view className='List'>
 
-              {/* 全部 */}
-              {
-                CurrentNavId - 0 === 1 &&
-                PageList.map((item, index) => (
-                  <view className='flex-h' key={`List-${index}`}>
-                    <view className='flex-item'>
-                      <text>每日签到</text>
-                      <text>2018-01-01  18:00</text>
+                {/* 全部 */}
+                {
+                  CurrentNavId - 0 === 1 &&
+                  PageList.map((item, index) => (
+                    <view className='flex-h' key={`List-${index}`}>
+                      <view className='flex-item'>
+                        <text>每日签到</text>
+                        <text>2018-01-01  18:00</text>
+                      </view>
+                      <text>+10</text>
                     </view>
-                    <text>+10</text>
-                  </view>
-                ))
-              }
+                  ))
+                }
 
-              {/* 积分收入 */}
-              {
-                CurrentNavId - 0 === 2 &&
-                PageList.map((item, index) => (
-                  <view className='flex-h' key={`List-${index}`}>
-                    <view className='flex-item'>
-                      <text>每日签到</text>
-                      <text>2018-01-01  18:00</text>
+                {/* 积分收入 */}
+                {
+                  CurrentNavId - 0 === 2 &&
+                  PageList.map((item, index) => (
+                    <view className='flex-h' key={`List-${index}`}>
+                      <view className='flex-item'>
+                        <text>每日签到</text>
+                        <text>2018-01-01  18:00</text>
+                      </view>
+                      <text>+10</text>
                     </view>
-                    <text>+10</text>
-                  </view>
-                ))
-              }
+                  ))
+                }
 
-              {/* 积分支出 */}
-              {
-                CurrentNavId - 0 === 3 &&
-                PageList.map((item, index) => (
-                  <view className='flex-h' key={`List-${index}`}>
-                    <view className='flex-item'>
-                      <text>每日签到</text>
-                      <text>2018-01-01  18:00</text>
+                {/* 积分支出 */}
+                {
+                  CurrentNavId - 0 === 3 &&
+                  PageList.map((item, index) => (
+                    <view className='flex-h' key={`List-${index}`}>
+                      <view className='flex-item'>
+                        <text>每日签到</text>
+                        <text>2018-01-01  18:00</text>
+                      </view>
+                      <text className='active'>-10</text>
                     </view>
-                    <text className='active'>-10</text>
-                  </view>
-                ))
-              }
+                  ))
+                }
 
-            </view>
-          </scroll-view>
+              </view>
+            </scroll-view>
+          </view>
         </view>
       </view>
-    </view>
+    </Page>
   )
 }

src/pages/FuLi/ShangPinDuiHuan/index.jsx

@@ -3,6 +3,7 @@ import Taro, { Current } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
 import { Input } from '@tarojs/components'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -42,7 +43,8 @@ export default function ShangPinDuiHuan () {
   }
 
   return (
-    <view className='ShangPinDuiHuan'>
+    <Page>
+      <view className='ShangPinDuiHuan'>
       <view className='Info'>
         <view className='Item flex-h'>
           <view className='Img'>
@@ -72,5 +74,6 @@ export default function ShangPinDuiHuan () {
         <text className={DataLock ? '' : 'active'} onClick={Submit}>{DataLock ? '正在提交...' : '确认兑换'}</text>
       </view>
     </view>
+    </Page>
   )
 }

src/pages/FuLi/ShangPinXiangQing/index.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
 import Taro, { Current } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -23,31 +24,33 @@ export default function ShangPinXiangQing () {
   }
 
   return (
-    <view className='ShangPinXiangQing'>
-      <view className='Info'>
-        <view className='Img'>
-          <image mode='aspectFill' src={GoodsDetail === null ? null : GoodsDetail.imgUrl} className='centerLabel'></image>
+    <Page>
+      <view className='ShangPinXiangQing'>
+        <view className='Info'>
+          <view className='Img'>
+            <image mode='aspectFill' src={GoodsDetail === null ? null : GoodsDetail.imgUrl} className='centerLabel'></image>
+          </view>
+          <view className='Title'>
+            <text>{GoodsDetail === null ? '' : GoodsDetail.goodsName}</text>
+          </view>
+          <view className='flex-h'>
+            <text>{GoodsDetail === null ? '' : GoodsDetail.pointPrice}</text>
+            <text className='flex-item'>积分</text>
+            <text>剩余数量</text>
+            <text>{GoodsDetail === null ? '' : GoodsDetail.inventory}</text>
+          </view>
         </view>
-        <view className='Title'>
-          <text>{GoodsDetail === null ? '' : GoodsDetail.goodsName}</text>
-        </view>
-        <view className='flex-h'>
-          <text>{GoodsDetail === null ? '' : GoodsDetail.pointPrice}</text>
-          <text className='flex-item'>积分</text>
-          <text>剩余数量</text>
-          <text>{GoodsDetail === null ? '' : GoodsDetail.inventory}</text>
-        </view>
-      </view>
-      <view className='Detail'>
-        <view className='Title'>
-          <view className='Line'></view>
-          <text>产品详情</text>
-          <image mode='widthFix' src={GoodsDetail === null ? null : GoodsDetail.detailImgUrl} style={{width: `100%`}}></image>
-        </view>
-        <view className='BottomBtn'>
-          <text className='active' onClick={() => { Taro.navigateTo({ url: `/pages/FuLi/ShangPinDuiHuan/index?id=${CurrnetId}` }) }}>立即兑换</text>
+        <view className='Detail'>
+          <view className='Title'>
+            <view className='Line'></view>
+            <text>产品详情</text>
+            <image mode='widthFix' src={GoodsDetail === null ? null : GoodsDetail.detailImgUrl} style={{ width: `100%` }}></image>
+          </view>
+          <view className='BottomBtn'>
+            <text className='active' onClick={() => { Taro.navigateTo({ url: `/pages/FuLi/ShangPinDuiHuan/index?id=${CurrnetId}` }) }}>立即兑换</text>
+          </view>
         </view>
       </view>
-    </view>
+    </Page>
   )
 }

src/pages/FuLi/index.jsx

@@ -1,8 +1,10 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import NavHeader from '@/components/NavHeader/index'
 import PrizeListItem from '@/components/PrizeListItem/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
+import request, { apis } from '@/utils/request'
+import Page from '@/layouts'
 import { useModel } from '@/store'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
@@ -10,9 +12,33 @@ import './index.less'
 
 export default function FuLi () {
 
-  const { user } = useModel('user')
+  const { user, setUser } = useModel('user')
+  const [DataLock, setDataLock] = useState(false)
   const [PageList, setPageList] = useState([])
 
+  useEffect(() => {
+    if (user !== null && user.havaSigned === undefined) {
+      request({ ...apis.getUserInfo }).then((res) => {
+        setUser({ ...user, ...res })
+      }).catch((res) => {
+        Taro.showToast({ title: res, icon: 'none' })
+      })
+    }
+  }, [])
+
+  const ToSign = () => { // 签到
+    if (DataLock || (user.havaSigned !== undefined && user.havaSigned - 0 === 1)) return
+    setDataLock(true)
+    request({ ...apis.userSign }).then(() => {
+      Taro.showToast({ title: '签到成功', icon: 'none' })
+      setUser({ ...user, havaSigned: 1 })
+      setDataLock(false)
+    }).catch((res) => {
+      Taro.showToast({ title: res, icon: 'none' })
+      setDataLock(false)
+    })
+  }
+
   const Refresh = (e) => { // 下拉刷新
     setPageList(e)
   }
@@ -22,75 +48,80 @@ export default function FuLi () {
   }
 
   return (
-    <view className='FuLi flex-v'>
-      <NavHeader BgColor='none' Title='福利' IsFixed={true}></NavHeader>
+    <Page>
+      <view className='FuLi flex-v'>
+        <NavHeader BgColor='none' Title='福利' IsFixed={true}></NavHeader>
 
-      {/* 顶部背景图 */}
-      <view className='TopBg'>
-        <image mode='aspectFill' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/bg.jpg' class='centerLabel'></image>
-      </view>
+        {/* 顶部背景图 */}
+        <view className='TopBg'>
+          <image mode='aspectFill' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/bg.jpg' class='centerLabel'></image>
+        </view>
 
-      {/* 正文 */}
-      <view className='flex-item'>
-        <view>
-          <ScrollPageRefresh ApiName={`getGoodsList`} Refresh={Refresh} Push={Push}>
-            <view className='FuLiContent'>
+        {/* 正文 */}
+        <view className='flex-item'>
+          <view>
+            <ScrollPageRefresh ApiName={`getGoodsList`} Refresh={Refresh} Push={Push}>
+              <view className='FuLiContent'>
 
-              {/* 用户面板 */}
-              <view className='UserTab'>
-                <view>
-                  <view className='Info flex-h'>
-                    <view className='Icon'>
+                {/* 用户面板 */}
+                <view className='UserTab'>
+                  <view>
+                    <view className='Info flex-h'>
+                      <view className='Icon'>
+                        {
+                          user !== null &&
+                          <image mode='aspectFill' src={user.avatarurl} class='centerLabel'></image>
+                        }
+                      </view>
+                      <view className='flex-item'>
+                        <text>{user === null ? '未登录' : user.nickname || '未授权用户信息'}</text>
+                        <text>积分{user === null ? '-' : user.points || 0}</text>
+                      </view>
                       {
-                        user !== null &&
-                        <image mode='aspectFill' src={user.avatarurl} class='centerLabel'></image>
+                        user.havaSigned !== undefined &&
+                        <text className={user.havaSigned - 0 === 1 ? '' : 'active'} onClick={ToSign}>{user.havaSigned - 0 === 1 ? '已签到' : '签到'}</text>
                       }
                     </view>
-                    <view className='flex-item'>
-                      <text>{user === null ? '未登录' : user.nickname || '未授权用户信息'}</text>
-                      <text>积分{user === null ? '-' : user.points || 0}</text>
-                    </view>
-                    <text className='active'>签到</text>
-                  </view>
-                  <view className='Rule flex-h'>
-                    <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/FuLi/JiFenGuiZe/index' }) }}>
-                      <text className='iconfont iconjifen'></text>
-                      <text>积分规则</text>
-                    </view>
-                    <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/FuLi/JiFenMingXi/index' }) }}>
-                      <text className='iconfont iconjifenguize'></text>
-                      <text>积分明细</text>
+                    <view className='Rule flex-h'>
+                      <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/FuLi/JiFenGuiZe/index' }) }}>
+                        <text className='iconfont iconjifen'></text>
+                        <text>积分规则</text>
+                      </view>
+                      <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/FuLi/JiFenMingXi/index' }) }}>
+                        <text className='iconfont iconjifenguize'></text>
+                        <text>积分明细</text>
+                      </view>
                     </view>
                   </view>
                 </view>
-              </view>
 
-              {/* 搜索框 */}
-              {/* <view className='SearchContainer'>
+                {/* 搜索框 */}
+                {/* <view className='SearchContainer'>
                 <view>
                   <text className='iconfont iconsousuo'></text>
                   <text>附近热搜：火锅</text>
                 </view>
               </view> */}
 
-              {/* 积分礼品列表 */}
-              <view className='PirzeList'>
-                {
-                  PageList.map((item, index) => (
-                    <view key={`PirzeListItem-${index}`}>
-                      <view>
-                        <PrizeListItem Data={item}></PrizeListItem>
+                {/* 积分礼品列表 */}
+                <view className='PirzeList'>
+                  {
+                    PageList.map((item, index) => (
+                      <view key={`PirzeListItem-${index}`}>
+                        <view>
+                          <PrizeListItem Data={item}></PrizeListItem>
+                        </view>
                       </view>
-                    </view>
-                  ))
-                }
-              </view>
+                    ))
+                  }
+                </view>
 
-            </view>
-          </ScrollPageRefresh>
+              </view>
+            </ScrollPageRefresh>
+          </view>
         </view>
-      </view>
 
-    </view>
+      </view>
+    </Page>
   )
 }

src/pages/HuoDong/HuoDongDetail/index.jsx

@@ -3,6 +3,7 @@ import Taro, { Current } from '@tarojs/taro'
 import { RichText } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
+import Page from '@/layouts'
 import toolclass from '@/utils/toolclass.js'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
@@ -13,6 +14,9 @@ export default function HuoDongDetail () {
   const { user } = useModel('user')
   const [DataLock, setDataLock] = useState(false)
   const [HasJoin, setHasJoin] = useState(null)
+  const [IsSign, setIsSign] = useState(null)
+  const [JoinBtnText, setJoinBtnText] = useState(null)
+  const [JoinBtnStatus, setJoinBtnStatus] = useState(false)
   const [CurrnetHuoDongId] = useState(Current.router.params.id) // 当前活动id
   const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
 
@@ -20,6 +24,12 @@ export default function HuoDongDetail () {
     GetActivityDetail()
   }, [CurrnetHuoDongId])
 
+  useEffect(() => {
+    if (ActivityDetail !== null) {
+      SetJoinBtnText()
+    }
+  }, [IsSign])
+
   const GetActivityDetail = () => { // 获取活动详情
     request({ ...apis.getActivityDetail, args: { id: CurrnetHuoDongId } }).then((res) => {
       setActivityDetail(res)
@@ -29,12 +39,58 @@ export default function HuoDongDetail () {
 
   const CheckActivityJoin = () => { // 查询活动参加详情
     request({ ...apis.checkActivityJoin, args: { id: CurrnetHuoDongId } }).then((res) => {
-      setHasJoin(!!res.dynamic.isSign)
+      setHasJoin(!!res.dynamic.isEnlist)
+      setIsSign(!!res.dynamic.isSign)
     })
   }
 
+  const SetJoinBtnText = () => {
+    let Now = Date.now()
+    let JoinStart = new Date(ActivityDetail.enlistStart).getTime()
+    let JoinEnd = new Date(ActivityDetail.enlistEnd).getTime()
+    let Start = new Date(ActivityDetail.startDate).getTime()
+    let End = new Date(ActivityDetail.endDate).getTime()
+
+    if (Now < JoinStart) {
+      setJoinBtnText(`未开始`)
+      return false
+    } else if (Now < JoinEnd) {
+      if (!HasJoin) {
+        setJoinBtnText(`立即参加`)
+        setJoinBtnStatus(true)
+        return false
+      }
+      setJoinBtnText(`已报名`)
+      return false
+    } else if (Now < Start) {
+      if (!HasJoin) {
+        setJoinBtnText(`报名已截止`)
+        return false
+      }
+      setJoinBtnText(`已报名`)
+      return false
+    } else if (Now < End) {
+      if (!HasJoin) {
+        setJoinBtnText(`活动已开始`)
+        return false
+      } else if (!IsSign) {
+        setJoinBtnText(`去签到`)
+        setJoinBtnStatus(true)
+        return false
+      } else {
+        setJoinBtnText(`已签到`)
+        return false
+      }
+    } else if (Now >= End) {
+      setJoinBtnText(`已结束`)
+      return false
+    }
+    setJoinBtnText(null)
+    return false
+  }
+
   const ToJoin = () => { // 去报名
-    if (DataLock || ActivityDetail === null || HasJoin) return
+    if (DataLock || ActivityDetail === null || !JoinBtnStatus) return
     setDataLock(true)
     const { personId, phone, nickname, orgId } = user
     const { dynamicId } = ActivityDetail
@@ -64,47 +120,49 @@ export default function HuoDongDetail () {
   }
 
   return (
-    <view className='HuoDongDetail'>
+    <Page>
+      <view className='HuoDongDetail'>
 
-      <view className='BannerLayer'></view>
-      {
-        ActivityDetail !== null &&
-        <view className='Banner'>
-          <image mode='aspectFill' src={ActivityDetail.bannerListImg} className='centerLabel'></image>
-        </view>
-      }
-      {
-        ActivityDetail !== null &&
-        <view className='Info'>
-          <view className='MainInfo'>
-            <text className='Name'>{ActivityDetail.title}</text>
-            <text className='Tips'>{ActivityDetail.enlisted}人已报名</text>
-            <view className='flex-h'>
-              <text>活动时间：</text>
-              <view className='flex-item'>{toolclass.FormatDate(ActivityDetail.startDate)}<text>限{ActivityDetail.enlistNum}人</text></view>
-            </view>
-            <view className='flex-h'>
-              <text>活动地址：</text>
-              <view className='flex-item'>{ActivityDetail.address}</view>
-            </view>
-            <view className='flex-h'>
-              <text>报名截止：</text>
-              <view className='flex-item'>{toolclass.FormatDate(ActivityDetail.enlistEnd)}</view>
-            </view>
+        <view className='BannerLayer'></view>
+        {
+          ActivityDetail !== null &&
+          <view className='Banner'>
+            <image mode='aspectFill' src={ActivityDetail.bannerListImg} className='centerLabel'></image>
           </view>
+        }
+        {
+          ActivityDetail !== null &&
+          <view className='Info'>
+            <view className='MainInfo'>
+              <text className='Name'>{ActivityDetail.title}</text>
+              <text className='Tips'>{ActivityDetail.enlisted}人已报名</text>
+              <view className='flex-h'>
+                <text>活动时间：</text>
+                <view className='flex-item'>{toolclass.FormatDate(ActivityDetail.startDate)}<text>限{ActivityDetail.enlistNum}人</text></view>
+              </view>
+              <view className='flex-h'>
+                <text>活动地址：</text>
+                <view className='flex-item'>{ActivityDetail.address}</view>
+              </view>
+              <view className='flex-h'>
+                <text>报名截止：</text>
+                <view className='flex-item'>{toolclass.FormatDate(ActivityDetail.enlistEnd)}</view>
+              </view>
+            </view>
 
-          <view className='Desc'>
-            <text>活动介绍</text>
-            <RichText nodes={ActivityDetail.desc}></RichText>
-          </view>
+            <view className='Desc'>
+              <text>活动介绍</text>
+              <RichText nodes={ActivityDetail.desc}></RichText>
+            </view>
 
-          {
-            HasJoin !== null &&
-            <text className={HasJoin ? 'BottomBtn' : 'active BottomBtn'} onClick={ToJoin}>{HasJoin ? '已报名' : '立即参加'}</text>
-          }
+            {
+              HasJoin !== null &&
+              <text className={JoinBtnStatus ? 'active BottomBtn' : 'BottomBtn'} onClick={ToJoin}>{JoinBtnText}</text>
+            }
 
-        </view>
-      }
-    </view>
+          </view>
+        }
+      </view>
+    </Page>
   )
 }

src/pages/HuoDong/ZiXunDetail/index.jsx

@@ -3,6 +3,7 @@ import Taro, { Current } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import { RichText } from '@tarojs/components'
 import toolclass from '@/utils/toolclass.js'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -28,21 +29,23 @@ export default function ZiXunDetail (props) {
   }
 
   return (
-    <view className='ZiXunDetail'>
-      {
-        NewsDetail !== null &&
-        <view>
-          <view className='Title'>
-            <text>{NewsDetail.newsName}</text>
+    <Page>
+      <view className='ZiXunDetail'>
+        {
+          NewsDetail !== null &&
+          <view>
+            <view className='Title'>
+              <text>{NewsDetail.newsName}</text>
+            </view>
+            <view className='flex-h'>
+              <text className='flex-item'>{toolclass.FormatDate(NewsDetail.createDate)}</text>
+              <text className='iconfont iconguankan'></text>
+              <text>{NewsDetail.pvNum || 0}</text>
+            </view>
+            <RichText nodes={NewsDetail.newsDetail}></RichText>
           </view>
-          <view className='flex-h'>
-            <text className='flex-item'>{toolclass.FormatDate(NewsDetail.createDate)}</text>
-            <text className='iconfont iconguankan'></text>
-            <text>{NewsDetail.pvNum || 0}</text>
-          </view>
-          <RichText nodes={NewsDetail.newsDetail}></RichText>
-        </view>
-      }
-    </view>
+        }
+      </view>
+    </Page>
   )
 }

src/pages/HuoDong/index.jsx

@@ -4,6 +4,7 @@ import NavHeader from '@/components/NavHeader/index'
 import ActivityListItem from '@/components/ActivityListItem/index'
 import NewsListItem from '@/components/NewsListItem/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -38,49 +39,51 @@ export default function HuoDong () {
   }
 
   return (
-    <view className='HuoDong flex-v'>
-      <NavHeader BgColor='none' Title='活动' IsFixed={true}></NavHeader>
-      <TabPageCutNav List={NavList} CurrentNavId={CurrentNavId} NavChange={NavChange}></TabPageCutNav>
-      <view className='flex-item'>
-        <view>
-          {/* 活动 */}
-          {
-            CurrentNavId - 0 === 1 &&
-            <ScrollPageRefresh ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
-              <view className='Content Activity'>
-                {
-                  ActivityList.map((item, index) => (
-                    <view className='ListItem' key={`ActivityItem-${index}`}>
-                      <ActivityListItem Data={item}></ActivityListItem>
-                    </view>
-                  ))
-                }
-              </view>
-            </ScrollPageRefresh>
-          }
-
-          {/* 资讯 */}
-          {
-            CurrentNavId - 0 === 2 &&
-            <ScrollPageRefresh ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
-              <view className='Content News'>
-                <view className='BigImg'>
-                  <image mode='aspectFill' src={null} class='centerLabel'></image>
-                </view>
-                <view className='List'>
+    <Page>
+      <view className='HuoDong flex-v'>
+        <NavHeader BgColor='none' Title='活动' IsFixed={true}></NavHeader>
+        <TabPageCutNav List={NavList} CurrentNavId={CurrentNavId} NavChange={NavChange}></TabPageCutNav>
+        <view className='flex-item'>
+          <view>
+            {/* 活动 */}
+            {
+              CurrentNavId - 0 === 1 &&
+              <ScrollPageRefresh ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
+                <view className='Content Activity'>
                   {
-                    NewsList.map((item, index) => (
-                      <view className='ListItem' key={`NewsItem-${index}`}>
-                        <NewsListItem Data={item} ShowTips={index === 0}></NewsListItem>
+                    ActivityList.map((item, index) => (
+                      <view className='ListItem' key={`ActivityItem-${index}`}>
+                        <ActivityListItem Data={item}></ActivityListItem>
                       </view>
                     ))
                   }
                 </view>
-              </view>
-            </ScrollPageRefresh>
-          }
+              </ScrollPageRefresh>
+            }
+
+            {/* 资讯 */}
+            {
+              CurrentNavId - 0 === 2 &&
+              <ScrollPageRefresh ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
+                <view className='Content News'>
+                  <view className='BigImg'>
+                    <image mode='aspectFill' src={null} class='centerLabel'></image>
+                  </view>
+                  <view className='List'>
+                    {
+                      NewsList.map((item, index) => (
+                        <view className='ListItem' key={`NewsItem-${index}`}>
+                          <NewsListItem Data={item} ShowTips={index === 0}></NewsListItem>
+                        </view>
+                      ))
+                    }
+                  </view>
+                </view>
+              </ScrollPageRefresh>
+            }
+          </view>
         </view>
       </view>
-    </view>
+    </Page>
   )
 }

src/pages/ShouYe/HuoDong/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
 import ActivityListItem from '@/components/ActivityListItem/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -18,18 +19,20 @@ export default function ShouYeHuoDong () {
   }
 
   return (
-    <view className='ShouYeHuoDong'>
-      <ScrollPageRefresh ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
-        <view className='ShouYeHuoDongContent'>
-          {
-            PageList.map((item, index) => (
-              <view className='ListItem' key={`ActivityItem-${index}`}>
-                <ActivityListItem Data={item}></ActivityListItem>
-              </view>
-            ))
-          }
-        </view>
-      </ScrollPageRefresh>
-    </view >
+    <Page>
+      <view className='ShouYeHuoDong'>
+        <ScrollPageRefresh ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
+          <view className='ShouYeHuoDongContent'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem' key={`ActivityItem-${index}`}>
+                  <ActivityListItem Data={item}></ActivityListItem>
+                </view>
+              ))
+            }
+          </view>
+        </ScrollPageRefresh>
+      </view>
+    </Page>
   )
 }

src/pages/ShouYe/ZiXun/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
 import NewsListItem from '@/components/NewsListItem/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -18,18 +19,20 @@ export default function ShouYeZiXun () {
   }
 
   return (
-    <view className='ShouYeZiXun'>
-      <ScrollPageRefresh ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
-        <view className='ShouYeHuoDongContent'>
-          {
-            PageList.map((item, index) => (
-              <view className='ListItem' key={`ActivityItem-${index}`}>
-                <NewsListItem Data={item} ShowTips={index === 0}></NewsListItem>
-              </view>
-            ))
-          }
-        </view>
-      </ScrollPageRefresh>
-    </view >
+    <Page>
+      <view className='ShouYeZiXun'>
+        <ScrollPageRefresh ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
+          <view className='ShouYeHuoDongContent'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem' key={`ActivityItem-${index}`}>
+                  <NewsListItem Data={item} ShowTips={index === 0}></NewsListItem>
+                </view>
+              ))
+            }
+          </view>
+        </ScrollPageRefresh>
+      </view>
+    </Page>
   )
 }

src/pages/ShouYe/index.jsx

@@ -262,7 +262,7 @@ export default function Index (props) {
           </view>
 
         </view>
-      </view >
+      </view>
     </Page>
   )
 }

src/pages/WoDe/GeRenXinXi/index.jsx

@@ -1,4 +1,5 @@
 import React, { useState } from 'react'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -6,41 +7,43 @@ import './index.less'
 export default function GeRenXinXi (props) {
 
   return (
-    <view className='GeRenXinXi'>
-      <view className='Form'>
-        <view className='flex-h'>
-          <text className='flex-item'>头像</text>
-          <view className='UserIcon'>
-            <image mode='aspectFill' src={null}></image>
+    <Page>
+      <view className='GeRenXinXi'>
+        <view className='Form'>
+          <view className='flex-h'>
+            <text className='flex-item'>头像</text>
+            <view className='UserIcon'>
+              <image mode='aspectFill' src={null}></image>
+            </view>
+          </view>
+          <view className='flex-h'>
+            <text className='flex-item'>姓名</text>
+            <text>三十而已</text>
+          </view>
+          <view className='flex-h'>
+            <text className='flex-item'>性别</text>
+            <text>女</text>
+          </view>
+          <view className='flex-h'>
+            <text className='flex-item'>联系电话</text>
+            <text>13648041829</text>
           </view>
         </view>
-        <view className='flex-h'>
-          <text className='flex-item'>姓名</text>
-          <text>三十而已</text>
-        </view>
-        <view className='flex-h'>
-          <text className='flex-item'>性别</text>
-          <text>女</text>
-        </view>
-        <view className='flex-h'>
-          <text className='flex-item'>联系电话</text>
-          <text>13648041829</text>
-        </view>
-      </view>
-      <view className='Form'>
-        <view className='flex-h'>
-          <text className='flex-item'>身份</text>
-          <text>业主</text>
-        </view>
-        <view className='flex-h'>
-          <text className='flex-item'>联系电话</text>
-          <text>13648041829</text>
-        </view>
-        <view className='flex-h'>
-          <text>房产</text>
-          <text className='flex-item'>南京市雨花台区安德门大姐56号凤翔山庄3区1栋3单元3楼309</text>
+        <view className='Form'>
+          <view className='flex-h'>
+            <text className='flex-item'>身份</text>
+            <text>业主</text>
+          </view>
+          <view className='flex-h'>
+            <text className='flex-item'>联系电话</text>
+            <text>13648041829</text>
+          </view>
+          <view className='flex-h'>
+            <text>房产</text>
+            <text className='flex-item'>南京市雨花台区安德门大姐56号凤翔山庄3区1栋3单元3楼309</text>
+          </view>
         </view>
       </view>
-    </view>
+    </Page>
   )
 }

src/pages/WoDe/TuiJianErWeiMa/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
 import Taro from '@tarojs/taro'
 import CustomHeader from '@/components/CustomHeader/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -8,9 +9,11 @@ import './index.less'
 export default function TuiJianErWeiMa (props) {
 
   return (
-    <view className='TuiJianErWeiMa'>
-      <CustomHeader IsFixed={true} BgColor='none' Title='推荐二维码'></CustomHeader>
-      <image mode='widthFix' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/img2.jpg'></image>
-    </view>
+    <Page>
+      <view className='TuiJianErWeiMa'>
+        <CustomHeader IsFixed={true} BgColor='none' Title='推荐二维码'></CustomHeader>
+        <image mode='widthFix' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/img2.jpg'></image>
+      </view>
+    </Page>
   )
 }

src/pages/WoDe/TuiJianFenXiang/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
 import Taro from '@tarojs/taro'
 import CustomHeader from '@/components/CustomHeader/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -8,9 +9,11 @@ import './index.less'
 export default function TuiJianFenXiang (props) {
 
   return (
-    <view className='TuiJianFenXiang'>
-      <CustomHeader IsFixed={true} BgColor='none' Title='推荐分享'></CustomHeader>
-      <image mode='widthFix' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/img1.jpg'></image>
-    </view>
+    <Page>
+      <view className='TuiJianFenXiang'>
+        <CustomHeader IsFixed={true} BgColor='none' Title='推荐分享'></CustomHeader>
+        <image mode='widthFix' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/img1.jpg'></image>
+      </view>
+    </Page>
   )
 }

src/pages/WoDe/WoDeGongDan/index.jsx

@@ -2,6 +2,7 @@ import React, { useState } from 'react'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh'
 import WuYeBaoXiuItem from '@/components/WuYeBaoXiuItem'
 import { useModel } from '@/store'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -18,21 +19,23 @@ export default function WoDeGongDan () {
   const Push = (e) => { // 上拉加载
     setPageList(PageList.concat(e))
   }
-  
+
 
   return (
-    <view className='WoDeGongDan'>
-      <ScrollPageRefresh ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
-        <view className='Content Activity'>
-          {
-            PageList.map((item, index) => (
-              <view className='ListItem' key={`ActivityItem-${index}`}>
-                <WuYeBaoXiuItem Data={item}></WuYeBaoXiuItem>
-              </view>
-            ))
-          }
-        </view>
-      </ScrollPageRefresh>
-    </view>
+    <Page>
+      <view className='WoDeGongDan'>
+        <ScrollPageRefresh ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
+          <view className='Content Activity'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem' key={`ActivityItem-${index}`}>
+                  <WuYeBaoXiuItem Data={item}></WuYeBaoXiuItem>
+                </view>
+              ))
+            }
+          </view>
+        </ScrollPageRefresh>
+      </view>
+    </Page>
   )
 }

src/pages/WoDe/WoDeHuoDong/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
 import ActivityListItem from '@/components/ActivityListItem/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -16,21 +17,23 @@ export default function WoDeHuoDong (props) {
   const Push = (e) => { // 上拉加载
     setPageList(PageList.concat(e))
   }
-  
+
 
   return (
-    <view className='WoDeHuoDong'>
-      <ScrollPageRefresh ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
-        <view className='Content Activity'>
-          {
-            PageList.map((item, index) => (
-              <view className='ListItem' key={`ActivityItem-${index}`}>
-                <ActivityListItem Data={item}></ActivityListItem>
-              </view>
-            ))
-          }
-        </view>
-      </ScrollPageRefresh>
-    </view>
+    <Page>
+      <view className='WoDeHuoDong'>
+        <ScrollPageRefresh ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
+          <view className='Content Activity'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem' key={`ActivityItem-${index}`}>
+                  <ActivityListItem Data={item}></ActivityListItem>
+                </view>
+              ))
+            }
+          </view>
+        </ScrollPageRefresh>
+      </view>
+    </Page>
   )
 }

src/pages/WoDe/WoDeJiaoFei/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh'
 import WuYeJiaoFeiItem from '@/components/WuYeJiaoFeiItem'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -16,21 +17,23 @@ export default function WoDeJiaoFei () {
   const Push = (e) => { // 上拉加载
     setPageList(PageList.concat(e))
   }
-  
+
 
   return (
-    <view className='WoDeJiaoFei'>
-      <ScrollPageRefresh ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
-        <view className='Content Activity'>
-          {
-            PageList.map((item, index) => (
-              <view className='ListItem' key={`ActivityItem-${index}`}>
-                <WuYeJiaoFeiItem Data={item}></WuYeJiaoFeiItem>
-              </view>
-            ))
-          }
-        </view>
-      </ScrollPageRefresh>
-    </view>
+    <Page>
+      <view className='WoDeJiaoFei'>
+        <ScrollPageRefresh ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
+          <view className='Content Activity'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem' key={`ActivityItem-${index}`}>
+                  <WuYeJiaoFeiItem Data={item}></WuYeJiaoFeiItem>
+                </view>
+              ))
+            }
+          </view>
+        </ScrollPageRefresh>
+      </view>
+    </Page>
   )
 }

src/pages/WoDe/WoDeRenZheng/index.jsx

@@ -2,6 +2,7 @@ import React, { useState } from 'react'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh'
 import toolclass from '@/utils/toolclass.js'
 import Taro from '@tarojs/taro'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -20,30 +21,32 @@ export default function WoDeRenZheng () {
 
 
   return (
-    <view className='WoDeRenZheng'>
-      <ScrollPageRefresh ApiName={`getOwnerVerifyList`} ListName={null} Refresh={Refresh} Push={Push}>
-        <view className='Content Activity'>
-          {
-            PageList.map((item, index) => (
-              <view className='ListItem' key={`RenZhengItem-${index}`} onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuShenHe/index?id=${item.id}` }) }}>
-                <text>{item.phaseName}{item.buildingName}{item.unitName}{item.levelName}{item.roomNoName}</text>
-                <view className='flex-h'>
-                  <view className='flex-item'>
-                    <text>业主：{item.ownerName} {item.phone}</text>
-                    <text>{toolclass.FormatDate(item.createDate)}</text>
-                  </view>
-                  <view>
-                    <text className={item.verifyStatus - 0 === 0 ? '' : item.verifyStatus - 0 === 1 ? 'Green' : 'Red'}>{item.verifyStatus - 0 === 0 ? '审核中' : item.verifyStatus - 0 === 1 ? '审核通过' : '审核未通过'}</text>
+    <Page>
+      <view className='WoDeRenZheng'>
+        <ScrollPageRefresh ApiName={`getOwnerVerifyList`} ListName={null} Refresh={Refresh} Push={Push}>
+          <view className='Content Activity'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem' key={`RenZhengItem-${index}`} onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuShenHe/index?id=${item.id}` }) }}>
+                  <text>{item.phaseName}{item.buildingName}{item.unitName}{item.levelName}{item.roomNoName}</text>
+                  <view className='flex-h'>
+                    <view className='flex-item'>
+                      <text>业主：{item.ownerName} {item.phone}</text>
+                      <text>{toolclass.FormatDate(item.createDate)}</text>
+                    </view>
+                    <view>
+                      <text className={item.verifyStatus - 0 === 0 ? '' : item.verifyStatus - 0 === 1 ? 'Green' : 'Red'}>{item.verifyStatus - 0 === 0 ? '审核中' : item.verifyStatus - 0 === 1 ? '审核通过' : '审核未通过'}</text>
+                    </view>
                   </view>
                 </view>
-              </view>
-            ))
-          }
-          <view className='AddBtn'>
-            <text onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuRenZheng/index` }) }}>添加认证</text>
+              ))
+            }
+            <view className='AddBtn'>
+              <text onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuRenZheng/index` }) }}>添加认证</text>
+            </view>
           </view>
-        </view>
-      </ScrollPageRefresh>
-    </view>
+        </ScrollPageRefresh>
+      </view>
+    </Page>
   )
 }

src/pages/WoDe/YeZhuRenZheng/index.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
 import { Input, Picker } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
+import Page from '@/layouts'
 import { useModel } from '@/store'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
@@ -252,69 +253,71 @@ export default function YeZhuRenZheng () {
   }
 
   return (
-    <view className='YeZhuRenZheng'>
-      <view className='Form'>
-        <view className='flex-h'>
-          <text className='iconfont iconxingming'></text>
-          <Input className='flex-item' placeholder='请输入您的姓名' value={FormData.RealName} onInput={(e) => { setFormData({ ...FormData, RealName: e.detail.value }) }}></Input>
-        </view>
-        <view className='flex-h'>
-          <text className='iconfont iconshenfenzheng'></text>
-          <Input type='idcard' className='flex-item' placeholder='请输入您的身份证号码' value={FormData.IdCard} onInput={(e) => { setFormData({ ...FormData, IdCard: e.detail.value }) }}></Input>
-        </view>
-        <view className='flex-h'>
-          <text className='iconfont iconshouji'></text>
-          <Input type='idcard' className='flex-item' placeholder='请输入您的手机号码' value={FormData.Phone} onInput={(e) => { setFormData({ ...FormData, Phone: e.detail.value }) }}></Input>
-        </view>
-        <view className='flex-h'>
-          <text className='iconfont iconyanzhengma'></text>
-          <Input type='idcard' className='flex-item' placeholder='请输入验证码' value={PhoneCode} onInput={(e) => { setPhoneCode(e.detail.value) }}></Input>
-          <text className={CodeTimerNum - 0 === 60 ? 'active' : ''} onClick={ToGetPhoneCode}>{CodeTimerNum - 0 === 60 ? `获取验证码` : `${CodeTimerNum > 9 ? `${CodeTimerNum}s后再次获取` : `0${CodeTimerNum}s后再次获取`}`}</text>
-        </view>
-        <view className='flex-h'>
-          <text>期号</text>
-          <view className='flex-item'>
-            <Picker value={Level2Value} range-key='name' range={Level2List} onChange={Level2Change}>
-              <view className='PickerText'>{Level2List.length > 0 && Level2Value !== null ? Level2List[Level2Value].name : '请选择期号'}</view>
-            </Picker>
+    <Page>
+      <view className='YeZhuRenZheng'>
+        <view className='Form'>
+          <view className='flex-h'>
+            <text className='iconfont iconxingming'></text>
+            <Input className='flex-item' placeholder='请输入您的姓名' value={FormData.RealName} onInput={(e) => { setFormData({ ...FormData, RealName: e.detail.value }) }}></Input>
           </view>
-        </view>
-        <view className='flex-h'>
-          <text>楼栋</text>
-          <view className='flex-item'>
-            <Picker value={Level3Value} range-key='name' range={Level3List} onChange={Level3Change}>
-              <view className='PickerText'>{Level3List.length > 0 && Level3Value !== null ? Level3List[Level3Value].name : '请选择楼栋'}</view>
-            </Picker>
+          <view className='flex-h'>
+            <text className='iconfont iconshenfenzheng'></text>
+            <Input type='idcard' className='flex-item' placeholder='请输入您的身份证号码' value={FormData.IdCard} onInput={(e) => { setFormData({ ...FormData, IdCard: e.detail.value }) }}></Input>
           </view>
-        </view>
-        <view className='flex-h'>
-          <text>单元</text>
-          <view className='flex-item'>
-            <Picker value={Level4Value} range-key='name' range={Level4List} onChange={Level4Change}>
-              <view className='PickerText'>{Level4List.length > 0 && Level4Value !== null ? Level4List[Level4Value].name : '请选择单元'}</view>
-            </Picker>
+          <view className='flex-h'>
+            <text className='iconfont iconshouji'></text>
+            <Input type='idcard' className='flex-item' placeholder='请输入您的手机号码' value={FormData.Phone} onInput={(e) => { setFormData({ ...FormData, Phone: e.detail.value }) }}></Input>
           </view>
-        </view>
-        <view className='flex-h'>
-          <text>楼层</text>
-          <view className='flex-item'>
-            <Picker value={Level5Value} range-key='name' range={Level5List} onChange={Level5Change}>
-              <view className='PickerText'>{Level5List.length > 0 && Level5Value !== null ? Level5List[Level5Value].name : '请选择楼层'}</view>
-            </Picker>
+          <view className='flex-h'>
+            <text className='iconfont iconyanzhengma'></text>
+            <Input type='idcard' className='flex-item' placeholder='请输入验证码' value={PhoneCode} onInput={(e) => { setPhoneCode(e.detail.value) }}></Input>
+            <text className={CodeTimerNum - 0 === 60 ? 'active' : ''} onClick={ToGetPhoneCode}>{CodeTimerNum - 0 === 60 ? `获取验证码` : `${CodeTimerNum > 9 ? `${CodeTimerNum}s后再次获取` : `0${CodeTimerNum}s后再次获取`}`}</text>
           </view>
-        </view>
-        <view className='flex-h'>
-          <text>房号</text>
-          <view className='flex-item'>
-            <Picker value={Level6Value} range-key='name' range={Level6List} onChange={Level6Change}>
-              <view className='PickerText'>{Level6List.length > 0 && Level6Value !== null ? Level6List[Level6Value].name : '请选择房号'}</view>
-            </Picker>
+          <view className='flex-h'>
+            <text>期号</text>
+            <view className='flex-item'>
+              <Picker value={Level2Value} range-key='name' range={Level2List} onChange={Level2Change}>
+                <view className='PickerText'>{Level2List.length > 0 && Level2Value !== null ? Level2List[Level2Value].name : '请选择期号'}</view>
+              </Picker>
+            </view>
+          </view>
+          <view className='flex-h'>
+            <text>楼栋</text>
+            <view className='flex-item'>
+              <Picker value={Level3Value} range-key='name' range={Level3List} onChange={Level3Change}>
+                <view className='PickerText'>{Level3List.length > 0 && Level3Value !== null ? Level3List[Level3Value].name : '请选择楼栋'}</view>
+              </Picker>
+            </view>
+          </view>
+          <view className='flex-h'>
+            <text>单元</text>
+            <view className='flex-item'>
+              <Picker value={Level4Value} range-key='name' range={Level4List} onChange={Level4Change}>
+                <view className='PickerText'>{Level4List.length > 0 && Level4Value !== null ? Level4List[Level4Value].name : '请选择单元'}</view>
+              </Picker>
+            </view>
+          </view>
+          <view className='flex-h'>
+            <text>楼层</text>
+            <view className='flex-item'>
+              <Picker value={Level5Value} range-key='name' range={Level5List} onChange={Level5Change}>
+                <view className='PickerText'>{Level5List.length > 0 && Level5Value !== null ? Level5List[Level5Value].name : '请选择楼层'}</view>
+              </Picker>
+            </view>
+          </view>
+          <view className='flex-h'>
+            <text>房号</text>
+            <view className='flex-item'>
+              <Picker value={Level6Value} range-key='name' range={Level6List} onChange={Level6Change}>
+                <view className='PickerText'>{Level6List.length > 0 && Level6Value !== null ? Level6List[Level6Value].name : '请选择房号'}</view>
+              </Picker>
+            </view>
           </view>
         </view>
+        <view className='BottomBtn' onClick={Submit}>
+          <text>提交</text>
+        </view>
       </view>
-      <view className='BottomBtn' onClick={Submit}>
-        <text>提交</text>
-      </view>
-    </view>
+    </Page>
   )
 }

src/pages/WoDe/YeZhuShenHe/index.jsx

@@ -3,6 +3,7 @@ import Taro, { Current } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
 import SlidePopup from '@/components/SlidePopup/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -41,15 +42,15 @@ export default function YeZhuShenHe () {
         if (res.confirm) {
           if (Detail.verifyStatus - 0 === 1) { // 删除审核通过的房产
             request({ ...apis.deletePassRenZheng, args: { id: CurrnetId } }).then((res) => {
-              Taro.showToast({title: '删除成功', icon: 'none'})
+              Taro.showToast({ title: '删除成功', icon: 'none' })
             }).catch((res) => {
-              Taro.showToast({title: res, icon: 'none'})
+              Taro.showToast({ title: res, icon: 'none' })
             })
           } else { // 删除审核中的房产
             request({ ...apis.deleteCheckingRenZheng, args: { id: CurrnetId } }).then((res) => {
-              Taro.showToast({title: '删除成功', icon: 'none'})
+              Taro.showToast({ title: '删除成功', icon: 'none' })
             }).catch((res) => {
-              Taro.showToast({title: res, icon: 'none'})
+              Taro.showToast({ title: res, icon: 'none' })
             })
           }
         }
@@ -58,133 +59,135 @@ export default function YeZhuShenHe () {
   }
 
   return (
-    <view className='YeZhuShenHe'>
-      {
-        Detail !== null &&
-        <view className='ShenHeContent'>
-
-          {/* 审核中 */}
-          {
-            Detail.verifyStatus - 0 === 0 &&
-            <view className='CheckStatus Checking'>
-              <view className='Status'>
-                <text className='iconfont iconshenhezhong'></text>
-                <text>审核中</text>
-                <text>请等待物业或户主审核</text>
-              </view>
-
-              <view className='Info'>
-                <view className='flex-h'>
-                  <text>身份：</text>
-                  <text className='flex-item'>户主</text>
+    <Page>
+      <view className='YeZhuShenHe'>
+        {
+          Detail !== null &&
+          <view className='ShenHeContent'>
+
+            {/* 审核中 */}
+            {
+              Detail.verifyStatus - 0 === 0 &&
+              <view className='CheckStatus Checking'>
+                <view className='Status'>
+                  <text className='iconfont iconshenhezhong'></text>
+                  <text>审核中</text>
+                  <text>请等待物业或户主审核</text>
                 </view>
-                <view className='flex-h'>
-                  <text>房产：</text>
-                  <text className='flex-item'>{Detail.phaseName} {Detail.buildingName} {Detail.unitName} {Detail.levelName} {Detail.roomNoName}</text>
+
+                <view className='Info'>
+                  <view className='flex-h'>
+                    <text>身份：</text>
+                    <text className='flex-item'>户主</text>
+                  </view>
+                  <view className='flex-h'>
+                    <text>房产：</text>
+                    <text className='flex-item'>{Detail.phaseName} {Detail.buildingName} {Detail.unitName} {Detail.levelName} {Detail.roomNoName}</text>
+                  </view>
                 </view>
               </view>
-            </view>
-          }
+            }
+
+            {/* 审核通过 */}
+            {
+              Detail.verifyStatus - 0 === 1 &&
+              <view className='CheckStatus Pass'>
+                <view className='Status'>
+                  <text className='iconfont iconyitongguo'></text>
+                  <text>审核通过</text>
+                </view>
 
-          {/* 审核通过 */}
-          {
-            Detail.verifyStatus - 0 === 1 &&
-            <view className='CheckStatus Pass'>
-              <view className='Status'>
-                <text className='iconfont iconyitongguo'></text>
-                <text>审核通过</text>
+                <view className='Info'>
+                  <view className='flex-h'>
+                    <text>身份：</text>
+                    <text className='flex-item'>户主</text>
+                  </view>
+                  <view className='flex-h'>
+                    <text>房产：</text>
+                    <text className='flex-item'>{Detail.phaseName} {Detail.buildingName} {Detail.unitName} {Detail.levelName} {Detail.roomNoName}</text>
+                  </view>
+                </view>
               </view>
+            }
+
+            {/* 审核未通过 */}
+            {
+              Detail.verifyStatus - 0 === 2 &&
+              <view className='CheckStatus NoPass'>
+                <view className='Status'>
+                  <text className='iconfont iconweitongguo'></text>
+                  <text>审核未通过</text>
+                </view>
 
-              <view className='Info'>
-                <view className='flex-h'>
-                  <text>身份：</text>
-                  <text className='flex-item'>户主</text>
+                <view className='Info'>
+                  <view className='flex-h'>
+                    <text>审核人</text>
+                    <text className='flex-item'>{Detail.verifyName || '-'}</text>
+                  </view>
+                  <view className='flex-h'>
+                    <text>原因</text>
+                    <text className='flex-item'>{Detail.remark || '-'}</text>
+                  </view>
                 </view>
-                <view className='flex-h'>
-                  <text>房产：</text>
-                  <text className='flex-item'>{Detail.phaseName} {Detail.buildingName} {Detail.unitName} {Detail.levelName} {Detail.roomNoName}</text>
+
+                <view className='Info'>
+                  <view className='flex-h'>
+                    <text>身份</text>
+                    <text className='flex-item'>户主</text>
+                  </view>
+                  <view className='flex-h'>
+                    <text>房产</text>
+                    <text className='flex-item'>{Detail.phaseName} {Detail.buildingName} {Detail.unitName} {Detail.levelName} {Detail.roomNoName}</text>
+                  </view>
                 </view>
               </view>
-            </view>
-          }
+            }
 
-          {/* 审核未通过 */}
-          {
-            Detail.verifyStatus - 0 === 2 &&
-            <view className='CheckStatus NoPass'>
-              <view className='Status'>
-                <text className='iconfont iconweitongguo'></text>
-                <text>审核未通过</text>
+            <view className='OtherTab'>
+              <view className='flex-h' onClick={() => { setShowPopup(true) }}>
+                <text className='flex-item'>联系物业</text>
+                <text className='iconfont iconjiantouright'></text>
               </view>
-
-              <view className='Info'>
-                <view className='flex-h'>
-                  <text>审核人</text>
-                  <text className='flex-item'>{Detail.verifyName || '-'}</text>
-                </view>
-                <view className='flex-h'>
-                  <text>原因</text>
-                  <text className='flex-item'>{Detail.remark || '-'}</text>
-                </view>
+              <view className='flex-h' onClick={Detele}>
+                <text className='flex-item'>删除当前资料</text>
+                <text className='iconfont iconjiantouright'></text>
               </view>
-
-              <view className='Info'>
-                <view className='flex-h'>
-                  <text>身份</text>
-                  <text className='flex-item'>户主</text>
-                </view>
-                <view className='flex-h'>
-                  <text>房产</text>
-                  <text className='flex-item'>{Detail.phaseName} {Detail.buildingName} {Detail.unitName} {Detail.levelName} {Detail.roomNoName}</text>
-                </view>
+              <view className='flex-h' onClick={() => { Taro.redirectTo({ url: `/pages/WoDe/YeZhuRenZheng/index` }) }}>
+                <text className='flex-item'>关联其他房产</text>
+                <text className='iconfont iconjiantouright'></text>
               </view>
             </view>
-          }
-
-          <view className='OtherTab'>
-            <view className='flex-h' onClick={() => { setShowPopup(true) }}>
-              <text className='flex-item'>联系物业</text>
-              <text className='iconfont iconjiantouright'></text>
-            </view>
-            <view className='flex-h' onClick={Detele}>
-              <text className='flex-item'>删除当前资料</text>
-              <text className='iconfont iconjiantouright'></text>
-            </view>
-            <view className='flex-h' onClick={() => { Taro.redirectTo({ url: `/pages/WoDe/YeZhuRenZheng/index` }) }}>
-              <text className='flex-item'>关联其他房产</text>
-              <text className='iconfont iconjiantouright'></text>
-            </view>
-          </view>
 
-          <view className='ContentBottom'></view>
+            <view className='ContentBottom'></view>
 
-        </view>
-      }
+          </view>
+        }
 
 
-      {/* 审核未通过 */}
-      {
-        Detail !== null && Status - 0 === 2 &&
-        <view className='BottomBtn'>
-          <text>重新认证</text>
-        </view>
-      }
+        {/* 审核未通过 */}
+        {
+          Detail !== null && Status - 0 === 2 &&
+          <view className='BottomBtn'>
+            <text>重新认证</text>
+          </view>
+        }
 
-      <SlidePopup Close={() => { setShowPopup(false) }} Show={ShowPopup}>
-        <view className='LianXiPopup'>
-          <text>联系物业</text>
-          <text>对此费用有疑问</text>
-          {
-            PhoneList.map((item, index) => (
-              <view className='flex-h' key={`PhoneList-${index}`} onClick={() => { Taro.makePhoneCall({ phoneNumber: item.tel }) }}>
-                <text className='flex-item'>{item.name}</text>
-                <text>{item.tel}</text>
-                <text className='iconfont icondianhua'></text>
-              </view>
-            ))
-          }
-        </view>
-      </SlidePopup>
-    </view>
+        <SlidePopup Close={() => { setShowPopup(false) }} Show={ShowPopup}>
+          <view className='LianXiPopup'>
+            <text>联系物业</text>
+            <text>对此费用有疑问</text>
+            {
+              PhoneList.map((item, index) => (
+                <view className='flex-h' key={`PhoneList-${index}`} onClick={() => { Taro.makePhoneCall({ phoneNumber: item.tel }) }}>
+                  <text className='flex-item'>{item.name}</text>
+                  <text>{item.tel}</text>
+                  <text className='iconfont icondianhua'></text>
+                </view>
+              ))
+            }
+          </view>
+        </SlidePopup>
+      </view>
+    </Page>
   )
 }

src/pages/WoDe/index.jsx

@@ -3,6 +3,7 @@ import NavHeader from '@/components/NavHeader/index'
 import Taro from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -18,27 +19,28 @@ export default function WoDe () {
     { icon: 'iconfuwu1', name: '物业服务', id: 4, router: '/pages/WoDe/WoDeGongDan/index' }
   ])
   const [MoreUserTab] = useState([
-    { icon: 'iconerweima', name: '推荐二维码', id: 5, router: '/pages/WoDe/TuiJianErWeiMa/index' },
-    { icon: 'iconfenxiang', name: '推荐分享', id: 6, router: '/pages/WoDe/TuiJianFenXiang/index' },
+    // { icon: 'iconerweima', name: '推荐二维码', id: 5, router: '/pages/WoDe/TuiJianErWeiMa/index' },
+    // { icon: 'iconfenxiang', name: '推荐分享', id: 6, router: '/pages/WoDe/TuiJianFenXiang/index' },
     { icon: 'iconhuodong', name: '参与活动', id: 7, router: '/pages/WoDe/WoDeHuoDong/index' }
   ])
   const [DataLock, setDataLock] = useState(false)
 
   useEffect(() => {
-    // if (user !== null) {
-    //   request({ ...apis.getOwnerVerifyList }).then(() => {
-    //   }).catch((res) => {
-    //     Taro.showToast({ title: res, icon: 'none' })
-    //   })
-    // }
+    if (user !== null) {
+      request({ ...apis.getUserInfo }).then((res) => {
+        setUser({ ...user, ...res })
+      }).catch((res) => {
+        Taro.showToast({ title: res, icon: 'none' })
+      })
+    }
   }, [])
 
   const ToSign = () => { // 签到
-    if (DataLock) return
+    if (DataLock || (user.havaSigned !== undefined && user.havaSigned - 0 === 1)) return
     setDataLock(true)
     request({ ...apis.userSign }).then(() => {
       Taro.showToast({ title: '签到成功', icon: 'none' })
-      setUser({ ...user, isSignup: 1 })
+      setUser({ ...user, havaSigned: 1 })
       setDataLock(false)
     }).catch((res) => {
       Taro.showToast({ title: res, icon: 'none' })
@@ -56,55 +58,60 @@ export default function WoDe () {
   }
 
   return (
-    <view className='WoDe'>
-      <NavHeader BgColor='none' Title='我的' IsFixed={true}></NavHeader>
-      <scroll-view scroll-y='true' style='height: 100%;' refresher-enabled={true} onrefresherrefresh={OnRefresh} refresher-triggered={IsPull} refresher-background='#F35844'>
-        <view className='WoDeContent'>
+    <Page>
+      <view className='WoDe'>
+        <NavHeader BgColor='none' Title='我的' IsFixed={true}></NavHeader>
+        <scroll-view scroll-y='true' style='height: 100%;' refresher-enabled={true} onrefresherrefresh={OnRefresh} refresher-triggered={IsPull} refresher-background='#F35844'>
+          <view className='WoDeContent'>
 
-          {/* 顶部背景图 */}
-          <view className='TopBg'>
-            <view className='ColorBg'></view>
-            <view className='UserInfo flex-h'>
-              <view className='Icon' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
-                <image mode='aspectFill' src={null} class='centerLabel'></image>
-              </view>
-              <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
-                <text>{user.nickname || '暂未授权用户信息'}</text>
-                <text>{user.phone || '暂未授权手机号'}</text>
+            {/* 顶部背景图 */}
+            <view className='TopBg'>
+              <view className='ColorBg'></view>
+              <view className='UserInfo flex-h'>
+                <view className='Icon' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
+                  <image mode='aspectFill' src={user.avatarurl} class='centerLabel'></image>
+                </view>
+                <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
+                  <text>{user.nickname || '暂未授权用户信息'}</text>
+                  <text>{user.phone || '暂未授权手机号'}</text>
+                </view>
+                {
+                  user.havaSigned !== undefined &&
+                  <text onClick={ToSign}>{user.havaSigned - 0 === 1 ? '已签到' : '签到'}</text>
+                }
               </view>
-              <text onClick={ToSign}>{user.isSignup ? '已签到' : '签到'}</text>
             </view>
-          </view>
 
-          {/* 用户选项 */}
-          <view className='UserTab'>
-            {
-              UserTab.map((item, index) => (
-                <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
-                  <text className={`iconfont ${item.icon}`}></text>
-                  <view className='flex-h flex-item'>
-                    <text className='flex-item'>{item.name}</text>
-                    <text className='iconfont iconjiantouright'></text>
+            {/* 用户选项 */}
+            <view className='UserTab'>
+              {
+                UserTab.map((item, index) => (
+                  <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
+                    <text className={`iconfont ${item.icon}`}></text>
+                    <view className='flex-h flex-item'>
+                      <text className='flex-item'>{item.name}</text>
+                      <text className='iconfont iconjiantouright'></text>
+                    </view>
                   </view>
-                </view>
-              ))
-            }
-            <view className='Line'></view>
-            {
-              MoreUserTab.map((item, index) => (
-                <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
-                  <text className={`iconfont ${item.icon}`}></text>
-                  <view className='flex-h flex-item'>
-                    <text className='flex-item'>{item.name}</text>
-                    <text className='iconfont iconjiantouright'></text>
+                ))
+              }
+              <view className='Line'></view>
+              {
+                MoreUserTab.map((item, index) => (
+                  <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
+                    <text className={`iconfont ${item.icon}`}></text>
+                    <view className='flex-h flex-item'>
+                      <text className='flex-item'>{item.name}</text>
+                      <text className='iconfont iconjiantouright'></text>
+                    </view>
                   </view>
-                </view>
-              ))
-            }
-          </view>
+                ))
+              }
+            </view>
 
-        </view>
-      </scroll-view>
-    </view>
+          </view>
+        </scroll-view>
+      </view>
+    </Page>
   )
 }

src/pages/WuYe/BaoXiuDetail/index.jsx

@@ -4,6 +4,7 @@ import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
 import toolclass from '@/utils/toolclass.js'
 import SlidePopup from '@/components/SlidePopup/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -30,44 +31,45 @@ export default function BaoXiuDetail () {
   }
 
   return (
-    <view className='BaoXiuDetail'>
+    <Page>
+      <view className='BaoXiuDetail'>
 
-      <view className='TopLine'></view>
+        <view className='TopLine'></view>
 
-      {/* 概况 */}
-      <view className='TopInfo'>
-        <view className='flex-h'>
-          <text className='flex-item'>{DetailInfo === null ? null : DetailInfo.ticketTitle}</text>
-          <text className='iconfont iconjiantouright'></text>
-        </view>
-        <view className='flex-h'>
-          <text className='flex-item'>报修单号</text>
-          <text>{DetailInfo === null ? null : DetailInfo.id}</text>
-        </view>
-        <view className='flex-h'>
-          <text className='flex-item'>报修时间</text>
-          <text>{DetailInfo === null ? null : toolclass.FormatDate(DetailInfo.createDate)}</text>
+        {/* 概况 */}
+        <view className='TopInfo'>
+          <view className='flex-h'>
+            <text className='flex-item'>{DetailInfo === null ? null : DetailInfo.ticketTitle}</text>
+            <text className='iconfont iconjiantouright'></text>
+          </view>
+          <view className='flex-h'>
+            <text className='flex-item'>报修单号</text>
+            <text>{DetailInfo === null ? null : DetailInfo.id}</text>
+          </view>
+          <view className='flex-h'>
+            <text className='flex-item'>报修时间</text>
+            <text>{DetailInfo === null ? null : toolclass.FormatDate(DetailInfo.createDate)}</text>
+          </view>
         </view>
-      </view>
 
-      {/* 详情 */}
-      <view className='Detail'>
-        <text>处理进度</text>
-        <view className='flex-h'>
-          <view className='Line'><view></view></view>
-          <view className='flex-item'>
-            <view>
-              {
-                DetailInfo !== null && DetailInfo.ticketRecordList !== null &&
-                DetailInfo.ticketRecordList.map((item, index) => (
-                  <view className='StepList' key={`StepList-${index}`}>
-                    <view className='Title flex-h'>
-                      <text className='flex-item Red'>{item.ticketStatusName}</text>
-                      <text>{toolclass.FormatDate(item.createDate)}</text>
-                    </view>
-                    <view className='Text'>{item.content}</view>
-                    {/* <view className='Text'>您的报修正在分配物业处理人员，若长时间无人处理，请联系物业。<text className='Blue'>物业电话薄</text><text className='Blue iconfont iconjiantouright'></text></view> */}
-                    {/* <view className='ImgList'>
+        {/* 详情 */}
+        <view className='Detail'>
+          <text>处理进度</text>
+          <view className='flex-h'>
+            <view className='Line'><view></view></view>
+            <view className='flex-item'>
+              <view>
+                {
+                  DetailInfo !== null && DetailInfo.ticketRecordList !== null &&
+                  DetailInfo.ticketRecordList.map((item, index) => (
+                    <view className='StepList' key={`StepList-${index}`}>
+                      <view className='Title flex-h'>
+                        <text className='flex-item Red'>{item.ticketStatusName}</text>
+                        <text>{toolclass.FormatDate(item.createDate)}</text>
+                      </view>
+                      <view className='Text'>{item.content}</view>
+                      {/* <view className='Text'>您的报修正在分配物业处理人员，若长时间无人处理，请联系物业。<text className='Blue'>物业电话薄</text><text className='Blue iconfont iconjiantouright'></text></view> */}
+                      {/* <view className='ImgList'>
                       <view></view>
                       <view></view>
                       <view></view>
@@ -75,40 +77,41 @@ export default function BaoXiuDetail () {
                       <view></view>
                       <view></view>
                     </view> */}
-                  </view>
-                ))
-              }
+                    </view>
+                  ))
+                }
+              </view>
             </view>
           </view>
-        </view>
 
-        {/* 更多操作 */}
-        <view className='BottomBtn active'>
-          <text onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/BaoXiuFeiYong/index?id=${CurrnetBaoXiuId}` }) }}>费用详情</text>
-        </view>
+          {/* 更多操作 */}
+          <view className='BottomBtn active'>
+            <text onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/BaoXiuFeiYong/index?id=${CurrnetBaoXiuId}` }) }}>费用详情</text>
+          </view>
 
-        {/* 更多操作 */}
-        <view className='BottomBtn'>
-          <text onClick={() => { setShowPopup(true) }}>与物业沟通</text>
+          {/* 更多操作 */}
+          <view className='BottomBtn'>
+            <text onClick={() => { setShowPopup(true) }}>与物业沟通</text>
+          </view>
         </view>
-      </view>
 
-      <SlidePopup Close={() => { setShowPopup(false) }} Show={ShowPopup}>
-        <view className='LianXiPopup'>
-          <text>联系物业</text>
-          <text>对此费用有疑问</text>
-          {
-            PhoneList.map((item, index) => (
-              <view className='flex-h' key={`PhoneList-${index}`} onClick={() => { Taro.makePhoneCall({ phoneNumber: item.tel }) }}>
-                <text className='flex-item'>{item.name}</text>
-                <text>{item.tel}</text>
-                <text className='iconfont icondianhua'></text>
-              </view>
-            ))
-          }
-        </view>
-      </SlidePopup>
+        <SlidePopup Close={() => { setShowPopup(false) }} Show={ShowPopup}>
+          <view className='LianXiPopup'>
+            <text>联系物业</text>
+            <text>对此费用有疑问</text>
+            {
+              PhoneList.map((item, index) => (
+                <view className='flex-h' key={`PhoneList-${index}`} onClick={() => { Taro.makePhoneCall({ phoneNumber: item.tel }) }}>
+                  <text className='flex-item'>{item.name}</text>
+                  <text>{item.tel}</text>
+                  <text className='iconfont icondianhua'></text>
+                </view>
+              ))
+            }
+          </view>
+        </SlidePopup>
 
-    </view>
+      </view>
+    </Page>
   )
 }

src/pages/WuYe/BaoXiuFeiYong/index.jsx

@@ -2,6 +2,7 @@ import React, { useState } from 'react'
 import Taro, { Current } from '@tarojs/taro'
 import SlidePopup from '@/components/SlidePopup/index'
 import UploadImg from '@/components/UploadImg/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -17,77 +18,79 @@ export default function BaoXiuFeiYong () {
   }
 
   return (
-    <view className='BaoXiuFeiYong'>
+    <Page>
+      <view className='BaoXiuFeiYong'>
 
-      {/* 费用信息 */}
-      <view className='Info'>
-        <view>
-          <text>1栋3单元2楼-3楼走廊声控灯出现故障</text>
-          <view className='flex-h'>
-            <text className='flex-item'>报修类型</text>
-            <text>公共区域问题</text>
-          </view>
-          <view className='flex-h'>
-            <text className='flex-item'>报修单号</text>
-            <text>201810120020</text>
-          </view>
-          <view className='flex-h'>
-            <text className='flex-item'>报修时间</text>
-            <text>2018-10-12 18:00</text>
-          </view>
-          <view className='flex-h'>
-            <text className='flex-item'>报修进度</text>
-            <text>已修缮</text>
-          </view>
-          <view className='flex-h'>
-            <text className='flex-item'>处理人</text>
-            <text>郭培军</text>
-          </view>
-          <view className='flex-h'>
-            <text className='flex-item'>报修费用</text>
-            <text className='Red'>￥150</text>
+        {/* 费用信息 */}
+        <view className='Info'>
+          <view>
+            <text>1栋3单元2楼-3楼走廊声控灯出现故障</text>
+            <view className='flex-h'>
+              <text className='flex-item'>报修类型</text>
+              <text>公共区域问题</text>
+            </view>
+            <view className='flex-h'>
+              <text className='flex-item'>报修单号</text>
+              <text>201810120020</text>
+            </view>
+            <view className='flex-h'>
+              <text className='flex-item'>报修时间</text>
+              <text>2018-10-12 18:00</text>
+            </view>
+            <view className='flex-h'>
+              <text className='flex-item'>报修进度</text>
+              <text>已修缮</text>
+            </view>
+            <view className='flex-h'>
+              <text className='flex-item'>处理人</text>
+              <text>郭培军</text>
+            </view>
+            <view className='flex-h'>
+              <text className='flex-item'>报修费用</text>
+              <text className='Red'>￥150</text>
+            </view>
           </view>
+          <view className='InfoBottom'></view>
         </view>
-        <view className='InfoBottom'></view>
-      </view>
 
-      <view className='BottomBtn'>
-        <text className='active' onClick={() => { setPopupType(1); setShowPopup(true) }}>我要缴费</text>
-        <text onClick={() => { setPopupType(2); setShowPopup(true) }}>线下缴费</text>
-      </view>
+        <view className='BottomBtn'>
+          <text className='active' onClick={() => { setPopupType(1); setShowPopup(true) }}>我要缴费</text>
+          <text onClick={() => { setPopupType(2); setShowPopup(true) }}>线下缴费</text>
+        </view>
 
-      {/* 弹窗 */}
-      <SlidePopup Close={SlidePopupClose} Show={ShowPopup}>
+        {/* 弹窗 */}
+        <SlidePopup Close={SlidePopupClose} Show={ShowPopup}>
 
-        {/* 线上缴费 */}
-        {
-          PopupType - 0 === 1 &&
-          <view className='JiaoFeiPopup XianShang'>
-            <view className='Price'>立即支付<text>150</text>元</view>
-            <view className='flex-h'>
-              <text className='iconfont iconweixinzhifu'></text>
-              <text className='flex-item'>微信支付</text>
-              <text className='iconfont icongou'></text>
-            </view>
-            <view className='Btn'>
-              <text>去付款</text>
+          {/* 线上缴费 */}
+          {
+            PopupType - 0 === 1 &&
+            <view className='JiaoFeiPopup XianShang'>
+              <view className='Price'>立即支付<text>150</text>元</view>
+              <view className='flex-h'>
+                <text className='iconfont iconweixinzhifu'></text>
+                <text className='flex-item'>微信支付</text>
+                <text className='iconfont icongou'></text>
+              </view>
+              <view className='Btn'>
+                <text>去付款</text>
+              </view>
             </view>
-          </view>
-        }
+          }
 
-        {/* 线下缴费 */}
-        {
-          PopupType - 0 === 2 &&
-          <view className='JiaoFeiPopup XianXia'>
-            <text>上传线下支付凭证</text>
-            <view className='UploadContainer'>
-              <UploadImg></UploadImg>
+          {/* 线下缴费 */}
+          {
+            PopupType - 0 === 2 &&
+            <view className='JiaoFeiPopup XianXia'>
+              <text>上传线下支付凭证</text>
+              <view className='UploadContainer'>
+                <UploadImg></UploadImg>
+              </view>
             </view>
-          </view>
-        }
+          }
 
-      </SlidePopup>
+        </SlidePopup>
 
-    </view>
+      </view>
+    </Page>
   )
 }

src/pages/WuYe/BaoXiuQuYu/index.jsx

@@ -1,5 +1,6 @@
 import React, { useState } from 'react'
 import Taro from '@tarojs/taro'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -13,20 +14,22 @@ export default function WuYeBaoXiuQuYu () {
   ])
 
   return (
-    <view className='WuYeBaoXiuQuYu'>
-      {
-        TypeList.map((item, index) => (
-          <view key={`WuYeBaoXiuQuYu-${index}`}>
-            <view onClick={() => { Taro.redirectTo({ url: `/pages/WuYe/TianJiaBaoXiu/index?type=${item.id}` }) }}>
-              <view>
-                <text className={`iconfont ${item.icon}`}></text>
-                <text>{item.name}</text>
+    <Page>
+      <view className='WuYeBaoXiuQuYu'>
+        {
+          TypeList.map((item, index) => (
+            <view key={`WuYeBaoXiuQuYu-${index}`}>
+              <view onClick={() => { Taro.redirectTo({ url: `/pages/WuYe/TianJiaBaoXiu/index?type=${item.id}` }) }}>
+                <view>
+                  <text className={`iconfont ${item.icon}`}></text>
+                  <text>{item.name}</text>
+                </view>
+                <text>{item.desc}</text>
               </view>
-              <text>{item.desc}</text>
             </view>
-          </view>
-        ))
-      }
-    </view>
+          ))
+        }
+      </view>
+    </Page>
   )
 }

src/pages/WuYe/FuWuDetail/index.jsx

@@ -1,29 +1,46 @@
-import React, { Component } from 'react'
-import '../../../assets/css/reset.less'
-import '../../../assets/css/iconfont.less'
+import React, { useState, useEffect } from 'react'
+import Taro, { Current } from '@tarojs/taro'
+import { RichText } from '@tarojs/components'
+import request, { apis } from '@/utils/request'
+import toolclass from '@/utils/toolclass.js'
+import Page from '@/layouts'
+import '@/assets/css/reset.less'
+import '@/assets/css/iconfont.less'
 import './index.less'
 
-export default class WuYeFuWuDetail extends Component {
+export default function WuYeFuWuDetail () {
 
-  state = {
-  }
-
-  componentWillMount () {
-  }
-
-  componentDidMount () { }
+  const [CurrnetId] = useState(Current.router.params.id) // 当前id
+  const [DetailInfo, setDetailInfo] = useState(null) // 详情
 
-  componentWillUnmount () { }
+  useEffect(() => {
+    GetDetail()
+  }, [CurrnetId])
 
-  componentDidShow () { }
-
-  componentDidHide () { }
+  const GetDetail = () => { // 获取详情
+    request({ ...apis.getWuYeFuWuDetail, args: { id: CurrnetId } }).then((res) => {
+      setDetailInfo(res)
+    })
+  }
 
-  render () {
-    return (
+  return (
+    <Page>
       <view className='WuYeFuWuDetail'>
-
+        {
+          DetailInfo !== null &&
+          <view>
+            <view className='Title'>
+              <text>{DetailInfo.newsName}</text>
+            </view>
+            <view className='flex-h'>
+              <text className='flex-item'>{toolclass.FormatDate(DetailInfo.createDate)}</text>
+              <text className='iconfont iconguankan'></text>
+              <text>{DetailInfo.pvNum || 0}</text>
+            </view>
+            <RichText nodes={DetailInfo.newsDetail}></RichText>
+          </view>
+        }
       </view>
-    )
-  }
+    </Page>
+  )
 }

src/pages/WuYe/FuWuDetail/index.less

@@ -1,6 +1,46 @@
 .WuYeFuWuDetail {
   width: 100%;
-  height: 100%;
+  min-height: 100vh;
   position: relative;
-  background: #f8f8f8;
+
+  >view {
+    position: relative;
+    overflow: hidden;
+    padding: 0 30px;
+    >.Title {
+      position: relative;
+      overflow: hidden;
+  
+      >text {
+        width: 100%;
+        display: block;
+        font-size: 34px;
+        color: #333;
+        line-height: 40px;
+        text-align: center;
+        margin-top: 40px;
+      }
+    }
+  
+    >.flex-h {
+      align-items: center;
+      margin-top: 20px;
+  
+      >text {
+        font-size: 24px;
+        color: #999;
+        line-height: 48px;
+        margin-left: 10px;
+  
+        &:first-child {
+          margin-left: 0;
+        }
+  
+        &.iconfont {
+          color: #F35844;
+          font-size: 40px;
+        }
+      }
+    }
+  }
 }

src/pages/WuYe/GongGaoDetail/index.jsx

@@ -4,6 +4,7 @@ import request, { apis } from '@/utils/request'
 import { RichText } from '@tarojs/components'
 import { useModel } from '@/store'
 import toolclass from '@/utils/toolclass.js'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -25,24 +26,26 @@ export default function WuYeGongGaoDetail () {
   }
 
   return (
-    <view className='WuYeGongGaoDetail'>
-      <view className='Title'>
-        <text>{DetailInfo === null ? null : DetailInfo.announcementTitle}</text>
-      </view>
-      <view className='flex-h'>
-        <view className='flex-item'>
-          <text>{DetailInfo === null ? null : DetailInfo.createUser}</text>
-          <text>{DetailInfo === null ? null : toolclass.FormatDate(DetailInfo.createDate)}</text>
+    <Page>
+      <view className='WuYeGongGaoDetail'>
+        <view className='Title'>
+          <text>{DetailInfo === null ? null : DetailInfo.announcementTitle}</text>
         </view>
-        <view>
-          <text className='iconfont iconguankan'></text>
-          <text>{DetailInfo === null ? null : DetailInfo.viewCount}</text>
+        <view className='flex-h'>
+          <view className='flex-item'>
+            <text>{DetailInfo === null ? null : DetailInfo.createUser}</text>
+            <text>{DetailInfo === null ? null : toolclass.FormatDate(DetailInfo.createDate)}</text>
+          </view>
+          <view>
+            <text className='iconfont iconguankan'></text>
+            <text>{DetailInfo === null ? null : DetailInfo.viewCount}</text>
+          </view>
+        </view>
+        <view className='Desc'>
+          <RichText nodes={DetailInfo === null ? null : DetailInfo.announcementContent}></RichText>
+          <image mode='widthFix' src={DetailInfo === null ? null : DetailInfo.announcementCarouselImg}></image>
         </view>
       </view>
-      <view className='Desc'>
-        <RichText nodes={DetailInfo === null ? null : DetailInfo.announcementContent}></RichText>
-        <image mode='widthFix' src={DetailInfo === null ? null : DetailInfo.announcementCarouselImg}></image>
-      </view>
-    </view>
+    </Page>
   )
 }

src/pages/WuYe/JiaoFeiDetail/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
 import Taro, { Current } from '@tarojs/taro'
 import SlidePopup from '@/components/SlidePopup/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -14,80 +15,82 @@ export default function JiaoFeiDetail () {
   const CurrnetJiaoFeiId = Current.router.params.id
 
   return (
-    <view className='JiaoFeiDetail'>
-      <view className='DetailContainer'>
-        <view className='Info'>
-          <view className='flex-h'>
-            <text className='flex-item'>物业费</text>
-            <text>2020/06/08  0:00截止</text>
-          </view>
-          <view className='Detail'>
-            <view className='Title flex-h'>
-              <text className='flex-item'>缴费金额</text>
-              <text className='Num'>300</text>
-              <text>元</text>
-            </view>
-            <text>2020年5月物业管理费</text>
-            <view className='Line flex-h'>
-              <text>垃圾费：</text>
-              <text className='flex-item'>100元</text>
-            </view>
-            <view className='Line flex-h'>
-              <text>绿地维护费：</text>
-              <text className='flex-item'>100元</text>
+    <Page>
+      <view className='JiaoFeiDetail'>
+        <view className='DetailContainer'>
+          <view className='Info'>
+            <view className='flex-h'>
+              <text className='flex-item'>物业费</text>
+              <text>2020/06/08  0:00截止</text>
             </view>
-            <view className='Line flex-h'>
-              <text>公摊电费：</text>
-              <text className='flex-item'>100元</text>
+            <view className='Detail'>
+              <view className='Title flex-h'>
+                <text className='flex-item'>缴费金额</text>
+                <text className='Num'>300</text>
+                <text>元</text>
+              </view>
+              <text>2020年5月物业管理费</text>
+              <view className='Line flex-h'>
+                <text>垃圾费：</text>
+                <text className='flex-item'>100元</text>
+              </view>
+              <view className='Line flex-h'>
+                <text>绿地维护费：</text>
+                <text className='flex-item'>100元</text>
+              </view>
+              <view className='Line flex-h'>
+                <text>公摊电费：</text>
+                <text className='flex-item'>100元</text>
+              </view>
             </view>
           </view>
+          <view className='InfoBottom'></view>
+        </view>
+        <view className='BottomContainer'>
+          <text onClick={() => { setPopupType(2); setShowPopup(true) }}>对费用有疑问？</text>
+          <text onClick={() => { setPopupType(1); setShowPopup(true) }}>立即缴费</text>
         </view>
-        <view className='InfoBottom'></view>
-      </view>
-      <view className='BottomContainer'>
-        <text onClick={() => { setPopupType(2); setShowPopup(true) }}>对费用有疑问？</text>
-        <text onClick={() => { setPopupType(1); setShowPopup(true) }}>立即缴费</text>
-      </view>
 
-      {/* 弹窗 */}
-      <SlidePopup Close={() => { setShowPopup(false); setPopupType(0) }} Show={ShowPopup}>
-        {
-          PopupType - 0 === 1 &&
-          <view className='JiaoFeiPopup'>
-            <view className='Price'>立即支付<text>150</text>元</view>
-            <view className='flex-h'>
-              <text className='iconfont iconweixinzhifu'></text>
-              <text className='flex-item'>微信支付</text>
-              <text className='iconfont icongou'></text>
+        {/* 弹窗 */}
+        <SlidePopup Close={() => { setShowPopup(false); setPopupType(0) }} Show={ShowPopup}>
+          {
+            PopupType - 0 === 1 &&
+            <view className='JiaoFeiPopup'>
+              <view className='Price'>立即支付<text>150</text>元</view>
+              <view className='flex-h'>
+                <text className='iconfont iconweixinzhifu'></text>
+                <text className='flex-item'>微信支付</text>
+                <text className='iconfont icongou'></text>
+              </view>
+              <view className='Btn'>
+                <text>去付款</text>
+              </view>
             </view>
-            <view className='Btn'>
-              <text>去付款</text>
+          }
+          {
+            PopupType - 0 === 2 &&
+            <view className='LianXiPopup'>
+              <text>联系物业</text>
+              <text>对此费用有疑问</text>
+              <view className='flex-h'>
+                <text className='flex-item'>物业电话</text>
+                <text>17826982167</text>
+                <text className='iconfont icondianhua'></text>
+              </view>
+              <view className='flex-h'>
+                <text className='flex-item'>门卫电话</text>
+                <text>17826982167</text>
+                <text className='iconfont icondianhua'></text>
+              </view>
+              <view className='flex-h'>
+                <text className='flex-item'>物业领导</text>
+                <text>17826982167</text>
+                <text className='iconfont icondianhua'></text>
+              </view>
             </view>
-          </view>
-        }
-        {
-          PopupType - 0 === 2 &&
-          <view className='LianXiPopup'>
-            <text>联系物业</text>
-            <text>对此费用有疑问</text>
-            <view className='flex-h'>
-              <text className='flex-item'>物业电话</text>
-              <text>17826982167</text>
-              <text className='iconfont icondianhua'></text>
-            </view>
-            <view className='flex-h'>
-              <text className='flex-item'>门卫电话</text>
-              <text>17826982167</text>
-              <text className='iconfont icondianhua'></text>
-            </view>
-            <view className='flex-h'>
-              <text className='flex-item'>物业领导</text>
-              <text>17826982167</text>
-              <text className='iconfont icondianhua'></text>
-            </view>
-          </view>
-        }
-      </SlidePopup>
-    </view>
+          }
+        </SlidePopup>
+      </view>
+    </Page>
   )
 }

src/pages/WuYe/TianJiaBaoXiu/index.jsx

@@ -2,6 +2,7 @@ import React, { useState } from 'react'
 import Taro, { Current } from '@tarojs/taro'
 import { Input, Textarea } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -82,29 +83,31 @@ export default function WuYeTianJiaBaoXiu () {
   }
 
   return (
-    <view className='WuYeTianJiaBaoXiu'>
-      <view className='Form'>
-        <Input placeholder='简述你的想法' onInput={TitleChange} value={Title}></Input>
-        <Textarea placeholder='描述问题详情，以便我们更好的相处' onInput={DescChange} value={Desc}></Textarea>
-      </view>
-      <view className='Photo'>
-        <view className='Add' onClick={AddImg}>
-          <view className='centerLabel'>
-            <text className='iconfont iconxiangji'></text>
-            <text>添加图片</text>
-          </view>
+    <Page>
+      <view className='WuYeTianJiaBaoXiu'>
+        <view className='Form'>
+          <Input placeholder='简述你的想法' onInput={TitleChange} value={Title}></Input>
+          <Textarea placeholder='描述问题详情，以便我们更好的相处' onInput={DescChange} value={Desc}></Textarea>
         </view>
-        {
-          PhotoUrl !== null &&
-          <view className='PhotoItem'>
-            <text className='iconfont iconshanchu' onClick={DeleteItem}></text>
-            <image mode='aspectFit' src={PhotoUrl}></image>
+        <view className='Photo'>
+          <view className='Add' onClick={AddImg}>
+            <view className='centerLabel'>
+              <text className='iconfont iconxiangji'></text>
+              <text>添加图片</text>
+            </view>
           </view>
-        }
-      </view>
-      <view className='Btn'>
-        <text onClick={Send}>确认发送</text>
+          {
+            PhotoUrl !== null &&
+            <view className='PhotoItem'>
+              <text className='iconfont iconshanchu' onClick={DeleteItem}></text>
+              <image mode='aspectFit' src={PhotoUrl}></image>
+            </view>
+          }
+        </view>
+        <view className='Btn'>
+          <text onClick={Send}>确认发送</text>
+        </view>
       </view>
-    </view>
+    </Page>
   )
 }

src/pages/WuYe/XiuGaiBaoXiu/index.jsx

@@ -3,6 +3,7 @@ import Taro, { Current } from '@tarojs/taro'
 import { Input, Textarea } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -94,29 +95,31 @@ export default function WuYeXiuGaiBaoXiu () {
   }
 
   return (
-    <view className='WuYeXiuGaiBaoXiu'>
-      <view className='Form'>
-        <Input placeholder='简述你的想法' onInput={TitleChange} value={DetailInfo === null ? null : DetailInfo.ticketTitle}></Input>
-        <Textarea placeholder='描述问题详情，以便我们更好的相处' onInput={DescChange} value={DetailInfo === null ? null : DetailInfo.ticketContent}></Textarea>
-      </view>
-      <view className='Photo'>
-        <view className='Add' onClick={AddImg}>
-          <view className='centerLabel'>
-            <text className='iconfont iconxiangji'></text>
-            <text>添加图片</text>
-          </view>
+    <Page>
+      <view className='WuYeXiuGaiBaoXiu'>
+        <view className='Form'>
+          <Input placeholder='简述你的想法' onInput={TitleChange} value={DetailInfo === null ? null : DetailInfo.ticketTitle}></Input>
+          <Textarea placeholder='描述问题详情，以便我们更好的相处' onInput={DescChange} value={DetailInfo === null ? null : DetailInfo.ticketContent}></Textarea>
         </view>
-        {
-          PhotoUrl !== null &&
-          <view className='PhotoItem'>
-            <text className='iconfont iconshanchu' onClick={DeleteItem}></text>
-            <image mode='aspectFit' src={PhotoUrl}></image>
+        <view className='Photo'>
+          <view className='Add' onClick={AddImg}>
+            <view className='centerLabel'>
+              <text className='iconfont iconxiangji'></text>
+              <text>添加图片</text>
+            </view>
           </view>
-        }
-      </view>
-      <view className='Btn'>
-        <text onClick={Send}>确认修改</text>
+          {
+            PhotoUrl !== null &&
+            <view className='PhotoItem'>
+              <text className='iconfont iconshanchu' onClick={DeleteItem}></text>
+              <image mode='aspectFit' src={PhotoUrl}></image>
+            </view>
+          }
+        </view>
+        <view className='Btn'>
+          <text onClick={Send}>确认修改</text>
+        </view>
       </view>
-    </view>
+    </Page>
   )
 }

src/pages/WuYe/index.jsx

@@ -5,15 +5,15 @@ import WuYeGongGao from '@/components/WuYeGongGao/index'
 import WuYeFuWu from '@/components/WuYeFuWu/index'
 import WuYeBaoXiu from '@/components/WuYeBaoXiu/index'
 import WuYeJiaoFei from '@/components/WuYeJiaoFei/index'
+import Page from '@/layouts'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
 
-export default function WuYe (props) {
+export default function WuYe () {
 
   const [NavList] = useState([{ name: '公告', id: 1 }, { name: '服务', id: 2 }, { name: '报修', id: 3 }, { name: '缴费', id: 4 }])
   const [CurrentNavId, setCurrentNavId] = useState(1)
-  const [IsPull, setIsPull] = useState(false)
 
   const NavChange = (e) => {
     return () => {
@@ -21,52 +21,47 @@ export default function WuYe (props) {
     }
   }
 
-  const OnRefresh = () => {
-    setIsPull(true)
-    window.setTimeout(() => {
-      setIsPull(false)
-    }, 1000)
-  }
-
   return (
-    <view className='WuYe flex-v'>
-      <NavHeader Title='物业' BgColor='none' IsFixed={true}></NavHeader>
-      <TabPageCutNav List={NavList} CurrentNavId={CurrentNavId} NavChange={NavChange}></TabPageCutNav>
-      <view className='flex-item'>
-        <view>
-          {/* 公告 */}
-          {
-            CurrentNavId - 0 === 1 &&
-            <view className='Content GongGao'>
-              <WuYeGongGao></WuYeGongGao>
-            </view>
-          }
+    <Page>
+      <view className='WuYe flex-v'>
+        <NavHeader Title='物业' BgColor='none' IsFixed={true}></NavHeader>
+        <TabPageCutNav List={NavList} CurrentNavId={CurrentNavId} NavChange={NavChange}></TabPageCutNav>
+        <view className='flex-item'>
+          <view>
+            {/* 公告 */}
+            {
+              CurrentNavId - 0 === 1 &&
+              <view className='Content GongGao'>
+                <WuYeGongGao></WuYeGongGao>
+              </view>
+            }
 
-          {/* 服务 */}
-          {
-            CurrentNavId - 0 === 2 &&
-            <view className='Content FuWu'>
-              <WuYeFuWu></WuYeFuWu>
-            </view>
-          }
+            {/* 服务 */}
+            {
+              CurrentNavId - 0 === 2 &&
+              <view className='Content FuWu'>
+                <WuYeFuWu></WuYeFuWu>
+              </view>
+            }
 
-          {/* 报修 */}
-          {
-            CurrentNavId - 0 === 3 &&
-            <view className='Content BaoXiu'>
-              <WuYeBaoXiu></WuYeBaoXiu>
-            </view>
-          }
+            {/* 报修 */}
+            {
+              CurrentNavId - 0 === 3 &&
+              <view className='Content BaoXiu'>
+                <WuYeBaoXiu></WuYeBaoXiu>
+              </view>
+            }
 
-          {/* 缴费 */}
-          {
-            CurrentNavId - 0 === 4 &&
-            <view className='Content JiaoFei'>
-              <WuYeJiaoFei></WuYeJiaoFei>
-            </view>
-          }
+            {/* 缴费 */}
+            {
+              CurrentNavId - 0 === 4 &&
+              <view className='Content JiaoFei'>
+                <WuYeJiaoFei></WuYeJiaoFei>
+              </view>
+            }
+          </view>
         </view>
       </view>
-    </view>
+    </Page>
   )
 }

src/utils/api.js

@@ -1,6 +1,18 @@
 const prefix = `${HOST}/api/wx`
 
 const $api = {
+  getUserInfo: { // 获取用户信息
+    method: 'get',
+    url: `${prefix}/user/info`
+  },
+  getWuYeFuWuDetail: { // 获取物业服务详情
+    method: 'get',
+    url: `${prefix}/property-news/:id`
+  },
+  getWuYeFuWuList: { // 获取物业服务列表
+    method: 'get',
+    url: `${prefix}/property-news`
+  },
   uploadImage: { // 上传图片
     method: 'post',
     url: `${prefix}/image`