xcx 4 years ago
parent
commit
32d4e0060d

+ 1
- 1
src/pages/HuiAiXin/EnergyStory/index.vue View File

10
 
10
 
11
         <!-- 列表 -->
11
         <!-- 列表 -->
12
         <view class="List" v-if="PageList.length">
12
         <view class="List" v-if="PageList.length">
13
-          <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">
13
+          <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">
14
             <view class="flex-item">
14
             <view class="flex-item">
15
               <text>{{item.name}}</text>
15
               <text>{{item.name}}</text>
16
               <text>副标题</text>
16
               <text>副标题</text>

+ 1
- 1
src/pages/HuiAiXin/StarOwner/index.vue View File

10
 
10
 
11
         <!-- 列表 -->
11
         <!-- 列表 -->
12
         <view class="List" v-if="PageList.length">
12
         <view class="List" v-if="PageList.length">
13
-          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item">
13
+          <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">
14
             <view class="Img">
14
             <view class="Img">
15
               <view class="MainItemImg">
15
               <view class="MainItemImg">
16
                 <image mode="aspectFill" :src="item.thumb"></image>
16
                 <image mode="aspectFill" :src="item.thumb"></image>

+ 2
- 2
src/pages/HuiAiXin/index.vue View File

22
           <view class="ListContainer" v-if="PageStarList.length">
22
           <view class="ListContainer" v-if="PageStarList.length">
23
             <scroll-view scroll-x="true">
23
             <scroll-view scroll-x="true">
24
               <view class="List">
24
               <view class="List">
25
-                <navigator v-for="(item, index) in PageStarList" :key="index" :url="`../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item">
25
+                <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">
26
                   <view class="Img">
26
                   <view class="Img">
27
                     <view class="MainItemImg">
27
                     <view class="MainItemImg">
28
                       <image mode="aspectFill" :src="item.thumb"></image>
28
                       <image mode="aspectFill" :src="item.thumb"></image>
45
             <navigator url="./EnergyStory/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
45
             <navigator url="./EnergyStory/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
46
           </view>
46
           </view>
47
           <view class="List" v-if="PageStoryList.length">
47
           <view class="List" v-if="PageStoryList.length">
48
-            <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">
48
+            <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">
49
               <view class="flex-item">
49
               <view class="flex-item">
50
                 <text>{{item.name}}</text>
50
                 <text>{{item.name}}</text>
51
                 <text>{{item.address}}</text>
51
                 <text>{{item.address}}</text>

+ 2
- 0
src/pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/index.vue View File

51
   components: {
51
   components: {
52
   },
52
   },
