恢复
This commit is contained in:
commit
0a4c85b2a0
1
app.js
1
app.js
@ -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',
|
||||||
|
@ -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,
|
||||||
|
@ -278,6 +278,11 @@ Page({
|
|||||||
app.dialog.msg(data.msg);
|
app.dialog.msg(data.msg);
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
cancelPhone: function () {
|
||||||
|
this.setData({
|
||||||
|
showPhone: false
|
||||||
|
})
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* 生命周期函数--监听页面加载
|
* 生命周期函数--监听页面加载
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user