Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/zkyxcx

app.json

@@ -1,16 +1,15 @@
 {
   "pages": [
-    "pages/hotel/hotel",
+    
     "pages/mine/mine",
-    "pages/learning/learning",
+    "pages/hotel/hotel",
+    "pages/verify/verify",
     "pages/index/index",
     "pages/order/order",
-    
     "pages/eventDetail/eventDetail",
-    
     "pages/order/hotel",
-    
-    "pages/conference/conference",
+    "pages/learning/learning",
+    "pages/conference/conference",  
     "pages/collect/collect",
     "pages/search/search",
     "pages/knowledge/knowledge",

pages/hotel/hotel.js

@@ -18,8 +18,8 @@ Page({
    */
   onLoad: function (options) {
     wx.showNavigationBarLoading();
-    options.id=1;
-    options.conference_id=1;
+    // options.id=1;
+    // options.conference_id=1;
     this.setData({
       aid: Number(options.aid)
     })