diff --git a/app.js b/app.js
index f200905..e6cf713 100644
--- a/app.js
+++ b/app.js
@@ -1,20 +1,21 @@
//app.js
var restAjax = require('utils/restAjax.js');
var dialog = require('utils/dialog.js');
+// + 'https://www.xzszwhy.cn/usercenter'
App({
- loginUrl: 'https://www.wgink.ink/usercenter',
- usercenterUrl: 'https://www.wgink.ink/usercenter',
- newsUrl: 'https://www.wgink.ink/news',
- newsContentUrl: 'https://www.wgink.ink',
- libraryUrl: 'https://www.wgink.ink/library',
- venueUrl: 'https://www.wgink.ink/venuebooking',
- activityUrl: 'https://www.wgink.ink/culturalactivity',
- volunteerUrl: 'https://www.wgink.ink/volunteer',
- activityUrl: 'https://www.wgink.ink/culturalactivity',
- volunteerUrl: 'https://www.wgink.ink/volunteer',
- liveUrl: 'https://www.wgink.ink/live',
- liveRecordUrl: 'https://www.wgink.ink',
- socialUrl: 'https://www.wgink.ink/social',
+ loginUrl:restAjax.baseUrl,
+ usercenterUrl:restAjax.baseUrl,
+ newsUrl: restAjax.baseUrl,
+ newsContentUrl: restAjax.baseUrl,
+ libraryUrl: restAjax.baseUrl,
+ venueUrl: restAjax.baseUrl,
+ activityUrl: restAjax.baseUrl,
+ volunteerUrl: restAjax.baseUrl,
+ activityUrl: restAjax.baseUrl,
+ volunteerUrl: restAjax.baseUrl,
+ liveUrl: restAjax.baseUrl,
+ liveRecordUrl: restAjax.baseUrl,
+ socialUrl: restAjax.baseUrl,
restAjax: restAjax,
dialog: dialog,
onLaunch: function () {
diff --git a/pages/activity/activity.js b/pages/activity/activity.js
index c6d4ffe..8773892 100644
--- a/pages/activity/activity.js
+++ b/pages/activity/activity.js
@@ -52,7 +52,7 @@ Page({
if('200' == code) {
for(var item of data.rows) {
if('' != item.activityImage) {
- item.activityImage = app.activityUrl + '/route/file/downloadfile/true/' + item.activityImage;
+ item.activityImage = app.activityUrl + '/route/file/download/true/' + item.activityImage;
}
}
if(1 === self.data.pages.page) {
diff --git a/pages/activityDetail/activityDetail.wxml b/pages/activityDetail/activityDetail.wxml
index 7b5dca2..0cd2c82 100644
--- a/pages/activityDetail/activityDetail.wxml
+++ b/pages/activityDetail/activityDetail.wxml
@@ -1,7 +1,7 @@
-
+
diff --git a/pages/activityDialog/activityDialog.js b/pages/activityDialog/activityDialog.js
index 5afb011..dda691a 100644
--- a/pages/activityDialog/activityDialog.js
+++ b/pages/activityDialog/activityDialog.js
@@ -41,19 +41,19 @@ Page({
var photos = [];
for(var item of data.rows) {
if('' != item.photo) {
- item.photo = app.volunteerUrl + '/route/file/downloadfile/true/' + item.photo;
+ item.photo = app.volunteerUrl + '/route/file/download/true/' + item.photo;
}
if('' != item.photos) {
var photoArr = item.photos.split(",");
for(var i=0; i
-
+
diff --git a/pages/broadcast/broadcast.wxml b/pages/broadcast/broadcast.wxml
index ff7c19d..681ac73 100644
--- a/pages/broadcast/broadcast.wxml
+++ b/pages/broadcast/broadcast.wxml
@@ -1,7 +1,7 @@
-
+
已结束
未开始
直播中
diff --git a/pages/broadcastDetail/broadcastDetail.wxml b/pages/broadcastDetail/broadcastDetail.wxml
index 10af21f..2542eb8 100644
--- a/pages/broadcastDetail/broadcastDetail.wxml
+++ b/pages/broadcastDetail/broadcastDetail.wxml
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/center/center.js b/pages/center/center.js
index edf0569..ab5f4e3 100644
--- a/pages/center/center.js
+++ b/pages/center/center.js
@@ -15,7 +15,7 @@ Page({
token: '',
userInfo: {},
usercenterUrl: app.usercenterUrl,
- sourcePath: '/route/file/downloadfile/true/',
+ sourcePath: '/route/file/download/true/',
phone: '',
code: '',
isLoading: false
diff --git a/pages/cultureDetail/cultureDetail.js b/pages/cultureDetail/cultureDetail.js
index cf3bba7..d37d6f3 100644
--- a/pages/cultureDetail/cultureDetail.js
+++ b/pages/cultureDetail/cultureDetail.js
@@ -39,7 +39,7 @@ Page({
var covers = data.libraryCover.split(',');
var imageArray = [];
for(var i = 0, item; item = covers[i++];) {
- imageArray.push(app.restAjax.path('{libraryUrl}/route/file/downloadfile/true/{cover}', [self.data.libraryUrl, item]));
+ imageArray.push(app.restAjax.path('{libraryUrl}/route/file/download/true/{cover}', [self.data.libraryUrl, item]));
}
self.setData({
library: data,
diff --git a/pages/friendCircle/friendCircle.wxml b/pages/friendCircle/friendCircle.wxml
index 3e9f969..cafaf5d 100644
--- a/pages/friendCircle/friendCircle.wxml
+++ b/pages/friendCircle/friendCircle.wxml
@@ -17,7 +17,7 @@
{{item.creatorName}}
{{item.content}}
-
+
{{item.gmtCreate}}
@@ -30,7 +30,7 @@
{{item.creatorName}}
{{item.content}}
-
+
{{item.gmtCreate}}
@@ -43,7 +43,7 @@
{{item.creatorName}}
{{item.content}}
-
+
{{item.gmtCreate}}
diff --git a/pages/heritage/heritage.wxml b/pages/heritage/heritage.wxml
index 404a660..6979eee 100644
--- a/pages/heritage/heritage.wxml
+++ b/pages/heritage/heritage.wxml
@@ -21,7 +21,7 @@
-
+
diff --git a/pages/index/index.js b/pages/index/index.js
index 1618d1a..163f8ac 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -37,9 +37,11 @@ Page({
wx.login({
success(res) {
if (res.code) {
- app.restAjax.post(app.restAjax.path('{url}/wxminiapp/auth/login', [app.loginUrl]), {
+ app.restAjax.post(app.restAjax.path('{url}/wechat-miniapp/sign/default', [app.loginUrl]), {
jsCode: res.code
}, null, function (code, data) {
+ // var token ='elMxZExMVzZ2ZnYyM0JKU1FWRTZKcDFiVFhZeXpGbFBMTFh6c2I0NjNmeWlrU0RwUmlHMDViY1QxY0hsZ1dpdzh1TFhKL0hMT1JRV2pMYkZ0emliNW1LNU0rVHYwNDQvYW5qV0ZwcitoWGhMMENBeFZxTmlDT0FjTThhaDZaM3pFSzFyUXlGbFN5MUlTaE80dG5aNFJYSWFlMEk4a0d0R0kyczRYanIwUUF6VkFmeGdlWEdIM3UzYmdOMWtZYUtrZTZJUVF1bm94V0p4QTlpVDBmb0U1bTkvSCt5UkpqemE3cGxYTDMzZG5SQmVzNXU4dHIxS3l5bHlINURkV1VTWVc2VHFRanVMN0t2eXd0YUhTcHJaQzNYaFhLVEFBYm9MU0hkS1lEaE41d1U9';
+ console.log(data)
var tokenArray = data.data.split('_');
var token = tokenArray[0];
var isRandomUsername = tokenArray[1];
@@ -52,6 +54,7 @@ Page({
app.dialog.msg(data.msg);
});
} else {
+ console.log(res)
app.dialog.msg('登录失败!'+ res.errMsg);
}
}
@@ -93,6 +96,7 @@ Page({
page: 1,
rows: 3
}, null, function(code, data) {
+ console.log(data);
for(var i = 0, item; item = data.rows[i++];) {
item.activityImageArray = item.activityImage.split(',');
}
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index dcbadff..115657e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,7 +1,7 @@
-
+
@@ -57,10 +57,10 @@
-
+
-
+
@@ -76,7 +76,7 @@
{{item.newsContentTitle}}
-
+
来源:{{item.newsContentResource}}
@@ -85,7 +85,7 @@
-
+
{{item.newsContentTitle}}
@@ -104,13 +104,13 @@
-
+
{{item.newsContentTitle}}
-
+
来源:{{item.newsContentResource}}
@@ -127,7 +127,7 @@
{{item.newsContentTitle}}
-
+
@@ -155,7 +155,7 @@
-
+
{{item.livePlanName}}
直播中
已结束
diff --git a/pages/myFriendCircle/myFriendCircle.wxml b/pages/myFriendCircle/myFriendCircle.wxml
index 15dfbad..59e2b16 100644
--- a/pages/myFriendCircle/myFriendCircle.wxml
+++ b/pages/myFriendCircle/myFriendCircle.wxml
@@ -17,7 +17,7 @@
{{item.creatorName}}
{{item.content}}
-
+
{{item.gmtCreate}}
@@ -30,7 +30,7 @@
{{item.creatorName}}
{{item.content}}
-
+
{{item.gmtCreate}}
@@ -43,7 +43,7 @@
{{item.creatorName}}
{{item.content}}
-
+
{{item.gmtCreate}}
diff --git a/pages/myVolunteerActivity/myVolunteerActivity.js b/pages/myVolunteerActivity/myVolunteerActivity.js
index 362e624..4eb2c9f 100644
--- a/pages/myVolunteerActivity/myVolunteerActivity.js
+++ b/pages/myVolunteerActivity/myVolunteerActivity.js
@@ -66,7 +66,7 @@ Page({
for(var item of data.rows) {
if('' != item.photo) {
var photoArr = item.photo.split(",");
- item.photo = app.volunteerUrl + '/route/file/downloadfile/true/' + photoArr[0];
+ item.photo = app.volunteerUrl + '/route/file/download/true/' + photoArr[0];
}
}
self.setData({
diff --git a/pages/newTeam/newTeam.js b/pages/newTeam/newTeam.js
index 09b67b6..dadcb1a 100644
--- a/pages/newTeam/newTeam.js
+++ b/pages/newTeam/newTeam.js
@@ -75,7 +75,7 @@ Page({
var data = data.substr(9, data.length);
data = data.substr(0, data.length - 2);
self.setData({
- photo: app.volunteerUrl + '/route/file/downloadfile/true/' + data,
+ photo: app.volunteerUrl + '/route/file/download/true/' + data,
uploadPhoto: data
})
}
diff --git a/pages/newVolunteerActivity/newVolunteerActivity.js b/pages/newVolunteerActivity/newVolunteerActivity.js
index 051d5d2..6f0f7df 100644
--- a/pages/newVolunteerActivity/newVolunteerActivity.js
+++ b/pages/newVolunteerActivity/newVolunteerActivity.js
@@ -100,7 +100,7 @@ Page({
var data = data.substr(9, data.length);
data = data.substr(0, data.length - 2);
self.setData({
- photo: app.volunteerUrl + '/route/file/downloadfile/true/' + data,
+ photo: app.volunteerUrl + '/route/file/download/true/' + data,
uploadPhoto: data
})
}
diff --git a/pages/newsList/newsList.wxml b/pages/newsList/newsList.wxml
index 4c63df4..575348a 100644
--- a/pages/newsList/newsList.wxml
+++ b/pages/newsList/newsList.wxml
@@ -29,7 +29,7 @@
{{item.newsContentTitle}}
-
+
来源:{{item.newsContentResource}}
@@ -38,7 +38,7 @@
-
+
{{item.newsContentTitle}}
@@ -57,13 +57,13 @@
-
+
{{item.newsContentTitle}}
-
+
来源:{{item.newsContentResource}}
@@ -80,7 +80,7 @@
{{item.newsContentTitle}}
-
+
diff --git a/pages/order/order.js b/pages/order/order.js
index a8aae2c..86ba5be 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -7,7 +7,7 @@ Page({
*/
data: {
venueUrl : app.venueUrl,
- imgRoute : '/route/file/downloadfile/true/',
+ imgRoute : '/route/file/download/true/',
token: '',
orderList:[],
page: 1,
diff --git a/pages/orderDetail/orderDetail.js b/pages/orderDetail/orderDetail.js
index 276c389..83a69b1 100644
--- a/pages/orderDetail/orderDetail.js
+++ b/pages/orderDetail/orderDetail.js
@@ -7,7 +7,7 @@ Page({
*/
data: {
venueUrl : app.venueUrl,
- imgRoute : '/route/file/downloadfile/true/',
+ imgRoute : '/route/file/download/true/',
token:'',
groundBookingId: '',
serial: '',
diff --git a/pages/resource/resource.wxml b/pages/resource/resource.wxml
index 6761b90..dee09d3 100644
--- a/pages/resource/resource.wxml
+++ b/pages/resource/resource.wxml
@@ -16,7 +16,7 @@
{{item.newsContentTitle}}
-
+
{{item.newsContentPublishTime}}
diff --git a/pages/serviceActivityDetail/serviceActivityDetail.js b/pages/serviceActivityDetail/serviceActivityDetail.js
index f00dc9f..f8590cf 100644
--- a/pages/serviceActivityDetail/serviceActivityDetail.js
+++ b/pages/serviceActivityDetail/serviceActivityDetail.js
@@ -39,7 +39,7 @@ Page({
}
}, function(code, data) {
if('200' == code) {
- data.photo = app.volunteerUrl + '/route/file/downloadfile/true/' + data.photo;
+ data.photo = app.volunteerUrl + '/route/file/download/true/' + data.photo;
self.setData({
dataMap: data
})
diff --git a/pages/template/template.js b/pages/template/template.js
index e68fba0..3dfda78 100644
--- a/pages/template/template.js
+++ b/pages/template/template.js
@@ -18,7 +18,7 @@ Page({
app.dialog.loading('正在加载');
var type = options.link.split('.')
if (type[type.length-1] == 'pdf') {
- wx.downloadFile({
+ wx.download({
url: options.link,
success: function (res) {
const filePath = res.tempFilePath
diff --git a/pages/train/train.wxml b/pages/train/train.wxml
index 6761b90..dee09d3 100644
--- a/pages/train/train.wxml
+++ b/pages/train/train.wxml
@@ -16,7 +16,7 @@
{{item.newsContentTitle}}
-
+
{{item.newsContentPublishTime}}
diff --git a/pages/travel/travel.wxml b/pages/travel/travel.wxml
index f99efab..4d8a873 100644
--- a/pages/travel/travel.wxml
+++ b/pages/travel/travel.wxml
@@ -2,7 +2,7 @@
{{item.newsContentTitle}}
-
+
\ No newline at end of file
diff --git a/pages/venue/venue.js b/pages/venue/venue.js
index 4e3104e..1a69bc5 100644
--- a/pages/venue/venue.js
+++ b/pages/venue/venue.js
@@ -7,7 +7,7 @@ Page({
*/
data: {
venueUrl : app.venueUrl,
- imgRoute : '/route/file/downloadfile/true/',
+ imgRoute : '/route/file/download/true/',
venueTypeParentId : 'df8b758c-f6d8-465a-9aa8-c451fde47076',
page : '1',
rows : '10',
diff --git a/pages/venueDetail/venueDetail.js b/pages/venueDetail/venueDetail.js
index ac9e952..7c42efb 100644
--- a/pages/venueDetail/venueDetail.js
+++ b/pages/venueDetail/venueDetail.js
@@ -6,7 +6,7 @@ Page({
*/
data: {
venueUrl: app.venueUrl,
- imgRoute : '/route/file/downloadfile/true/',
+ imgRoute : '/route/file/download/true/',
indicatorDots: true,
autoplay: true,
venuesInfoId: '',
diff --git a/pages/volunteer/volunteer.js b/pages/volunteer/volunteer.js
index c5855e8..b5b5244 100644
--- a/pages/volunteer/volunteer.js
+++ b/pages/volunteer/volunteer.js
@@ -47,7 +47,7 @@ Page({
for(var item of data.rows) {
if('' != item.photo) {
var photoArr = item.photo.split(",");
- item.photo = app.volunteerUrl + '/route/file/downloadfile/true/' + photoArr[0];
+ item.photo = app.volunteerUrl + '/route/file/download/true/' + photoArr[0];
}
}
if(1 === self.data.pages.page) {
diff --git a/utils/restAjax.js b/utils/restAjax.js
index c818e8d..90eab16 100644
--- a/utils/restAjax.js
+++ b/utils/restAjax.js
@@ -224,4 +224,5 @@ module.exports.get = getForm;
module.exports.params = getParamsArg;
module.exports.path = buildPath;
module.exports.escape = escape;
-module.exports.file = postFile;
\ No newline at end of file
+module.exports.file = postFile;
+module.exports.baseUrl='http://49.233.36.36:58099/xzszwhy';
\ No newline at end of file