bug

pages/list/list.js

@@ -9,7 +9,8 @@ Page({
   data: {
     list:[],
     subject_id:'',
-    organizer_id:''
+    organizer_id:'',
+    keyword:''
   },
 
   /**
@@ -26,7 +27,7 @@ Page({
     this.getData();
   },
   getData(){
-    var that = this, data = { keyword:''};
+    var that = this, data = { keyword:this.data.keyword};
         wx.showNavigationBarLoading()
         if (this.data.subject_id){
           data.subject_id = this.data.subject_id

pages/order/order.wxml

@@ -9,11 +9,11 @@
             <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" 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 catchtap="verify" data-url='{{item.verify_qrcode}}' class="btn" wx:if='{{item.signup_status==3}}' >核销</view>
             <view class="btn" style="background:#999;" wx:if='{{item.signup_status==4}}' >已核销</view>
-            <view class="btn" style="background:#999;" wx:if='{{item.signup_status==1}}' >已驳回</view>
+            <view class="btn" style="background:#999;" wx:if='{{item.signup_status==-1}}' >已驳回</view>
         </view>
     </navigator>
 </view>