53
   created () {
53
   created () {
54
+    this.Name = this.UserInfo.Name
55
+    this.Phone = this.UserInfo.Phone
54
     this.CurrnetId = getCurrentInstance().router.params.id
56
     this.CurrnetId = getCurrentInstance().router.params.id
55
     this.$authed(() => {
57
     this.$authed(() => {
56
       this.Init()
58
       this.Init()

+ 9
- 1
src/pages/HuiShengHuo/ActivityList/ActivityDetail/index.vue View File

93
   name: 'HuoDongXiangQing',
93
   name: 'HuoDongXiangQing',
94
   data () {
94
   data () {
95
     return {
95
     return {
96
+      From: null,
96
       ActivityStatus: false,
97
       ActivityStatus: false,
97
       HasEnroll: false,
98
       HasEnroll: false,
98
       ShowVoteRes: false,
99
       ShowVoteRes: false,
118
   onShareAppMessage () {
119
   onShareAppMessage () {
119
     return {
120
     return {
120
       title: this.ActivityInfo.shareTitle,
121
       title: this.ActivityInfo.shareTitle,
121
-      path: `/pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${this.ActivityInfo.activityId}`,
122
+      path: `/pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${this.ActivityInfo.activityId}&from=life`,
122
       imageUrl: this.ActivityInfo.shareImg
123
       imageUrl: this.ActivityInfo.shareImg
123
     }
124
     }
124
   },
125
   },
125
   created () {
126
   created () {
126
     this.CurrnetId = getCurrentInstance().router.params.id
127
     this.CurrnetId = getCurrentInstance().router.params.id
128
+    this.From = getCurrentInstance().router.params.from
129
+    let _that = this
130
+    wx.setNavigationBarTitle({
131
+      title: _that.From === 'love' ? '荟 · 爱心' : '荟 · 生活'
132
+    })
127
     this.$authed(() => {
133
     this.$authed(() => {
128
       this.Init()
134
       this.Init()
129
     })
135
     })
130
   },
136
   },
137
+  mounted () {
138
+  },
131
   methods: {
139
   methods: {
132
     ...mapUserActions([ // 活动投票
140
     ...mapUserActions([ // 活动投票
133
       'PostActivityVote',
141
       'PostActivityVote',

+ 3
- 3
src/pages/HuiShengHuo/ActivityList/index.vue View File

22
           </view>
22
           </view>
23
           <view class="List">
23
           <view class="List">
24
             <view class="Item" v-for="(item, index) in PageList" :key="index">
24
             <view class="Item" v-for="(item, index) in PageList" :key="index">
25
-              <navigator class="Img" :url="`./ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover">
25
+              <navigator class="Img" :url="`./ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover">
26
                 <view class="MainItemImg">
26
                 <view class="MainItemImg">
27
                   <image mode="aspectFill" :src="item.thumb"></image>
27
                   <image mode="aspectFill" :src="item.thumb"></image>
28
                 </view>
28
                 </view>
31
                 <text>{{item.name}}</text>
31
                 <text>{{item.name}}</text>
32
                 <view class="flex-h">
32
                 <view class="flex-h">
33
                   <text class="flex-item">参与截止时间:{{ToolClass.DateFormat(new Date(item.enrollEnd).getTime())}}</text>
33
                   <text class="flex-item">参与截止时间:{{ToolClass.DateFormat(new Date(item.enrollEnd).getTime())}}</text>
34
-                  <navigator :url="`./ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isEnroll">立即报名</navigator>
35
-                  <navigator :url="`./ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isVote">立即投票</navigator>
34
+                  <navigator :url="`./ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover" class="Btn" v-if="item.isEnroll">立即报名</navigator>
35
+                  <navigator :url="`./ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover" class="Btn" v-if="item.isVote">立即投票</navigator>
36
                   <view v-if="new Date(item.endDate).getTime() <= Date.now()">已结束</view>
36
                   <view v-if="new Date(item.endDate).getTime() <= Date.now()">已结束</view>
37
                 </view>
37
                 </view>
38
               </view>
38
               </view>

+ 7
- 2
src/pages/HuiShengHuo/PhotoList/index.vue View File

42
   name: 'HuoDongZhaoPianQiang',
42
   name: 'HuoDongZhaoPianQiang',
43
   data () {
43
   data () {
44
     return {
44
     return {
45
+      PhotoUrlArr: [],
45
       ShowBigImg: false,
46
       ShowBigImg: false,
46
       BigImgUrl: null,
47
       BigImgUrl: null,
47
       PageList: [],
48
       PageList: [],
84
       this.PageData.pageNum = 1
85
       this.PageData.pageNum = 1
85
       this.HasNextPage = true
86
       this.HasNextPage = true
86
       this.PageList = []
87
       this.PageList = []
88
+      this.PhotoUrlArr = []
87
       this.EmptyPhotoList() // 清空照片墙列表
89
       this.EmptyPhotoList() // 清空照片墙列表
88
       this.ToGetPageList() // 获取列表
90
       this.ToGetPageList() // 获取列表
89
     },
91
     },
90
     CheckBigImg (url) { // 查看大图
92
     CheckBigImg (url) { // 查看大图
91
-      this.BigImgUrl = url
92
-      this.ShowBigImg = true
93
+      wx.previewImage({
94
+        current: url, // 当前显示图片的http链接
95
+        urls: this.PhotoUrlArr // 需要预览的图片http链接列表
96
+      })
93
     },
97
     },
94
     ToGetPageList () { // 获取列表
98
     ToGetPageList () { // 获取列表
95
       this.GetPhotoList({ queryData: { ...this.PageData } }).then((res) => { // 获取照片墙列表
99
       this.GetPhotoList({ queryData: { ...this.PageData } }).then((res) => { // 获取照片墙列表
96
         let Arr = []
100
         let Arr = []
97
         this.PhotoList.map((item) => {
101
         this.PhotoList.map((item) => {
102
+          this.PhotoUrlArr.push(item.imgUrl)
98
           if (Arr.length && item.typeId === Arr[Arr.length - 1].Month) {
103
           if (Arr.length && item.typeId === Arr[Arr.length - 1].Month) {
99
             Arr[Arr.length - 1].List.push({ ...item })
104
             Arr[Arr.length - 1].List.push({ ...item })
100
           } else {
105
           } else {

+ 12
- 5
src/pages/HuiShengHuo/index.vue View File

43
           </view>
43
           </view>
44
           <view class="List" v-if="ActivityList.length">
44
           <view class="List" v-if="ActivityList.length">
45
             <view class="Item" v-for="(item, index) in ActivityList" :key="index">
45
             <view class="Item" v-for="(item, index) in ActivityList" :key="index">
46
-              <navigator class="Img" :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover">
46
+              <navigator class="Img" :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover">
47
                 <view class="MainItemImg">
47
                 <view class="MainItemImg">
48
                   <image mode="aspectFill" :src="item.thumb"></image>
48
                   <image mode="aspectFill" :src="item.thumb"></image>
49
                 </view>
49
                 </view>
52
                 <text>{{item.name}}</text>
52
                 <text>{{item.name}}</text>
53
                 <view class="flex-h">
53
                 <view class="flex-h">
54
                   <text class="flex-item">参与截止时间:{{ToolClass.DateFormat(new Date(item.enrollEnd).getTime())}}</text>
54
                   <text class="flex-item">参与截止时间:{{ToolClass.DateFormat(new Date(item.enrollEnd).getTime())}}</text>
55
-                  <navigator :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isEnroll">立即报名</navigator>
56
-                  <navigator :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isVote">立即投票</navigator>
55
+                  <navigator :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover" class="Btn" v-if="item.isEnroll">立即报名</navigator>
56
+                  <navigator :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}&from=life`" hover-class="other-navigator-hover" class="Btn" v-if="item.isVote">立即投票</navigator>
57
                   <view v-if="new Date(item.endDate).getTime() <= Date.now()">已结束</view>
57
                   <view v-if="new Date(item.endDate).getTime() <= Date.now()">已结束</view>
58
                 </view>
58
                 </view>
59
               </view>
59
               </view>
81
   name: 'HuiShengHuo',
81
   name: 'HuiShengHuo',
82
   data () {
82
   data () {
83
     return {
83
     return {
84
+      PhotoUrlArr: [],
84
       ShowBigImg: false,
85
       ShowBigImg: false,
85
       BigImgUrl: null,
86
       BigImgUrl: null,
86
       PageActivityList: [],
87
       PageActivityList: [],
144
         this.CheckRequestNum(3) // 判断请求接口个数
145
         this.CheckRequestNum(3) // 判断请求接口个数
145
       })
146
       })
146
       this.GetPhotoList({ queryData: { pageNum: 1, pageSize: 10 } }).then(() => { // 获取照片墙列表
147
       this.GetPhotoList({ queryData: { pageNum: 1, pageSize: 10 } }).then(() => { // 获取照片墙列表
148
+        this.PhotoUrlArr = []
149
+        this.PhotoList.map((item) => {
150
+          this.PhotoUrlArr.push(item.imgUrl)
151
+        })
147
         this.CheckRequestNum(3) // 判断请求接口个数
152
         this.CheckRequestNum(3) // 判断请求接口个数
148
       }).catch(() => {
153
       }).catch(() => {
149
         this.CheckRequestNum(3) // 判断请求接口个数
154
         this.CheckRequestNum(3) // 判断请求接口个数
156
       })
161
       })
157
     },
162
     },
158
     CheckBigImg (url) { // 查看大图
163
     CheckBigImg (url) { // 查看大图
159
-      this.BigImgUrl = url
160
-      this.ShowBigImg = true
164
+      wx.previewImage({
165
+        current: url, // 当前显示图片的http链接
166
+        urls: this.PhotoUrlArr // 需要预览的图片http链接列表
167
+      })
161
     },
168
     },
162
     CheckRequestNum (num) { // 判断请求接口个数
169
     CheckRequestNum (num) { // 判断请求接口个数
163
       this.RequestNum += 1
170
       this.RequestNum += 1

+ 1
- 1
src/pages/WoDe/MyActivityList/index.vue View File

15
 
15
 
16
         <!-- 列表 -->
16
         <!-- 列表 -->
17
         <view class="List" v-if="PageList.length">
17
         <view class="List" v-if="PageList.length">
18
-          <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">
18
+          <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">
19
             <view class="flex-item">
19
             <view class="flex-item">
20
               <text>{{item.name}}</text>
20
               <text>{{item.name}}</text>
21
               <text>已报名{{item.enrollNum}}人</text>
21
               <text>已报名{{item.enrollNum}}人</text>