diff --git a/app.js b/app.js index f992a35..f200905 100644 --- a/app.js +++ b/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', diff --git a/pages/book/book.js b/pages/book/book.js index 77250aa..aefe4d9 100644 --- a/pages/book/book.js +++ b/pages/book/book.js @@ -123,9 +123,13 @@ 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 ){ + if(data.data.length > 0 ){ self.setData({ groundList: data.data, selectGround:data.data[0].groundInfoId, diff --git a/pages/center/center.js b/pages/center/center.js index 1ef3b73..b901ff1 100644 --- a/pages/center/center.js +++ b/pages/center/center.js @@ -278,6 +278,11 @@ Page({ app.dialog.msg(data.msg); }) }, + cancelPhone: function () { + this.setData({ + showPhone: false + }) + }, /** * 生命周期函数--监听页面加载 */