From 29c66900800597c123ce5b796782bff207d296cf Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Fri, 26 Jun 2020 15:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E6=96=B9?=
=?UTF-8?q?=E6=B3=95,=20app.json=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=97=B6=E7=9A=84=E9=BB=98=E8=AE=A4=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.js | 2 +-
app.json | 5 +++
pages/venue/venue.js | 38 ++++++++++-----------
pages/venue/venue.wxml | 8 ++---
pages/venueDetail/venueDetail.js | 54 +++++++++++++++---------------
pages/venueDetail/venueDetail.wxml | 6 ++--
6 files changed, 59 insertions(+), 54 deletions(-)
diff --git a/app.js b/app.js
index c6ba268..d3f420c 100644
--- a/app.js
+++ b/app.js
@@ -7,7 +7,7 @@ App({
newsUrl: 'http://192.168.0.113:8082/news',
libraryUrl: 'http://192.168.0.113:8081/library',
activityUrl: '',
- venueUrl: '',
+ venueUrl: 'http://192.168.0.109:8082/venuebooking',
restAjax: restAjax,
dialog: dialog,
onLaunch: function () {
diff --git a/app.json b/app.json
index 6788cc1..77edd74 100644
--- a/app.json
+++ b/app.json
@@ -64,6 +64,11 @@
}
]
},
+ "permission": {
+ "scope.userLocation": {
+ "desc": "你的位置信息将用于您当前所在位置"
+ }
+ },
"style": "v2",
"sitemapLocation": "sitemap.json"
}
\ No newline at end of file
diff --git a/pages/venue/venue.js b/pages/venue/venue.js
index 20fdd62..77839f1 100644
--- a/pages/venue/venue.js
+++ b/pages/venue/venue.js
@@ -1,3 +1,4 @@
+var app = getApp();
// pages/venue/venue.js
Page({
@@ -5,8 +6,8 @@ Page({
* 页面的初始数据
*/
data: {
- baseUrl : 'http://192.168.0.109:8082/venuebooking/',
- imgRoute : 'route/file/downloadfile/true/',
+ venueUrl : app.venueUrl,
+ imgRoute : '/route/file/downloadfile/true/',
venueTypeParentId : 'df8b758c-f6d8-465a-9aa8-c451fde47076',
page : '1',
rows : '10',
@@ -38,23 +39,23 @@ Page({
//获取场馆分类
listVenueType : function(){
var self = this;
- wx.request({
- url: self.data.baseUrl + 'app/venuedictionary/listvenuedictionarybyparentidrelease/' + self.data.venueTypeParentId,
- success : function(res){
- var data = res.data;
+ app.restAjax.get(app.restAjax.path('{venueUrl}/app/venuedictionary/listvenuedictionarybyparentidrelease/{venueTypeParentId}',
+ [app.venueUrl, self.data.venueTypeParentId]), {}, null,
+ function(code,data){
self.setData({
- venueTypeList : data.data
- })
+ venueTypeList: data.data
+ });
+ },function(code, data){
+ app.dialog.msg(data.msg);
}
- })
+ );
},
//获取场馆列表
listPageVenuesInfo : function(){
var self = this;
- wx.request({
- url: self.data.baseUrl + 'app/venuesinfo/listpagevenuesinforelease',
- data : {
+ app.restAjax.get(app.restAjax.path('{venueUrl}/app/venuesinfo/listpagevenuesinforelease', [app.venueUrl]),
+ {
page : self.data.page,
rows : self.data.rows,
orderKey : self.data.orderKey,
@@ -62,9 +63,8 @@ Page({
latitude: self.data.latitude,
longitude: self.data.longitude,
selfLocation: 'TX',
- },
- success : function(res){
- var data = res.data;
+ }, null,
+ function(code, data){
data.rows.forEach(element => {
element.venuePanorama = element.venuePanorama.split(',')[0];
if(element.apart >= 1000){
@@ -76,10 +76,11 @@ Page({
self.setData({
venuesList : data.rows,
page : data.page
- })
-
+ });
+ }, function(code,data){
+ app.dialog.msg(data.msg);
}
- })
+ );
},
//切换场馆类型
@@ -97,7 +98,6 @@ Page({
//切换场馆排序
changeVenuesOrderBy: function(options){
var beCheck = options.currentTarget.dataset.becheck;
- console.log(options);
this.setData({
orderKey : beCheck
})
diff --git a/pages/venue/venue.wxml b/pages/venue/venue.wxml
index 2a510c2..25a3eeb 100644
--- a/pages/venue/venue.wxml
+++ b/pages/venue/venue.wxml
@@ -1,7 +1,7 @@
-
-
+
+
{{item.dictionaryName}}
@@ -18,9 +18,9 @@
-
+
-
+
diff --git a/pages/venueDetail/venueDetail.js b/pages/venueDetail/venueDetail.js
index 5db2e05..a0d2ebb 100644
--- a/pages/venueDetail/venueDetail.js
+++ b/pages/venueDetail/venueDetail.js
@@ -1,15 +1,14 @@
+var app = getApp();
// pages/venueDetail/venueDetail.js
Page({
-
/**
* 页面的初始数据
*/
data: {
- baseUrl: 'http://192.168.0.109:8082/venuebooking/',
- imgRoute : 'route/file/downloadfile/true/',
+ venueUrl: app.venueUrl,
+ imgRoute : '/route/file/downloadfile/true/',
indicatorDots: true,
autoplay: true,
-
venuesInfoId: '',
venuesDetail:{},
venuesProjectList: [],
@@ -22,37 +21,35 @@ Page({
//场馆详情接口
getVenuesDetail: function(){
var self = this;
- wx.request({
- url: self.data.baseUrl + 'app/venuesinfo/getvenuesinfobyidrelease/' + self.data.venuesInfoId,
- data: {
+ app.restAjax.get(app.restAjax.path('{venueUrl}/app/venuesinfo/getvenuesinfobyidrelease/{venuesInfoId}',[app.venueUrl, self.data.venuesInfoId]),
+ {
resultLocation: 'TX'
- },
- success:(res) => {
- var swiperImg = res.data.venuePanorama.split(',');
+ }, null, function(code, data){
+ var swiperImg = data.venuePanorama.split(',');
if(swiperImg.length <= 1){
self.setData({
indicatorDots: false,
autoplay: false
})
- }
+ };
self.setData({
- venuesDetail: res.data,
+ venuesDetail: data,
swiperImg: swiperImg,
- venueCharge: res.data.venueCharge
+ venueCharge: data.venueCharge
});
- console.log(self.data.venuesDetail);
+ }, function(code,data){
+ app.dialog.msg(data.msg);
}
- })
+ );
},
//获取项目列表
listVenuesProject: function(){
var self = this;
- wx.request({
- url: self.data.baseUrl + 'app/venuesproject/listprojectinforelease/' + self.data.venuesInfoId,
- success: (res) => {
+ app.restAjax.get(app.restAjax.path('{venueUrl}/app/venuesproject/listprojectinforelease/{venuesInfoId}', [app.venueUrl, self.data.venuesInfoId]), {}, null ,
+ function(code,data){
self.setData({
- venuesProjectList: res.data
+ venuesProjectList: data
});
if(self.data.venuesProjectList.length > 0){
self.setData({
@@ -60,8 +57,10 @@ Page({
});
self.getVenuesProjectDetail();
};
+ }, function(code, data){
+ app.dialog.msg(data.msg);
}
- })
+ );
},
//切换当前选择项目
@@ -79,21 +78,22 @@ Page({
//获取项目详情信息
getVenuesProjectDetail: function(){
var self = this;
- wx.request({
- url: self.data.baseUrl + 'app/venuesproject/getvenuesprojectdetailrelease/' + self.data.selectVenuesProject,
- success: function(res){
+ app.restAjax.get(app.restAjax.path('{venueUrl}/app/venuesproject/getvenuesprojectdetailrelease/{selectVenuesProject}',
+ [app.venueUrl, self.data.selectVenuesProject]), {}, null,
+ function(code,data){
+ console.log(data);
self.setData({
- selectVenuesProjectDetail: res.data.data
+ selectVenuesProjectDetail: data.data
});
+ }, function(code,data){
+ app.dialog.msg(data.msg);
}
- });
+ );
},
//场馆地图导航
showMap: function(options){
- console.log(options);
var dataObj = options.currentTarget.dataset
- console.log(dataObj.latitude + 0)
wx.openLocation({//使用微信内置地图查看位置。
latitude: Number(dataObj.latitude),//要去的纬度-地址
longitude: Number(dataObj.longitude),//要去的经度-地址
diff --git a/pages/venueDetail/venueDetail.wxml b/pages/venueDetail/venueDetail.wxml
index b9a2b07..9972306 100644
--- a/pages/venueDetail/venueDetail.wxml
+++ b/pages/venueDetail/venueDetail.wxml
@@ -1,7 +1,7 @@
-
-
+
+
@@ -28,7 +28,7 @@
{{item.projectName}}
+ wx:for="{{venuesProjectList}}" wx:key="index" bindtap="changeVenuesProject" data-id="{{item.venuesProjectId}}">{{item.projectName}}