update

app.json

@@ -1,16 +1,19 @@
 {
   "pages": [
+    "pages/index/index",
+    "pages/search/search",
+    "pages/searchList/searchList",
     
     "pages/mine/mine",
     "pages/hotel/hotel",
-    "pages/index/index",
+    
     "pages/order/order",
     "pages/eventDetail/eventDetail",
     "pages/order/hotel",
     "pages/learning/learning",
     "pages/conference/conference",  
     "pages/collect/collect",
-    "pages/search/search",
+    
     "pages/knowledge/knowledge",
     "pages/list/list",
     "pages/actDetail/actDetail",

app.wxss

@@ -29,6 +29,7 @@ page{
   top: 0;
   bottom: 0;
   margin: auto;
+  z-index: 999;
 }
 
 .login{

pages/eventDetail/eventDetail.js

@@ -29,6 +29,14 @@ Page({
    */
   onLoad: function (options) {
     options.id=1;
+    if (options.apply_id){
+      this.setData({
+        page: 3,
+        show:1,
+        apply_id: options.apply_id
+      })
+    }
+    
     var that = this;
     wx.showNavigationBarLoading()
     var that = this;

pages/hotel/hotel.js

@@ -11,7 +11,10 @@ Page({
     aid:'',
     data:{},
     date:'',
-    show:0
+    show:0,
+    s_time:'',
+    e_time:'',
+    room_nums:''
   },
 
   /**
@@ -52,11 +55,28 @@ Page({
       data:this.data.info.rooms[i]
     })
   },
+  bindDateChange:function(e){
+    this.setData({
+      s_time:e.detail.value
+    })
+  },
+  bindDateChange1: function (e) {
+    this.setData({
+      e_time: e.detail.value
+    })
+  },
+  bindinputChange:function(e){
+    this.setData({
+      room_nums:e.detail.value
+    })
+  },
   order:function(e){
     var data={};
     data.hotel_id=this.data.info.id;
     data.room_id=e.target.dataset.id;
-    data.id = this.data.aid
+    data.id = this.data.aid;
+    data.room_stime=this.data.s_time;
+    data.room_etime = this.data.e_time;
     wx.request({
       url: host + '/api/user/signup',
       method: 'PUT',

pages/hotel/hotel.wxml

@@ -31,23 +31,23 @@
           <view><text>餐食:{{data.food_condition}}</text><text>房价:{{data.unit_price}}元</text></view>
       </view>
       <view class="room_item" style="padding-bottom:0;">
-        <label>入住人数: </label><input></input>
+        <label>入住人数: </label><input bindinput="bindinputChange"></input>
       </view>
       <view class="room_item">
         <view><label>入住时间: </label>
-          <picker mode="date" value="{{date}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
+          <picker mode="date" value="{{s_time}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
             <view class="picker">
-              <text>请选择</text>
-               {{date}}
+              <text wx:if='{{!s_time}}'>请选择</text>
+               {{s_time}}
             </view>
           </picker>
         </view>
         <view>
           <label>离开时间: </label>
-          <picker mode="date" value="{{date}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
+          <picker mode="date" value="{{e_time}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange1">
             <view class="picker">
-              <text>请选择</text>
-               {{date}}
+              <text wx:if='{{!e_time}}'>请选择</text>
+               {{e_time}}
             </view>
           </picker>
         </view>

pages/hotel/hotel.wxss

@@ -84,6 +84,7 @@ page{
   z-index: 99;
   background: rgba(0,0,0,.5);
   padding: 50rpx 0;
+  overflow: auto;
 }
 .room{
   background: #fff;

pages/index/index.wxml

@@ -1,5 +1,5 @@
 <view class="search" bindtap='search' wx:if="{{act!=3}}">
-    <input  placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
+    <input bindfocus="search" placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
     <image  mode="widthFix" src="../images/search.png"></image>
 </view>
 

pages/knowledge/knowledge.wxml

@@ -33,8 +33,8 @@
                               <view>
                                   <text>2018.5.28</text>
                               </view>
-                              <text>作者：包为民</text>
-                              <text>《中国科学院》</text> 
+                              <text>作者：</text>
+                              <text></text> 
                   </view>
                   <text class="">主办单位：{{item.desc}}</text>
               </view>

pages/order/order.js

@@ -10,7 +10,8 @@ Page({
       act:1,
       code:0,
       uid:'',
-      list:[]
+      list:[],
+
   },
 
   /**
@@ -54,6 +55,17 @@ Page({
       }
     })
   },
+  verify:function(e){
+    var code=e.target.dataset.url;
+    this.setData({
+      code:code
+    })
+  },
+  close:function(){
+    this.setData({
+      code: ''
+    })
+  },
   tab:function(e){
       this.setData({
         act:e.target.dataset.id

pages/order/order.wxml

@@ -8,20 +8,22 @@
         <view>
             <view class="title">{{item.conference_name}}</view>
             <text>报名时间：{{item.ctime}}</text>
-            <navigator class="btn" wx:if='{{item.signup_status==0}}' >上传凭证</navigator>
-            <navigator class="btn" wx:if='{{item.signup_status==1}}' >待审核</navigator>
+            <navigator url="../eventDetail/eventDetail?id={{item.conference_id}}&apply_id={{item.id}}" class="btn" wx:if='{{item.signup_status==0}}' >上传凭证</navigator>
+            <navigator class="btn" style="background:#999;" wx:if='{{item.signup_status==1}}' >待审核</navigator>
             <navigator class="btn" wx:if='{{item.signup_status==2}}' url="../order/hotel?id={{item.conference_id}}&&aid={{item.id}}"  class="btn">选酒店</navigator>
-            <navigator class="btn" wx:if='{{item.signup_status==3}}' >核销</navigator>
-            <navigator class="btn" wx:if='{{item.signup_status==4}}' >已核销</navigator>
-            <navigator class="btn" wx:if='{{item.signup_status==-1}}' >已驳回</navigator>
+            <view bindtap="verify" data-url='{{item.verify_qrcode}}' class="btn" wx:if='{{item.signup_status==3}}' >核销</view>
+            <navigator class="btn" style="background:#999;" wx:if='{{item.signup_status==4}}' >已核销</navigator>
+            <navigator class="btn" style="background:#999;" wx:if='{{item.signup_status==-1}}' >已驳回</navigator>
         </view>
     </view>
 </view>
 
-<view class="bg" wx:if='{{code}}'>
+<view class="bg" wx:if='{{code}}' bindtap="close">
     <view class="form">
         <view class="tt">核销码</view>
-        <view class="code"></view>
+        <view class="code">
+          <image mode="widthFix" src="{{code}}"></image>
+        </view>
         <text>请将二维码出示给工作人员</text>
     </view>
 </view>

pages/order/order.wxss

@@ -112,6 +112,9 @@ page{
   border: 1px solid #D0D0D0;
   margin: 40rpx auto;
 }
+.code image{
+  width: 100%;
+}
 .form text{
   color: #999;
   font-size: 26rpx;

pages/search/search.js

@@ -7,7 +7,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    info:{}
+    info:{},
+    keyword:''
   },
 
   /**
@@ -25,7 +26,17 @@ Page({
       }
     })
   },
+  search:function(){
+    wx.navigateTo({
+      url: '../searchList/searchList?keyword=' + this.data.keyword,
+    })
+  },
+  inputChange: function (e) {
+    this.setData({
+      keyword: e.detail.value
+    })
 
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/search/search.wxml

@@ -1,20 +1,20 @@
 <view class="search">
-    <input placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
-    <image  mode="widthFix" src="../images/search.png"></image>
+    <input bindinput="inputChange"  placeholder-style='color:#C8C8C8;' placeholder="输入名称/关键字搜索"></input>
+    <image bindtap="search"  mode="widthFix" src="../images/search.png"></image>
 </view>
 <view class="part">
     <view class="title">搜索指定内容</view>
-    <text wx:for='{{info.navs}}'>{{item.name}}</text>
+    <navigator url="../searchList/searchList?keyword={{item}}" wx:for='{{info.navs}}'>{{item.name}}</navigator>
 </view>
 <view class="part">
     <view class="title">搜索记录</view>
-    <navigator wx:for='{{info.history}}'>{{item}}</navigator>
+    <navigator url="../searchList/searchList?keyword={{item}}" wx:for='{{info.history}}'>{{item}}</navigator>
 </view>
 <view class="part">
     <view class="title">冷词</view>
-    <navigator wx:for='{{info.cold_keyword}}'>{{item}}</navigator>
+    <navigator url="../searchList/searchList?keyword={{item}}" wx:for='{{info.cold_keyword}}'>{{item}}</navigator>
 </view>
 <view class="part">
     <view class="title">热词</view>
-    <navigator wx:for='{{info.hot_keyword}}'>{{item}}</navigator>
+    <navigator url="../searchList/searchList?keyword={{item}}" wx:for='{{info.hot_keyword}}'>{{item}}</navigator>
 </view>

pages/searchList/searchList.js

@@ -0,0 +1,121 @@
+// pages/searchList/searchList.js
+const app = getApp()
+var host = app.globalData.host;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    act:0,
+    data:[],
+    keyword:'',
+    type:''
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    // options.keyword='科学'
+    this.setData({
+      keyword: options.keyword,
+      type: options.type ? options.type:''
+    })
+    this.getData()
+  },
+  getData:function(){
+    wx.showNavigationBarLoading()
+    wx.request({
+      url: host + '/api/search',
+      method: 'GET',
+      data: {
+        keyword: this.data.keyword,
+        type: this.data.type
+      },
+      success: res => {
+        wx.hideNavigationBarLoading();
+        this.setData({
+          data: res.data.data
+        })
+      },
+      fail: function () {
+        wx.hideLoading();
+        wx.showToast({
+          title: '服务器开小差啦！',
+          icon: 'none'
+        })
+      }
+    })
+  },
+  inputChange:function(e){
+    this.setData({
+      keyword:e.detail.value
+    })
+    this.getData();
+  },
+  tab:function(e){
+    var i=e.target.dataset.id;
+    var array = ['', 'organizer', 'article', 'conference', 'journal','subject'];
+    this.setData({
+      type: array[i],
+      act:i
+    })
+    // this.getData()
+  },
+  more: function (e) {
+    var value = e.target.dataset.id;
+    this.setData({
+      type: value,
+      act: e.target.dataset.index
+    })
+  },
+  /**organizer/article/conference/journal/subject
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/searchList/searchList.json

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

pages/searchList/searchList.wxml

@@ -0,0 +1,95 @@
+<view class="search">
+    <input bindinput="inputChange" placeholder-style='color:#C8C8C8;' value="{{keyword}}" placeholder="输入名称/关键字搜索"></input>
+    <image  mode="widthFix" src="../images/search.png"></image>
+</view>
+<view  class="tab">
+  <view>
+      <text bindtap="tab" data-id='0' class="{{act == 0?'active':''}}">全部</text>
+      <text bindtap="tab" data-id='1' class="{{act == 1?'active':''}}">相关主办单位</text>
+      <text bindtap="tab" data-id='2' class="{{act == 2?'active':''}}">相关文章</text>
+      <text bindtap="tab" data-id='3' class="{{act == 3?'active':''}}">相关学术会议</text>
+      <text bindtap="tab" data-id='4' class="{{act == 4?'active':''}}">相关期刊</text>
+      <text bindtap="tab" data-id='5' class="{{act == 5?'active':''}}">相关学术学科</text>
+  </view>
+</view>
+
+<view wx:if='{{act==0}}' class="part" wx:for='{{data}}'>
+    <view class="title">{{item.name}}   <text bindtap="more" data-index='{{index+1}}' data-id='{{item.value}}'>查看更多</text></view>
+    <navigator  url="../journalDetail/journalDetail?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value=="journal"&& idx<3}}'>
+              <image  src="{{i.img}}"></image>
+              <view>
+                  <view class="title">{{i.name}}</view>
+                  <text>微信号：{{i.wxcode}}</text>
+                  <text>主编：{{i.editor}}</text>
+                  <text class="">主办单位：{{i.publishingUnit}}</text>
+              </view>
+    </navigator>
+    <navigator url="../list/list?organizer_id={{i.id}}&title={{i.name}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value=="organizer" && idx<3}}' >
+              <image  src="{{i.img}}"></image>
+              <view>
+                  <view class="title">{{i.name}}</view>
+                  <text class="wrap">{{i.desc}}</text>
+              </view>
+    </navigator>
+    <navigator url="../actDetail/actDetail?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value=="article" && idx<3}}' >
+              <image  mode="widthFix" src="{{i.img}}"></image>
+              <view>
+                  <view class="title">{{i.name}}</view>
+                  <text class="wrap">{{i.desc}}</text>
+              </view>
+    </navigator>
+    <navigator url="../conference/conference?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value=="conference" && idx<3}}' >
+              <image src="{{i.img}}"></image>
+              <view>
+                  <view class="title">{{i.name}}</view>
+                  <text class="wrap">{{i.desc}}</text>
+              </view>
+    </navigator>
+    <navigator url="../list/list?subject_id={{i.id}}&title={{i.name}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value=="subject" && idx<3}}' style='padding-left:0;'>
+              <!-- <image  mode="widthFix" src="{{i.img}}"></image> -->
+              <view>
+                  <view class="title">{{i.name}}</view>
+                  <text class="wrap">{{i.desc}}</text>
+              </view>
+    </navigator>
+</view>
+<view wx:if='{{act!=0}}' class="part" wx:for='{{data}}'>
+
+    <navigator  url="../journalDetail/journalDetail?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type}}'>
+              <image  src="{{i.img}}"></image>
+              <view>
+                  <view class="title">{{i.name}}</view>
+                  <text>微信号：{{i.wxcode}}</text>
+                  <text>主编：{{i.editor}}</text>
+                  <text class="">主办单位：{{i.publishingUnit}}</text>
+              </view>
+    </navigator>
+    <navigator url="../list/list?organizer_id={{i.id}}&title={{i.name}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value=="organizer" && idx<3}}' >
+              <image  src="{{i.img}}"></image>
+              <view>
+                  <view class="title">{{i.name}}</view>
+                  <text class="wrap">{{i.desc}}</text>
+              </view>
+    </navigator>
+    <navigator url="../actDetail/actDetail?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type}}' >
+              <image  mode="widthFix" src="{{i.img}}"></image>
+              <view>
+                  <view class="title">{{i.name}}</view>
+                  <text class="wrap">{{i.desc}}</text>
+              </view>
+    </navigator>
+    <navigator url="../conference/conference?id={{i.id}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type}}' >
+              <image src="{{i.img}}"></image>
+              <view>
+                  <view class="title">{{i.name}}</view>
+                  <text class="wrap">{{i.desc}}</text>
+              </view>
+    </navigator>
+    <navigator url="../list/list?subject_id={{i.id}}&title={{i.name}}" class="list" wx:for='{{item.list}}' wx:for-item='i'  wx:for-index='idx' wx:if='{{item.value==type}}' style='padding-left:0;'>
+              <!-- <image  mode="widthFix" src="{{i.img}}"></image> -->
+              <view>
+                  <view class="title">{{i.name}}</view>
+                  <text class="wrap">{{i.desc}}</text>
+              </view>
+    </navigator>
+</view>

pages/searchList/searchList.wxss

@@ -0,0 +1,107 @@
+/* pages/searchList/searchList.wxss */
+page{
+  padding: 0;
+}
+.search{
+  padding: 0 10px;
+  background: #fff;
+}
+.search input{
+  background: #EEEEEE;
+}
+.tab{
+  overflow: auto;
+  background: #fff;
+  padding: 10px;
+  margin-bottom: 20rpx;
+}
+.tab view{
+  display: flex;
+  justify-content: space-between;
+  
+  width: 150vw
+}
+.tab text{
+  font-size: 30rpx;
+  color: #666;
+}
+.tab .active{
+  color: #3780CD;
+}
+.part{
+  background: #fff;
+  padding: 0 10px;
+  margin-top: 10px;
+}
+.part>.title{
+  font-size: 32rpx;
+  color: #333;
+  margin-bottom: 28rpx;
+  line-height: 40px;
+}
+.part>.title text{
+  float: right;
+  color: #3780CD;
+  font-size: 26rpx;
+}
+.tj{
+  display: flex;
+  justify-content: space-between;
+}
+.tj navigator{
+  width: 30%;
+}
+.tj image{
+  width: 100%;
+  max-height: 200rpx;
+}
+.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;
+  
+}
+.list image{
+  width: 20%;
+  height: 160rpx;
+  max-height: 100px;
+}
+.list>view{
+  width: 80%;
+  padding-left: 20rpx;
+  vertical-align: middle;
+}
+.list .title{
+  margin-bottom: 20rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.list text{
+  color: #999;
+  display: block;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  font-size: 26rpx;
+}
+.list .company{
+  overflow: visible;
+  white-space: pre-wrap;
+  margin-top: 40rpx;
+  font-size: 28rpx;
+}
+.list .wrap{
+  display: block;
+  font-size: 26rpx;
+  color: #999;
+   overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    white-space: normal;
+}