恢复

app.js

@@ -10,7 +10,6 @@ App({
   venueUrl: 'https://www.wgink.ink/venuebooking',
   activityUrl: 'https://www.wgink.ink/culturalactivity',
   volunteerUrl: 'https://www.wgink.ink/volunteer',
-  venueUrl: 'https://www.wgink.ink/venuebooking',
   activityUrl: 'https://www.wgink.ink/culturalactivity',
   volunteerUrl: 'https://www.wgink.ink/volunteer',
   liveUrl: 'https://www.wgink.ink/live',

pages/book/book.js

@@ -123,7 +123,11 @@ Page({
       return false;
     }
     app.restAjax.get(app.restAjax.path('{venueUrl}/app/booking/listgrouninfoanditemrelease/{venuesProjectId}',
+<<<<<<< HEAD
       [app.venueUrl,self.data.selectVenuesProject]), null, {headers : {token:self.data.token}}, 
+=======
+      [app.venueUrl,self.data.selectVenuesProject]), null, {headers : {token:self.data.token}} ,
+>>>>>>> f1eff69198504079759bf289a71907006b988a79
       function(code,data){
 			if(data.data.length > 0 ){
           self.setData({

pages/center/center.js

@@ -278,6 +278,11 @@ Page({
         app.dialog.msg(data.msg);
       })
     },
+  cancelPhone: function () {
+    this.setData({
+      showPhone: false
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */