Merge branch 'master' of https://github.com/wanggeng888/xz_mini

# Conflicts: # pages/book/book.js
2020-10-13 16:19:05 +08:00 · 2020-10-13 16:19:05 +08:00 · fd7af2eb10
commit fd7af2eb10
parent 4aaac4e997 edcf529ee0
1 changed files with 2 additions and 2 deletions
--- a/pages/book/book.js
+++ b/pages/book/book.js
@ -123,7 +123,7 @@ Page({
      return false;
    }
    app.restAjax.get(app.restAjax.path('{venueUrl}/app/booking/listgrouninfoanditemrelease/{venuesProjectId}',
-      [app.venueUrl,self.data.selectVenuesProject]), {}, {headers : {token:self.data.token}}, 
+      [app.venueUrl,self.data.selectVenuesProject]), null, {headers : {token:self.data.token}} ,
      function(code,data){
 			if(data.data.length > 0 ){
          self.setData({