test

app.js

@@ -2,19 +2,20 @@
 var restAjax = require('utils/restAjax.js');
 var dialog = require('utils/dialog.js');
 App({
-  loginUrl: 'https://www.wgink.ink/usercenter',
+  loginUrl: 'https://www.xzszwhy.cn/usercenter',
-  usercenterUrl: 'https://www.wgink.ink/usercenter',
+  usercenterUrl: 'https://www.xzszwhy.cn/usercenter',
-  newsUrl: 'https://www.wgink.ink/news',
+  newsUrl: 'https://www.xzszwhy.cn/news',
-  newsContentUrl: 'https://www.wgink.ink',
+  newsContentUrl: 'https://www.xzszwhy.cn',
-  libraryUrl: 'https://www.wgink.ink/library',
+  libraryUrl: 'https://www.xzszwhy.cn/library',
-  venueUrl: 'https://www.wgink.ink/venuebooking',
+  venueUrl: 'https://www.xzszwhy.cn/venuebooking',
-  activityUrl: 'https://www.wgink.ink/culturalactivity',
+  activityUrl: 'https://www.xzszwhy.cn/culturalactivity',
-  volunteerUrl: 'https://www.wgink.ink/volunteer',
+  volunteerUrl: 'https://www.xzszwhy.cn/volunteer',
-  activityUrl: 'https://www.wgink.ink/culturalactivity',
+  activityUrl: 'https://www.xzszwhy.cn/culturalactivity',
-  volunteerUrl: 'https://www.wgink.ink/volunteer',
+  volunteerUrl: 'https://www.xzszwhy.cn/volunteer',
-  liveUrl: 'https://www.wgink.ink/live',
+  liveUrl: 'https://www.xzszwhy.cn/live',
-  liveRecordUrl: 'https://www.wgink.ink',
+  liveRecordUrl: 'https://www.xzszwhy.cn.ink',
-  socialUrl: 'https://www.wgink.ink/social',
+  socialUrl: 'https://www.xzszwhy.cn/social',
+  settingUrl: 'https://www.xzszwhy.cn/miniapp',
   restAjax: restAjax,
   dialog: dialog,
   onLaunch: function () {

app.json

@@ -9,7 +9,6 @@
     "pages/order/order",
     "pages/venue/venue",
     "pages/center/center",
-    "pages/myFriendCircle/myFriendCircle",
     "pages/friendCircle/friendCircle",
     "pages/orderDetail/orderDetail",
     "pages/broadcastList/broadcastList",

pages/activity/activity.wxss

@@ -76,6 +76,8 @@
   height: 80rpx;
   white-space: nowrap;
   overflow-x: auto;
+  background: #FFF;
+  z-index: 100;
 }
 .area-box{
   display: inline-block;

pages/broadcastList/broadcastList.js

@@ -13,7 +13,8 @@ Page({
     page: 1,
     rows: 20,
     liveRecordList: [],
-    videoPath: ''
+    videoPath: '',
+    curTime: ''
   },
   getLivePlanRecordList: function () {
     var self = this
@@ -50,8 +51,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    var time = new Date().getTime()
     this.setData({
-      livePlanId: options.livePlanId
+      livePlanId: options.livePlanId,
+      curTime: time
     })
     this.getLivePlanRecordList();
   },

pages/broadcastList/broadcastList.wxml

@@ -4,4 +4,4 @@
 <view class="select-list">
   <view class="select-video {{item.recordFilePath == videoPath ? 'active': ''}}" wx:for="{{liveRecordList}}" data-url="{{item.recordFilePath}}" bindtap="playVideo">{{index+1}}.{{item.recordFileName}}</view>
 </view> -->
-<web-view src="{{liveRecordContentUrl}}/flv/index.html?livePlanId={{livePlanId}}&liveUrl={{liveUrl}}&liveRecordUrl={{liveRecordUrl}}" wx:if="{{livePlanId}}"></web-view>
+<web-view src="{{liveRecordContentUrl}}/flv/index.html?livePlanId={{livePlanId}}&liveUrl={{liveUrl}}&liveRecordUrl={{liveRecordUrl}}&{{curTime}}" wx:if="{{livePlanId}}"></web-view>

pages/center/center.wxml

@@ -1,5 +1,5 @@
 <view class="top-img">
-	<image src="../../images/center-bg.png"></image>
+	<image src="../../images/center-bg.jpg"></image>
 </view>
 <view class="page-container">
 	<view class="person">

pages/index/index.js

@@ -4,6 +4,8 @@ Page({
    * 页面的初始数据
    */
   data: {
+    showLive: false,
+    navList: [],
     randomName: true,
     showPhone: true,
     gotCode: false,
@@ -32,6 +34,35 @@ Page({
     usercenterUrl: app.usercenterUrl,
     isConfirm: false
   },
+  getSetting: function () {
+    var self = this
+    var num = Math.random()
+    app.restAjax.get(app.restAjax.path('{settingUrl}/nav-setting.json?v=' + num, [app.settingUrl]), {}, null, function(code, data) {
+      self.setData({
+        navList: data.nav,
+        showLive: data.showLive
+      })
+    }, function(code, data) {
+      app.dialog.msg(data.msg);
+    });
+  },
+  goNav: function (e) {
+    var type = e.currentTarget.dataset.type
+    var url = e.currentTarget.dataset.url
+    if (type == '0') {
+      wx.navigateTo({
+        url: '../' + url + '/' + url,
+      })
+    } else if (type == '1' || type == '2') {
+      wx.navigateTo({
+        url: '../newsList/newsList?type=' + type,
+      })
+    } else {
+      wx.switchTab({
+        url: '../' + url + '/' + url,
+      })
+    }
+  },
   doLogin: function () {
     var self = this;
     wx.login({
@@ -131,9 +162,15 @@ Page({
     });
   },
   goNewsDetail: function (event) {
-    wx.navigateTo({
+    if (event.currentTarget.dataset.type == '6') {
-      url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
+      wx.navigateTo({
-    })
+        url: '../newsDetail/newsDetail?content='+ event.currentTarget.dataset.content,
+      })
+    } else {
+      wx.navigateTo({
+        url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
+      })
+    }
   },
   goNewsList: function(event) {
     wx.navigateTo({
@@ -226,6 +263,7 @@ Page({
     self.doGetLiveList();
     self.doGetVenueList();
     self.doGetActivityList();
+    self.getSetting()
   },
 
   /**

pages/index/index.wxml

@@ -1,12 +1,16 @@
 <view class="swiper-box">
   <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" >
-    <swiper-item class="swiper-item" wx:for="{{news.bannerList}}" bindtap="goNewsDetail"  data-template-record-url="{{item.templateRecordUrl}}" wx:for-index="idx" wx:for-item="item" wx:key="bannerList">
+    <swiper-item class="swiper-item" wx:for="{{news.bannerList}}" bindtap="goNewsDetail"  data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:for-index="idx" wx:for-item="item" wx:key="bannerList">
       <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" class="swiper-img" wx:key="swiperImg"></image>
     </swiper-item>
   </swiper>
 </view>
 <view class="tab">
-  <view class="tab-box" bindtap="goNewsList" data-type="2">
+  <view class="tab-box" data-type="{{item.type}}" wx:for="{{navList}}" data-url="{{item.url}}" bindtap="goNav" wx:key="index" wx:if="{{item.isShow}}">
+    <image src="{{item.icon}}"></image>
+    <view class="tab-title">{{item.title}}123</view>
+  </view>
+  <!-- <view class="tab-box" bindtap="goNewsList" data-type="2">
     <image src="../../images/tab6.png"></image>
     <view class="tab-title">展览展示</view>
   </view>
@@ -45,7 +49,7 @@
   <view class="tab-box" bindtap="goResource">
     <image src="../../images/tab4.png"></image>
     <view class="tab-title">数图资源</view>
-  </view>
+  </view> -->
 </view>
 <view class="recommend">
   <view class="public-title">
@@ -73,7 +77,7 @@
     </view>
   </view>
   <view wx:for="{{news.newsList}}" wx:for-index="idx" wx:for-item="item" wx:key="newsList">
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_1'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" wx:if="{{item.typesettingCode == 'key_1'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-small-pic">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
@@ -83,7 +87,7 @@
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_2'}}">
+    <view class="news-box transverse-news" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_2'}}">
       <view class="news-row-img">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
       </view>
@@ -95,7 +99,7 @@
         </view>
       </view>
     </view>
-    <view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_3'}}">
+    <view class="news-box transverse-news" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_3'}}">
       <view class="news-row-info">
         <view class="news-title">{{item.newsContentTitle}}</view>
         <view class="news-info">
@@ -107,7 +111,7 @@
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_4'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_4'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-big-pic">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
@@ -117,14 +121,14 @@
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_5'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_5'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-info">
         <text>来源：{{item.newsContentResource}}</text>
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_6'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_6'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-big-pic">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
@@ -135,7 +139,7 @@
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_7'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_7'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-info voice-box">
         <text>来源：{{item.newsContentResource}}</text>
@@ -145,7 +149,7 @@
     </view>
   </view>
 </view>
-<view class="broadcast">
+<view class="broadcast" wx:if="{{showLive}}">
   <view class="public-title">
     <view class="title-text">
       <image src="../../images/selected-l.png" class="selected-l"></image>

pages/myFriendCircle/myFriendCircle.js

@@ -1,116 +0,0 @@
-// pages/friendCircle/friendCircle.js
-var app = getApp();
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    usercenterUrl: app.usercenterUrl,
-    socialUrl: app.socialUrl,
-    momentsList: [],
-    currentPage: 1,
-    rows: 20
-  },
-  doGetMomentsList: function(page) {
-    var self = this;
-    app.dialog.loading('正在加载');
-    app.restAjax.get(app.restAjax.path('{socialUrl}/app/moments/listpagemomentsofpublicrelease', [self.data.socialUrl]), {
-      page: page,
-      rows: self.data.rows
-    }, null, function(code, data) {
-      if(data.rows.length == 0) {
-        app.dialog.msg('暂无数据');
-        return;
-      }
-      for(var i = 0, item; item = data.rows[i++];) {
-        if(item.type === 'photo') {
-          var photos = item.photos.split(',');
-          var photoArray = [];
-          for(var j = 0, jItem; jItem = photos[j++];) {
-            if(jItem.length != 0) {
-              photoArray.push(jItem);
-            }
-          }
-          item.photoArray = photoArray;
-        }
-      }
-      var momentsArray;
-      if(page <= 1) {
-        momentsArray = data.rows;
-      } else {
-        momentsArray = self.data.news.newsList;
-        momentsArray = momentsArray.concat(data.rows);
-      }
-      self.setData({
-        currentPage: page,
-        momentsList: momentsArray
-      })
-    }, function(code, data) {
-      app.dialog.msg(data.msg);
-    }, function() {
-      wx.stopPullDownRefresh();
-      wx.hideLoading();
-    });
-  },
-  newFriendCircle: function () {
-    wx.navigateTo({
-      url: '../newFriendCircle/newFriendCircle',
-    })
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.doGetMomentsList(1);
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-    this.doGetMomentsList(1);
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    this.doGetMomentsList(this.data.currentPage + 1);
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})

pages/myFriendCircle/myFriendCircle.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/myFriendCircle/myFriendCircle.wxml

@@ -1,54 +0,0 @@
-<view class="friend-circle" wx:for="{{momentsList}}" wx:for-item="item" wx:for-index="index" wx:key="momentsList">
-  <view class="friend-circle-box" wx:if="{{item.type === 'text'}}">
-    <view class="avatar">
-      <image src="{{usercenterUrl}}/app/user/downloadavatar/{{item.creator}}"></image>
-    </view>
-    <view class="content">
-      <view class="name">{{item.creatorName}}</view>
-      <view class="text">{{item.content}}</view>
-      <view class="date">{{item.gmtCreate}}</view>
-    </view>
-  </view>
-  <view class="friend-circle-box" wx:if="{{item.type === 'photo' && item.photoArray.length === 1}}">
-    <view class="avatar">
-      <image src="{{usercenterUrl}}/app/user/downloadavatar/{{item.creator}}"></image>
-    </view>
-    <view class="content">
-      <view class="name">{{item.creatorName}}</view>
-      <view class="text">{{item.content}}</view>
-      <view class="photo-one">
-        <image src="{{socialUrl}}/route/file/downloadfile/true/{{item.photoArray[0]}}"></image>
-      </view>
-      <view class="date">{{item.gmtCreate}}</view>
-    </view>
-  </view>
-  <view class="friend-circle-box" wx:if="{{item.type === 'photo' && item.photoArray.length > 1}}">
-    <view class="avatar">
-      <image src="{{usercenterUrl}}/app/user/downloadavatar/{{item.creator}}"></image>
-    </view>
-    <view class="content">
-      <view class="name">{{item.creatorName}}</view>
-      <view class="text">{{item.content}}</view>
-      <view class="photo-more">
-        <image src="{{socialUrl}}/route/file/downloadfile/true/{{photo}}" wx:for="{{item.photoArray}}" wx:for-item="photo" wx:for-index="photoIndex" wx:key="photoArray"></image>
-      </view>
-      <view class="date">{{item.gmtCreate}}</view>
-    </view>
-  </view>
-  <view class="friend-circle-box" wx:if="{{item.type === 'video'}}">
-    <view class="avatar">
-      <image src="{{usercenterUrl}}/app/user/downloadavatar/{{item.creator}}"></image>
-    </view>
-    <view class="content">
-      <view class="name">{{item.creatorName}}</view>
-      <view class="text">{{item.content}}</view>
-      <view class="video">
-        <video src="{{socialUrl}}/route/file/downloadfile/true/{{item.video}}"></video>
-      </view>
-      <view class="date">{{item.gmtCreate}}</view>
-    </view>
-  </view>
-</view>
-<view class="new-friend-circle">
-  <view class="box new" bindtap="newFriendCircle">发布</view>
-</view>

pages/myFriendCircle/myFriendCircle.wxss

@@ -1,68 +0,0 @@
-.friend-circle{
-  padding: 15rpx 30rpx;
-  border-bottom: 1px solid #DEDEDE;
-}
-.friend-circle:last-child {
-  border-bottom: none;
-}
-.friend-circle-box{
-  display: flex;
-  justify-content: space-between;
-  padding-bottom: 10rpx;
-}
-
-.avatar{
-  width: 8%;
-}
-.avatar image{
-  width: 100%;
-  height: 50rpx;
-  border-radius: 50rpx;
-}
-.content{
-  width: 90%;
-}
-.name{
-  font-size: 30rpx;
-  color: #949494;
-}
-.text{
-  font-size: 32rpx;
-  color: #000;
-  margin: 10rpx 0;
-}
-.date{
-  font-size: 28rpx;
-  color: #949494;
-}
-.photo-one image{
-  width: 100%;
-}
-.photo-more image{
-  width: 32%;
-  height: 150rpx;
-  margin-right: 2%;
-  margin-bottom: 10rpx;
-}
-.photo-more image:nth-child(3n){
-  margin-right: 0;
-}
-.video video{
-  width: 100%;
-}
-.new-friend-circle{
-  position: fixed;
-  right: 30rpx;
-  bottom: 30rpx;
-}
-.box{
-  width: 100rpx;
-  height: 100rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: #9F1512;
-  color: #fff;
-  font-size: 32rpx;
-  border-radius: 50%;
-}

pages/newsDetail/newsDetail.js

@@ -7,16 +7,25 @@ Page({
    */
   data: {
     newsContentUrl: app.newsContentUrl,
-    templateRecordUrl: null
+    templateRecordUrl: null,
+    content: '',
+    pageUrl: ''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.setData({
+    if (options.content) {
-      templateRecordUrl: options.templateRecordUrl
+      this.setData({
-    })
+        pageUrl: options.content
+      })
+    } else {
+      this.setData({
+        pageUrl: this.data.newsContentUrl + '/' + options.templateRecordUrl
+      })
+    }
+    
   },
 
   /**

pages/newsDetail/newsDetail.wxml

@@ -1,4 +1,13 @@
-<web-view src="{{newsContentUrl}}/{{templateRecordUrl}}" wx:if="{{templateRecordUrl}}"></web-view>
+<web-view src="{{pageUrl}}" class="web-view"></web-view>
+
+
+
+
+
+
+
+
+
 <!-- <view class="news-title">
   <view class="title">银保监会印发《关于加快推进意外险改革的意见》</view>
   <view class="news-info">

pages/newsDetail/newsDetail.wxss

@@ -1,6 +1,10 @@
 /* page{
   background: #d2e0f6;
 } */
+.web-view{
+  width: 100%;
+  height: 100%;
+}
 .news-title{
   padding: 20rpx 30rpx;
 }

pages/newsList/newsList.js

@@ -32,7 +32,6 @@ Page({
   },
   doClickDictionaries: function(event) {
     var self = this;
-    console.log(event.currentTarget.dataset.newsDirectoriesId)
     self.setData({
       currentNewsDictionariesId: event.currentTarget.dataset.newsDirectoriesId
     });
@@ -48,7 +47,6 @@ Page({
   doGetNewsList: function(page, lv) {
     var self = this;
     app.dialog.loading('正在加载');
-    console.log(self.data.currentNewsDictionariesId)
     var info = {
       newsDirectoriesParentId: self.data.directoriesParentId,
       newsDirectoriesId: self.data.currentNewsDictionariesId ? self.data.currentNewsDictionariesId : '',
@@ -71,7 +69,6 @@ Page({
         currentPage: page,
         'news.newsList': newsArray
       })
-      console.log(self.data.news.newsList)
       if(data.rows.length == 0) {
         app.dialog.msg('暂无数据');
         return;
@@ -84,9 +81,15 @@ Page({
     });
   },
   goNewsDetail: function (event) {
-    wx.navigateTo({
+    if (event.currentTarget.dataset.type == '6') {
-      url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
+      wx.navigateTo({
-    })
+        url: '../newsDetail/newsDetail?content='+ event.currentTarget.dataset.content,
+      })
+    } else {
+      wx.navigateTo({
+        url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
+      })
+    }
   },
   getAreaList: function () {
     var self = this;

pages/newsList/newsList.wxml

@@ -26,7 +26,7 @@
   </view>
 <view class="news">
   <view wx:for="{{news.newsList}}" wx:for-index="idx" wx:for-item="item" wx:key="idx">
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_1'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_1'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-small-pic">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
@@ -36,7 +36,7 @@
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_2'}}">
+    <view class="news-box transverse-news" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_2'}}">
       <view class="news-row-img">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
       </view>
@@ -48,7 +48,7 @@
         </view>
       </view>
     </view>
-    <view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_3'}}">
+    <view class="news-box transverse-news" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_3'}}">
       <view class="news-row-info">
         <view class="news-title">{{item.newsContentTitle}}</view>
         <view class="news-info">
@@ -60,7 +60,7 @@
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_4'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_4'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-big-pic">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
@@ -70,14 +70,14 @@
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_5'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_5'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-info">
         <text>来源：{{item.newsContentResource}}</text>
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_6'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_6'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-big-pic">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
@@ -88,7 +88,7 @@
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_7'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_7'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-info voice-box">
         <text>来源：{{item.newsContentResource}}</text>

pages/resource/resource.wxss

@@ -20,6 +20,9 @@
   color: #242424;
   flex-shrink: 0;
   padding: 0 10rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 .tab-box.active{
   color: #9F1512;

pages/template/template.js

@@ -43,7 +43,7 @@ Page({
     } else {
       options.url = decodeURIComponent(options.url)
       this.setData({
-        url: 'https://www.wgink.ink/' + options.url
+        url: 'https://www.xzszwhy.cn/' + options.url
       })
     }
   },

pages/train/train.js

@@ -76,14 +76,22 @@ Page({
   goNewsDetail: function (e) {
     var url = e.currentTarget.dataset.templateRecordUrl
     var link = e.currentTarget.dataset.contentLink
-    if (link) {
+    var content = e.currentTarget.dataset.newsContentContent
+    var type = e.currentTarget.dataset.type
+    if (type == '6') {
       wx.navigateTo({
-        url: '../template/template?link=' + encodeURIComponent(link),
+        url: '../newsDetail/newsDetail?content='+ content,
       })
     } else {
-      wx.navigateTo({
+      if (link) {
-        url: '../template/template?url=' + encodeURIComponent(url),
+        wx.navigateTo({
-      })
+          url: '../template/template?link=' + encodeURIComponent(link),
+        })
+      } else {
+        wx.navigateTo({
+          url: '../template/template?url=' + encodeURIComponent(url),
+        })
+      }
     }
   },
   /**

pages/train/train.wxml

@@ -13,7 +13,7 @@
   </view>
 </view>
 <view class="news">
-  <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" data-content-link="{{item.newsContentLink}}" wx:for="{{trainList}}" wx:key="index">
+  <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" data-content-link="{{item.newsContentLink}}" wx:for="{{trainList}}" wx:key="index">
     <view class="news-title">{{item.newsContentTitle}}</view>
     <view class="news-small-pic">
       <image src="{{newsUrl}}/route/file/downloadfile/true/{{item.newsContentCoverList}}"></image>

pages/volunteer/volunteer.wxml

@@ -1,13 +1,13 @@
 <view class="swiper-box">
   <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" >
     <swiper-item class="swiper-item">
-      <image src="../../images/center-bg.png" class="swiper-img"></image>
+      <image src="../../images/center-bg.jpg" class="swiper-img"></image>
     </swiper-item>
     <swiper-item class="swiper-item">
-      <image src="../../images/center-bg.png" class="swiper-img"></image>
+      <image src="../../images/center-bg.jpg" class="swiper-img"></image>
     </swiper-item>
     <swiper-item class="swiper-item">
-      <image src="../../images/center-bg.png" class="swiper-img"></image>
+      <image src="../../images/center-bg.jpg" class="swiper-img"></image>
     </swiper-item>
   </swiper>
 </view>

utils/settings.js

@@ -0,0 +1,78 @@
+var json = {
+  "nav": [
+    {
+      "title": "展览展示",
+      "icon": "../../images/tab6.png",
+      "url": "newsList",
+      "type": "2",
+      "isShow": true
+    },
+    {
+      "title": "文化动态",
+      "icon": "../../images/tab7.png",
+      "url": "newsList",
+      "type": "1",
+      "isShow": true
+    },
+    {
+      "title": "志愿者服务",
+      "icon": "../../images/tab1.png",
+      "url": "volunteer",
+      "type": "0",
+      "isShow": true
+    },
+    {
+      "title": "精彩活动",
+      "icon": "../../images/tab2.png",
+      "url": "activity",
+      "type": "3",
+      "isShow": true
+    },
+    {
+      "title": "场馆导航",
+      "icon": "../../images/tab3.png",
+      "url": "venue",
+      "type": "3",
+      "isShow": true
+    },
+    {
+      "title": "非遗文化",
+      "icon": "../../images/tab4.png",
+      "url": "heritage",
+      "type": "3",
+      "isShow": true
+    },
+    {
+      "title": "直播点播",
+      "icon": "../../images/tab5.png",
+      "url": "broadcast",
+      "type": "0",
+      "isShow": true
+    },
+    {
+      "title": "在线培训",
+      "icon": "../../images/tab5.png",
+      "url": "train",
+      "type": "0",
+      "isShow": true
+    },
+    {
+      "title": "文化旅游",
+      "icon": "../../images/tab6.png",
+      "url": "travel",
+      "type": "0",
+      "isShow": true
+    },
+    {
+      "title": "数图资源",
+      "icon": "../../images/tab4.png",
+      "url": "resource",
+      "type": "0",
+      "isShow": true
+    }
+  ],
+  "showLive": false
+}
+module.exports = {
+  setting: json
+}

webview/flv/index.html

@@ -3,6 +3,10 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0"/>
+    <meta http-equiv="cache-control" content="no-cache">
+    <meta http-equiv="pragma" content="no-cache">
+    <META http-equiv="Cache-Control" content="no-cache, must-revalidate">
+    <META http-equiv="expires" content="0">
     <title>直播历史</title>
     <link rel="stylesheet" href="css/reset.css">
     <link rel="stylesheet" href="css/style.css">
@@ -62,13 +66,14 @@
                 var self = this;
                 var layIndex = null;
                 $.ajax({
-                    url: self.liveUrl +'/app/liverecord/listpageliverecordrelease/'+ self.livePlanId,
+                    url: self.liveUrl +'/app/liverecord/listpageliverecordrelease/'+ self.livePlanId + '?t=' + new Date().getTime(),
                     type: 'GET',
                     contentType: "application/json;charset=utf-8",
                     headers: {},
                     data: 'page='+ page +'&rows='+ self.rows,
                     success: function (data, status, XMLHttpRequest) {
                         var responseCode = XMLHttpRequest.status;
+                        console.log(liveRecordArray)
                         if(data.rows.length === 0) {
                             layer.open({
                                 content: '暂无数据',
@@ -118,6 +123,7 @@
         mounted: function() {
             var self = this;
             var pathParams = this.getPathParams(window.location.href);
+            console.log(pathParams)
             self.livePlanId = pathParams.livePlanId;
             self.liveUrl = decodeURI(pathParams.liveUrl);
             self.liveRecordUrl = decodeURI(pathParams.liveRecordUrl);