From 42ba6dd0362361528974e75361919686da4c7136 Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Wed, 15 Jul 2020 14:07:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B0=E9=97=BB?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/tab6.png            | Bin 0 -> 3287 bytes
 images/tab7.png            | Bin 0 -> 2917 bytes
 pages/index/index.js       |   4 ++--
 pages/index/index.wxml     |  12 ++++++++++--
 pages/newsList/newsList.js |  10 ++++++++++
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 images/tab6.png
 create mode 100644 images/tab7.png

diff --git a/images/tab6.png b/images/tab6.png
new file mode 100644
index 0000000000000000000000000000000000000000..22c387000012880f866599fd66b342a587173c78
GIT binary patch
literal 3287
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
Vjin8yP!IqB002ovPDHLkV1fldC=CDr

literal 0
HcmV?d00001

diff --git a/images/tab7.png b/images/tab7.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d22afdc2cf45a60e3bfbf298a935eb137ef5cef
GIT binary patch
literal 2917
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
P00000NkvXXu0mjf&_7Ks

literal 0
HcmV?d00001

diff --git a/pages/index/index.js b/pages/index/index.js
index c7a82cf..8b63aa1 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -122,9 +122,9 @@ Page({
       url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
     })
   },
-  goNewsList: function() {
+  goNewsList: function(event) {
     wx.navigateTo({
-      url: '../newsList/newsList',
+      url: '../newsList/newsList?type='+ event.currentTarget.dataset.type,
     })
   },
   goVolunteer: function () {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5760780..f737008 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -6,13 +6,21 @@
   </swiper>
 </view>
 <view class="tab">
+  <view class="tab-box" bindtap="goNewsList" data-type="2">
+    <image src="../../images/tab6.png"></image>
+    <view class="tab-title">展览展示</view>
+  </view>
+  <view class="tab-box" bindtap="goNewsList" data-type="1">
+    <image src="../../images/tab7.png"></image>
+    <view class="tab-title">文化动态</view>
+  </view>
   <view class="tab-box" bindtap="goVolunteer">
     <image src="../../images/tab1.png"></image>
     <view class="tab-title">志愿者服务</view>
   </view>
   <view class="tab-box" bindtap="goActivity">
     <image src="../../images/tab2.png"></image>
-    <view class="tab-title">精品活动</view>
+    <view class="tab-title">精彩活动</view>
   </view>
   <view class="tab-box" bindtap="goVenue">
     <image src="../../images/tab3.png"></image>
@@ -46,7 +54,7 @@
 </view>
 <view class="news">
   <view class="public-title">
-    <view class="title-text" bindtap="goNewsList">
+    <view class="title-text">
       <image src="../../images/selected-l.png" class="selected-l"></image>
       文化动态
       <image src="../../images/selected-r.png" class="selected-r"></image>
diff --git a/pages/newsList/newsList.js b/pages/newsList/newsList.js
index 21566fc..fe2a4bf 100644
--- a/pages/newsList/newsList.js
+++ b/pages/newsList/newsList.js
@@ -84,6 +84,16 @@ Page({
    */
   onLoad: function (options) {
     var self = this;
+    console.log(options);
+    if(options.type == 1) {
+      self.setData({
+        directoriesParentId: 'f497904b-7727-4832-891c-604c36ae4167'
+      });
+    } else {
+      self.setData({
+        directoriesParentId: 'f1d5d313-f728-4dda-9843-1116d97e17b0'
+      });
+    }
     self.doGetNewsDictionariesList();
   },
 

From 36b60563b68b017354a715f7e20535d76175c520 Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Wed, 15 Jul 2020 14:45:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activityDetail/activityDetail.js   | 17 ++++++-----------
 pages/activityDetail/activityDetail.json |  3 +--
 pages/activityDetail/activityDetail.wxml |  6 +++++-
 pages/activityDetail/activityDetail.wxss |  3 +++
 pages/index/index.js                     | 16 ++++++++++++++++
 pages/index/index.wxml                   |  8 ++++----
 pages/newsList/newsList.js               |  9 ++++-----
 7 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/pages/activityDetail/activityDetail.js b/pages/activityDetail/activityDetail.js
index c610f84..6e28e7e 100644
--- a/pages/activityDetail/activityDetail.js
+++ b/pages/activityDetail/activityDetail.js
@@ -6,6 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    activityUrl: app.activityUrl,
     dataMap: {},
     token: ''
   },
@@ -65,24 +66,18 @@ Page({
         url = '/wxminiapp/activitylibrary/getactivitylibrarybyid/' + id
         self.getToken()
       }
-      app.restAjax.get(app.restAjax.path(app.activityUrl + url, []), 
-        {}, {
+      app.restAjax.get(app.restAjax.path(app.activityUrl + url, []), {}, {
           headers: {
             token: self.data.token
           }
         }, function(code, data) {
-          if('200' == code) {
-            data.activityImage = app.activityUrl + '/route/file/downloadfile/true/' + data.activityImage;
+            data.activityImageArray = data.activityImage.split(',');
             self.setData({
               dataMap: data
             })
-            console.log(self.data.dataMap)
-          }
-      }, function() {
-
-      }, function() {
-        
-      })
+      }, function(code, data) {
+        app.dialog.msg(data.msg);
+      });
     })
   },
 
diff --git a/pages/activityDetail/activityDetail.json b/pages/activityDetail/activityDetail.json
index 7360326..8835af0 100644
--- a/pages/activityDetail/activityDetail.json
+++ b/pages/activityDetail/activityDetail.json
@@ -1,4 +1,3 @@
 {
-  "usingComponents": {},
-  "enablePullDownRefresh": true
+  "usingComponents": {}
 }
\ No newline at end of file
diff --git a/pages/activityDetail/activityDetail.wxml b/pages/activityDetail/activityDetail.wxml
index b636b25..d577469 100644
--- a/pages/activityDetail/activityDetail.wxml
+++ b/pages/activityDetail/activityDetail.wxml
@@ -1,5 +1,9 @@
 <view class="activity-img">
-  <image src="{{dataMap.activityImage}}"></image>
+  <swiper indicator-dots="false" autoplay="true" >
+    <swiper-item class="swiper-item" wx:for="{{dataMap.activityImageArray}}" wx:for-index="idx" wx:for-item="item" wx:key="activityImageArray">
+      <image src="{{activityUrl}}/route/file/downloadfile/true/{{item}}"></image>
+    </swiper-item>
+  </swiper>
 </view>
 <view class="activity-detail">
   <view class="activity-title">{{dataMap.activityTitle}}</view>
diff --git a/pages/activityDetail/activityDetail.wxss b/pages/activityDetail/activityDetail.wxss
index 40e403d..8808df0 100644
--- a/pages/activityDetail/activityDetail.wxss
+++ b/pages/activityDetail/activityDetail.wxss
@@ -2,6 +2,9 @@
   width: 100%;
   height: 480rpx;
 }
