tanyanfei 3 years ago
parent
commit
9ffd4b2a6b

+ 5 - 5
pages/order/order.wxml

@@ -3,19 +3,19 @@
     <text bindtap="tab" data-id='2' class="{{act==2?'act':''}}">已结束</text>
 </view>
 <view class="content">
-    <view class="list" wx:for='{{list}}'>
+    <navigator class="list" wx:for='{{list}}' url="../eventDetail/eventDetail?id={{item.conference_id}}">
         <image src="{{item.conference_img}}"></image>
-        <navigator url="../eventDetail/eventDetail?id={{item.conference_id}}">
+        <view >
             <view class="title">{{item.conference_name}}</view>
             <text>报名时间:{{item.ctime}}</text>
             <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>
-            <view bindtap="verify" data-url='{{item.verify_qrcode}}' class="btn" wx:if='{{item.signup_status==3}}' >核销</view>
+            <view catchtap="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>
-        </navigator>
-    </view>
+        </view>
+    </navigator>
 </view>
 
 <view class="bg" wx:if='{{code}}' bindtap="close">

+ 1 - 1
pages/order/order.wxss

@@ -41,7 +41,7 @@ page{
   width: 25%;
   height: 210rpx;
 }
-.list>navigator{
+.list>view{
   width: 75%;
   padding-left: 20rpx;
   vertical-align: middle;

+ 1 - 1
pages/search/search.wxml

@@ -4,7 +4,7 @@
 </view>
 <view class="part">
     <view class="title">搜索指定内容</view>
-    <navigator url="../searchList/searchList?keyword={{item}}" wx:for='{{info.navs}}'>{{item.name}}</navigator>
+    <navigator url="../searchList/searchList?type={{item.value}}&act={{index+1}}" wx:for='{{info.navs}}'>{{item.name}}</navigator>
 </view>
 <view class="part">
     <view class="title">搜索记录</view>

+ 8 - 4
pages/searchList/searchList.js

@@ -19,10 +19,14 @@ Page({
   onLoad: function (options) {
     // options.keyword='科学'
     this.setData({
-      keyword: options.keyword,
-      type: options.type ? options.type:''
+      keyword: options.keyword ? options.keyword:'',
+      type: options.type ? options.type:'',
+      act: options.act
     })
-    this.getData()
+    if (options.keyword ){
+      this.getData()
+    }
+    
   },
   getData:function(){
     wx.showNavigationBarLoading()
@@ -31,7 +35,7 @@ Page({
       method: 'GET',
       data: {
         keyword: this.data.keyword,
-        type: this.data.type
+        // type: this.data.type
       },
       success: res => {
         wx.hideNavigationBarLoading();

+ 0 - 1
pages/searchList/searchList.wxml

@@ -12,7 +12,6 @@
       <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" wx:if='{{item.list.length>0}}'>{{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}}'>