静态页面

src/app.config.js

@@ -1,58 +1,44 @@
 
 export default {
   pages: [
-
-    'pages/HuiShengHuo/index', // 荟生活
-    'pages/HuiShengHuo/ActivityList/index', // 荟生活-活动列表
-    'pages/HuiShengHuo/ActivityList/ActivityDetail/index', // 荟生活-活动列表-活动详情
-    'pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/index', // 荟生活-活动列表-活动详情-报名
-    'pages/HuiShengHuo/PhotoList/index', // 荟生活-照片列表
-    'pages/HuiShengHuo/PhotoList/PhotoDetail/index', // 荟生活-照片列表-照片详情
-
-    'pages/HuiQuanYi/index', // 荟权益
-    'pages/HuiQuanYi/OwnersNews/index', // 荟权益-业主资讯
-    'pages/HuiQuanYi/OwnersNews/NewsDetail/index', // 荟权益-业主资讯-详情
-    'pages/HuiQuanYi/Recommed/index', // 荟权益-一荐倾心
-
-    'pages/HuiAiXin/index', // 荟爱心
-    'pages/HuiAiXin/StarOwner/index', // 荟爱心-明星业主
-    'pages/HuiAiXin/StarOwner/StarOwnerDetail/index', // 荟爱心-明星业主-详情
-    'pages/HuiAiXin/EnergyStory/index', // 荟爱心-正能量事迹
-    'pages/HuiAiXin/EnergyStory/EnergyStoryDetail/index', // 荟爱心-正能量事迹-详情
-
+    'pages/ShouYe/index', // 首页
+    'pages/WuYe/index', // 物业
+    'pages/HuoDong/index', // 活动
+    'pages/FuLi/index', // 福利
     'pages/WoDe/index', // 我的
-    'pages/WoDe/Feedback/index', // 我的-反馈
-    'pages/WoDe/MyActivityList/index', // 我的-活动列表
-    'pages/WoDe/MyRecommed/index', // 我的-我的推荐
-
-    'pages/SignIn/index', // 登录页
-    'pages/SignIn/XieYi/index', // 协议
-
-
+    'pages/SignIn/index' // 登录页
   ],
   tabBar: {
+    color: '#666666',
+    selectedColor: '#971C21',
     list: [
       {
-        iconPath: 'assets/image/iconhuishenghuo-.png',
-        selectedIconPath: 'assets/image/iconhuishenghuo.png',
-        pagePath: 'pages/HuiShengHuo/index',
-        text: '荟 · 生活'
+        iconPath: 'assets/img/tabicon1.png',
+        selectedIconPath: 'assets/img/tabicon1-.png',
+        pagePath: 'pages/ShouYe/index',
+        text: '首页'
+      },
+      {
+        iconPath: 'assets/img/tabicon2.png',
+        selectedIconPath: 'assets/img/tabicon2-.png',
+        pagePath: 'pages/WuYe/index',
+        text: '物业'
       },
       {
-        iconPath: 'assets/image/iconhuiquanyi-.png',
-        selectedIconPath: 'assets/image/iconhuiquanyi.png',
-        pagePath: 'pages/HuiQuanYi/index',
-        text: '荟 · 权益'
+        iconPath: 'assets/img/tabicon3.png',
+        selectedIconPath: 'assets/img/tabicon3-.png',
+        pagePath: 'pages/HuoDong/index',
+        text: '活动'
       },
       {
-        iconPath: 'assets/image/iconhuiaixin-.png',
-        selectedIconPath: 'assets/image/iconhuiaixin.png',
-        pagePath: 'pages/HuiAiXin/index',
-        text: '荟 · 爱心'
+        iconPath: 'assets/img/tabicon4.png',
+        selectedIconPath: 'assets/img/tabicon4-.png',
+        pagePath: 'pages/FuLi/index',
+        text: '福利'
       },
       {
-        iconPath: 'assets/image/iconwode-.png',
-        selectedIconPath: 'assets/image/iconwode.png',
+        iconPath: 'assets/img/tabicon5.png',
+        selectedIconPath: 'assets/img/tabicon5-.png',
         pagePath: 'pages/WoDe/index',
         text: '我的'
       }

src/app.js

@@ -1,7 +1,5 @@
 import Taro from '@tarojs/taro'
 import Vue from 'vue'
-import BasicLayout from '@/components/Layout/Basic'
-import Markdown from '@/components/Markdown'
 import { vueAuthPlugin } from '@/util/auth-plugin'
 import store from './store/index'
 
@@ -15,47 +13,22 @@ import ToolClass from './util/PublicMethod/index'
 Vue.prototype.ToolClass = ToolClass
 
 Vue.use(vueAuthPlugin)
-Vue.component('BasicLayout', BasicLayout)
-Vue.component('Markdown', Markdown)
 
 const App = new Vue({
   store,
   onLaunch (options) {
     this.login(options)
   },
-  render(h) {
+  render (h) {
     // this.$slots.default 是将要会渲染的页面
     return h('block', this.$slots.default)
   },
   methods: {
-    login(options) {
+    login (options) {
       Taro.login({
         success (res) {
           if (res.code) {
-            store.dispatch(
-              'user/MainSignIn',
-              { queryData: { code: res.code } }
-            ).then((res) => { // 获取用户信息
-              store.commit(
-                'user/EditUserInfo',
-                { name: 'PersonId', value: res.data.data.person.personId }
-              )
-
-              store.commit(
-                'user/EditUserInfo',
-                { name: 'OpenId', value: res.data.data.person.openId }
-              )
-              
-              store.commit(
-                'user/EditUserInfo',
-                { name: 'SessionKey', value: res.data.data.extraInfo.sessionKey }
-              )
-              
-              store.commit(
-                'user/EditUserInfo',
-                { name: 'Phone', value: res.data.data.person.phone }
-              )
-            })
+            console.log(`登录成功，登录信息${res}`)
           } else {
             Taro.showToast({
               title: '初始化失败, 请退出重试',

src/app.scss

@@ -51,33 +51,7 @@ page {
   .MainLoading {
     width: 100%;
     height: 300px;
-    background: url('../src/assets/image/bars.svg') no-repeat center center;
+    background: url('../src/assets/img/bars.svg') no-repeat center center;
     background-size: 100px auto;
   }
-  .NoData {
-    > image {
-      width: 53%;
-      margin: 172px auto 0;
-      display: block;
-    }
-    > text {
-      font-size: 28px;
-      color: #999;
-      line-height: 40px;
-      margin-top: 10px;
-      display: block;
-      text-align: center;
-    }
-  }
-  view.MainItemImg {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    > image {
-      width: 100%;
-      height: 100%;
-    }
-  }
 }

src/components/BannerSwiper/index.vue

@@ -1,46 +0,0 @@
-<template>
-  <view class="BannerSwiper">
-    <swiper style="width: 100%; height: 100%;" indicator-color="rgba(255,255,255,0.3)" indicator-active-color="rgba(255,255,255,1)" :indicator-dots="true" :autoplay="true" :interval="2000" :duration="300">
-      <block v-for="(item, index) in List" :key="index">
-        <swiper-item>
-          <view class="swiper-item">
-            <view class="MainItemImg">
-              <image mode="aspectFill" :src="item.image" @tap="LinkTo(item)"></image>
-            </view>
-          </view>
-        </swiper-item>
-      </block>
-    </swiper>
-  </view>
-</template>
-
-<script>
-export default {
-  name: 'BannerSwiper',
-  props: {
-    List: {
-      default: () => {
-        return []
-      },
-      type: Array
-    }
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-    LinkTo (item) {
-      if (item.srcId === null) return
-      wx.navigateTo({ url: `../../pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.srcId}` })
-    }
-  }
-}
-</script>
-
-<style>
-.BannerSwiper {
-  width: 100%;
-  height: 100%;
-}
-</style>

src/components/GetUserIcon/index.vue

@@ -1,123 +0,0 @@
-<template>
-  <view class="GetUserIcon" v-show="Show">
-    <view class="centerLabel">
-      <image mode="widthFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/morentouxiang.png"></image>
-      <text>授权头像</text>
-      <button open-type="getUserInfo" @getuserinfo="ToGetUserIcon">授权头像</button>
-    </view>
-  </view>
-</template>
-
-<script>
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-export default {
-  name: 'GetUserIcon',
-  data () {
-    return {
-      Show: false,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapUserState({
-      UserInfo: x => x.UserInfo // 用户信息
-    })
-  },
-  created () {
-    this.Init() // 初始化
-  },
-  methods: {
-    ...mapUserActions([
-      'UpdateUserInfo'
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo'
-    ]),
-    Init () { // 初始化
-      let _that = this
-      wx.getSetting({ // 校验用户是否已授权
-        success (res) {
-          if (res.authSetting['scope.userInfo']) { // 已授权时，获取用户信息
-            wx.authorize({
-              scope: 'scope.userInfo',
-              success () {
-                wx.getUserInfo({ // 授权成功时，获取用户信息
-                  success (subRes) {
-                    _that.EditUserInfo({ name: 'Icon', value: subRes.userInfo.avatarUrl })
-                    _that.EditUserInfo({ name: 'Name', value: subRes.userInfo.nickName })
-                    _that.$emit('UserInfoChange')
-                  }
-                })
-              }
-            })
-          } else { // 未授权时，显示弹窗
-            _that.Show = true
-          }
-        }
-      })
-    },
-    ToGetUserIcon (res) { // 获取用户头像
-      if (this.DataLock) return
-      this.DataLock = true
-      this.UpdateUserInfo({
-        urlData: { id: this.UserInfo.PersonId },
-        data: { data: { nickname: res.detail.userInfo.nickName, avatar: res.detail.userInfo.avatarUrl, sex: res.detail.userInfo.gender, personId: this.UserInfo.PersonId } }
-      }).then(() => {
-        this.EditUserInfo({ name: 'Icon', value: res.detail.userInfo.avatarUrl })
-        this.EditUserInfo({ name: 'Name', value: res.detail.userInfo.nickName })
-        this.$emit('UserInfoChange')
-        this.DataLock = false
-        this.Show = false
-      }).catch(() => {
-        this.DataLock = false
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.GetUserIcon {
-  width: 100%;
-  position: fixed;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  z-index: 100;
-  background: rgba(0, 0, 0, 0.6);
-  > view {
-    width: 60%;
-    padding: 20px 0 0;
-    background: #fff;
-    border-radius: 10px;
-    overflow: hidden;
-    > image {
-      width: 120px;
-      margin: 0 auto;
-      display: block;
-    }
-    > text {
-      font-size: 32px;
-      color: #07c160;
-      line-height: 80px;
-      display: block;
-      text-align: center;
-      border-top: 2px solid #f5f5f5;
-      margin-top: 40px;
-      &:active {
-        background: #f5f5f5;
-      }
-    }
-    > button {
-      width: 100%;
-      height: 80px;
-      opacity: 0;
-      display: block;
-      position: absolute;
-      left: 0;
-      bottom: 0;
-    }
-  }
-}
-</style>

src/components/Layout/Basic/index.vue

@@ -1,27 +0,0 @@
-<template>
-  <block>
-    <block v-if="user.PersonId">
-      <slot v-bind:user="user"></slot>
-    </block>
-    <view class="MainLoading centerLabel" v-else></view>
-  </block>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import Loading from '@/components/Loading'
-
-export default {
-  name: 'BasicLayout',
-  components: {
-    Loading
-  },
-  computed: {
-    ...mapState({
-      user: s => s.user.UserInfo || {}
-    })
-  },
-  created () {
-  }
-}
-</script>

src/components/Loading/index.vue

@@ -1,3 +0,0 @@
-<template>
-  <view style="text-align: center; margin-top: 20vh">Loading</view>
-</template>

src/components/Markdown/Readme.md

@@ -1,6 +0,0 @@
-使用当前组件的页面，必须设置
-
-  usingComponents: {
-    'towxml': '/towxml/towxml'
-  }
-  

src/components/Markdown/index.vue

@@ -1,28 +0,0 @@
-<template>
-  <towxml :nodes="nodes" />
-</template>
-
-<script>
-// https://github.com/sbfkcel/towxml
-// import towxml from '../../towxml'
-const towxml = require('../../towxml/index')
-
-export default {
-  props: {
-    value: {
-      type: String,
-      default: undefined
-    }
-  },
-
-  data() {
-    return {}
-  },
-
-  computed: {
-    nodes() {
-      return towxml(this.value, 'markdown')
-    }
-  }
-}
-</script>

src/components/NavHeader/index.vue

@@ -0,0 +1,39 @@
+<template>
+  <view class="NavHeader" :style="{background: BgColor}">
+    <text>{{Title}}</text>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'NavHeader',
+  props: {
+    Title: {
+      default: '香颂蔚澜',
+      type: String
+    },
+    BgColor: {
+      default: '#fff',
+      type: String
+    }
+  },
+  data () {
+    return {
+    }
+  },
+  computed: {
+  },
+  components: {
+  },
+  created () {
+  },
+  methods: {
+    Init () {
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "page.scss";
+</style>

src/components/NavHeader/page.scss

@@ -0,0 +1,13 @@
+.NavHeader {
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+  > text {
+    display: block;
+    font-size: 32px;
+    color: #fff;
+    text-indent: 30px;
+    margin-top: 60px;
+    padding-bottom: 20px;
+  }
+}

src/components/ScrollY/index.vue

@@ -1,32 +0,0 @@
-<template>
-  <view class="ScrollY">
-    <scroll-view style="width: 100%; height: 100%;" :scroll-y="true" :refresher-enabled="true" :refresher-threshold="120" refresher-background="#f8f8f8" :refresher-triggered="IsRefreshing" @refresherpulling="$emit('Refresh')" @scrolltolower="$emit('ScrollBottom')">
-      <slot></slot>
-    </scroll-view>
-  </view>
-</template>
-
-<script>
-export default {
-  name: 'ScrollY',
-  props: {
-    IsRefreshing: {
-      default: false,
-      type: Boolean
-    }
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-  }
-}
-</script>
-
-<style>
-.ScrollY {
-  width: 100%;
-  height: 100%;
-}
-</style>

src/pages/FuLi/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '香颂蔚澜'
+}

src/pages/FuLi/index.vue

@@ -0,0 +1,39 @@
+<template>
+  <view class="page FuLi">
+    福利
+  </view>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+export default {
+  name: 'FuLi',
+  data () {
+    return {
+      DataLock: false
+    }
+  },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo // 用户信息
+    })
+  },
+  components: {
+  },
+  created () {
+  },
+  methods: {
+    ...mapUserActions([
+    ]),
+    ...mapUserMutations([
+    ]),
+    Init () {
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "page.scss";
+</style>

src/pages/FuLi/page.scss

@@ -0,0 +1,6 @@
+.page.FuLi {
+  width: 100%;
+  height: 100%;
+  overflow-y: scroll;
+  background: #fff;
+}

src/pages/HuiAiXin/EnergyStory/EnergyStoryDetail/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '丽园助农详情'
-}

src/pages/HuiAiXin/EnergyStory/EnergyStoryDetail/index.vue

@@ -1,30 +0,0 @@
-<template>
-  <view class="page">
-    正能量事迹详情
-  </view>
-</template>
-
-<script>
-
-export default {
-  name: 'EnergyStoryDetail',
-  data () {
-    return {
-
-    }
-  },
-  components: {
-  },
-  created () {
-    this.Init()
-  },
-  methods: {
-    Init () {
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiAiXin/EnergyStory/EnergyStoryDetail/page.scss

@@ -1,3 +0,0 @@
-.page {
-  width: 100%;
-}

src/pages/HuiAiXin/EnergyStory/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '丽园助农'
-}

src/pages/HuiAiXin/EnergyStory/index.vue

@@ -1,117 +0,0 @@
-<template>
-  <view class="page ZhengNengLiangShiJi">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
-      <view class="Container">
-
-        <!-- 标题 -->
-        <view class="Title">
-          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/zhengnengliangshiji.png"></image>
-        </view>
-
-        <!-- 列表 -->
-        <view class="List" v-if="PageList.length">
-          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}&from=love`" hover-class="other-navigator-hover" class="Item flex-h">
-            <view class="flex-item">
-              <text>{{item.name}}</text>
-              <text>副标题</text>
-              <text>来源</text>
-            </view>
-            <view class="Img">
-              <view>
-                <view class="MainItemImg">
-                  <image mode="aspectFill" :src="item.thumb"></image>
-                </view>
-              </view>
-            </view>
-          </navigator>
-        </view>
-
-      </view>
-    </ScrollY>
-  </view>
-</template>
-
-<script>
-import ScrollY from '../../../components/ScrollY/index'
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
-const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-export default {
-  name: 'ZhengNengLiangShiJi',
-  data () {
-    return {
-      PageList: [],
-      PageData: {
-        pageNum: 1,
-        pageSize: 15
-      },
-      HasNextPage: true,
-      IsRefreshing: false,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapIndexState({
-      ZhengNengLiangShiJiList: x => x.ZhengNengLiangShiJiList // 正能量事迹列表
-    })
-  },
-  components: {
-    ScrollY
-  },
-  created () {
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  methods: {
-    ...mapUserActions([
-      'MainSignIn' // 获取用户信息
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
-    ]),
-    ...mapIndexActions([
-      'GetZhengNengLiangShiJiList' // 获取正能量事迹列表
-    ]),
-    ...mapIndexMutations([
-      'EmptyZhengNengLiangShiJiList' // 清空正能量事迹列表
-    ]),
-    Init () { // 初始化
-      this.PageData.pageNum = 1
-      this.HasNextPage = true
-      this.EmptyZhengNengLiangShiJiList() // 清空正能量事迹列表
-      this.PageList = []
-      this.ToGetPageList() // 获取列表
-    },
-    ToGetPageList () { // 获取列表
-      this.GetZhengNengLiangShiJiList({ queryData: { ...this.PageData, typeId: 6 } }).then((res) => { // 获取正能量事迹列表
-        this.PageList = [...this.ZhengNengLiangShiJiList]
-        this.HasNextPage = res.data.data.current < res.data.data.pages
-        this.DataLock = false
-        this.IsRefreshing = false
-      }).catch(() => {
-        this.DataLock = false
-        this.IsRefreshing = false
-      })
-    },
-    ScrollBottom () { // 上拉加载
-      if (this.DataLock || !this.HasNextPage) return
-      this.DataLock = true
-      this.PageData.pageNum += 1
-      this.ToGetPageList() // 获取列表
-    },
-    Refresh (e) { // 页面下拉刷新
-      if (this.DataLock) return
-      this.DataLock = true
-      this.IsRefreshing = true
-      setTimeout(() => {
-        this.Init() // 获取列表
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiAiXin/EnergyStory/page.scss

@@ -1,63 +0,0 @@
-.page.ZhengNengLiangShiJi {
-  width: 100%;
-  height: 100%;
-  background: #fff;
-  .Container {
-    > .Title {
-      margin-top: 40px;
-      > image {
-        height: 44px;
-        margin-left: 20px;
-      }
-    }
-    > .List {
-      padding: 0 20px;
-      > .Item {
-        padding: 40px 0;
-        border-bottom: 2px solid #f5f5f5;
-        > .flex-item {
-          margin-right: 20px;
-          > text {
-            display: block;
-            font-size: 28px;
-            line-height: 40px;
-            overflow: hidden;
-            margin-top: 6px;
-            &:nth-child(1) {
-              text-overflow: ellipsis;
-              display: -webkit-box;
-              -webkit-box-orient: vertical;
-              -webkit-line-clamp: 2;
-              margin-top: 0;
-            }
-            &:nth-child(2) {
-              color: #666;
-              font-size: 24px;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-            }
-            &:nth-child(3) {
-              color: #fe4e45;
-              font-size: 24px;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-            }
-          }
-        }
-        > .Img {
-          width: 34%;
-          margin-right: 20px;
-          position: relative;
-          overflow: hidden;
-          > view {
-            width: 100%;
-            padding-bottom: 70%;
-            background: #ccc;
-            position: relative;
-            overflow: hidden;
-          }
-        }
-      }
-    }
-  }
-}

src/pages/HuiAiXin/StarOwner/StarOwnerDetail/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '明星业主详情'
-}

src/pages/HuiAiXin/StarOwner/StarOwnerDetail/index.vue

@@ -1,30 +0,0 @@
-<template>
-  <view class="page">
-    明星业主详情
-  </view>
-</template>
-
-<script>
-
-export default {
-  name: 'StarOwnerDetail',
-  data () {
-    return {
-
-    }
-  },
-  components: {
-  },
-  created () {
-    this.Init()
-  },
-  methods: {
-    Init () {
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiAiXin/StarOwner/StarOwnerDetail/page.scss

@@ -1,3 +0,0 @@
-.page {
-  width: 100%;
-}

src/pages/HuiAiXin/StarOwner/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '旧衣飞行'
-}

src/pages/HuiAiXin/StarOwner/index.vue

@@ -1,111 +0,0 @@
-<template>
-  <view class="page MingXingYeZhu">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
-      <view class="Container">
-
-        <!-- 标题 -->
-        <view class="Title">
-          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/mingxingyezhu.png"></image>
-        </view>
-
-        <!-- 列表 -->
-        <view class="List" v-if="PageList.length">
-          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}&from=love`" hover-class="other-navigator-hover" class="Item">
-            <view class="Img">
-              <view class="MainItemImg">
-                <image mode="aspectFill" :src="item.thumb"></image>
-              </view>
-            </view>
-            <text class="Info">{{item.name}}</text>
-          </navigator>
-        </view>
-
-      </view>
-    </ScrollY>
-  </view>
-</template>
-
-<script>
-import ScrollY from '../../../components/ScrollY/index'
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
-const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-export default {
-  name: 'MingXingYeZhu',
-  data () {
-    return {
-      PageList: [],
-      PageData: {
-        pageNum: 1,
-        pageSize: 15
-      },
-      HasNextPage: true,
-      IsRefreshing: false,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapIndexState({
-      MingXingYeZhuList: x => x.MingXingYeZhuList // 旧衣飞行列表
-    })
-  },
-  components: {
-    ScrollY
-  },
-  created () {
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  methods: {
-    ...mapUserActions([
-      'MainSignIn' // 获取用户信息
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
-    ]),
-    ...mapIndexActions([
-      'GetMingXingYeZhuList' // 获取旧衣飞行列表
-    ]),
-    ...mapIndexMutations([
-      'EmptyMingXingYeZhuList' // 清空旧衣飞行列表
-    ]),
-    Init () { // 初始化
-      this.PageData.pageNum = 1
-      this.HasNextPage = true
-      this.EmptyMingXingYeZhuList() // 清空旧衣飞行列表
-      this.PageList = []
-      this.ToGetPageList() // 获取列表
-    },
-    ToGetPageList () { // 获取列表
-      this.GetMingXingYeZhuList({ queryData: { ...this.PageData, typeId: 5 } }).then((res) => { // 获取旧衣飞行列表
-        this.PageList = [...this.MingXingYeZhuList]
-        this.HasNextPage = res.data.data.current < res.data.data.pages
-        this.DataLock = false
-        this.IsRefreshing = false
-      }).catch(() => {
-        this.DataLock = false
-        this.IsRefreshing = false
-      })
-    },
-    ScrollBottom () { // 上拉加载
-      if (this.DataLock || !this.HasNextPage) return
-      this.DataLock = true
-      this.PageData.pageNum += 1
-      this.ToGetPageList() // 获取列表
-    },
-    Refresh (e) { // 页面下拉刷新
-      if (this.DataLock) return
-      this.DataLock = true
-      this.IsRefreshing = true
-      setTimeout(() => {
-        this.Init() // 获取列表
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiAiXin/StarOwner/page.scss

@@ -1,45 +0,0 @@
-.page.MingXingYeZhu {
-  width: 100%;
-  height: 100%;
-  background: #fff;
-  .Container {
-    > .Title {
-      margin-top: 40px;
-      > image {
-        height: 44px;
-        margin-left: 20px;
-      }
-    }
-    > .List {
-      padding: 0 20px;
-      margin-top: 40px;
-      > .Item {
-        width: 100%;
-        position: relative;
-        overflow: hidden;
-        display: inline-block;
-        vertical-align: middle;
-        border-radius: 20px;
-        box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
-        margin-bottom: 40px;
-        > .Img {
-          width: 100%;
-          padding-bottom: 45%;
-          background: #ccc;
-          position: relative;
-          overflow: hidden;
-        }
-        > .Info {
-          display: block;
-          padding: 0 34px;
-          font-size: 24px;
-          line-height: 70px;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          color: #333;
-        }
-      }
-    }
-  }
-}

src/pages/HuiAiXin/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '荟 · 爱心'
-}

src/pages/HuiAiXin/index.vue

@@ -1,172 +0,0 @@
-<template>
-  <view class="page HuiAiXin">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
-
-      <view class="PageContainer">
-
-        <!-- banner -->
-        <view class="Banner">
-          <view>
-            <BannerSwiper :List="HuiAiXinBanner"></BannerSwiper>
-          </view>
-        </view>
-
-        <!-- 明星业主 -->
-        <view class="StarOwnerList">
-          <view class="flex-h">
-            <view class="flex-item">
-              <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/mingxingyezhu.png"></image>
-            </view>
-            <navigator url="./StarOwner/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
-          </view>
-          <view class="ListContainer" v-if="PageStarList.length">
-            <scroll-view scroll-x="true">
-              <view class="List">
-                <navigator v-for="(item, index) in PageStarList" :key="index" :url="`../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}&from=love`" hover-class="other-navigator-hover" class="Item">
-                  <view class="Img">
-                    <view class="MainItemImg">
-                      <image mode="aspectFill" :src="item.thumb"></image>
-                    </view>
-                  </view>
-                  <text class="Info">{{item.name}}</text>
-                </navigator>
-              </view>
-              <view style="width: 100%; height: 20px;"></view>
-            </scroll-view>
-          </view>
-        </view>
-
-        <!-- 正能量事迹 -->
-        <view class="StoryList">
-          <view class="flex-h">
-            <view class="flex-item">
-              <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/zhengnengliangshiji.png"></image>
-            </view>
-            <navigator url="./EnergyStory/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
-          </view>
-          <view class="List" v-if="PageStoryList.length">
-            <navigator v-for="(item, index) in PageStoryList" :key="index" :url="`../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}&from=love`" hover-class="other-navigator-hover" class="Item flex-h">
-              <view class="flex-item">
-                <text>{{item.name}}</text>
-                <text>{{item.address}}</text>
-                <text>{{ToolClass.DateFormat(new Date(item.startDate).getTime())}}</text>
-              </view>
-              <view class="Img">
-                <view>
-                  <view class="MainItemImg">
-                    <image mode="aspectFill" :src="item.thumb"></image>
-                  </view>
-                </view>
-              </view>
-            </navigator>
-          </view>
-        </view>
-
-        <!-- 授权头像获取弹窗 -->
-        <GetUserIcon></GetUserIcon>
-
-      </view>
-
-    </ScrollY>
-  </view>
-</template>
-
-<script>
-import GetUserIcon from '../../components/GetUserIcon/index'
-import ScrollY from '../../components/ScrollY/index'
-import BannerSwiper from '../../components/BannerSwiper/index'
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
-const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-export default {
-  name: 'HuiAiXin',
-  data () {
-    return {
-      PageStarList: [],
-      PageStoryList: [],
-      RequestNum: 0,
-      IsRefreshing: false,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapIndexState({
-      HuiAiXinBanner: x => x.HuiAiXinBanner, // 荟爱心banner
-      MingXingYeZhuList: x => x.MingXingYeZhuList, // 明星业主列表
-      ZhengNengLiangShiJiList: x => x.ZhengNengLiangShiJiList // 正能量事迹列表
-    })
-  },
-  components: {
-    ScrollY,
-    BannerSwiper,
-    GetUserIcon
-  },
-  created () {
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  methods: {
-    ...mapUserActions([
-      'MainSignIn' // 获取用户信息
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
-    ]),
-    ...mapIndexActions([
-      'GetHuiAiXinBanner', // 获取荟爱心banner
-      'GetMingXingYeZhuList', // 获取明星业主列表
-      'GetZhengNengLiangShiJiList' // 获取正能量事迹列表
-    ]),
-    ...mapIndexMutations([
-      'EmptyHuiAiXinBanner', // 清空荟爱心banner
-      'EmptyMingXingYeZhuList', // 清空明星业主列表
-      'EmptyZhengNengLiangShiJiList' // 清空正能量事迹列表
-    ]),
-    Init () {
-      this.RequestNum = 0
-      this.EmptyHuiAiXinBanner() // 清空荟爱心banner
-      this.EmptyMingXingYeZhuList() // 清空明星业主列表
-      this.EmptyZhengNengLiangShiJiList() // 清空正能量事迹列表
-      this.PageStarList = []
-      this.PageStoryList = []
-      this.GetHuiAiXinBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'love' } }).then(() => { // 获取荟爱心banner
-        this.CheckRequestNum(3) // 判断请求接口个数
-      }).catch(() => {
-        this.CheckRequestNum(3) // 判断请求接口个数
-      })
-      this.GetMingXingYeZhuList({ queryData: { pageNum: 1, pageSize: 10, typeId: 5 } }).then(() => { // 获取明星业主列表
-        this.PageStarList = [...this.MingXingYeZhuList]
-        this.CheckRequestNum(3) // 判断请求接口个数
-      }).catch(() => {
-        this.CheckRequestNum(3) // 判断请求接口个数
-      })
-      this.GetZhengNengLiangShiJiList({ queryData: { pageNum: 1, pageSize: 10, typeId: 6 } }).then(() => { // 获取正能量事迹列表
-        this.PageStoryList = [...this.ZhengNengLiangShiJiList]
-        this.CheckRequestNum(3) // 判断请求接口个数
-      }).catch(() => {
-        this.CheckRequestNum(3) // 判断请求接口个数
-      })
-    },
-    CheckRequestNum (num) { // 判断请求接口个数
-      this.RequestNum += 1
-      if (this.RequestNum >= num) {
-        this.IsRefreshing = false
-        this.DataLock = false
-      }
-    },
-    Refresh (e) { // 页面下拉刷新
-      if (this.DataLock) return
-      this.DataLock = true
-      this.IsRefreshing = true
-      setTimeout(() => {
-        this.Init() // 初始化
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiAiXin/page.scss

@@ -1,164 +0,0 @@
-.page.HuiAiXin {
-  width: 100%;
-  height: 100%;
-  .PageContainer {
-    width: 100%;
-    min-height: 100vh;
-    position: relative;
-    .Banner {
-      width: 100%;
-      padding-bottom: 41%;
-      position: relative;
-      overflow: hidden;
-      > view {
-        width: 100%;
-        position: absolute;
-        left: 0;
-        top: 0;
-        bottom: 0;
-        overflow: hidden;
-        background: #ccc;
-      }
-    }
-    .StarOwnerList {
-      padding: 20px 0;
-      background: #fff;
-      margin-top: 20px;
-      > .flex-h {
-        padding: 0 20px;
-        align-items: center;
-        margin-top: 10px;
-        > .flex-item {
-          > image {
-            height: 48px;
-          }
-        }
-        > .More {
-          font-size: 26px;
-          color: #999;
-          > text {
-            font-size: 26px;
-          }
-        }
-      }
-      > .ListContainer {
-        width: 100%;
-        position: relative;
-        overflow: hidden;
-        margin-top: 40px;
-        margin-bottom: 10px;
-        > scroll-view {
-          .List {
-            font-size: 0;
-            white-space: nowrap;
-            overflow: visible;
-            > .Item {
-              width: 80%;
-              position: relative;
-              overflow: hidden;
-              display: inline-block;
-              vertical-align: middle;
-              margin-left: 25px;
-              border-radius: 20px;
-              box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
-              &:last-child {
-                margin-right: 25px;
-              }
-              > .Img {
-                width: 100%;
-                padding-bottom: 45%;
-                background: #ccc;
-                position: relative;
-                overflow: hidden;
-              }
-              > .Info {
-                display: block;
-                padding: 0 34px;
-                font-size: 24px;
-                line-height: 70px;
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                color: #333;
-              }
-            }
-          }
-        }
-      }
-    }
-    .StoryList {
-      padding: 20px 0;
-      background: #fff;
-      margin-top: 20px;
-      > .flex-h {
-        padding: 0 20px;
-        align-items: center;
-        margin-top: 10px;
-        > .flex-item {
-          > image {
-            height: 48px;
-          }
-        }
-        > .More {
-          font-size: 26px;
-          color: #999;
-          > text {
-            font-size: 26px;
-          }
-        }
-      }
-      > .List {
-        position: relative;
-        overflow: hidden;
-        margin-bottom: 30px;
-        padding-left: 30px;
-        > .Item {
-          padding: 40px 0;
-          border-bottom: 2px solid #f5f5f5;
-          > .flex-item {
-            margin-right: 20px;
-            > text {
-              display: block;
-              font-size: 28px;
-              line-height: 40px;
-              overflow: hidden;
-              margin-top: 6px;
-              &:nth-child(1) {
-                text-overflow: ellipsis;
-                display: -webkit-box;
-                -webkit-box-orient: vertical;
-                -webkit-line-clamp: 2;
-                margin-top: 0;
-              }
-              &:nth-child(2) {
-                color: #666;
-                font-size: 24px;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-              }
-              &:nth-child(3) {
-                color: #fe4e45;
-                font-size: 24px;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-              }
-            }
-          }
-          > .Img {
-            width: 34%;
-            margin-right: 20px;
-            position: relative;
-            overflow: hidden;
-            > view {
-              width: 100%;
-              padding-bottom: 70%;
-              background: #ccc;
-              position: relative;
-              overflow: hidden;
-            }
-          }
-        }
-      }
-    }
-  }
-}

src/pages/HuiQuanYi/NoticeBoard/NoticeDetail/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '公告详情'
-}

src/pages/HuiQuanYi/NoticeBoard/NoticeDetail/index.vue

@@ -1,30 +0,0 @@
-<template>
-  <view class="page">
-    公告栏
-  </view>
-</template>
-
-<script>
-
-export default {
-  name: 'NoticeBoard',
-  data () {
-    return {
-
-    }
-  },
-  components: {
-  },
-  created () {
-    this.Init()
-  },
-  methods: {
-    Init () {
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiQuanYi/NoticeBoard/NoticeDetail/page.scss

@@ -1,3 +0,0 @@
-.page {
-  width: 100%;
-}

src/pages/HuiQuanYi/NoticeBoard/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '业主公告栏'
-}

src/pages/HuiQuanYi/NoticeBoard/index.vue

@@ -1,30 +0,0 @@
-<template>
-  <view class="page">
-    公告详情
-  </view>
-</template>
-
-<script>
-
-export default {
-  name: 'NoticeDetail',
-  data () {
-    return {
-
-    }
-  },
-  components: {
-  },
-  created () {
-    this.Init()
-  },
-  methods: {
-    Init () {
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiQuanYi/NoticeBoard/page.scss

@@ -1,3 +0,0 @@
-.page {
-  width: 100%;
-}

src/pages/HuiQuanYi/OwnersNews/NewsDetail/index.config.js

@@ -1,6 +0,0 @@
-export default {
-  navigationBarTitleText: '业主资讯',
-  usingComponents: {
-    'towxml': '/towxml/towxml'
-  }
-}

src/pages/HuiQuanYi/OwnersNews/NewsDetail/index.vue

@@ -1,64 +0,0 @@
-<template>
-  <view class="page ZiXunXiangQing">
-    <!-- 标题 -->
-    <view class="MainTitle" v-if="Info !== null">
-      <text>{{Info.title}}</text>
-      <text class="iconfont iconguanbi" @tap="GoBack"></text>
-    </view>
-
-    <!-- 内容 -->
-    <view class="Container" v-if="Info !== null">
-      <image mode="widthFix" class="Img" :src="Info.thumb"></image>
-      <!-- <towxml :nodes="nodes" /> -->
-      <Markdown :value="(Info || {}).content" />
-    </view>
-
-    <!-- 授权头像获取弹窗 -->
-    <GetUserIcon></GetUserIcon>
-  </view>
-</template>
-
-<script>
-import GetUserIcon from '../../../../components/GetUserIcon/index'
-import { getCurrentInstance } from "@tarojs/taro"
-import { createNamespacedHelpers } from "vuex"
-const { mapActions: mapIndexActions } = createNamespacedHelpers("index")
-export default {
-  name: "ZiXunXiangQing",
-  data() {
-    return {
-      CurrnetId: null,
-      Info: null
-    }
-  },
-  components: {
-    GetUserIcon
-  },
-  computed: {},
-  created() {
-    this.CurrnetId = getCurrentInstance().router.params.id
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  methods: {
-    ...mapIndexActions([
-      "GetNewsDetail", // 获取资讯详情
-    ]),
-    Init() {
-      this.GetNewsDetail({
-        urlData: { id: this.CurrnetId }
-      }).then((res) => {
-        this.Info = res.data.data || null
-      })
-    },
-    GoBack () {
-      wx.navigateBack()
-    }
-  },
-}
-</script>
-
-<style lang="scss">
-@import "page.scss"
-</style>

src/pages/HuiQuanYi/OwnersNews/NewsDetail/page.scss

@@ -1,47 +0,0 @@
-.page.ZiXunXiangQing {
-  width: 100%;
-  height: 100%;
-  overflow-y: scroll;
-  background: #fff;
-  > .MainTitle {
-    position: relative;
-    overflow: hidden;
-    margin-top: 20px;
-    > text {
-      &:nth-child(1) {
-        display: block;
-        text-align: center;
-        font-size: 52px;
-        font-weight: bold;
-        line-height: 80px;
-        z-index: 1;
-        position: relative;
-      }
-      &:nth-child(2) {
-        font-size: 24px;
-        display: inline-block;
-        position: absolute;
-        z-index: 2;
-        right: 40px;
-        top: 50%;
-        transform: translateY(-50%);
-        -webkit-transform: translateY(-50%);
-      }
-    }
-  }
-  > .Container {
-    margin-top: 40px;
-    padding: 0 20px;
-    padding-bottom: 40px;
-    > image {
-      width: 100%;
-    }
-    > text {
-      display: block;
-      font-size: 28px;
-      line-break: 40px;
-      color: #666;
-      margin-top: 20px;
-    }
-  }
-}

src/pages/HuiQuanYi/OwnersNews/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '业主资讯'
-}

src/pages/HuiQuanYi/OwnersNews/index.vue

@@ -1,110 +0,0 @@
-<template>
-  <view class="page YeZhuZiXun">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
-      <view class="Container">
-
-        <!-- 标题 -->
-        <view class="Title">
-          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/yezhuzixun.png"></image>
-        </view>
-
-        <!-- 列表 -->
-        <view class="List" v-if="PageList.length">
-          <navigator :url="`./NewsDetail/index?id=${item.newsId}`" hover-class="other-navigator-hover" v-for="(item, index) in PageList" :key="index" class="Item flex-h">
-            <view class="flex-item">
-              <text>{{item.title}}</text>
-              <text></text>
-            </view>
-            <text class="iconfont iconjiantouright"></text>
-          </navigator>
-        </view>
-
-      </view>
-    </ScrollY>
-  </view>
-</template>
-
-<script>
-import ScrollY from '../../../components/ScrollY/index'
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
-const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-export default {
-  name: 'YeZhuZiXun',
-  data () {
-    return {
-      PageList: [],
-      PageData: {
-        pageNum: 1,
-        pageSize: 15
-      },
-      HasNextPage: true,
-      IsRefreshing: false,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapIndexState({
-      YeZhuZiXunList: x => x.YeZhuZiXunList // 业主资讯列表
-    })
-  },
-  components: {
-    ScrollY
-  },
-  created () {
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  methods: {
-    ...mapUserActions([
-      'MainSignIn' // 获取用户信息
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
-    ]),
-    ...mapIndexActions([
-      'GetYeZhuZiXunList' // 获取资讯列表
-    ]),
-    ...mapIndexMutations([
-      'EmptyYeZhuZiXunList' // 清空资讯列表
-    ]),
-    Init () { // 初始化
-      this.PageData.pageNum = 1
-      this.HasNextPage = true
-      this.PageList = []
-      this.EmptyYeZhuZiXunList() // 清空资讯列表
-      this.ToGetPageList() // 获取列表
-    },
-    ToGetPageList () { // 获取列表
-      this.GetYeZhuZiXunList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取资讯列表
-        this.PageList = [...this.YeZhuZiXunList]
-        this.HasNextPage = res.data.data.current < res.data.data.pages
-        this.DataLock = false
-        this.IsRefreshing = false
-      }).catch(() => {
-        this.DataLock = false
-        this.IsRefreshing = false
-      })
-    },
-    ScrollBottom () { // 上拉加载
-      if (this.DataLock || !this.HasNextPage) return
-      this.DataLock = true
-      this.PageData.pageNum += 1
-      this.ToGetPageList() // 获取列表
-    },
-    Refresh (e) { // 页面下拉刷新
-      if (this.DataLock) return
-      this.DataLock = true
-      this.IsRefreshing = true
-      setTimeout(() => {
-        this.Init() // 初始化
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiQuanYi/OwnersNews/page.scss

@@ -1,50 +0,0 @@
-.page.YeZhuZiXun {
-  width: 100%;
-  height: 100%;
-  background: #fff;
-  .Container {
-    > .Title {
-      margin-top: 40px;
-      > image {
-        height: 44px;
-        margin-left: 20px;
-      }
-    }
-    > .List {
-      padding-left: 20px;
-      margin-top: 20px;
-      padding-bottom: 40px;
-      > .Item {
-        border-bottom: 2px solid #f5f5f5;
-        padding: 20px 20px 20px 0;
-        align-items: center;
-        > view {
-          font-size: 0;
-          white-space: nowrap;
-          position: relative;
-          overflow: hidden;
-          > text {
-            display: inline-block;
-            vertical-align: middle;
-            font-size: 28px;
-            color: #999;
-            &:nth-child(1) {
-              color: #000;
-              max-width: 88%;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              margin-right: 2%;
-            }
-            &:nth-child(2) {
-              width: 10%;
-            }
-          }
-        }
-        > text {
-          font-size: 28px;
-          color: #999;
-        }
-      }
-    }
-  }
-}

src/pages/HuiQuanYi/Recommed/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '一荐倾心计划'
-}

src/pages/HuiQuanYi/Recommed/index.vue

@@ -1,135 +0,0 @@
-<template>
-  <view class="page YiJianQingXin">
-    <view class="Form">
-      <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/yijianqingxinjihua.png"></image>
-      <view class="flex-h">
-        <text>姓名</text>
-        <view class="flex-item">
-          <input type="text" v-model="Name" placeholder="请输入" />
-        </view>
-      </view>
-      <view class="flex-h">
-        <text>性别</text>
-        <view class="flex-item">
-          <picker @change="SexChange" :range="SexList" range-key="name">
-            <view class="picker">{{SexName || '请选择'}}</view>
-          </picker>
-        </view>
-      </view>
-      <view class="flex-h">
-        <text>电话</text>
-        <view class="flex-item">
-          <input type="number" v-model="Phone" placeholder="请输入" />
-        </view>
-      </view>
-      <view class="flex-h" style="border-bottom: none;">
-        <text>备注</text>
-      </view>
-      <view class="textarea">
-        <textarea v-model="Remark" placeholder="请输入" @input="Remark = Remark.substring(0, 100)"></textarea>
-        <text>{{Remark.length}}/100</text>
-      </view>
-    </view>
-
-    <text @tap="ToPostRecommed">提交</text>
-  </view>
-</template>
-
-<script>
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapUserState, mapActions: mapUserActions } = createNamespacedHelpers('user')
-export default {
-  name: 'YiJianQingXin',
-  data () {
-    return {
-      DataLock: false,
-      Name: '',
-      Sex: '',
-      Phone: '',
-      Remark: '',
-      SexName: '',
-      SexList: [
-        { name: '男', id: '1' },
-        { name: '女', id: '2' }
-      ]
-    }
-  },
-  computed: {
-    ...mapUserState({
-      UserInfo: x => x.UserInfo // 用户信息
-    })
-  },
-  components: {
-  },
-  created () {
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  methods: {
-    ...mapUserActions([
-      'PostRecommed'
-    ]),
-    Init () { // 初始化
-    },
-    ToPostRecommed () {
-      if (this.DataLock) return
-      if (this.Name === '') {
-        wx.showToast({
-          title: '姓名不能为空',
-          icon: 'none',
-          duration: 2000
-        })
-        return
-      }
-      if (this.Sex === '') {
-        wx.showToast({
-          title: '性别不能为空',
-          icon: 'none',
-          duration: 2000
-        })
-        return
-      }
-      if (this.Phone === '') {
-        wx.showToast({
-          title: '电话不能为空',
-          icon: 'none',
-          duration: 2000
-        })
-        return
-      }
-      this.DataLock = true
-      this.PostRecommed({
-        data: { data: { name: this.Name, phone: this.Phone, sex: this.Sex, remark: this.Remark } }
-      }).then((res) => {
-        wx.showToast({
-          title: '推荐成功',
-          icon: 'none',
-          duration: 2000
-        })
-        setTimeout(() => {
-          wx.switchTab({
-            url: '../index'
-          })
-        }, 300)
-        this.DataLock = false
-      }).catch((res) => {
-        wx.showToast({
-          title: res.data.data.message,
-          icon: 'none',
-          duration: 2000
-        })
-        this.DataLock = false
-      })
-    },
-    SexChange (e) {
-      this.Sex = this.SexList[e.detail.value].id
-      this.SexName = this.SexList[e.detail.value].name
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiQuanYi/Recommed/page.scss

@@ -1,70 +0,0 @@
-.page.YiJianQingXin {
-  width: 100%;
-  height: 100%;
-  background: #fff;
-  overflow-y: scroll;
-  > .Form {
-    padding: 0 20px;
-    > image {
-      height: 50px;
-      margin-top: 20px;
-      margin-bottom: 20px;
-    }
-    > view.flex-h {
-      padding: 30px 0;
-      border-bottom: 2px solid #f5f5f5;
-      align-items: center;
-      > text {
-        font-size: 28px;
-        line-height: 40px;
-      }
-      > view {
-        > input {
-          width: 100%;
-          display: block;
-          border: none;
-          text-align: right;
-          width: 100%;
-          font-size: 28px;
-          color: #999;
-          line-height: 40px;
-        }
-        > picker {
-          text-align: right;
-          font-size: 28px;
-        }
-      }
-    }
-    > view.textarea {
-      border: 2px solid #f5f5f5;
-      box-sizing: border-box;
-      border-radius: 16px;
-      padding: 20px;
-      > textarea {
-        display: block;
-        font-size: 28px;
-        line-height: 40px;
-        width: 100%;
-      }
-      > text {
-        display: block;
-        font-size: 28px;
-        text-align: right;
-        color: #999;
-        line-height: 40px;
-      }
-    }
-  }
-  > text {
-    width: 620px;
-    font-size: 40px;
-    display: block;
-    font-weight: bold;
-    line-height: 100px;
-    border-radius: 100px;
-    background: #fddd39;
-    margin: 60px auto 0;
-    text-align: center;
-    box-shadow: 0 5px 10px 5px rgba(253, 221, 57, 0.3);
-  }
-}

src/pages/HuiQuanYi/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '荟 · 权益'
-}

src/pages/HuiQuanYi/index.vue

@@ -1,135 +0,0 @@
-<template>
-  <view class="page HuiQuanYi">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
-
-      <view class="PageContainer">
-
-        <!-- banner -->
-        <view class="Banner">
-          <view>
-            <BannerSwiper :List="QuanYiBanner"></BannerSwiper>
-          </view>
-        </view>
-
-        <!-- 一荐倾心计划 -->
-        <navigator url="./Recommed/index" hover-class="other-navigator-hover" class="YiJianQingXin">
-          <image mode="widthFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/yijianqingxin.png"></image>
-        </navigator>
-
-        <!-- 业主资讯 -->
-        <view class="NewsList">
-          <view class="flex-h">
-            <view class="flex-item">
-              <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/yezhuzixun.png"></image>
-            </view>
-            <navigator url="./OwnersNews/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
-          </view>
-          <view class="List" v-if="PageList.length">
-            <navigator v-for="(item, index) in PageList" class="flex-h" :key="index" :url="`./OwnersNews/NewsDetail/index?id=${item.newsId}`" hover-class="other-navigator-hover">
-              <view class="Num"><text>{{index + 1}}</text></view>
-              <view class="flex-item">
-                <text>{{item.title}}</text>
-              </view>
-              <text :class="{'active': item.typeId - 0 === 2}">{{item.typeId - 0 === 1 ? '喜' : item.typeId - 0 === 2 ? '书' : ''}}</text>
-            </navigator>
-          </view>
-        </view>
-
-        <!-- 授权头像获取弹窗 -->
-        <GetUserIcon v-if="ShowGetUserIcon"></GetUserIcon>
-
-      </view>
-
-    </ScrollY>
-  </view>
-</template>
-
-<script>
-import GetUserIcon from '../../components/GetUserIcon/index'
-import ScrollY from '../../components/ScrollY/index'
-import BannerSwiper from '../../components/BannerSwiper/index'
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
-const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-export default {
-  name: 'HuiQuanYi',
-  data () {
-    return {
-      ShowGetUserIcon: false,
-      PageList: [],
-      RequestNum: 0,
-      IsRefreshing: false,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapIndexState({
-      QuanYiBanner: x => x.QuanYiBanner, // 荟权益banner
-      YeZhuZiXunList: x => x.YeZhuZiXunList // 业主资讯列表
-    })
-  },
-  components: {
-    ScrollY,
-    BannerSwiper,
-    GetUserIcon
-  },
-  created () {
-    this.$authed(() => {
-      this.Init()
-      this.ShowGetUserIcon = true
-    })
-  },
-  methods: {
-    ...mapUserActions([
-      'MainSignIn' // 获取用户信息
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
-    ]),
-    ...mapIndexActions([
-      'GetHuiQuanYiBanner', // 获取荟权益banner
-      'GetYeZhuZiXunList' // 获取业主资讯列表
-    ]),
-    ...mapIndexMutations([
-      'EmptyQuanYiBanner', // 清空荟权益banner
-      'EmptyYeZhuZiXunList' // 清空业主资讯列表
-    ]),
-    Init () {
-      this.RequestNum = 0
-      this.PageList = []
-      this.EmptyQuanYiBanner() // 清空荟权益banner
-      this.EmptyYeZhuZiXunList() // 清空业主资讯列表
-      this.GetHuiQuanYiBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'rights' } }).then(() => { // 获取荟权益banner
-        this.CheckRequestNum(2) // 判断请求接口个数
-      }).catch(() => {
-        this.CheckRequestNum(2) // 判断请求接口个数
-      })
-      this.GetYeZhuZiXunList({ queryData: { pageNum: 1, pageSize: 10 } }).then(() => { // 获取业主资讯列表
-        this.PageList = [...this.YeZhuZiXunList]
-        this.CheckRequestNum(2) // 判断请求接口个数
-      }).catch(() => {
-        this.CheckRequestNum(2) // 判断请求接口个数
-      })
-    },
-    CheckRequestNum (num) { // 判断请求接口个数
-      this.RequestNum += 1
-      if (this.RequestNum >= num) {
-        this.IsRefreshing = false
-        this.DataLock = false
-      }
-    },
-    Refresh (e) { // 页面刷新
-      if (this.DataLock) return
-      this.DataLock = true
-      this.IsRefreshing = true
-      setTimeout(() => {
-        this.Init()
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiQuanYi/page.scss

@@ -1,158 +0,0 @@
-.page.HuiQuanYi {
-  width: 100%;
-  height: 100%;
-  .PageContainer {
-    width: 100%;
-    min-height: 100vh;
-    position: relative;
-    .Banner {
-      width: 100%;
-      padding-bottom: 41%;
-      position: relative;
-      overflow: hidden;
-      > view {
-        width: 100%;
-        position: absolute;
-        left: 0;
-        top: 0;
-        bottom: 0;
-        overflow: hidden;
-        background: #ccc;
-      }
-    }
-    .YiJianQingXin {
-      margin-top: 20px;
-      > image {
-        width: 100%;
-      }
-    }
-    .NewsList {
-      padding: 20px 0;
-      background: #fff;
-      margin-top: 20px;
-      > .flex-h {
-        padding: 0 20px;
-        align-items: center;
-        margin-top: 10px;
-        > .flex-item {
-          > image {
-            height: 48px;
-          }
-        }
-        > .More {
-          font-size: 26px;
-          color: #999;
-          > text {
-            font-size: 26px;
-          }
-        }
-      }
-      > .List {
-        position: relative;
-        overflow: hidden;
-        margin-top: 40px;
-        margin-bottom: 30px;
-        > .flex-h {
-          align-items: center;
-          &:nth-child(1) {
-            > .Num {
-              > text {
-                width: 40px;
-                text-align: center;
-                line-height: 40px;
-                display: inline-block;
-                border-radius: 100%;
-                background: #fe4e45;
-                color: #fff;
-                box-shadow: 0 10px 20px 5px rgba(254, 78, 69, 0.1);
-              }
-            }
-          }
-          &:nth-child(2) {
-            > .Num {
-              > text {
-                display: inline-block;
-                width: 40px;
-                text-align: center;
-                line-height: 40px;
-                display: inline-block;
-                border-radius: 100%;
-                background: #fe7e48;
-                color: #fff;
-                box-shadow: 0 10px 20px 5px rgba(254, 126, 72, 0.1);
-              }
-            }
-          }
-          &:nth-child(3) {
-            > .Num {
-              > text {
-                width: 40px;
-                text-align: center;
-                line-height: 40px;
-                display: inline-block;
-                border-radius: 100%;
-                background: #ffa93a;
-                color: #fff;
-                box-shadow: 0 10px 20px 5px rgba(255, 169, 58, 0.1);
-              }
-            }
-          }
-          > .Num {
-            width: 56px;
-            margin-left: 10px;
-            text-align: center;
-            font-size: 0;
-            height: 40px;
-            overflow: visible;
-            > text {
-              font-size: 24px;
-              color: #999;
-            }
-          }
-          > .flex-item {
-            padding: 20px 0;
-            margin-left: 10px;
-            border-bottom: 2px solid #f5f5f5;
-            font-size: 0;
-            white-space: nowrap;
-            margin-top: 10px;
-            > text {
-              display: inline-block;
-              vertical-align: middle;
-              max-width: 100%;
-              font-size: 28px;
-              line-height: 1.5;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              &:nth-child(1) {
-                max-width: 88%;
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-              }
-              &:nth-child(2) {
-                color: #999;
-                width: 10%;
-                margin-left: 2%;
-              }
-            }
-          }
-          > text {
-            font-size: 24px;
-            background: #fe7e48;
-            line-height: 40px;
-            width: 40px;
-            text-align: center;
-            border-radius: 6px;
-            color: #fff;
-            margin-right: 20px;
-            &.active {
-              background: #ffa93a;
-            }
-          }
-        }
-      }
-    }
-  }
-}

src/pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '活动报名'
-}

src/pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/index.vue

@@ -1,104 +0,0 @@
-<template>
-  <view class="page LiJiBaoMing">
-
-    <!-- 表单 -->
-    <view class="Form">
-      <view class="flex-h">
-        <text>姓名</text>
-        <view class="flex-item">
-          <input type="text" placeholder="请输入" v-model="Name" />
-        </view>
-      </view>
-      <view class="flex-h">
-        <text>手机号</text>
-        <view class="flex-item">
-          <input type="number" placeholder="请输入" v-model="Phone" />
-        </view>
-      </view>
-      <view class="flex-h">
-        <text>人数</text>
-        <view class="flex-item">
-          <input type="number" placeholder="请输入" v-model="Num" />
-        </view>
-      </view>
-    </view>
-
-    <text @tap="ToJoin">提交</text>
-
-  </view>
-</template>
-
-<script>
-import { getCurrentInstance } from '@tarojs/taro'
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-const { mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
-export default {
-  name: 'LiJiBaoMing',
-  data () {
-    return {
-      Name: '',
-      Phone: '',
-      Num: '',
-      CurrnetId: null,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapUserState({
-      UserInfo: x => x.UserInfo // 用户信息
-    })
-  },
-  components: {
-  },
-  created () {
-    this.Name = this.UserInfo.Name
-    this.Phone = this.UserInfo.Phone
-    this.CurrnetId = getCurrentInstance().router.params.id
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  methods: {
-    ...mapUserActions([
-      'GetUserPhone',
-      'PostActivityJoin',
-      'MainSignIn' // 获取用户信息
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
-    ]),
-    ...mapIndexMutations([
-      'EditActivityDetail'
-    ]),
-    Init () {
-    },
-    ToJoin () { // 去报名
-      if (this.DataLock) return
-      this.DataLock = true
-      this.PostActivityJoin({
-        urlData: { id: this.CurrnetId },
-        data: { data: { enrollName: this.Name, enrollPhone: this.Phone, enrollNum: this.Num } }
-      }).then((res) => {
-        this.DataLock = false
-        this.EditActivityDetail({ name: 'status', value: 1 })
-        wx.showToast({
-          title: '报名成功',
-          icon: 'none',
-          duration: 2000
-        })
-        wx.navigateBack({
-          delta: 1
-        })
-      }).catch(() => {
-        this.DataLock = false
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>
- 

src/pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/page.scss

@@ -1,43 +0,0 @@
-.page.LiJiBaoMing {
-  width: 100%;
-  height: 100%;
-  overflow-y: scroll;
-  background: #fff;
-  > .Form {
-    padding: 0 20px;
-    > view {
-      padding: 26px 0;
-      border-bottom: 2px solid #f5f5f5;
-      &:last-child {
-        border-bottom: none;
-      }
-      > text {
-        font-size: 28px;
-        width: 100px;
-      }
-      > view {
-        position: relative;
-        overflow: hidden;
-        > input {
-          width: 100%;
-          font-size: 28px;
-          line-height: 40px;
-          height: 40px;
-          text-align: right;
-        }
-      }
-    }
-  }
-  > text {
-    width: 620px;
-    font-size: 40px;
-    display: block;
-    font-weight: bold;
-    line-height: 100px;
-    border-radius: 100px;
-    background: #fddd39;
-    margin: 60px auto 0;
-    text-align: center;
-    box-shadow: 0 5px 10px 5px rgba(253, 221, 57, 0.3);
-  }
-}

src/pages/HuiShengHuo/ActivityList/ActivityDetail/index.config.js

@@ -1,6 +0,0 @@
-export default {
-  navigationBarTitleText: '荟 · 生活',
-  usingComponents: {
-    'towxml': '/towxml/towxml'
-  }
-}

src/pages/HuiShengHuo/ActivityList/ActivityDetail/index.vue

@@ -1,242 +0,0 @@
-<template>
-  <view class="page HuoDongXiangQing flex-v">
-
-    <view class="flex-item">
-      <view v-if="ActivityDetail !== null">
-
-        <!-- 活动主要信息 -->
-        <view class="MainInfo">
-          <text>{{ActivityDetail.name}}</text>
-          <view class="SubInfo flex-h">
-            <view class="flex-item">
-              <text class="iconfont iconxianshi"></text>
-              <text>{{ActivityDetail.pv || ''}}</text>
-            </view>
-            <view class="Time">
-              <text class="iconfont iconshijian"></text>
-              <text>{{ToolClass.DateFormat(new Date(ActivityDetail.createDate).getTime())}}</text>
-            </view>
-          </view>
-          <view class="Line flex-h">
-            <text>活动时间：</text>
-            <text class="flex-item">{{ToolClass.DateFormat(new Date(ActivityDetail.startDate).getTime())}} 至 {{ToolClass.DateFormat(new Date(ActivityDetail.endDate).getTime())}}</text>
-          </view>
-          <view class="Line flex-h">
-            <text>活动地址：</text>
-            <text class="flex-item">{{ActivityDetail.address}}</text>
-          </view>
-          <view class="Line flex-h" v-if="IsEnroll">
-            <text>报名截止：</text>
-            <text class="flex-item">{{ToolClass.DateFormat(new Date(ActivityDetail.enrollEnd).getTime())}}</text>
-          </view>
-        </view>
-
-        <!-- 活动详情 -->
-        <view class="DetailContainer">
-          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huodongxiangqing.png"></image>
-          <view class="Text">
-            <!-- <rich-text :nodes="ActivityDetail.detail"></rich-text> -->
-            <Markdown :value="ActivityDetail.detail" />
-          </view>
-        </view>
-
-        <!-- 投票 -->
-        <view class="VoteContainer" v-if="IsVote">
-          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/toupiao.png"></image>
-          <view class="List" v-if="!ShowVoteRes">
-            <view v-for="(item, index) in VoteList" :key="index" class="flex-h" @tap="VoteIndex = index">
-              <text class="iconfont iconweigouxuan" v-if="VoteIndex !== index"></text>
-              <text class="iconfont icongouxuan" v-else></text>
-              <view class="flex-item">
-                <text>{{item.name}}</text>
-              </view>
-            </view>
-          </view>
-          <text @tap="ToPostActivityVote" v-if="!ShowVoteRes && (ActivityDetail.status - 0 !== 2)">提交</text>
-          <button open-type="getPhoneNumber" class="GetPhoneBtn" v-if="!DataLock && ShowGetPhoneBtn &&　!ShowVoteRes && (ActivityDetail.status - 0 !== 2)" @getphonenumber="GetPhoneNumber">授权手机号</button>
-          <view class="ResList" v-if="ShowVoteRes">
-            <view v-for="(item, index) in VoteResList" :key="index">
-              <view class="Text flex-h">
-                <text class="flex-item">{{item.name}}({{item.num}}/{{item.total}})</text>
-                <text>{{item.selfVoted ? '我投过的' : ''}}</text>
-              </view>
-              <view class="Line">
-                <view>
-                  <view :style="{width: `${item.pec}%`}"></view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-
-      </view>
-    </view>
-
-    <!-- 底部栏 -->
-    <view class="Bottom flex-h">
-      <view class="flex-item" @tap="LinkTo('../../index')">
-        <image class="centerLabel" mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huishenghuo.png"></image>
-      </view>
-      <view class="flex-item" @tap="ToShare">
-        <image class="centerLabel" mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/fenxiang.png"></image>
-      </view>
-      <button open-type="share" class="ShareBottomBtn" :class="{'active': IsEnroll}">分享</button>
-      <image mode="heightFix" v-if="IsEnroll && !HasEnroll && (ActivityDetail.status - 0 !== 2)" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/lijibaomingbtn.png" @tap="ToJoin"></image>
-      <button open-type="getPhoneNumber" class="GetPhoneBottomBtn" v-if="!DataLock && ShowGetPhoneBtn && IsEnroll && !HasEnroll && (ActivityDetail.status - 0 !== 2)" @getphonenumber="GetPhoneNumber">授权手机号</button>
-      <text v-if="IsEnroll && HasEnroll && (ActivityDetail.status - 0 !== 2)">已报名</text>
-      <text v-if="!(ActivityDetail.status - 0 !== 2)">已过期</text>
-    </view>
-
-    <!-- 授权头像获取弹窗 -->
-    <GetUserIcon></GetUserIcon>
-
-  </view>
-</template>
-
-<script>
-import GetUserIcon from '../../../../components/GetUserIcon/index'
-import { getCurrentInstance } from '@tarojs/taro'
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions } = createNamespacedHelpers('index')
-const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-export default {
-  name: 'HuoDongXiangQing',
-  data () {
-    return {
-      From: null,
-      HasEnroll: false,
-      ShowVoteRes: false,
-      VoteResList: [],
-      ShowGetPhoneBtn: false,
-      VoteIndex: null,
-      VoteList: [],
-      IsVote: false,
-      IsEnroll: false,
-      CurrnetId: null,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapUserState({
-      UserInfo: x => x.UserInfo // 用户信息
-    }),
-    ...mapIndexState({
-      ActivityDetail: x => x.ActivityDetail // 活动详情
-    })
-  },
-  components: {
-    GetUserIcon
-  },
-  onShareAppMessage () {
-    return {
-      title: this.ActivityDetail.shareTitle,
-      path: `/pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${this.ActivityDetail.activityId}&from=life`,
-      imageUrl: this.ActivityDetail.shareImg
-    }
-  },
-  created () {
-    this.CurrnetId = getCurrentInstance().router.params.id
-    this.From = getCurrentInstance().router.params.from
-    let _that = this
-    wx.setNavigationBarTitle({
-      title: _that.From === 'love' ? '荟 · 爱心' : '荟 · 生活'
-    })
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  mounted () {
-  },
-  methods: {
-    ...mapUserActions([ // 活动投票
-      'PostActivityVote',
-      'GetUserPhone',
-      'PostActivityJoin',
-      'MainSignIn' // 获取用户信息
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
-    ]),
-    ...mapIndexActions([
-      'GetActivityDetail' // 获取活动详情
-    ]),
-    Init () {
-      this.ShowGetPhoneBtn = this.UserInfo === null || this.UserInfo.Phone === undefined || this.UserInfo.Phone === null
-      this.GetActivityDetail({ urlData: { id: this.CurrnetId } }).then((res) => {
-        this.IsEnroll = this.ActivityDetail.isEnroll
-        if (this.IsEnroll) {
-          this.HasEnroll = this.ActivityDetail.isSelfEnrolled
-        }
-        if (this.ActivityDetail.isVote) {
-          this.VoteList = this.ActivityDetail.voteItemList.slice(0)
-          this.CreateVoteResList()
-          this.ShowVoteRes = !!this.ActivityDetail.selfVoted
-        }
-        this.IsVote = this.ActivityDetail.isVote
-      })
-    },
-    CreateVoteResList () { // 计算投票结果
-      this.VoteResList = []
-      let VoteTotal = 0
-      this.VoteList.map((item) => {
-        VoteTotal += item.voteNum - 0
-      })
-      this.VoteList.map((item) => {
-        this.VoteResList.push({ name: item.name, pec: Math.floor((item.voteNum / VoteTotal) * 100), total: VoteTotal, num: item.voteNum, selfVoted: this.ActivityDetail.selfVoted === item.itemId })
-      })
-    },
-    ToShare () {
-      wx.showShareMenu({
-        withShareTicket: true,
-        menus: ['shareAppMessage', 'shareTimeline']
-      })
-    },
-    LinkTo (url) {
-      wx.switchTab({ url })
-    },
-    ToJoin () { // 报名
-      wx.navigateTo({ url: `./JoinIn/index?id=${this.ActivityDetail.activityId}` })
-    },
-    ToPostActivityVote () { // 活动投票
-      if (this.DataLock || this.VoteIndex === null) return
-      this.DataLock = true
-      this.PostActivityVote({
-        urlData: { id: this.ActivityDetail.activityId },
-        data: { data: { itemId: this.VoteList[this.VoteIndex].itemId } }
-      }).then(() => {
-        this.DataLock = false
-        wx.showToast({
-          title: '投票成功',
-          icon: 'none',
-          duration: 2000
-        })
-        this.ActivityDetail.selfVoted = this.VoteList[this.VoteIndex].itemId
-        this.CreateVoteResList()
-        this.ShowVoteRes = true
-      }).catch(() => {
-        this.DataLock = false
-      })
-    },
-    GetPhoneNumber (e) {
-      if (this.DataLock) return
-      this.DataLock = true
-      this.GetUserPhone({
-        urlData: { personId: this.UserInfo.PersonId },
-        data: { data: { sessionKey: this.UserInfo.SessionKey, encryptedData: e.detail.encryptedData, iv: e.detail.iv } }
-      }).then((res) => {
-        this.ShowGetPhoneBtn = false
-        this.EditUserInfo({ name: 'OpenId', value: res.data.data.openId })
-        this.EditUserInfo({ name: 'Phone', value: res.data.data.phone })
-        this.DataLock = false
-      }).catch(() => {
-        this.DataLock = false
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>
- 

src/pages/HuiShengHuo/ActivityList/ActivityDetail/page.scss

@@ -1,236 +0,0 @@
-.page.HuoDongXiangQing {
-  width: 100%;
-  height: 100%;
-  > .flex-item {
-    position: relative;
-    overflow: hidden;
-    > view {
-      width: 100%;
-      height: 100%;
-      overflow-y: scroll;
-      > .MainInfo {
-        background: #fff;
-        padding: 24px;
-        box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
-        > text {
-          display: block;
-          font-size: 44px;
-          line-height: 60px;
-        }
-        > .SubInfo {
-          align-items: center;
-          margin-top: 10px;
-          > .flex-item {
-            font-size: 0;
-            white-space: nowrap;
-            > text {
-              display: inline-block;
-              vertical-align: middle;
-              font-size: 24px;
-              line-height: 40px;
-              color: #999;
-              margin-right: 10px;
-              &:nth-child(1) {
-                font-size: 30px;
-              }
-            }
-          }
-          > .Time {
-            font-size: 0;
-            white-space: nowrap;
-            > text {
-              display: inline-block;
-              vertical-align: middle;
-              font-size: 24px;
-              line-height: 40px;
-              margin-left: 10px;
-              color: #999;
-              &:nth-child(1) {
-                font-size: 30px;
-              }
-            }
-          }
-        }
-        > .Line {
-          align-items: center;
-          margin-top: 10px;
-          margin-bottom: 10px;
-          > text {
-            font-size: 28px;
-            color: #000;
-            line-height: 40px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            &:nth-child(1) {
-              color: #999;
-              width: 140px;
-            }
-          }
-        }
-      }
-      > .DetailContainer {
-        background: #fff;
-        margin-top: 20px;
-        padding-top: 50px;
-        box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
-        > image {
-          height: 70px;
-          display: block;
-          margin: 0 auto;
-        }
-        > .Text {
-          padding: 20px;
-        }
-      }
-      > .VoteContainer {
-        background: #fff;
-        margin-top: 20px;
-        padding-top: 50px;
-        padding-bottom: 80px;
-        margin-bottom: 40px;
-        box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
-        > image {
-          height: 70px;
-          display: block;
-          margin: 0 auto;
-        }
-        > .List {
-          padding-top: 20px;
-          padding-left: 20px;
-          > view {
-            margin-bottom: 20px;
-            align-items: flex-start;
-            padding: 22px 0;
-            border-bottom: 2px solid #f5f5f5;
-            > text {
-              font-size: 38px;
-              line-height: 40px;
-              margin-right: 20px;
-              color: #fe4e45;
-            }
-            > view {
-              position: relative;
-              overflow: hidden;
-              > text {
-                display: block;
-                font-size: 28px;
-                color: #666;
-                line-height: 40px;
-              }
-            }
-          }
-        }
-        > .ResList {
-          padding-left: 20px;
-          margin-top: 20px;
-          > view {
-            padding: 22px 0;
-            border-bottom: 2px solid #f5f5f5;
-            margin-bottom: 20px;
-            > view.flex-h {
-              align-items: center;
-              > text {
-                font-size: 28px;
-                color: #666;
-                line-height: 40px;
-                &:last-child {
-                  margin-right: 20px;
-                }
-              }
-            }
-            > view.Line {
-              padding-right: 20px;
-              > view {
-                margin-top: 20px;
-                width: 100%;
-                position: relative;
-                overflow: hidden;
-                background: #ccc;
-                border-radius: 20px;
-                height: 20px;
-                > view {
-                  position: absolute;
-                  left: 0;
-                  top: 0;
-                  height: 100%;
-                  background: #fe4e45;
-                }
-              }
-            }
-          }
-        }
-        > text {
-          width: 620px;
-          font-size: 40px;
-          display: block;
-          font-weight: bold;
-          line-height: 100px;
-          border-radius: 100px;
-          background: #fddd39;
-          margin: 40px auto 0;
-          text-align: center;
-          box-shadow: 0 5px 10px 5px rgba(253, 221, 57, 0.3);
-        }
-        > .GetPhoneBtn {
-          line-height: 100px;
-          margin-top: -100px;
-          opacity: 0;
-        }
-      }
-    }
-  }
-  > .Bottom {
-    background: #fff;
-    position: relative;
-    overflow: hidden;
-    > text {
-      line-height: 90px;
-      width: 380px;
-      display: block;
-      text-align: center;
-      font-size: 36px;
-      font-weight: bold;
-      background: #ccc;
-      color: #333;
-    }
-    > view {
-      height: 90px;
-      position: relative;
-      overflow: hidden;
-      > image {
-        height: 40px;
-      }
-      &:nth-child(2) {
-        > image {
-          height: 36px;
-        }
-      }
-    }
-    > image {
-      height: 90px;
-    }
-    > .ShareBottomBtn {
-      height: 90px;
-      width: 50%;
-      display: block;
-      position: absolute;
-      right: 0;
-      top: 0;
-      opacity: 0;
-      &.active {
-        width: 188px;
-        right: 380px;
-      }
-    }
-    > .GetPhoneBottomBtn {
-      height: 90px;
-      width: 380px;
-      display: block;
-      position: absolute;
-      right: 0;
-      top: 0;
-      opacity: 0;
-    }
-  }
-}

src/pages/HuiShengHuo/ActivityList/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '精彩活动'
-}

src/pages/HuiShengHuo/ActivityList/index.vue

@@ -1,155 +0,0 @@
-<template>
-  <view class="page JingCaiHuoDong flex-v">
-
-    <!-- Nav -->
-    <view class="NavContainer">
-      <scroll-view scroll-x="true">
-        <view class="NavX">
-          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/jingcaihuodong.png"></image>
-          <view v-for="(item, index) in HuoDongNavList" :key="index" :class="{'active': CurrentNavId - 0 === item.Id - 0}" @tap="CutNav(item)">{{item.Name}}</view>
-        </view>
-      </scroll-view>
-    </view>
-
-    <!-- 列表 -->
-    <view class="flex-item">
-      <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
-
-        <view class="ActivityList">
-          <view class="NoData" v-show="NoData">
-            <image mode="widthFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/nodata.png"></image>
-            <text>暂无内容</text>
-          </view>
-          <view class="List">
-            <view class="Item" v-for="(item, index) in PageList" :key="index">
-              <navigator class="Img" :url="`./ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover">
-                <view class="MainItemImg">
-                  <image mode="aspectFill" :src="item.thumb"></image>
-                </view>
-              </navigator>
-              <view class="Info">
-                <text>{{item.name}}</text>
-                <view class="flex-h">
-                  <text class="flex-item">参与截止时间：{{ToolClass.DateFormat(new Date(item.enrollEnd).getTime())}}</text>
-                  <navigator :url="`./ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover" class="Btn" v-if="item.isEnroll">立即报名</navigator>
-                  <navigator :url="`./ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover" class="Btn" v-if="item.isVote">立即投票</navigator>
-                  <view v-if="new Date(item.endDate).getTime() <= Date.now()">已结束</view>
-                </view>
-              </view>
-            </view>
-            <view style="width: 100%; height: 10px;"></view>
-          </view>
-        </view>
-
-      </ScrollY>
-    </view>
-  </view>
-</template>
-
-<script>
-import ScrollY from '../../../components/ScrollY/index'
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
-const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-export default {
-  name: 'JingCaiHuoDong',
-  data () {
-    return {
-      NoData: false,
-      PageData: {
-        pageNum: 1,
-        pageSize: 15
-      },
-      PageList: [],
-      HuoDongNavList: [
-        { Name: '暖场活动', Id: '1' },
-        { Name: '六点半学堂', Id: '2' },
-        { Name: '夜跑行动', Id: '3' },
-        { Name: '美好出游季', Id: '4' },
-        { Name: '旧衣飞行', Id: '5' },
-        { Name: '丽园助农', Id: '6' }
-      ],
-      CurrentNavId: 1,
-      HasNextPage: true,
-      IsRefreshing: false,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapIndexState({
-      ActivityList: x => x.ActivityList // 活动列表
-    })
-  },
-  components: {
-    ScrollY
-  },
-  created () {
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  methods: {
-    ...mapUserActions([
-      'MainSignIn' // 获取用户信息
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
-    ]),
-    ...mapIndexActions([
-      'GetActivityList' // 获取活动列表
-    ]),
-    ...mapIndexMutations([
-      'EmptyActivityList' // 清空活动列表
-    ]),
-    Init () { // 初始化
-      this.PageData.pageNum = 1
-      this.HasNextPage = true
-      this.PageList = []
-      this.EmptyActivityList() // 清空活动列表
-      this.ToGetPageList() // 获取列表
-    },
-    LinkTo (url) { // 跳转页面
-      wx.navigateTo({ url })
-    },
-    CutNav (item) { // 切换导航
-      if (this.DataLock) return
-      this.DataLock = true
-      this.EmptyActivityList() // 清空活动列表
-      this.CurrentNavId = item.Id
-      setTimeout(() => {
-        this.Init() // 初始化
-      }, 300)
-    },
-    ScrollBottom () { // 上拉加载
-      if (this.DataLock || !this.HasNextPage) return
-      this.DataLock = true
-      this.PageData.pageNum += 1
-      this.ToGetPageList() // 获取列表
-    },
-    ToGetPageList () { // 获取列表
-      this.GetActivityList({ queryData: { ...this.PageData, typeId: this.CurrentNavId } }).then((res) => { // 获取活动列表
-        this.NoData = !this.ActivityList.length
-        this.PageList = [...this.ActivityList]
-        this.HasNextPage = res.data.data.current < res.data.data.pages
-        this.DataLock = false
-        this.IsRefreshing = false
-      }).catch(() => {
-        this.DataLock = false
-        this.IsRefreshing = false
-      })
-    },
-    Refresh (e) { // 页面下拉刷新
-      if (this.DataLock) return
-      this.DataLock = true
-      this.IsRefreshing = true
-      setTimeout(() => {
-        this.Init() // 初始化
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiShengHuo/ActivityList/page.scss

@@ -1,109 +0,0 @@
-.page.JingCaiHuoDong {
-  width: 100%;
-  height: 100%;
-  background: #fff;
-  > .NavContainer {
-    width: 100%;
-    position: relative;
-    overflow: hidden;
-    margin-top: 40px;
-    padding-bottom: 20px;
-    > scroll-view {
-      position: relative;
-      .NavX {
-        font-size: 0;
-        white-space: nowrap;
-        > image {
-          display: inline-block;
-          vertical-align: text-bottom;
-          height: 44px;
-          margin-left: 20px;
-        }
-        > view {
-          display: inline-block;
-          vertical-align: text-bottom;
-          font-size: 28px;
-          line-height: 30px;
-          margin-left: 30px;
-          &.active {
-            color: #fe4e45;
-          }
-          &:last-child {
-            margin-right: 30px;
-          }
-        }
-      }
-    }
-  }
-  > .flex-item {
-    .ActivityList {
-      background: #fff;
-      > .List {
-        position: relative;
-        overflow: hidden;
-        margin-top: 40px;
-        margin-bottom: 30px;
-        padding: 0 20px;
-        > .Item {
-          position: relative;
-          overflow: hidden;
-          background: #fff;
-          border-radius: 20px;
-          box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
-          margin-top: 20px;
-          &:first-child {
-            margin-top: 0;
-          }
-          > .Img {
-            width: 100%;
-            padding-bottom: 55%;
-            background: #ccc;
-            position: relative;
-            overflow: hidden;
-          }
-          > .Info {
-            padding: 20px 34px;
-            > text {
-              display: block;
-              font-size: 32px;
-              line-height: 1.5;
-            }
-            > .flex-h {
-              align-items: center;
-              margin-top: 20px;
-              margin-bottom: 20px;
-              overflow: visible;
-              > text {
-                margin-right: 10px;
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                font-size: 24px;
-                color: #999;
-                line-height: 1.5;
-              }
-              > .Btn {
-                font-size: 26px;
-                color: #fff;
-                background: #fe4e45;
-                line-height: 54px;
-                border-radius: 54px;
-                padding: 0 20px;
-                box-shadow: 0 10px 20px 5px rgba(254, 78, 69, 0.3);
-              }
-              > view {
-                font-size: 26px;
-                color: #000;
-                background: #e5e3e3;
-                line-height: 54px;
-                border-radius: 54px;
-                padding: 0 20px;
-                box-shadow: 0 10px 20px 5px rgba(0, 0, 0, 0.1);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

src/pages/HuiShengHuo/PhotoList/PhotoDetail/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '照片'
-}

src/pages/HuiShengHuo/PhotoList/PhotoDetail/index.vue

@@ -1,44 +0,0 @@
-<template>
-  <view class="page ZhaoPianXiangQing">
-    
-    <!-- 标题 -->
-    <view class="MainTitle">
-      <text>照片</text>
-      <text class="iconfont iconguanbi"></text>
-    </view>
-
-    <!-- 列表 -->
-    <view class="List">
-      <view v-for="(item, index) in 10">
-        <view class="Img"></view>
-        <text>相册描述</text>
-      </view>
-    </view>
-
-  </view>
-</template>
-
-<script>
-
-export default {
-  name: 'ZhaoPianXiangQing',
-  data () {
-    return {
-
-    }
-  },
-  components: {
-  },
-  created () {
-    this.Init()
-  },
-  methods: {
-    Init () {
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiShengHuo/PhotoList/PhotoDetail/page.scss

@@ -1,66 +0,0 @@
-.page.ZhaoPianXiangQing {
-  width: 100%;
-  height: 100%;
-  overflow-y: scroll;
-  background: #fff;
-  > .MainTitle {
-    position: relative;
-    overflow: hidden;
-    margin-top: 20px;
-    > text {
-      &:nth-child(1) {
-        display: block;
-        text-align: center;
-        font-size: 52px;
-        font-weight: bold;
-        line-height: 80px;
-        z-index: 1;
-        position: relative;
-      }
-      &:nth-child(2) {
-        font-size: 24px;
-        display: inline-block;
-        position: absolute;
-        z-index: 2;
-        right: 40px;
-        top: 50%;
-        transform: translateY(-50%);
-        -webkit-transform: translateY(-50%);
-      }
-    }
-  }
-  > .List {
-    padding: 0 20px;
-    > view {
-      margin-top: 40px;
-      padding-bottom: 30px;
-      position: relative;
-      overflow: hidden;
-      &::after {
-        content: "";
-        display: block;
-        position: absolute;
-        width: 90%;
-        height: 2px;
-        background: #d5d4d3;
-        left: 5%;
-        bottom: 0;
-      }
-      > .Img {
-        width: 100%;
-        padding-bottom: 74%;
-        background: #ccc;
-        border-radius: 10px;
-        position: relative;
-        overflow: hidden;
-      }
-      > text {
-        display: block;
-        font-size: 24px;
-        line-height: 40px;
-        text-align: center;
-        margin-top: 40px;
-      }
-    }
-  }
-}

src/pages/HuiShengHuo/PhotoList/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '活动照片墙'
-}

src/pages/HuiShengHuo/PhotoList/index.vue

@@ -1,174 +0,0 @@
-<template>
-  <view class="page HuoDongZhaoPianQiang">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
-
-      <!-- 活动照片墙 -->
-      <view class="PhotoList">
-        <view class="flex-h">
-          <view class="flex-item">
-            <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huodongzhaopianqiang.png"></image>
-          </view>
-        </view>
-        <view class="ListContainer">
-          <view v-for="(item, index) in PageList" :key="index">
-            <view class="Title flex-h" @tap="ShowItemList(item, index)">
-              <text class="flex-item">{{item.name}}</text>
-              <text class="iconfont iconxiala" v-if="!item.Show"></text>
-              <text class="iconfont iconshangla" v-else></text>
-            </view>
-            <view class="List" v-show="item.Show">
-              <view v-for="(subItem, subIndex) in item.List" :key="subIndex">
-                <view class="Img" @tap="CheckBigImg(item, subItem.imgUrl)">
-                  <view class="MainItemImg">
-                    <image mode="aspectFill" :src="subItem.imgUrl"></image>
-                  </view>
-                </view>
-              </view>
-            </view>
-            <text class="More" v-if="item.Show" @tap="GetMore(item, index)">{{item.Loading ? '加载中...' : item.pageNum < item.pages ? '加载更多' : '加载完毕'}}</text>
-          </view>
-        </view>
-      </view>
-
-    </ScrollY>
-
-    <view class="BigImg" v-if="ShowBigImg" @tap="ShowBigImg = false">
-      <image mode="aspectFit" :src="BigImgUrl"></image>
-    </view>
-  </view>
-</template>
-
-<script>
-import ScrollY from '../../../components/ScrollY/index'
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
-const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-export default {
-  name: 'HuoDongZhaoPianQiang',
-  data () {
-    return {
-      PhotoUrlArr: [],
-      ShowBigImg: false,
-      BigImgUrl: null,
-      PageList: [],
-      PageData: {
-        pageNum: 1,
-        pageSize: 15
-      },
-      HasNextPage: true,
-      IsRefreshing: false,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapIndexState({
-      GalleryTypeList: x => x.GalleryTypeList, // 照片墙类型列表
-      PhotoList: x => x.PhotoList // 照片墙列表
-    })
-  },
-  components: {
-    ScrollY
-  },
-  created () {
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  methods: {
-    ...mapUserActions([
-      'MainSignIn' // 获取用户信息
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
-    ]),
-    ...mapIndexActions([
-      'GetGalleryType', // 获取照片墙列表类型
-      'GetPhotoList' // 获取照片墙列表
-    ]),
-    ...mapIndexMutations([
-      'EmptyGalleryTypeList', // 清空照片墙类型列表
-      'EmptyPhotoList' // 清空照片墙列表
-    ]),
-    Init () { // 初始化
-      this.PageData.pageNum = 1
-      this.HasNextPage = true
-      this.PageList = []
-      this.PhotoUrlArr = []
-      this.EmptyPhotoList() // 清空照片墙列表
-      this.EmptyGalleryTypeList() // 清空照片墙类型列表
-      this.GetGalleryType({ queryData: { pageNum: 1, pageSize: 10000, hasImages: true } }).then(() => {
-        this.GalleryTypeList.map((item) => {
-          this.PageList.push({ ...item, List: [], Show: false, pageNum: 1, pageSize: 10, pages: 2, Loading: false })
-        })
-      })
-    },
-    GetMore (item, index) { // 加载更多
-      if (this.DataLock) return
-      this.DataLock = true
-      item.Loading = true
-      item.pageNum += 1
-      this.GetPhotoList({ queryData: { pageNum: item.pageNum, pageSize: item.pageSize, typeId: item.typeId } }).then((res) => {
-        item.pageNum = res.data.data.current - 0
-        item.pages = res.data.data.pages - 0
-        this.PhotoList.map((subItem) => {
-          item.List.push({ ...subItem })
-        })
-        this.DataLock = false
-        item.Loading = false
-      }).catch((res) => {
-        this.DataLock = false
-        item.Loading = false
-      })
-    },
-    ShowItemList (item, index) { // 显示图片列表
-      if (item.Show) {
-        item.Show = false
-      } else {
-        if (item.List.length) {
-          item.Show = true
-        } else {
-          if (this.DataLock) return
-          this.DataLock = true
-          item.Loading = true
-          item.List = []
-          this.GetPhotoList({ queryData: { pageNum: item.pageNum, pageSize: item.pageSize, typeId: item.typeId } }).then((res) => {
-            item.pageNum = res.data.data.current - 0
-            item.pages = res.data.data.pages - 0
-            this.PhotoList.map((subItem) => {
-              item.List.push({ ...subItem })
-            })
-            item.Show = true
-            this.DataLock = false
-            item.Loading = false
-          }).catch((res) => {
-            this.DataLock = false
-            item.Loading = false
-          })
-        }
-      }
-    },
-    CheckBigImg (item, url) { // 查看大图
-      this.PhotoUrlArr = []
-      item.List.map((item) => {
-        this.PhotoUrlArr.push(item.imgUrl)
-      })
-      wx.previewImage({
-        current: url, // 当前显示图片的http链接
-        urls: this.PhotoUrlArr // 需要预览的图片http链接列表
-      })
-    },
-    Refresh (e) { // 页面下拉刷新
-      if (this.DataLock) return
-      this.DataLock = true
-      this.IsRefreshing = true
-      setTimeout(() => {
-        this.Init() // 获取列表
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiShengHuo/PhotoList/page.scss

@@ -1,96 +0,0 @@
-.page.HuoDongZhaoPianQiang {
-  width: 100%;
-  height: 100%;
-  background: #fff;
-  > .BigImg {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    z-index: 100;
-    background: rgba(0, 0, 0, 0.7);
-    overflow: hidden;
-    > image {
-      width: 100%;
-      height: 100%;
-    }
-  }
-  .PhotoList {
-    > .flex-h {
-      padding: 0 20px;
-      align-items: center;
-      margin-top: 10px;
-      > .flex-item {
-        > image {
-          height: 52px;
-        }
-      }
-      > .More {
-        font-size: 26px;
-        color: #999;
-        > text {
-          font-size: 26px;
-        }
-      }
-    }
-    > .ListContainer {
-      > view {
-        > .More {
-          display: block;
-          text-align: center;
-          font-size: 26px;
-          line-height: 60px;
-          color: #999;
-        }
-        > view.Title {
-          padding: 0 3.5vw;
-          align-items: center;
-          margin-top: 20px;
-          position: relative;
-          &::after {
-            content: "";
-            display: block;
-            width: 8px;
-            height: 30px;
-            background: #fddd39;
-            position: absolute;
-            left: 3.5vw;
-            top: 15px;
-          }
-          > text {
-            &:nth-child(1) {
-              overflow: hidden;
-              font-size: 28px;
-              line-height: 60px;
-              text-indent: 20px;
-            }
-            &:nth-child(2) {
-              font-size: 40px;
-            }
-          }
-        }
-        > view.List {
-          font-size: 0;
-          margin-top: 20px;
-          > view {
-            display: inline-block;
-            vertical-align: middle;
-            width: 44.75vw;
-            margin-left: 3.5vw;
-            margin-bottom: 3.5vw;
-            > .Img {
-              width: 100%;
-              display: block;
-              padding-bottom: 84%;
-              background: #ccc;
-              position: relative;
-              overflow: hidden;
-              border-radius: 10px;
-            }
-          }
-        }
-      }
-    }
-  }
-}

src/pages/HuiShengHuo/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '荟 · 生活'
-}

src/pages/HuiShengHuo/index.vue

@@ -1,193 +0,0 @@
-<template>
-  <BasicLayout>
-    <view class="page HuiShengHuo">
-      <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
-
-        <!-- banner -->
-        <view class="Banner">
-          <view>
-            <BannerSwiper :List="IndexBanner"></BannerSwiper>
-          </view>
-        </view>
-
-        <!-- 活动照片墙 -->
-        <view class="PhotoList">
-          <view class="flex-h">
-            <view class="flex-item">
-              <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huodongzhaopianqiang.png"></image>
-            </view>
-            <navigator url="./PhotoList/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
-          </view>
-          <view class="ListContainer" v-if="PhotoList.length">
-            <scroll-view scroll-x="true">
-              <view class="List">
-                <view v-for="(item, index) in PhotoList" :key="index">
-                  <view @tap="CheckBigImg(item.imgUrl)">
-                    <view class="MainItemImg">
-                      <image mode="aspectFill" :src="item.imgUrl"></image>
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </scroll-view>
-          </view>
-        </view>
-
-        <!-- 精彩活动 -->
-        <view class="ActivityList">
-          <view class="flex-h">
-            <view class="flex-item">
-              <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/jingcaihuodong.png"></image>
-            </view>
-            <navigator url="./ActivityList/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
-          </view>
-          <view class="List" v-if="ActivityList.length">
-            <view class="Item" v-for="(item, index) in ActivityList" :key="index">
-              <navigator class="Img" :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover">
-                <view class="MainItemImg">
-                  <image mode="aspectFill" :src="item.thumb"></image>
-                </view>
-              </navigator>
-              <view class="Info">
-                <text>{{item.name}}</text>
-                <view class="flex-h">
-                  <text class="flex-item">参与截止时间：{{ToolClass.DateFormat(new Date(item.enrollEnd).getTime())}}</text>
-                  <navigator :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover" class="Btn" v-if="item.isEnroll">立即报名</navigator>
-                  <navigator :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover" class="Btn" v-if="item.isVote">立即投票</navigator>
-                  <view v-if="new Date(item.endDate).getTime() <= Date.now()">已结束</view>
-                </view>
-              </view>
-            </view>
-            <view style="width: 100%; height: 10px;"></view>
-          </view>
-        </view>
-
-      </ScrollY>
-
-      <view class="BigImg" v-if="ShowBigImg" @tap="ShowBigImg = false">
-        <image mode="aspectFit" :src="BigImgUrl"></image>
-      </view>
-    </view>
-  </BasicLayout>
-</template>
-
-<script>
-import ScrollY from '../../components/ScrollY/index'
-import BannerSwiper from '../../components/BannerSwiper/index'
-import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
-const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
-export default {
-  name: 'HuiShengHuo',
-  data () {
-    return {
-      PhotoUrlArr: [],
-      ShowBigImg: false,
-      BigImgUrl: null,
-      PageActivityList: [],
-      PagePhotoList: [],
-      RequestNum: 0,
-      IsRefreshing: false,
-      DataLock: false
-    }
-  },
-  computed: {
-    ...mapIndexState({
-      IndexBanner: x => x.IndexBanner, // 首页banner
-      PhotoList: x => x.PhotoList, // 照片墙列表
-      ActivityList: x => x.ActivityList // 活动列表
-    })
-  },
-  components: {
-    ScrollY,
-    BannerSwiper
-  },
-  created () {
-    this.$authed(() => {
-      this.Init()
-    })
-  },
-  mounted () {
-    this.$nextTick(() => {
-      wx.showShareMenu({
-        withShareTicket: true,
-        menus: ['shareAppMessage', 'shareTimeline']
-      })
-    })
-  },
-  methods: {
-    ...mapUserActions([
-      'MainSignIn' // 获取用户信息
-    ]),
-    ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
-    ]),
-    ...mapIndexActions([
-      'GetIndexBanner', // 获取首页banner
-      'GetPhotoList', // 获取照片墙列表
-      'GetActivityList' // 获取活动列表
-    ]),
-    ...mapIndexMutations([
-      'EmptyIndexBanner', // 清空首页banner
-      'EmptyPhotoList', // 清空照片墙列表
-      'EmptyActivityList' // 清空活动列表
-    ]),
-    Init () { // 初始化
-      this.RequestNum = 0
-      this.EmptyIndexBanner() // 清空首页banner
-      this.EmptyPhotoList() // 清空照片墙列表
-      this.EmptyActivityList() // 清空活动列表
-      this.PageActivityList = []
-      this.PagePhotoList = []
-      this.GetIndexBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'life' } }).then(() => { // 获取首页banner
-        this.CheckRequestNum(3) // 判断请求接口个数
-      }).catch(() => {
-        this.CheckRequestNum(3) // 判断请求接口个数
-      })
-      this.GetPhotoList({ queryData: { pageNum: 1, pageSize: 10 } }).then(() => { // 获取照片墙列表
-        this.PhotoUrlArr = []
-        this.PhotoList.map((item) => {
-          this.PhotoUrlArr.push(item.imgUrl)
-        })
-        this.CheckRequestNum(3) // 判断请求接口个数
-      }).catch(() => {
-        this.CheckRequestNum(3) // 判断请求接口个数
-      })
-      this.GetActivityList({ queryData: { pageNum: 1, pageSize: 10, toIndex: true } }).then(() => { // 获取活动列表
-        this.PageActivityList = [...this.ActivityList]
-        this.CheckRequestNum(3) // 判断请求接口个数
-      }).catch(() => {
-        this.CheckRequestNum(3) // 判断请求接口个数
-      })
-    },
-    CheckBigImg (url) { // 查看大图
-      wx.previewImage({
-        current: url, // 当前显示图片的http链接
-        urls: this.PhotoUrlArr // 需要预览的图片http链接列表
-      })
-    },
-    CheckRequestNum (num) { // 判断请求接口个数
-      this.RequestNum += 1
-      if (this.RequestNum >= num) {
-        this.IsRefreshing = false
-        this.DataLock = false
-      }
-    },
-    LinkTo (url) {
-      wx.navigateTo({ url })
-    },
-    Refresh (e) { // 页面刷新
-      if (this.DataLock) return
-      this.DataLock = true
-      this.IsRefreshing = true
-      setTimeout(() => {
-        this.Init() // 初始化
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/HuiShengHuo/page.scss

@@ -1,176 +0,0 @@
-.page.HuiShengHuo {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  >.BigImg {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    z-index: 100;
-    background: rgba(0, 0, 0, 0.7);
-    overflow: hidden;
-    > image {
-      width: 100%;
-      height: 100%;
-    }
-  }
-  .Banner {
-    width: 100%;
-    padding-bottom: 41%;
-    position: relative;
-    overflow: hidden;
-    > view {
-      width: 100%;
-      position: absolute;
-      left: 0;
-      top: 0;
-      bottom: 0;
-      overflow: hidden;
-      background: #ccc;
-    }
-  }
-  .PhotoList {
-    padding: 20px 0;
-    background: #fff;
-    margin-top: 20px;
-    > .flex-h {
-      padding: 0 20px;
-      align-items: center;
-      margin-top: 10px;
-      > .flex-item {
-        > image {
-          height: 48px;
-        }
-      }
-      > .More {
-        font-size: 26px;
-        color: #999;
-        > text {
-          font-size: 26px;
-        }
-      }
-    }
-    > .ListContainer {
-      width: 100%;
-      position: relative;
-      overflow: hidden;
-      margin-top: 40px;
-      margin-bottom: 30px;
-      > scroll-view {
-        .List {
-          font-size: 0;
-          white-space: nowrap;
-          > view {
-            width: 36%;
-            position: relative;
-            overflow: visible;
-            display: inline-block;
-            vertical-align: middle;
-            margin-left: 25px;
-            &:last-child {
-              margin-right: 25px;
-            }
-            > view {
-              width: 100%;
-              padding-bottom: 85%;
-              background: #ccc;
-              border-radius: 20px;
-              position: relative;
-              overflow: hidden;
-            }
-          }
-        }
-      }
-    }
-  }
-  .ActivityList {
-    padding: 20px 0;
-    background: #fff;
-    margin-top: 20px;
-    > .flex-h {
-      padding: 0 20px;
-      align-items: center;
-      margin-top: 10px;
-      > .flex-item {
-        > image {
-          height: 48px;
-        }
-      }
-      > .More {
-        font-size: 26px;
-        color: #999;
-        > text {
-          font-size: 26px;
-        }
-      }
-    }
-    > .List {
-      position: relative;
-      overflow: hidden;
-      margin-top: 40px;
-      margin-bottom: 30px;
-      padding: 0 20px;
-      > .Item {
-        position: relative;
-        overflow: hidden;
-        background: #fff;
-        border-radius: 20px;
-        box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
-        margin-top: 20px;
-        &:first-child {
-          margin-top: 0;
-        }
-        > .Img {
-          width: 100%;
-          padding-bottom: 55%;
-          background: #ccc;
-          position: relative;
-          overflow: hidden;
-        }
-        > .Info {
-          padding: 20px 34px;
-          > text {
-            display: block;
-            font-size: 32px;
-            line-height: 1.5;
-          }
-          > .flex-h {
-            align-items: center;
-            margin-top: 20px;
-            margin-bottom: 20px;
-            overflow: visible;
-            > text {
-              margin-right: 10px;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              font-size: 24px;
-              color: #999;
-              line-height: 1.5;
-            }
-            > .Btn {
-              font-size: 26px;
-              color: #fff;
-              background: #fe4e45;
-              line-height: 54px;
-              border-radius: 54px;
-              padding: 0 20px;
-              box-shadow: 0 10px 20px 5px rgba(254, 78, 69, 0.3);
-            }
-            > view {
-              font-size: 26px;
-              color: #000;
-              background: #e5e3e3;
-              line-height: 54px;
-              border-radius: 54px;
-              padding: 0 20px;
-              box-shadow: 0 10px 20px 5px rgba(0, 0, 0, 0.1);
-            }
-          }
-        }
-      }
-    }
-  }
-}

src/pages/HuoDong/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '香颂蔚澜'
+}

src/pages/HuoDong/index.vue

@@ -0,0 +1,39 @@
+<template>
+  <view class="page HuoDong">
+    活动
+  </view>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+export default {
+  name: 'HuoDong',
+  data () {
+    return {
+      DataLock: false
+    }
+  },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo // 用户信息
+    })
+  },
+  components: {
+  },
+  created () {
+  },
+  methods: {
+    ...mapUserActions([
+    ]),
+    ...mapUserMutations([
+    ]),
+    Init () {
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "page.scss";
+</style>

src/pages/HuoDong/page.scss

@@ -0,0 +1,6 @@
+.page.HuoDong {
+  width: 100%;
+  height: 100%;
+  overflow-y: scroll;
+  background: #fff;
+}

src/pages/ShouYe/index.config.js

@@ -0,0 +1,5 @@
+export default {
+  navigationBarTitleText: '香颂蔚澜',
+  navigationStyle: 'custom',
+  navigationBarTextStyle: 'white'
+}

src/pages/ShouYe/index.vue

@@ -0,0 +1,168 @@
+<template>
+  <view class="page ShouYe flex-v">
+    <NavHeader Title="首页" BgColor="#f35844"></NavHeader>
+    <view class="flex-item">
+      <view class="PageContainer">
+        <scroll-view scroll-y="true" style="height: 100%;" :refresher-enabled="true" @refresherrefresh="OnRefresh" :refresher-triggered="IsPull" refresher-background="none">
+          <view class="Content">
+
+            <view class="TopBg"></view>
+
+            <view>
+              <!-- 欢迎词 -->
+              <text class="Welcome">欢迎来到远道智慧社区！</text>
+
+              <!-- banner -->
+              <view class="BannerContainer">
+                <view>
+                  <view>
+                    <swiper class="BannerSwiper" :autoplay="true" :circular="true" :indicator-dots="true" indicator-color="rgba(0,0,0,0.4)" indicator-active-color="rgba(255,255,255,0.8)">
+                      <swiper-item v-for="(item, index) in BannerList" :key="index">
+                        <view class="BannerItem">
+                          <image mode="aspectFill" :src="item.img"></image>
+                        </view>
+                      </swiper-item>
+                    </swiper>
+                  </view>
+                </view>
+              </view>
+
+              <!-- 导航 -->
+              <view class="NavContainer flex-h">
+                <view v-for="(item, index) in NavList" :key="index" class="flex-item">
+                  <view>
+                    <view class="centerLabel">
+                      <text class="iconfont" :class="item.icon"></text>
+                      <text>{{item.name}}</text>
+                    </view>
+                  </view>
+                </view>
+              </view>
+
+              <!-- 热门活动 -->
+              <view class="HotActivityContainer">
+                <view>
+                  <view class="Title">
+                    <text>热门活动</text>
+                    <text class="iconfont icongengduo"></text>
+                  </view>
+                  <view class="Activity">
+                    <image class="centerLabel" mode="aspectFill" :src="TestImg"></image>
+                  </view>
+                </view>
+              </view>
+
+              <!-- 业主专区 -->
+              <view class="OwnerContainer">
+                <view>
+                  <view class="Title">
+                    <text>业主专区</text>
+                  </view>
+                  <view class="OwnerList flex-h">
+                    <view class="flex-item" v-for="(item, index) in OwnerList" :key="index">
+                      <text class="iconfont" :class="item.icon"></text>
+                      <text>{{item.name}}</text>
+                    </view>
+                  </view>
+                </view>
+              </view>
+
+              <!-- 热门资讯 -->
+              <view class="NewsContainer">
+                <view>
+                  <view class="Title flex-h">
+                    <text class="flex-item">热门资讯</text>
+                    <text>查看全部</text>
+                    <text class="iconfont iconjiantouright"></text>
+                  </view>
+                  <view class="List">
+                    <view v-for="(item, index) in NewsList" :key="index" class="flex-h">
+                      <view class="Img">
+                        <image mode="aspectFill" :src="item.img" class="centerLabel"></image>
+                      </view>
+                      <view class="flex-item">
+                        <text>{{item.title}}</text>
+                        <text>{{item.desc}}</text>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+
+              <view class="PageBottom"></view>
+            </view>
+
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import NavHeader from '../../components/NavHeader'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+export default {
+  name: 'ShouYe',
+  data () {
+    return {
+      IsPull: false,
+      NewsList: [
+        { img: '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', title: '标题', desc: '描述' },
+        { img: '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', title: '标题', desc: '描述' },
+        { img: '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', title: '标题', desc: '描述' },
+        { img: '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', title: '标题', desc: '描述' }
+      ],
+      OwnerList: [
+        { icon: 'iconjiaofei', name: '物业缴费', id: 1 },
+        { icon: 'icontongzhi', name: '物业通知', id: 2 },
+        { icon: 'iconbaoxiu', name: '物业报修', id: 3 },
+        { icon: 'iconrenzheng', name: '业主认证', id: 4 }
+      ],
+      NavList: [
+        { icon: 'iconhuodong1', name: '活动', id: 1 },
+        { icon: 'iconfuli', name: '福利', id: 2 },
+        { icon: 'iconfuwu', name: '服务', id: 3 },
+        { icon: 'iconxinwen', name: '资讯', id: 4 }
+      ],
+      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',
+      BannerList: [
+        { img: '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' },
+        { img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1606120989360&di=16024dc7edcdbb6c325d40cdff6373a1&imgtype=0&src=http%3A%2F%2Fattach.bbs.miui.com%2Fforum%2F201408%2F07%2F213601f2xz7usscm2z1mjh.jpg' },
+        { img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1606120989360&di=3f54f5330ec21728ecb02352fbb6af90&imgtype=0&src=http%3A%2F%2Fattach.bbs.miui.com%2Fforum%2F201205%2F15%2F152011zser9o5oa9ee9xx6.jpg' },
+        { img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1606120989359&di=46ae1d0f0d4f1f3740139191398f2a81&imgtype=0&src=http%3A%2F%2Fpic.baike.soso.com%2Fp%2F20131230%2F20131230165604-1960511167.jpg' },
+        { img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1606120989359&di=2ec3fe46fb98c01055601cece86f111f&imgtype=0&src=http%3A%2F%2Fbenyouhuifile.it168.com%2Fforum%2Fday_100429%2F1004291840008539c8ac02cd5c.jpg' }
+      ]
+    }
+  },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo // 用户信息
+    })
+  },
+  components: {
+    NavHeader
+  },
+  created () {
+  },
+  methods: {
+    ...mapUserActions([
+    ]),
+    ...mapUserMutations([
+    ]),
+    Init () {
+    },
+    OnRefresh (e) {
+      this.IsPull = true
+      window.setTimeout(() => {
+        this.IsPull = false
+      }, 1000)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "page.scss";
+</style>

src/pages/ShouYe/page.scss

@@ -0,0 +1,334 @@
+.page.ShouYe {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  background: #f8f8f8;
+  > view {
+    position: relative;
+    &.flex-item {
+      > .PageContainer {
+        width: 100%;
+        position: relative;
+        z-index: 2;
+        height: 100%;
+        overflow: hidden;
+        .Content {
+          position: relative;
+          overflow: hidden;
+          > view {
+            position: relative;
+            z-index: 2;
+            &.TopBg {
+              width: 100%;
+              position: absolute;
+              z-index: 1;
+              left: 0;
+              top: 0;
+              padding-bottom: 60%;
+              border-radius: 0 0 100px 100px;
+              background-image: linear-gradient(#f35844, #ff8d61);
+              z-index: 1;
+            }
+            > .Welcome {
+              display: block;
+              font-size: 30px;
+              color: #fff;
+              margin-top: 60px;
+              text-indent: 30px;
+            }
+            > .BannerContainer {
+              padding: 0 30px;
+              position: relative;
+              overflow: hidden;
+              margin-top: 50px;
+              > view {
+                width: 100%;
+                position: relative;
+                overflow: hidden;
+                padding-bottom: 50%;
+                background: #f8f8f8;
+                border-radius: 24px;
+                height: 0;
+                > view {
+                  width: 100%;
+                  position: absolute;
+                  left: 0;
+                  top: 0;
+                  bottom: 0;
+                  overflow: hidden;
+                  > .BannerSwiper {
+                    width: 100%;
+                    height: 100%;
+                    position: relative;
+                    overflow: hidden;
+                    .BannerItem {
+                      width: 100%;
+                      height: 100%;
+                      position: relative;
+                      overflow: hidden;
+                      > image {
+                        width: 100%;
+                        height: 100%;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            > .NavContainer {
+              position: relative;
+              overflow: hidden;
+              align-items: center;
+              padding: 0 30px;
+              margin-top: 40px;
+              > view {
+                margin-left: 30px;
+                position: relative;
+                overflow: hidden;
+                &:first-child {
+                  margin-left: 0;
+                }
+                &:nth-child(1) {
+                  > view {
+                    > view {
+                      > text {
+                        &:first-child {
+                          color: #ffc412;
+                        }
+                      }
+                    }
+                  }
+                }
+                &:nth-child(2) {
+                  > view {
+                    > view {
+                      > text {
+                        &:first-child {
+                          color: #fb3fc8;
+                        }
+                      }
+                    }
+                  }
+                }
+                &:nth-child(3) {
+                  > view {
+                    > view {
+                      > text {
+                        &:first-child {
+                          color: #fb7820;
+                        }
+                      }
+                    }
+                  }
+                }
+                &:nth-child(4) {
+                  > view {
+                    > view {
+                      > text {
+                        &:first-child {
+                          color: #586ff8;
+                        }
+                      }
+                    }
+                  }
+                }
+                > view {
+                  width: 100%;
+                  padding-bottom: 100%;
+                  background: #fff;
+                  position: relative;
+                  overflow: hidden;
+                  border-radius: 12px;
+                  > view {
+                    width: 100%;
+                    > text {
+                      display: block;
+                      text-align: center;
+                      line-height: 40px;
+                      color: #333;
+                      font-size: 26px;
+                      &:first-child {
+                        font-size: 50px;
+                        line-height: 60px;
+                        margin-bottom: 10px;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            > .HotActivityContainer {
+              padding: 0 30px;
+              position: relative;
+              overflow: hidden;
+              margin-top: 30px;
+              > view {
+                width: 100%;
+                position: relative;
+                overflow: hidden;
+                border-radius: 40px;
+                background: #fff;
+                > .Title {
+                  font-size: 0;
+                  white-space: nowrap;
+                  text-align: center;
+                  padding: 30px 0;
+                  > text {
+                    display: inline-block;
+                    vertical-align: middle;
+                    font-size: 24px;
+                    color: #999;
+                    &:first-child {
+                      font-size: 34px;
+                      color: #333;
+                      line-height: 40px;
+                      font-weight: bold;
+                      margin-right: 20px;
+                    }
+                  }
+                }
+                > .Activity {
+                  width: 100%;
+                  padding-bottom: 33.33%;
+                  position: relative;
+                  overflow: hidden;
+                  > image {
+                    width: 100%;
+                    height: 100%;
+                  }
+                }
+              }
+            }
+            > .OwnerContainer {
+              padding: 0 30px;
+              position: relative;
+              overflow: hidden;
+              margin-top: 30px;
+              > view {
+                width: 100%;
+                position: relative;
+                overflow: hidden;
+                border-radius: 40px;
+                background: #fff;
+                > .Title {
+                  font-size: 0;
+                  white-space: nowrap;
+                  text-align: center;
+                  padding: 30px 0;
+                  > text {
+                    display: inline-block;
+                    vertical-align: middle;
+                    font-size: 24px;
+                    color: #999;
+                    &:first-child {
+                      font-size: 34px;
+                      color: #333;
+                      line-height: 40px;
+                      font-weight: bold;
+                      margin-right: 20px;
+                    }
+                  }
+                }
+                > .OwnerList {
+                  border-top: 2px solid #f8f8f8;
+                  align-items: center;
+                  padding: 30px 0;
+                  > view {
+                    > text {
+                      display: block;
+                      width: 100%;
+                      text-align: center;
+                      font-size: 26px;
+                      color: #333;
+                      line-height: 40px;
+                      &:first-child {
+                        color: #f35844;
+                        font-size: 60px;
+                        line-height: 70px;
+                        margin-bottom: 10px;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            > .NewsContainer {
+              padding: 0 30px;
+              position: relative;
+              overflow: hidden;
+              margin-top: 30px;
+              > view {
+                position: relative;
+                overflow: hidden;
+                background: #fff;
+                border-radius: 40px;
+                > .Title {
+                  align-items: center;
+                  padding: 0 20px;
+                  > text {
+                    font-size: 24px;
+                    color: #666;
+                    line-height: 98px;
+                    margin-left: 10px;
+                    &:first-child {
+                      font-size: 30px;
+                      color: #333;
+                    }
+                  }
+                }
+                > .List {
+                  > view {
+                    align-items: center;
+                    border-top: 2px solid #f8f8f8;
+                    padding: 30px 20px;
+                    position: relative;
+                    overflow: hidden;
+                    &:first-child {
+                      border-top: none;
+                    }
+                    > .Img {
+                      width: 160px;
+                      height: 128px;
+                      position: relative;
+                      overflow: hidden;
+                      background: #f8f8f8;
+                      margin-right: 20px;
+                      > image {
+                        width: 100%;
+                        height: 100%;
+                      }
+                    }
+                    > .flex-item {
+                      position: relative;
+                      overflow: hidden;
+                      > text {
+                        display: block;
+                        font-size: 26px;
+                        color: #666;
+                        line-height: 40px;
+                        &:first-child {
+                          font-size: 30px;
+                          color: #333;
+                          margin-bottom: 10px;
+                        }
+                        &:last-child {
+                          white-space: nowrap;
+                          overflow: hidden;
+                          text-overflow: ellipsis;
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            > .PageBottom {
+              width: 100%;
+              height: 30px;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/pages/SignIn/XieYi/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '协议'
-}

src/pages/SignIn/XieYi/index.vue

@@ -1,40 +0,0 @@
-<template>
-  <view class="page XieYi">
-    <text class="Bold">用户隐私协议</text>
-    <text>丽园荟小程序下称“本软件”尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本软件会按照本隐私权政策的规定使用和披露您的个人信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本软件不会将这些信息对外披露或向第三方提供。本软件会不时更新本隐私权政策。您在同意本软件服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本软件服务使用协议不可分割的一部分。</text>
-    <text>1.适用范围</text>
-    <text>a)在您使用本软件网络服务，本软件自动接收并记录的您的手机上的信息，包括但不限于您的健康数据、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据；</text>
-    <text>2.信息的使用</text>
-    <text>a)在获得您的数据之后，本软件会将其上传至服务器，以生成您的排行榜数据，以便您能够更好地使用服务。</text>
-    <text>3.信息披露</text>
-    <text>a)本软件不会将您的信息披露给不受信任的第三方。</text>
-    <text>b)根据法律的有关规定，或者行政或司法机构的要求，向第三方或者行政、司法机构披露；</text>
-    <text>c)如您出现违反中国有关法律、法规或者相关规则的情况，需要向第三方披露；</text>
-    <text>4.信息存储和交换</text>
-    <text>本软件收集的有关您的信息和资料将保存在本软件及（或）其关联公司的服务器上，这些信息和资料可能传送至您所在国家、地区或本软件收集信息和资料所在地的境外并在境外被访问、存储和展示。</text>
-    <text>5.信息安全</text>
-    <text>a)在使用本软件网络服务进行网上交易时，您不可避免的要向交易对方或潜在的交易对方披露自己的个人信息，如联络方式或者邮政地址。请您妥善保护自己的个人信息，仅在必要的情形下向他人提供。如您发现自己的个人信息泄密，请您立即联络本软件客服，以便本软件采取相应措施。</text>
-  </view>
-</template>
-
-<script>
-export default {
-  name: 'XieYi',
-  data () {
-    return {
-    }
-  },
-  computed: {
-  },
-  components: {
-  },
-  created () {
-  },
-  methods: {
-  }
-}
-</script>
-
-<style lang="scss">
-@import "page.scss";
-</style>

src/pages/SignIn/XieYi/page.scss

@@ -1,20 +0,0 @@
-.page.XieYi {
-  padding: 0 20px 20px;
-  height: 100%;
-  overflow-y: scroll;
-  background: #fff;
-  > text {
-    display: block;
-    line-height: 40px;
-    font-size: 28px;
-    text-align: justify;
-    text-indent: 2em;
-    &.Bold {
-      text-indent: 0;
-      font-size: 40px;
-      text-align: center;
-      line-height: 60px;
-      margin-top: 20px;
-    }
-  }
-}

src/pages/SignIn/index.config.js

@@ -1,3 +1,3 @@
 export default {
-  navigationBarTitleText: '丽园荟'
+  navigationBarTitleText: '香颂蔚澜'
 }

src/pages/SignIn/index.vue

@@ -1,19 +1,6 @@
 <template>
   <view class="page DengLu">
-    <image mode="widthFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/signinbg.png"></image>
-    <view class="Btn flex-h">
-      <view class="flex-item"><text @tap="Back">取消登录</text></view>
-      <view class="flex-item"><text>授权登录</text></view>
-      <button open-type="getPhoneNumber" v-if="Agree && UserInfo !== null && UserInfo.PersonId !== undefined" @getphonenumber="GetPhoneNumber">授权登录</button>
-    </view>
-    <view class="Agree flex-h">
-      <text class="iconfont icongouxuan" v-if="Agree" @tap="Agree = false"></text>
-      <text class="iconfont iconweigouxuan" v-else @tap="Agree = true"></text>
-      <view class="flex-item">
-        <view>我已认真阅读，理解并同意<view @tap="LinkTo">《用户协议及隐私政策》</view>
-        </view>
-      </view>
-    </view>
+    登录页
   </view>
 </template>
 
@@ -24,8 +11,7 @@ export default {
   name: 'DengLu',
   data () {
     return {
-      DataLock: false,
-      Agree: false
+      DataLock: false
     }
   },
   computed: {
@@ -36,57 +22,13 @@ export default {
   components: {
   },
   created () {
-    this.$authed(() => {
-      this.Init()
-    })
   },
   methods: {
     ...mapUserActions([
-      'MainSignIn', // 获取用户信息
-      'GetUserPhone' // 获取用户手机号
     ]),
     ...mapUserMutations([
-      'EditUserInfo' // 编辑用户信息
     ]),
     Init () {
-      // this.ToLogin() 
-    },
-    LinkTo () {
-      wx.navigateTo({ url: './XieYi/index' })
-    },
-    Back () {
-      wx.navigateBack({ changed: true })
-    },
-    ToLogin () {
-      let _that = this
-      wx.login({
-        success (res) {
-          _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
-            _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-            _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-            _that.GetUserPhone({ urlData: { personId: _that.UserInfo.PersonId } })
-          })
-        }
-      })
-    },
-    GetPhoneNumber (e) {
-      if (this.DataLock) return
-      this.DataLock = true
-      this.GetUserPhone({
-        urlData: { personId: this.UserInfo.PersonId },
-        data: { data: { sessionKey: this.UserInfo.SessionKey, encryptedData: e.detail.encryptedData, iv: e.detail.iv } }
-      }).then((res) => {
-        this.ShowGetPhoneBtn = false
-        this.EditUserInfo({ name: 'OpenId', value: res.data.data.openId })
-        this.EditUserInfo({ name: 'Phone', value: res.data.data.phone })
-        wx.navigateBack()
-        wx.switchTab({
-          url: '../WoDe/index'
-        })
-        this.DataLock = false
-      }).catch(() => {
-        this.DataLock = false
-      })
     }
   }
 }

src/pages/SignIn/page.scss

@@ -3,74 +3,4 @@
   height: 100%;
   overflow-y: scroll;
   background: #fff;
-  > image {
-    width: 100%;
-  }
-  > .Btn {
-    padding: 0 76px;
-    margin-top: 40px;
-    align-items: center;
-    overflow: visible;
-    position: relative;
-    > view {
-      position: relative;
-      margin-left: 40px;
-      overflow: visible;
-      &:nth-child(1) {
-        margin-left: 0;
-      }
-      &:nth-child(2) {
-        > text {
-          background: #fddd39;
-          border-color: #fddd39;
-          box-shadow: 0 5px 10px 5px rgba(253, 221, 57, 0.3);
-        }
-      }
-      > text {
-        display: block;
-        text-align: center;
-        font-size: 28px;
-        line-height: 80px;
-        border-radius: 80px;
-        box-sizing: border-box;
-        border: 2px solid #333;
-        text-align: center;
-      }
-    }
-    > button {
-      width: 40%;
-      display: block;
-      position: absolute;
-      font-size: 28px;
-      line-height: 80px;
-      right: 76px;
-      top: 0;
-      opacity: 0;
-    }
-  }
-  > .Agree {
-    padding: 0 76px;
-    align-items: flex-start;
-    margin-top: 20px;
-    > text {
-      font-size: 36px;
-      line-height: 40px;
-      margin-right: 10px;
-      color: #fe4e45;
-    }
-    > view {
-      > view {
-        display: block;
-        font-size: 24px;
-        color: #333;
-        line-height: 40px;
-        > view {
-          display: inline-block;
-          font-size: 24px;
-          color: #333;
-          line-height: 40px;
-        }
-      }
-    }
-  }
 }