+swiper {
+  height: 100%;
+}
 .activity-detail{
   position: absolute;
   left: 0;
diff --git a/pages/index/index.js b/pages/index/index.js
index 8b63aa1..03a4504 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -70,6 +70,9 @@ Page({
       page: 1,
       rows: 3
     }, null, function(code, data) {
+      for(var i = 0, item; item = data.rows[i++];) {
+        item.venuePanoramaArray = item.venuePanorama.split(',');
+      }
       self.setData({
         'venue.venueList': data.rows
       });
@@ -83,6 +86,9 @@ Page({
       page: 1,
       rows: 3
     }, null, function(code, data) {
+      for(var i = 0, item; item = data.rows[i++];) {
+        item.activityImageArray = item.activityImage.split(',');
+      }
       self.setData({
         'activity.activityList': data.rows
       });
@@ -142,6 +148,11 @@ Page({
       url: '../venue/venue',
     })
   },
+  goVenueDetail: function(event) {
+    wx.navigateTo({
+      url: '../venueDetail/venueDetail?venuesInfoId=' + event.currentTarget.dataset.venuesInfoId,
+    })
+  },
   goBroadcastDetail: function (event) {
     wx.navigateTo({
       url: '../broadcastDetail/broadcastDetail?livePlanId='+ event.currentTarget.dataset.livePlanId,
@@ -152,6 +163,11 @@ Page({
       url: '../activity/activity',
     })
   },
+  goActivityDetail: function(event) {
+    wx.navigateTo({
+      url: '../activityDetail/activityDetail?id=' + event.currentTarget.dataset.activityLibraryId
+    })
+  },
   goHeritage: function () {
     wx.switchTab({
       url: '../heritage/heritage',
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f737008..d2bed56 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -44,11 +44,11 @@
     </view>
   </view>
   <view class="recommend-container">
-    <view class="recommend-box" wx:for="{{venue.venueList}}" wx:for-index="index" wx:for-item="item" wx:key="venueList">
-      <image src="{{venue.venueUrl}}/route/file/downloadfile/true/{{item.venuePanorama}}"></image>
+    <view class="recommend-box" wx:for="{{venue.venueList}}" bindtap="goVenueDetail" data-venues-info-Id="{{item.venuesInfoId}}" wx:for-index="index" wx:for-item="item" wx:key="venueList">
+      <image src="{{venue.venueUrl}}/route/file/downloadfile/true/{{item.venuePanoramaArray[0]}}"></image>
     </view>
-    <view class="recommend-box" wx:for="{{activity.activityList}}" wx:for-index="index" wx:for-item="item" wx:key="activityList">
-      <image src="{{activity.activityUrl}}/route/file/downloadfile/true/{{item.activityImage}}"></image>
+    <view class="recommend-box" wx:for="{{activity.activityList}}" bindtap="goActivityDetail" data-activity-library-id="{{item.activityLibraryId}}" wx:for-index="index" wx:for-item="item" wx:key="activityList">
+      <image src="{{activity.activityUrl}}/route/file/downloadfile/true/{{item.activityImageArray[0]}}"></image>
     </view>
   </view>
 </view>
diff --git a/pages/newsList/newsList.js b/pages/newsList/newsList.js
index fe2a4bf..6c4e7f4 100644
--- a/pages/newsList/newsList.js
+++ b/pages/newsList/newsList.js
@@ -52,10 +52,6 @@ Page({
       page: page,
       rows: self.data.rows
     }, null, function(code, data) {
-      if(data.rows.length == 0) {
-        app.dialog.msg('暂无数据');
-        return;
-      }
       var newsArray;
       if(page <= 1) {
         newsArray = data.rows;
@@ -67,6 +63,10 @@ Page({
         currentPage: page,
         'news.newsList': newsArray
       })
+      if(data.rows.length == 0) {
+        app.dialog.msg('暂无数据');
+        return;
+      }
     }, function(code, data) {
       app.dialog.msg(data.msg);
     }, function() {
@@ -84,7 +84,6 @@ Page({
    */
   onLoad: function (options) {
     var self = this;
-    console.log(options);
     if(options.type == 1) {
       self.setData({
         directoriesParentId: 'f497904b-7727-4832-891c-604c36ae4167'