update

app.json

@@ -1,17 +1,20 @@
 {
   "pages": [
-    
-    "pages/knowledge/knowledge",
+    "pages/search/search",
     "pages/index/index",
+    "pages/learning/learning",
+    "pages/collect/collect",
+   
+    "pages/knowledge/knowledge",
     "pages/list/list",
     "pages/actDetail/actDetail",
-    "pages/search/search",
+    
     
     
     "pages/jInfo/jInfo",
     "pages/eventDetail/eventDetail",
     "pages/journalDetail/journalDetail",
-    "pages/learning/learning",
+    
     "pages/mine/mine"   
   ],
   "window": {

pages/actDetail/actDetail.js

@@ -17,9 +17,7 @@ Page({
   onLoad: function (options) {
     // options.id=89;
     var that = this;
-    wx.showLoading({
-      title: '加载中',
-    })
+    wx.showNavigationBarLoading()
     wx.getStorage({
       key: 'uid',
       success: function (res) {
@@ -43,7 +41,7 @@ Page({
         uid: this.data.uid
       },
       success: function (res) {
-        wx.hideLoading();
+        wx.hideNavigationBarLoading();
         that.setData({
           info: res.data.data
         })

pages/actDetail/actDetail.json

@@ -1,3 +1,3 @@
 {
-  "usingComponents": {}
+  "navigationBarTitleText": "内容详情"
 }

pages/collect/collect.js

@@ -0,0 +1,66 @@
+// pages/collect/collect.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/collect/collect.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我的收藏"
+}

pages/collect/collect.wxml

@@ -0,0 +1,23 @@
+<navigator url="../actDetail/actDetail?id={{item.id}}" class="list" wx:for='{{list}}' wx:key="journals{{index}}">
+              <image   src="{{item.img}}"></image>
+              <view>
+                  <view class="title">{{item.name}}</view>
+                  <view class="ly"> 
+                              <view>
+                                  <text>2018.5.28</text>
+                              </view>
+                              <text>作者：包为民</text>
+                              <text>《中国科学院》</text> 
+                  </view>
+                  <text class="">主办单位：{{item.desc}}</text>
+              </view>
+</navigator>
+
+<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> 

pages/collect/collect.wxss

@@ -0,0 +1,68 @@
+/* pages/collect/collect.wxss */
+.list{
+  /* box-shadow: 0px 2rpx 9rpx 0px rgba(0, 0, 0, 0.2); */
+  /* border-radius: 20rpx; */
+  display: flex;
+  /* padding: 20rpx; */
+  /* box-shadow: 0 0 15rpx 0px rgba(0, 0, 0, 0.2); */
+  /* margin: 0 20rpx 40rpx; */
+  border-bottom: 1px solid #F0F0F0;
+  padding: 28rpx 0;
+  
+}
+.list image{
+  width: 20%;
+  max-height: 100px;
+}
+.list>view{
+  width: 80%;
+  vertical-align: middle;
+  padding-left: 20rpx;  
+}
+.list .tt{
+  margin-bottom: 20rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  font-size: 28rpx;
+}
+.list text{
+  color: #999;
+  display: block;
+  overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    white-space: normal;
+    font-size: 26rpx;
+}
+.list .hd_ly{
+  margin-bottom: 40rpx;
+  color: #666;
+}
+.hd_ly text{
+  font-size: 18rpx;
+  float: right;
+  margin-top: 5rpx;
+}
+.content{
+  background: #fff;
+  border-radius: 18rpx;
+  padding: 20rpx;
+}
+.ly{
+  margin-bottom: 28rpx;
+}
+.ly text{
+  display: block;
+  color: #666;
+  font-size: 22rpx;
+}
+.ly view{
+  float: right;
+  text-align: right;
+}
+.ly view text{
+  font-size: 18rpx;
+}

pages/index/index.js

@@ -61,9 +61,7 @@ Page({
   },
   //获取所有数据
   getData:function(){
-    wx.showLoading({
-      title: '加载中',
-    })
+    wx.showNavigationBarLoading()
     var that=this;
     wx.request({
       url: host+'/api/index/banners',
@@ -74,7 +72,7 @@ Page({
           })
       },
       fail: function () {
-        wx.hideLoading();
+        wx.hideNavigationBarLoading()
         wx.showToast({
           title: '服务器开小差啦！',
           icon: 'none'
@@ -120,7 +118,7 @@ Page({
         method:'PUT',
         data:{
           id:e.target.dataset.id,
-          type:'subject'
+          type: e.target.dataset.type
         },
         success:function(res){
           console.log(res.data)

pages/index/index.wxml

@@ -60,8 +60,8 @@
                         <view>{{jour.name}}</view>
                         <text>{{jour.desc}}</text>
                     </navigator>
-                    <view wx:if='{{index==0}}' bindtap="cancel_top" class="top cancel">取消置顶</view>
-                    <view wx:else bindtap="top" data-id='{{item.id}}' class="top">置顶</view>
+                    <view wx:if='{{index==0}}' 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>
       </scroll-view>
@@ -79,8 +79,8 @@
                         <view>{{jour.ename}}</view>
                         <text>{{jour.desc}}</text>
                     </navigator>
-                    <view wx:if='{{index==0}}' bindtap="cancel_top" class="top cancel">取消置顶</view>
-                    <view wx:else bindtap="top" data-id='{{item.subject_id}}' class="top">置顶</view>
+                    <view wx:if='{{index==0}}' 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>
       </scroll-view>

pages/journalDetail/journalDetail.js

@@ -16,9 +16,7 @@ Page({
   onLoad: function (options) {
     // options.id=353;
     var that = this;
-    wx.showLoading({
-      title: '加载中',
-    })
+    wx.showNavigationBarLoading()
     wx.request({
       url: host + '/api/detail',
       method: 'GET',
@@ -27,13 +25,13 @@ Page({
         id: options.id
       },
       success: function (res) {
-        wx.hideLoading();
+        wx.hideNavigationBarLoading()
         that.setData({
           info:res.data.data
         })
       },
       fail: function () {
-        wx.hideLoading();
+        wx.hideNavigationBarLoading();
         wx.showToast({
           title: '服务器开小差啦！',
           icon:'none'

pages/knowledge/knowledge.js

@@ -42,11 +42,7 @@ Page({
   },
   //获取所有数据
   getData: function () {
-    if(this.data.keyword == ''){
-      wx.showLoading({
-        title: '加载中',
-      })
-    }
+    wx.showNavigationBarLoading()
     var that = this;
     var index=this.data.index;
     wx.request({
@@ -57,7 +53,7 @@ Page({
         keyword:this.data.keyword
       },
       success: function (res) {
-        wx.hideLoading();
+        wx.hideNavigationBarLoading()
         that.setData({
           list: res.data.data.list
         })

pages/knowledge/knowledge.json

@@ -1,3 +1,3 @@
 {
-  "usingComponents": {}
+  "navigationBarTitleText": "知识服务"
 }

pages/learning/learning.js

@@ -7,10 +7,17 @@ Page({
    * 页面的初始数据
    */
   data: {
-    act:2,
+    act:0,
     arct:[],
     hot_arct:[],
-    over_arct:[]
+    over_arct:[],
+    conference:[],
+    over:[],
+    pre:[],
+    keyword:'',
+    array: ['时间正序', '时间倒序'],
+    val: ['ctime', '-ctime'],
+    index: 0,
   },
 
   /**
@@ -21,16 +28,79 @@ Page({
   },
   getData:function(){
     var that=this;
+    var order_by = this.data.val[this.data.index]
+    wx.showNavigationBarLoading()
     wx.request({
       url: host+'/api/recommend',
       success:function(res){
+        wx.hideNavigationBarLoading()
         that.setData({
-          arct: res.data.data.arct,
-          hot_arct: res.data.data.hot_arct,
-          over_arct: res.data.data.over_arct
+          arct: res.data.data.article,
+          hot_arct: res.data.data.hot_act,
+          pre_arct: res.data.data.pre_act,
+          over_arct: res.data.data.over_act
         })
       }
     })
+    //学术会议
+    wx.request({
+      url: host + '/api/conference/list',
+      data:{
+        order_by: order_by,
+        keyword: this.data.keyword
+      },
+      success: function (res) {
+        that.setData({
+          conference: res.data.data.list
+        })
+      }
+    })
+    //活动预告
+    wx.request({
+      url: host + '/api/activity/list',
+      data:{
+        type:'pre',
+        order_by: order_by,
+        keyword: this.data.keyword
+      },
+      success: function (res) {
+        if(!res.data){
+          return
+        }
+        that.setData({
+          pre: res.data.data.list
+        })
+      }
+    })
+    //活动回顾
+    wx.request({
+      url: host + '/api/activity/list',
+      data: {
+        type: 'over',
+        order_by: order_by,
+        keyword: this.data.keyword
+      },
+      success: function (res) {
+        if (!res.data) {
+          return
+        }
+        that.setData({
+          over: res.data.data.list
+        })
+      }
+    })
+  },
+  showmenu: function () {
+    this.setData({
+      show: !this.data.show
+    })
+  },
+  check: function (e) {
+    this.setData({
+      show: 0,
+      index: e.target.dataset.id
+    })
+    this.getData();
   },
   tab: function (e) {
     this.setData({

pages/learning/learning.wxml

@@ -2,6 +2,14 @@
     <input placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
     <image  mode="widthFix" src="../images/search.png"></image>
 </view>
+<view class="menu">
+    <view class="picker" bindtap="showmenu">
+        {{array[index]}} <text class="up"></text>
+    </view>
+    <view class="drop_menu" wx:if='{{show}}'>
+        <text wx:for='{{array}}' bindtap="check" data-id='{{index}}'>{{item}}</text>
+    </view>
+</view>
 <view class="tab">
     <text bindtap="tab" data-id='0' class="{{act == 0?'active':''}}">推荐</text>
     <text bindtap="tab" data-id='1' class="{{act == 1?'active':''}}">学术会议</text>
@@ -41,7 +49,7 @@
           <view class="part">
               <view class="title">活动预告   <navigator>查看更多</navigator></view>
               <view class="hd">
-                  <navigator class="list" wx:for='{{over_arct}}' wx:key="over_arct{{index}}">
+                  <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>
@@ -52,15 +60,28 @@
               </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}}">
+                      <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>
+          </view>
       </scroll-view>
   </swiper-item>
   <swiper-item>
       <scroll-view class="content" scroll-y="true">
-                <navigator class="list" wx:for='{{hot_arct}}' wx:key="hot_arct{{index}}">
+                <navigator class="list" wx:for='{{conference}}' wx:key="conference{{index}}">
                       <image  mode="widthFix" src="{{item.img}}"></image>
                       <view>
                           <view class="tt">{{item.name}}  </view>
-                          <text class="hd_ly">来源 :地球化学研究所 <text>2018.5.28</text></text>
+                          <text class="hd_ly">来源 :地球化学研究所 <text>{{item.publish_time}}</text></text>
                           <text>{{item.desc}}</text>
                       </view>
                   </navigator> 
@@ -68,7 +89,7 @@
   </swiper-item>
   <swiper-item>
       <scroll-view class="content" scroll-y="true">
-                <navigator class="list" wx:for='{{hot_arct}}' wx:key="hot_arct{{index}}">
+                <navigator class="list" wx:for='{{pre}}' wx:key="pre{{index}}">
                       <image  mode="widthFix" src="{{item.img}}"></image>
                       <view>
                           <view class="tt">{{item.name}}  </view>
@@ -88,7 +109,7 @@
 
   <swiper-item>
       <scroll-view class="content" scroll-y="true">
-                <navigator class="list" wx:for='{{hot_arct}}' wx:key="hot_arct{{index}}">
+                <navigator class="list" wx:for='{{over}}' wx:key="over{{index}}">
                       <image  mode="widthFix" src="{{item.img}}"></image>
                       <view>
                           <view class="tt">{{item.name}}  </view>

pages/learning/learning.wxss

@@ -1,4 +1,9 @@
 /* pages/learning/learning.wxss */
+.search{
+  width: 70%;
+  display: inline-block;
+  margin-bottom: 20rpx;
+}
 .tab{
   display: flex;
   justify-content: space-between;
@@ -130,4 +135,47 @@ scroll-view{
 }
 .ly view text{
   font-size: 18rpx;
+}
+.menu{
+  width: 28%;
+  background: #fff;
+  display: inline-block;
+  line-height: 64rpx;
+  border-radius: 15rpx;
+  margin-left: 2%;
+  vertical-align: top;
+  position: relative;
+}
+.picker{
+  
+  text-align: center;
+  color: #999;
+  font-size: 26rpx;
+  
+}
+.up{
+    width: 0;
+    height: 0;
+    border: 10rpx solid transparent;
+    border-top: 12rpx solid #999;
+    display: inline-block;
+    position: relative;
+    top: 3px;
+}
+
+.drop_menu{
+  background: #fff;
+  box-shadow: 2px 2px 10rpx 1px rgba(0, 0, 0, 0.2);
+  position: absolute;
+  width: 100%;
+  right: 0;
+  border-radius: 15rpx;
+  z-index: 9;
+  top: 70rpx;
+}
+.drop_menu text{
+  display: block;
+  line-height: 60rpx;
+  text-align: center;
+  color: #999;
 }

pages/search/search.js

@@ -1,4 +1,6 @@
 // pages/search/search.js
+const app = getApp()
+var host = app.globalData.host;
 Page({
 
   /**
@@ -12,7 +14,16 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    var that=this;
+    wx.request({
+      url: host + '/api/search/default',
+      method: 'GET',
+      success: function (res) {
+        that.setData({
+          
+        })
+      }
+    })
   },
 
   /**