update

app.json

@@ -1,19 +1,22 @@
 {
   "pages": [
-    "pages/search/search",
-    "pages/index/index",
+   
     "pages/learning/learning",
-    "pages/collect/collect",
+    "pages/conference/conference",  
+      "pages/eventDetail/eventDetail",
+    "pages/index/index", 
    
-    "pages/knowledge/knowledge",
-    "pages/list/list",
-    "pages/actDetail/actDetail",
+    "pages/collect/collect",
+    "pages/search/search",
+    "pages/knowledge/knowledge",   
+    "pages/list/list",   
+    "pages/actDetail/actDetail",    
     
     
     
-    "pages/jInfo/jInfo",
-    "pages/eventDetail/eventDetail",
-    "pages/journalDetail/journalDetail",
+    "pages/jInfo/jInfo", 
+       
+    "pages/journalDetail/journalDetail", 
     
     "pages/mine/mine"   
   ],

pages/collect/collect.js

@@ -1,4 +1,6 @@
 // pages/collect/collect.js
+const app = getApp()
+var host = app.globalData.host;
 Page({
 
   /**
@@ -12,7 +14,27 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    wx.showNavigationBarLoading();
+    wx.getStorage({
+      key: 'uid',
+      success: res => {
+        if (res.data) {
+          wx.request({
+            url: host + '/api/user/collection',
+            method: 'GET',
+            data: {uid:res.data},
+            success: result=>{
+              wx.hideNavigationBarLoading()
+              this.setData({
+                list: result.data.data.list
+              })
+            }
+          })
+        }
+      },
+    })
+
+    
   },
 
   /**

pages/collect/collect.wxml

@@ -1,4 +1,4 @@
-<navigator url="../actDetail/actDetail?id={{item.id}}" class="list" wx:for='{{list}}' wx:key="journals{{index}}">
+<navigator url="../actDetail/actDetail?id={{item.id}}" class="list" wx:for='{{list}}' wx:key="journals{{index}}" wx:if='{{item.target_type== "article"}}'>
               <image   src="{{item.img}}"></image>
               <view>
                   <view class="title">{{item.name}}</view>
@@ -6,18 +6,18 @@
                               <view>
                                   <text>2018.5.28</text>
                               </view>
-                              <text>作者：包为民</text>
-                              <text>《中国科学院》</text> 
+                              <text>作者：{{item.author}}</text>
+                              <text>{{}}</text> 
                   </view>
-                  <text class="">主办单位：{{item.desc}}</text>
+                  <text class="">{{item.desc}}</text>
               </view>
 </navigator>
 
-<navigator class="list" wx:for='{{list}}' wx:key="conference{{index}}">
+<!-- <navigator class="list" wx:for='{{list}}' wx:key="conference{{index}}">
                       <image  mode="widthFix" src="{{item.img}}"></image>
                       <view>
                           <view class="tt">{{item.name}}  </view>
                           <text class="hd_ly">来源 :地球化学研究所 <text>{{item.publish_time}}</text></text>
                           <text>{{item.desc}}</text>
                       </view>
-</navigator> 
+</navigator>  -->

pages/conference/conference.js

@@ -0,0 +1,92 @@
+// pages/conference/conference.js
+const app = getApp()
+var host = app.globalData.host;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    info:{}
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    options.id=6;
+    var that = this;
+    wx.showNavigationBarLoading()
+    var that = this;
+    wx.request({
+      url: host + '/api/detail',
+      method: 'GET',
+      data: {
+        type: 'activity',
+        id: options.id
+      },
+      success: function (res) {
+        wx.hideNavigationBarLoading();
+        that.setData({
+          info: res.data.data
+        })
+      },
+      fail: function () {
+        wx.hideLoading();
+        wx.showToast({
+          title: '服务器开小差啦！',
+          icon: 'none'
+        })
+      }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/conference/conference.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "活动详情"
+}

pages/conference/conference.wxml

@@ -0,0 +1,18 @@
+<view class='name'>{{info.name}}</view>
+
+<view class="info">
+  <text>发布单位：{{info.publish_unit}}</text>
+  <text>主办方：{{info.hold_unit}}</text>
+  <text>承办方：{{info.assist_unit}}</text>
+  <text>发表时间：{{info.begin_time}}</text>
+</view>
+
+<view class="title">活动简介：</view>
+<view class="content">
+  {{info.desc}}
+</view>
+
+<view class="title">活动内容：</view>
+<view class="content">
+  <rich-text nodes='{{info.content}}'></rich-text>
+</view>

pages/conference/conference.wxss

@@ -0,0 +1,25 @@
+/* pages/conference/conference.wxss */
+page{
+  background: #fff;
+}
+.name{
+  font-size: 36rpx;
+  text-align: center;
+  color: #000;
+  margin-bottom: 30rpx;
+}
+.info text{
+  color: #666;
+  display: block;
+  margin-bottom: 20rpx;
+}
+.title{
+  font-size: 32rpx;
+  color: #000;
+  margin-bottom: 20rpx;
+}
+.content{
+  color: #666;
+  line-height: 52rpx;
+  margin-bottom: 20rpx;
+}

pages/eventDetail/eventDetail.js

@@ -1,26 +1,55 @@
-// pages/eventDetail/eventDetail.js
+// pages/actDetail/actDetail.js
+const app = getApp()
+var host = app.globalData.host;
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-      zk1:0,
-      zk2:0,
-      sex_array:['男','女'],
-      sex:-1,
-      job_array: ['中科院单位', '非中科院单位'],
-      job: 0,
-      show:0
+    info: {},
+    uid: '',
+    zk1: 0,
+    zk2: 0,
+    sex_array: ['男', '女'],
+    sex: -1,
+    job_array: ['中科院单位', '非中科院单位'],
+    job: 0,
+    show: 0
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    // options.id=1;
+    var that = this;
+    wx.showNavigationBarLoading()
+    var that = this;
+    wx.request({
+      url: host + '/api/detail',
+      method: 'GET',
+      data: {
+        type: 'conference',
+        id: options.id
+      },
+      success: function (res) {
+        wx.hideNavigationBarLoading();
+        that.setData({
+          info: res.data.data
+        })
+      },
+      fail: function () {
+        wx.hideLoading();
+        wx.showToast({
+          title: '服务器开小差啦！',
+          icon: 'none'
+        })
+      }
+    })
 
   },
-  open:function(){
+  open: function () {
     this.setData({
       show: 1
     })
@@ -30,9 +59,9 @@ Page({
       show: 0
     })
   },
-  zk1:function(){
+  zk1: function () {
     this.setData({
-      zk1:1
+      zk1: 1
     })
   },
   sq1: function () {

pages/eventDetail/eventDetail.json

@@ -1,3 +1,3 @@
 {
-  "usingComponents": {}
+ "navigationBarTitleText": "会议详情"
 }

pages/eventDetail/eventDetail.wxml

@@ -1,25 +1,25 @@
-<image class='banner'  mode="widthFix" src="../images/233.jpg"></image>
+<image class='banner'  mode="widthFix" src="{{info.img}}"></image>
 <view class="info">
-    <view>尼古丁对记忆的影响</view>
-    <text>主办单位：化学学报</text>
-    <text>主讲人：孟迎芳</text>
-    <text>时间：2018年8月8日   14：00-16：00</text>
-    <text>地址：鸟巢</text>
+    <view>{{info.name}}</view>
+    <text>主办单位：{{info.organizer_info.name}}</text>
+    <text>主讲人：{{info.speaker}}</text>
+    <text>时间：{{info.uptime}} </text>
+    <text>地址：{{info.province}}{{info.area}}</text>
 </view>
 
 <view class="content">
     <view class="tt">会议简介</view>
     <view class="p {{zk1==1?'':'sq'}}">
-      尼古丁是一种与记忆密切相关的物质,以往研究主要探讨不同胆碱类药物对外显记忆的影响,内隐记忆受胆碱影响与外显记忆是否相同仍存在争议。实验1采用尼古丁是一种与记忆密切相关的物质尼古丁是一种与记忆密切相关的物质尼古丁是一种与记忆密切相关的物质
+      {{info.desc}}
     </view>
     <text bindtap="sq1" class="zksq" wx:if='{{zk1}}'>收起</text>
     <text bindtap="zk1" class="zksq"  wx:if='{{!zk1}}'>展开</text>
 </view>
 
 <view class="content">
-    <view class="tt">化学学报</view>
+    <view class="tt">{{info.organizer_info.name}}</view>
     <view class="p {{zk2==1?'':'sq'}}">
-      尼古丁是一种与记忆密切相关的物质,以往研究主要探讨不同胆碱类药物对外显记忆的影响,内隐记忆受胆碱影响与外显记忆是否相同仍存在争议。实验1采用尼古丁是一种与记忆密切相关的物质尼古丁是一种与记忆密切相关的物质尼古丁是一种与记忆密切相关的物质
+      {{info.organizer_info.desc}}
     </view>
     <text bindtap="sq2" class="zksq" wx:if='{{zk2}}'>收起</text>
     <text bindtap="zk2" class="zksq"  wx:if='{{!zk2}}'>展开</text>

pages/index/index.js

@@ -16,7 +16,8 @@ Page({
     journals:[],
     organizers:[],
     subjects:[],
-    show:1
+    show:1,
+    uid:''
   },
 
 
@@ -28,7 +29,7 @@ Page({
       key: 'uid',
       success: res => {
         if (res.data) {
-          this.setData({ show: 0 })
+          this.setData({ show: 0 ,uid:res.data})
         }
       },
     })
@@ -60,31 +61,33 @@ Page({
     })
   },
   //获取所有数据
-  getData:function(){
+  getData:function(flag){
     wx.showNavigationBarLoading()
     var that=this;
-    wx.request({
-      url: host+'/api/index/banners',
-      method:'GET',
-      success:function(res){
-          that.setData({
-            lb: res.data.data.banners
+    if(!flag){
+      wx.request({
+        url: host+'/api/index/banners',
+        method:'GET',
+        success:function(res){
+            that.setData({
+              lb: res.data.data.banners
+            })
+        },
+        fail: function () {
+          wx.hideNavigationBarLoading()
+          wx.showToast({
+            title: '服务器开小差啦！',
+            icon: 'none'
           })
-      },
-      fail: function () {
-        wx.hideNavigationBarLoading()
-        wx.showToast({
-          title: '服务器开小差啦！',
-          icon: 'none'
-        })
-      }
-    })
+        }
+      })
+    }
     // 全刊
     wx.request({
       url: host + '/api/index/journals',
       method: 'GET',
       success: function (res) {
-        wx.hideLoading()
+        wx.hideNavigationBarLoading()
         that.setData({
           journals: res.data.data.journals
         })
@@ -94,6 +97,9 @@ Page({
     wx.request({
       url: host + '/api/index/organizers',
       method: 'GET',
+      data:{
+        uid:this.data.uid
+      },
       success: function (res) {
         that.setData({
           organizers: res.data.data.list
@@ -104,6 +110,9 @@ Page({
     wx.request({
       url: host + '/api/index/subjects',
       method: 'GET',
+      data: {
+        uid: this.data.uid
+      },
       success: function (res) {
         that.setData({
           subjects: res.data.data.list
@@ -111,20 +120,51 @@ Page({
       }
     })
   }, 
+  search:function(){
+    wx.navigateTo({
+      url: '../search/search',
+    })
+  },
   //置顶
   top: function(e){
+    var that=this;
       wx.request({
         url: host+'/api/index/totop',
         method:'PUT',
         data:{
           id:e.target.dataset.id,
-          type: e.target.dataset.type
+          type: e.target.dataset.type,
+          uid:this.data.uid,
+          action:'do'
         },
         success:function(res){
-          console.log(res.data)
+          wx.showToast({
+            title: '置顶成功',
+            icon:'none'
+          })
+          that.getData(1)
         }
       })
   },
+  cancel_top: function (e) {
+    wx.request({
+      url: host + '/api/index/totop',
+      method: 'PUT',
+      data: {
+        id: e.target.dataset.id,
+        type: e.target.dataset.type,
+        uid: this.data.uid,
+        action:'cancel'
+      },
+      success: function (res) {
+        wx.showToast({
+          title: '已取消',
+          icon: 'none'
+        })
+        that.getData(1)
+      }
+    })
+  },
   tab:function(e){
     this.setData({
       act: e.target.dataset.id

pages/index/index.wxml

@@ -1,5 +1,5 @@
-<view class="search" wx:if="{{act!=3}}">
-    <input placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
+<view class="search" bindtap='search' wx:if="{{act!=3}}">
+    <input  placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
     <image  mode="widthFix" src="../images/search.png"></image>
 </view>
 
@@ -11,7 +11,7 @@
           </swiper-item>
         </block>
 </swiper>
-<view class="search" wx:if="{{act==3}}"  style="margin-bottom:20rpx;">
+<view class="search"  wx:if="{{act==3}}"  style="margin-bottom:20rpx;">
     <input placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
     <image  mode="widthFix" src="../images/search.png"></image>
 </view>
@@ -51,7 +51,7 @@
   <swiper-item>
       <scroll-view  scroll-y="true">
           <view class="dw" wx:for='{{organizers}}' wx:key="organizers{{index}}">
-              <navigator class="dw_title" url="../list/list?id={{item.id}}">
+              <navigator class="dw_title" url="../list/list?organizer_id={{item.id}}&title={{item.name}}">
                 <view>{{item.name}}</view>
                 <image mode="widthFix"  src="../images/left.png"></image><text wx:if='{{item.total_journal>0}}'>{{item.total_journal}} </text>
                </navigator>
@@ -60,7 +60,7 @@
                         <view>{{jour.name}}</view>
                         <text>{{jour.desc}}</text>
                     </navigator>
-                    <view wx:if='{{index==0}}' bindtap="cancel_top" data-type='organizer' data-id='{{item.id}}' class="top cancel">取消置顶</view>
+                    <view wx:if='{{item.istop}}' bindtap="cancel_top" data-type='organizer' data-id='{{item.id}}' class="top cancel">取消置顶</view>
                     <view wx:else bindtap="top" data-type='organizer' data-id='{{item.id}}' class="top">置顶</view>
               </view>
           </view>
@@ -70,7 +70,7 @@
   <swiper-item>
       <scroll-view scroll-y="true">
           <view class="dw" wx:for='{{subjects}}' wx:key="*this">
-              <navigator class="dw_title" url="../list/list?id={{item.id}}"><view>{{item.name}}</view>
+              <navigator class="dw_title" url="../list/list?subject_id={{item.id}}&title={{item.name}}"><view>{{item.name}}</view>
               <image mode="widthFix"  src="../images/left.png"></image>
               <text wx:if='{{item.total_journal>0}}'>{{item.total_journal}} </text> 
               </navigator>
@@ -79,7 +79,7 @@
                         <view>{{jour.ename}}</view>
                         <text>{{jour.desc}}</text>
                     </navigator>
-                    <view wx:if='{{index==0}}' bindtap="cancel_top" data-type='subject' data-id='{{item.subject_id}}' class="top cancel">取消置顶</view>
+                    <view wx:if='{{item.istop}}' bindtap="cancel_top" data-type='subject' data-id='{{item.subject_id}}' class="top cancel">取消置顶</view>
                     <view wx:else bindtap="top" data-id='{{item.subject_id}}' data-type='subject' class="top">置顶</view>
               </view>
           </view>

pages/learning/learning.js

@@ -18,6 +18,7 @@ Page({
     array: ['时间正序', '时间倒序'],
     val: ['ctime', '-ctime'],
     index: 0,
+    show_tj:0
   },
 
   /**
@@ -90,6 +91,21 @@ Page({
       }
     })
   },
+  // 查看更多
+  more:function(e){
+    var type=e.target.dataset.id;
+    //精品推荐
+    if(type == 1){
+        this.setData({show_tj:1})
+    }else{
+      this.setData({ act: type-1 })
+    }
+  },
+  search: function (e) {
+    wx.navigateTo({
+      url: '../search/search',
+    })
+  },
   showmenu: function () {
     this.setData({
       show: !this.data.show
@@ -98,18 +114,21 @@ Page({
   check: function (e) {
     this.setData({
       show: 0,
+      
       index: e.target.dataset.id
     })
     this.getData();
   },
   tab: function (e) {
     this.setData({
-      act: e.target.dataset.id
+      act: e.target.dataset.id,
+      show_tj: 0
     })
   },
   swchange: function (e) {
     this.setData({
-      act: e.detail.current
+      act: e.detail.current,
+      show_tj: 0
     })
   },
   /**

pages/learning/learning.wxml

@@ -1,5 +1,5 @@
-<view class="search">
-    <input placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
+<view class="search" bindtap='search'>
+    <input   placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
     <image  mode="widthFix" src="../images/search.png"></image>
 </view>
 <view class="menu">
@@ -21,105 +21,139 @@
 <swiper circular="{{true}}" style="height:83vh;" bindchange='swchange' current='{{act}}' autoplay="{{false}}">
   <swiper-item>
       <scroll-view scroll-y="true">
-          <view class="part">
-              <view class="title">精品推荐   <navigator>查看更多</navigator></view>
-              <view class="tj">
-                  <navigator wx:for="{{arct}}">
-                    <image  mode="widthFix" src="{{item.img}}"></image>
-                    <view>{{item.name}}</view>
-                    <text>{{item.desc}}</text>
-                  </navigator>  
+          <block wx:if='{{!show_tj}}'>
+              <view class="part">
+                  <view class="title">精品推荐   <text bindtap="more" data-id='1'>查看更多</text></view>
+                  <view class="tj">
+                      <navigator wx:for="{{arct}}" url="../conference/conference?id={{item.id}}" wx:if='{{index<3}}'>
+                        <image  mode="widthFix" src="{{item.img}}"></image>
+                        <view>{{item.name}}</view>
+                        <text>{{item.desc}}</text>
+                      </navigator>  
+                  </view>
               </view>
-          </view>
 
-          <view class="part">
-              <view class="title">热门活动   <navigator>查看更多</navigator></view>
-              <view class="hd">
-                  <navigator class="list" wx:for='{{hot_arct}}' wx:key="hot_arct{{index}}">
-                      <image  mode="widthFix" src="{{item.img}}"></image>
-                      <view>
-                          <view class="tt">{{item.name}}  </view>
-                          <text class="ly">来源 :地球化学研究所 <text>2018.5.28</text></text>
-                          <text>{{item.desc}}</text>
-                      </view>
-                  </navigator> 
+              <view class="part">
+                  <view class="title">热门会议   <text bindtap="more" data-id='2'>查看更多</text></view>
+                  <view class="hd">
+                      <navigator class="list" wx:for='{{hot_arct}}' wx:key="hot_arct{{index}}"  url="../eventDetail/eventDetail?id={{item.id}}">
+                          <image  mode="widthFix" src="{{item.img}}"></image>
+                          <view>
+                              <view class="tt">{{item.name}}  </view>
+                              <text class="hd_ly">来源 :{{item.organizer_name}} <text>{{item.publish_time}}</text></text>
+                              <text>{{item.desc}}</text>
+                          </view>
+                      </navigator> 
+                  </view>
               </view>
-          </view>
 
-          <view class="part">
-              <view class="title">活动预告   <navigator>查看更多</navigator></view>
-              <view class="hd">
-                  <navigator class="list" wx:for='{{pre_arct}}' wx:key="pre_arct{{index}}">
-                      <image  mode="widthFix" src="{{item.img}}"></image>
-                      <view>
-                          <view class="tt">{{item.name}}  </view>
-                          <text class="ly">来源 :地球化学研究所 <text>2018.5.28</text></text>
-                          <text>{{item.desc}}</text>
-                      </view>
-                  </navigator> 
+              <view class="part">
+                  <view class="title">活动预告   <text bindtap="more" data-id='3'>查看更多</text></view>
+                  <view class="hd">
+                      <navigator class="list" wx:for='{{pre_arct}}' wx:key="pre_arct{{index}}" url="../conference/conference?id={{item.id}}" >
+                          <image  mode="widthFix" src="{{item.img}}"></image>
+                          <view>
+                              <view class="tt">{{item.name}}  </view>
+                              <view class="ly"> 
+                                  <view>
+                                      <text>{{item.begin_time}}</text>
+                                  </view>
+                                  <text>主讲人:{{item.speaker}}</text>
+                                  <text>{{item.publish_unit}}</text> 
+                              </view>
+                              <text>{{item.desc}}</text>
+                          </view>
+                      </navigator> 
+                  </view>
               </view>
-          </view>
 
-          <view class="part">
-              <view class="title">活动回顾   <navigator>查看更多</navigator></view>
-              <view class="hd">
-                  <navigator class="list" wx:for='{{over_arct}}' wx:key="over_arct{{index}}">
+              <view class="part">
+                  <view class="title">活动回顾   <text bindtap="more" data-id='4'>查看更多</text></view>
+                  <view class="hd">
+                      <navigator class="list" wx:for='{{over_arct}}' wx:key="over_arct{{index}}" url="../conference/conference?id={{item.id}}" >
+                          <image  mode="widthFix" src="{{item.img}}"></image>
+                          <view>
+                              <view class="tt">{{item.name}}  </view>
+                              <view class="ly"> 
+                                  <view>
+                                      <text>{{item.begin_time}}</text>
+                                  </view>
+                                  <text>主讲人:{{item.speaker}}</text>
+                                  <text>{{item.publish_unit}}</text> 
+                              </view>
+                              <text>{{item.desc}}</text>
+                          </view>
+                      </navigator> 
+                  </view>
+              </view>
+          </block>
+          <block wx:else>
+              <!-- 全部推荐 -->
+            <view class="part">
+                <navigator class="list" wx:for='{{arct}}' wx:key="prearct{{index}}" url="../conference/conference?id={{item.id}}" >
                       <image  mode="widthFix" src="{{item.img}}"></image>
                       <view>
                           <view class="tt">{{item.name}}  </view>
-                          <text class="ly">来源 :地球化学研究所 <text>2018.5.28</text></text>
+                          <view class="ly"> 
+                              <view>
+                                  <text>{{item.begin_time}}</text>
+                              </view>
+                              <text>主讲人:{{item.speaker}}</text>
+                              <text>{{item.publish_unit}}</text> 
+                          </view>
                           <text>{{item.desc}}</text>
                       </view>
-                  </navigator> 
-              </view>
-          </view>
+                </navigator> 
+            </view>
+          </block>
       </scroll-view>
   </swiper-item>
+  <!-- 学术会议 -->
   <swiper-item>
       <scroll-view class="content" scroll-y="true">
-                <navigator class="list" wx:for='{{conference}}' wx:key="conference{{index}}">
+                <navigator class="list" wx:for='{{conference}}' wx:key="conference{{index}}" url="../eventDetail/eventDetail?id={{item.id}}">
                       <image  mode="widthFix" src="{{item.img}}"></image>
                       <view>
                           <view class="tt">{{item.name}}  </view>
-                          <text class="hd_ly">来源 :地球化学研究所 <text>{{item.publish_time}}</text></text>
+                          <text class="hd_ly">来源 :{{item.organizer_name}} <text>{{item.publish_time}}</text></text>
                           <text>{{item.desc}}</text>
                       </view>
                   </navigator> 
       </scroll-view>
   </swiper-item>
+  <!-- 活动预告 -->
   <swiper-item>
       <scroll-view class="content" scroll-y="true">
-                <navigator class="list" wx:for='{{pre}}' wx:key="pre{{index}}">
+                <navigator class="list" wx:for='{{pre}}' wx:key="pre{{index}}" url="../conference/conference?id={{item.id}}" >
                       <image  mode="widthFix" src="{{item.img}}"></image>
                       <view>
                           <view class="tt">{{item.name}}  </view>
                           <view class="ly"> 
                               <view>
-                                  <text>2018.5.28</text>
-                                  <text>地址：中国科学院</text>
+                                  <text>{{item.begin_time}}</text>
                               </view>
-                              <text>作者：包为民</text>
-                              <text>中国科学院</text> 
+                              <text>主讲人:{{item.speaker}}</text>
+                              <text>{{item.publish_unit}}</text> 
                           </view>
                           <text>{{item.desc}}</text>
                       </view>
                   </navigator> 
       </scroll-view>
   </swiper-item>
-
+  <!-- 活动回顾 -->
   <swiper-item>
       <scroll-view class="content" scroll-y="true">
-                <navigator class="list" wx:for='{{over}}' wx:key="over{{index}}">
+                <navigator class="list" wx:for='{{over}}' wx:key="over{{index}}" url="../conference/conference?id={{item.id}}" >
                       <image  mode="widthFix" src="{{item.img}}"></image>
                       <view>
                           <view class="tt">{{item.name}}  </view>
                           <view class="ly"> 
                               <view>
-                                  <text>2018.5.28</text>
-                                  <text>地址：中国科学院</text>
+                                  <text>{{item.begin_time}}</text>
+                                  <!-- <text>地址：中国科学院</text> -->
                               </view>
-                              <text>作者：包为民</text>
-                              <text>中国科学院</text> 
+                              <text>主讲人:{{item.speaker}}</text>
+                              <text>{{item.publish_unit}}</text> 
                           </view>
                           <text>{{item.desc}}</text>
                       </view>

pages/learning/learning.wxss

@@ -30,7 +30,7 @@ scroll-view{
   color: #333;
   margin-bottom: 28rpx;
 }
-.title navigator{
+.title text{
   float: right;
   color: #3780CD;
   font-size: 26rpx;

pages/list/list.js

@@ -7,32 +7,51 @@ Page({
    * 页面的初始数据
    */
   data: {
-    list:[]
+    list:[],
+    subject_id:'',
+    organizer_id:''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    this.setData({
+      subject_id: options.subject_id,
+      organizer_id: options.organizer_id
+    })
+    wx.setNavigationBarTitle({
+      title: options.title,
+    })
     this.getData();
   },
   getData(){
-        var that = this;
-        wx.showLoading({
-          title: '加载中',
-        })
+    var that = this, data = { keyword:''};
+        wx.showNavigationBarLoading()
+        if (this.data.subject_id){
+          data.subject_id = this.data.subject_id
+        }
+        if (this.data.organizer_id) {
+          data.organizer_id = this.data.organizer_id
+        }
         wx.request({
-          url: host + '/api/index/journals',
+          url: host + '/api/journals/list',
           method: 'GET',
+          data:data,
           success: function (res) {
-            wx.hideLoading();
+            wx.hideNavigationBarLoading()
             that.setData({
-              list: res.data.data.journals[0].journals
+              list: res.data.data.list
             })
           }
         })
   },
-
+  search: function (e) {
+    this.setData({
+      keyword: e.detail.value
+    })
+    this.getData();
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/list/list.wxml

@@ -1,5 +1,5 @@
 <view class="search">
-    <input placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
+    <input  bindinput='search'  placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
     <image  mode="widthFix" src="../images/search.png"></image>
 </view>
 
@@ -9,6 +9,6 @@
                   <view class="title">{{item.name}}</view>
                   <text>微信号：{{item.wxcode}}</text>
                   <text>主编：{{item.editor}}</text>
-                  <text class="">主办单位：{{item.publishingUnit}}</text>
+                  <text class="">主办单位：{{item.organizers}}</text>
               </view>
 </navigator>

pages/mark.json

@@ -0,0 +1,11 @@
+    // "pages/conference/conference", //活动详情
+    // "pages/learning/learning", //学术交流
+    // "pages/index/index",
+    // "pages/collect/collect",收藏
+    // "pages/search/search", 搜索
+    // "pages/knowledge/knowledge", //知识服务
+    // "pages/list/list", //期刊列表
+    // "pages/actDetail/actDetail", //文章详情
+    // "pages/jInfo/jInfo", //期刊简介
+    // "pages/eventDetail/eventDetail", //会议详情
+    // "pages/journalDetail/journalDetail", //期刊详情

pages/search/search.js

@@ -7,7 +7,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    info:{}
   },
 
   /**
@@ -20,7 +20,7 @@ Page({
       method: 'GET',
       success: function (res) {
         that.setData({
-          
+          info:res.data.data
         })
       }
     })

pages/search/search.wxml

@@ -4,20 +4,17 @@
 </view>
 <view class="part">
     <view class="title">搜索指定内容</view>
-    <text>主办单位</text><text>文章</text>
-    <text>学术会议</text><text>期刊</text>
-    <text>学科</text>
+    <text wx:for='{{info.navs}}'>{{item.name}}</text>
 </view>
 <view class="part">
     <view class="title">搜索记录</view>
-    <navigator>高科技</navigator><navigator>物理</navigator>
+    <navigator wx:for='{{info.history}}'>{{item}}</navigator>
 </view>
 <view class="part">
     <view class="title">冷词</view>
-    <navigator>高科技</navigator><navigator>物理</navigator>
+    <navigator wx:for='{{info.cold_keyword}}'>{{item}}</navigator>
 </view>
 <view class="part">
     <view class="title">热词</view>
-    <navigator>高科技</navigator><navigator>物理</navigator>
-    <navigator>高科技</navigator><navigator>物理</navigator>
+    <navigator wx:for='{{info.hot_keyword}}'>{{item}}</navigator>
 </view>