投票

src/pages/HuiAiXin/EnergyStory/index.vue

@@ -10,7 +10,7 @@
 
         <!-- 列表 -->
         <view class="List" v-if="PageList.length">
-          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item flex-h">
+          <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>

src/pages/HuiAiXin/StarOwner/index.vue

@@ -10,7 +10,7 @@
 
         <!-- 列表 -->
         <view class="List" v-if="PageList.length">
-          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item">
+          <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>

src/pages/HuiAiXin/index.vue

@@ -22,7 +22,7 @@
           <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}`" hover-class="other-navigator-hover" class="Item">
+                <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>
@@ -45,7 +45,7 @@
             <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}`" hover-class="other-navigator-hover" class="Item flex-h">
+            <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>

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

@@ -51,6 +51,8 @@ export default {
   components: {
   },
   created () {
+    this.Name = this.UserInfo.Name
+    this.Phone = this.UserInfo.Phone
     this.CurrnetId = getCurrentInstance().router.params.id
     this.$authed(() => {
       this.Init()

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

@@ -93,6 +93,7 @@ export default {
   name: 'HuoDongXiangQing',
   data () {
     return {
+      From: null,
       ActivityStatus: false,
       HasEnroll: false,
       ShowVoteRes: false,
@@ -118,16 +119,23 @@ export default {
   onShareAppMessage () {
     return {
       title: this.ActivityInfo.shareTitle,
-      path: `/pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${this.ActivityInfo.activityId}`,
+      path: `/pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${this.ActivityInfo.activityId}&from=life`,
       imageUrl: this.ActivityInfo.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',

src/pages/HuiShengHuo/ActivityList/index.vue

@@ -22,7 +22,7 @@
           </view>
           <view class="List">
             <view class="Item" v-for="(item, index) in PageList" :key="index">
-              <navigator class="Img" :url="`./ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover">
+              <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>
@@ -31,8 +31,8 @@
                 <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}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isEnroll">立即报名</navigator>
-                  <navigator :url="`./ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isVote">立即投票</navigator>
+                  <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>

src/pages/HuiShengHuo/PhotoList/index.vue

@@ -42,6 +42,7 @@ export default {
   name: 'HuoDongZhaoPianQiang',
   data () {
     return {
+      PhotoUrlArr: [],
       ShowBigImg: false,
       BigImgUrl: null,
       PageList: [],
@@ -84,17 +85,21 @@ export default {
       this.PageData.pageNum = 1
       this.HasNextPage = true
       this.PageList = []
+      this.PhotoUrlArr = []
       this.EmptyPhotoList() // 清空照片墙列表
       this.ToGetPageList() // 获取列表
     },
     CheckBigImg (url) { // 查看大图
-      this.BigImgUrl = url
-      this.ShowBigImg = true
+      wx.previewImage({
+        current: url, // 当前显示图片的http链接
+        urls: this.PhotoUrlArr // 需要预览的图片http链接列表
+      })
     },
     ToGetPageList () { // 获取列表
       this.GetPhotoList({ queryData: { ...this.PageData } }).then((res) => { // 获取照片墙列表
         let Arr = []
         this.PhotoList.map((item) => {
+          this.PhotoUrlArr.push(item.imgUrl)
           if (Arr.length && item.typeId === Arr[Arr.length - 1].Month) {
             Arr[Arr.length - 1].List.push({ ...item })
           } else {

src/pages/HuiShengHuo/index.vue

@@ -43,7 +43,7 @@
           </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}`" hover-class="other-navigator-hover">
+              <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>
@@ -52,8 +52,8 @@
                 <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}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isEnroll">立即报名</navigator>
-                  <navigator :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isVote">立即投票</navigator>
+                  <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>
@@ -81,6 +81,7 @@ export default {
   name: 'HuiShengHuo',
   data () {
     return {
+      PhotoUrlArr: [],
       ShowBigImg: false,
       BigImgUrl: null,
       PageActivityList: [],
@@ -144,6 +145,10 @@ export default {
         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) // 判断请求接口个数
@@ -156,8 +161,10 @@ export default {
       })
     },
     CheckBigImg (url) { // 查看大图
-      this.BigImgUrl = url
-      this.ShowBigImg = true
+      wx.previewImage({
+        current: url, // 当前显示图片的http链接
+        urls: this.PhotoUrlArr // 需要预览的图片http链接列表
+      })
     },
     CheckRequestNum (num) { // 判断请求接口个数
       this.RequestNum += 1

src/pages/WoDe/MyActivityList/index.vue

@@ -15,7 +15,7 @@
 
         <!-- 列表 -->
         <view class="List" v-if="PageList.length">
-          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item flex-h">
+          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover" class="Item flex-h">
             <view class="flex-item">
               <text>{{item.name}}</text>
               <text>已报名{{item.enrollNum}}人</text>