gaojian/xz_dingri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

恢复

Browse Source
This commit is contained in:
dong_bo0602 2020-10-13 16:49:50 +08:00
commit 0a4c85b2a0
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app.js
View File

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

6
pages/book/book.js
View File

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

5
pages/center/center.js
View File

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