diff --git a/app.json b/app.json
index 7c3a774..6ec8c36 100644
--- a/app.json
+++ b/app.json
@@ -9,7 +9,6 @@
"pages/order/order",
"pages/venue/venue",
"pages/center/center",
- "pages/newFriendCircle/newFriendCircle",
"pages/myFriendCircle/myFriendCircle",
"pages/friendCircle/friendCircle",
"pages/orderDetail/orderDetail",
diff --git a/images/loading.gif b/images/loading.gif
new file mode 100644
index 0000000..8524d0f
Binary files /dev/null and b/images/loading.gif differ
diff --git a/images/play.png b/images/play.png
new file mode 100644
index 0000000..ab4c6ca
Binary files /dev/null and b/images/play.png differ
diff --git a/pages/book/book.js b/pages/book/book.js
index aefe4d9..6a4dcfe 100644
--- a/pages/book/book.js
+++ b/pages/book/book.js
@@ -123,11 +123,7 @@ Page({
return false;
}
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}} ,
->>>>>>> f1eff69198504079759bf289a71907006b988a79
function(code,data){
if(data.data.length > 0 ){
self.setData({
diff --git a/pages/center/center.js b/pages/center/center.js
index b901ff1..edf0569 100644
--- a/pages/center/center.js
+++ b/pages/center/center.js
@@ -17,7 +17,8 @@ Page({
usercenterUrl: app.usercenterUrl,
sourcePath: '/route/file/downloadfile/true/',
phone: '',
- code: ''
+ code: '',
+ isLoading: false
},
// 选择头像来源
changeAvatar: function () {
@@ -76,21 +77,6 @@ Page({
console.log(data)
})
},
- // 获取用户信息
- getUserInfo: function () {
- var self = this
- app.restAjax.get(app.restAjax.path('{usercenterUrl}/app/user/getappuser', [app.usercenterUrl]), {}, {
- headers: {
- token: self.data.token
- }
- }, function (code, data) {
- self.setData({
- userInfo: data
- })
- }, function (code, data) {
- console.log(data)
- })
- },
// 获取token
getToken: function () {
var self = this
@@ -179,36 +165,6 @@ Page({
})
}
},
- // 获取验证码
- getCode: function () {
- var self = this;
- self.setData({
- gotCode: true
- })
- self.data.timer = setInterval(function () {
- var cur = self.data.restTime - 1
- if (cur == 0) {
- clearInterval(self.data.timer)
- self.setData({
- restTime: 120,
- gotCode: false
- })
- } else {
- self.setData({
- restTime: cur
- })
- }
- }, 1000)
- app.restAjax.get(app.restAjax.path('{usercenterUrl}/api/sms/getverificationcode/' + self.data.phone, [app.usercenterUrl]), {}, null,
- function (code, data) {},
- function (code, data) {
- wx.showToast({
- title: data.msg,
- icon: 'none',
- duration: 1500
- })
- })
- },
// 提交绑定手机
submitPhone: function () {
var self = this;
@@ -216,8 +172,7 @@ Page({
isConfirm: true
})
app.restAjax.put(app.restAjax.path('{usercenterUrl}/app/user/updateminiappdefaultusername', [app.usercenterUrl]), {
- phone: self.data.phone,
- verificationCode: self.data.code
+ phone: self.data.phone
}, {
headers: {
token: self.data.token
@@ -238,11 +193,47 @@ Page({
})
})
},
- // 验证码
- inputCode: function (e) {
- this.setData({
- code: e.detail.value
+ // // 验证码
+ // inputCode: function (e) {
+ // this.setData({
+ // code: e.detail.value
+ // })
+ // },
+ getPhoneNumber: function (e) {
+ var self = this
+ self.setData({
+ isLoading: true
})
+ console.log(e)
+ if (e.detail.errMsg == 'getPhoneNumber:ok') {
+ var info = {
+ encryptedData: e.detail.encryptedData,
+ iv: e.detail.iv
+ }
+ // app.dialog.loading('正在加载');
+ app.restAjax.put(app.restAjax.path('{usercenterUrl}/app/miniuser/updatedefaultusernamebydata', [app.usercenterUrl]), info, {
+ headers: {
+ token: self.data.token
+ }
+ }, function (code, data) {
+ // wx.hideLoading();
+ self.setData({
+ isLoading: false
+ })
+ wx.setStorageSync('token', data.data);
+ wx.setStorageSync('isRandomUsername', '0');
+ self.setData({
+ randomName: false,
+ token: data.data
+ })
+ self.getUserInfo()
+ app.dialog.msg('绑定成功');
+ })
+ } else {
+ self.setData({
+ isLoading: false
+ })
+ }
},
// 判断用户是否为随机名称
isRandomName: function () {
@@ -251,7 +242,6 @@ Page({
key: 'isRandomUsername',
success: function (res) {
if (res.data == 1) {
- wx.hideTabBar()
self.setData({
randomName: true
})
@@ -263,32 +253,33 @@ Page({
}
})
},
- // 获取用户信息
- getUserInfo: function () {
- var self = this
- app.restAjax.get(app.restAjax.path('{usercenterUrl}/app/user/getappuser', [app.usercenterUrl]), {}, {
- headers: {
- token: self.data.token
- }
- }, function (code, data) {
- self.setData({
- userInfo: data
- })
- }, function (code, data) {
- app.dialog.msg(data.msg);
+ // 获取用户信息
+ getUserInfo: function () {
+ var self = this
+ app.restAjax.get(app.restAjax.path('{usercenterUrl}/app/user/getappuser', [app.usercenterUrl]), {}, {
+ headers: {
+ token: self.data.token
+ }
+ }, function (code, data) {
+ self.setData({
+ userInfo: data
})
- },
+ }, function (code, data) {
+ app.dialog.msg(data.msg);
+ })
+ },
cancelPhone: function () {
this.setData({
showPhone: false
})
+ wx.showTabBar()
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.isRandomName();
- this.getToken()
+ this.getToken();
},
/**
diff --git a/pages/center/center.wxml b/pages/center/center.wxml
index d014188..6f9900d 100644
--- a/pages/center/center.wxml
+++ b/pages/center/center.wxml
@@ -7,6 +7,8 @@
{{userInfo.name}}
+
+ 绑定手机号后，账号信息即可与APP共享
常用功能
@@ -39,10 +41,10 @@
我的志愿活动
-
+
+
+
\ No newline at end of file
diff --git a/pages/center/center.wxss b/pages/center/center.wxss
index 593722b..87f9007 100644
--- a/pages/center/center.wxss
+++ b/pages/center/center.wxss
@@ -143,4 +143,25 @@
color: #fff;
background: #9F1512;
border-radius: 10rpx;
+}
+.tips{
+ font-size: 30rpx;
+ text-align: center;
+ margin-top: 15rpx;
+}
+.loading{
+ position: fixed;
+ top: 0;
+ right: 0;
+ left: 0;
+ bottom: 0;
+ background: rgba(0, 0, 0, .2);
+}
+.loading image{
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%,-50%);
+ width: 150rpx;
+ height: 150rpx;
}
\ No newline at end of file
diff --git a/pages/friendCircle/friendCircle.js b/pages/friendCircle/friendCircle.js
index 3232d7a..77a66c3 100644
--- a/pages/friendCircle/friendCircle.js
+++ b/pages/friendCircle/friendCircle.js
@@ -53,11 +53,11 @@ Page({
wx.hideLoading();
});
},
- newFriendCircle: function () {
- wx.navigateTo({
- url: '../newFriendCircle/newFriendCircle',
- })
- },
+ // newFriendCircle: function () {
+ // wx.navigateTo({
+ // url: '../newFriendCircle/newFriendCircle',
+ // })
+ // },
toMyFriendCircle: function () {
wx.navigateTo({
url: '../myFriendCircle/myFriendCircle',
diff --git a/pages/heritage/heritage.wxml b/pages/heritage/heritage.wxml
index 68beadc..404a660 100644
--- a/pages/heritage/heritage.wxml
+++ b/pages/heritage/heritage.wxml
@@ -9,7 +9,7 @@
文化直播
-->
-
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8ce8aaf..dcbadff 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -124,6 +124,25 @@
{{item.newsContentPublishTime}}
+
+ {{item.newsContentTitle}}
+
+
+
+
+
+ 来源：{{item.newsContentResource}}
+ {{item.newsContentPublishTime}}
+
+
+
+ {{item.newsContentTitle}}
+
+ 来源：{{item.newsContentResource}}
+ {{item.newsContentPublishTime}}
+
+
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index ec4406b..64d5f2b 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -238,4 +238,26 @@
color: #fff;
background: #9F1512;
border-radius: 10rpx;
+}
+.voice-box{
+ padding-right: 30px;
+ position: relative;
+}
+.voice-box iamge{
+ position: absolute;
+ top: 0;
+ right: 0;
+ width:25rpx;
+ height: 25rpx;
+}
+.news-big-pic{
+ position: relative;
+}
+.news-big-pic image.play-btn{
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 80rpx;
+ height: 80rpx;
}
\ No newline at end of file
diff --git a/pages/newFriendCircle/newFriendCircle.js b/pages/newFriendCircle/newFriendCircle.js
deleted file mode 100644
index 743ed1c..0000000
--- a/pages/newFriendCircle/newFriendCircle.js
+++ /dev/null
@@ -1,130 +0,0 @@
-// pages/newFriendCircle/newFriendCircle.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- showAdd: true,
- selectedType: '',
- selectedList: [],
- isPublic: '' //朋友圈是否公开
- },
- changepublic: function (e) {
- this.setData({
- isPublic: e.detail.value
- })
- },
- selectContent: function () {
- var self = this
- wx.chooseMedia({
- count: 9 - self.data.selectedList.length,
- mediaType: ['image','video'],
- sourceType: ['album', 'camera'],
- success: function (res) {
- console.log(res)
- if (res.type == 'image') {
- self.setData({
- selectedType: res.type,
- selectedList: self.data.selectedList.concat(res.tempFiles)
- })
- } else {
- self.setData({
- selectedType: res.type,
- selectedList: self.data.selectedList.concat(res.tempFiles)
- })
- }
- self.isShowAdd()
- console.log(self.data.selectedList)
- }
- })
- },
- deletePhoto: function (e) {
- var self = this
- var now = e.currentTarget.dataset.idx
- var result = self.data.selectedList
- result.splice(now, 1)
- this.setData({
- selectedList: result
- })
- self.isShowAdd('delete')
- },
- isShowAdd: function (from) {
- if (this.data.selectedType == 'image') {
- if (this.data.selectedList.length < 9) {
- this.setData({
- showAdd: true
- })
- } else {
- this.setData({
- showAdd: false
- })
- }
- } else {
- if (from) {
- this.setData({
- showAdd: true
- })
- } else {
- this.setData({
- showAdd: false
- })
- }
- }
- },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/newFriendCircle/newFriendCircle.json b/pages/newFriendCircle/newFriendCircle.json
deleted file mode 100644
index 8835af0..0000000
--- a/pages/newFriendCircle/newFriendCircle.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/newFriendCircle/newFriendCircle.wxml b/pages/newFriendCircle/newFriendCircle.wxml
deleted file mode 100644
index 154553e..0000000
--- a/pages/newFriendCircle/newFriendCircle.wxml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是否公开：
-
- 公开
- 不公开
-
-
-
-
- 发布
-
\ No newline at end of file
diff --git a/pages/newFriendCircle/newFriendCircle.wxss b/pages/newFriendCircle/newFriendCircle.wxss
deleted file mode 100644
index 18d657f..0000000
--- a/pages/newFriendCircle/newFriendCircle.wxss
+++ /dev/null
@@ -1,79 +0,0 @@
-.new-friend-circle{
- padding: 30rpx;
- margin-bottom: 100rpx;
-}
-.text{
- width: 100%;
- height: 250rpx;
- margin-bottom: 30rpx;
-}
-.text textarea{
- width: 100%;
- height: 100%;
- border: 1px solid #DEDEDE;
- padding: 15rpx;
- box-sizing: border-box;
- font-size: 32rpx;
-}
-.add{
- width: 32%;
- height: 200rpx;
- background: #DEDEDE;
- display: inline-flex;
- justify-content: center;
- align-items: center;
- vertical-align: top;
-}
-.add image{
- width: 100rpx;
- height: 100rpx;
-}
-.is-public{
- margin-top: 20rpx;
- font-size: 30rpx;
-}
-.is-public radio-group{
- display: inline-block;
-}
-.is-public radio-group radio{
- margin-right: 20rpx;
-}
-.photo{
- display: inline-block;
- width: 32%;
- height: 200rpx;
- margin-right: 2%;
- position: relative;
- margin-bottom: 20rpx;
-}
-.photo:nth-child(3n){
- margin-right: 0;
-}
-.photo image{
- width: 100%;
- height: 100%;
-}
-.photo image.delete{
- width: 30rpx;
- height: 30rpx;
- position: absolute;
- top: -15rpx;
- right: -15rpx;
-}
-.type-box, .type-box video{
- width: 100%;
- height: 100%;
-}
-.submit{
- position: fixed;
- left: 0;
- right: 0;
- bottom: 0;
- background: #9F1512;
- height: 100rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- color: #fff;
- font-size: 32rpx;
-}
\ No newline at end of file
diff --git a/pages/newsList/newsList.js b/pages/newsList/newsList.js
index 330b6d0..bc89952 100644
--- a/pages/newsList/newsList.js
+++ b/pages/newsList/newsList.js
@@ -32,6 +32,7 @@ Page({
},
doClickDictionaries: function(event) {
var self = this;
+ console.log(event.currentTarget.dataset.newsDirectoriesId)
self.setData({
currentNewsDictionariesId: event.currentTarget.dataset.newsDirectoriesId
});
@@ -47,6 +48,7 @@ Page({
doGetNewsList: function(page, lv) {
var self = this;
app.dialog.loading('正在加载');
+ console.log(self.data.currentNewsDictionariesId)
var info = {
newsDirectoriesParentId: self.data.directoriesParentId,
newsDirectoriesId: self.data.currentNewsDictionariesId ? self.data.currentNewsDictionariesId : '',
@@ -69,6 +71,7 @@ Page({
currentPage: page,
'news.newsList': newsArray
})
+ console.log(self.data.news.newsList)
if(data.rows.length == 0) {
app.dialog.msg('暂无数据');
return;
diff --git a/pages/newsList/newsList.wxml b/pages/newsList/newsList.wxml
index 3359958..4c63df4 100644
--- a/pages/newsList/newsList.wxml
+++ b/pages/newsList/newsList.wxml
@@ -25,7 +25,7 @@
-
+
{{item.newsContentTitle}}
@@ -77,5 +77,24 @@
{{item.newsContentPublishTime}}
+
+ {{item.newsContentTitle}}
+
+
+
+
+
+ 来源：{{item.newsContentResource}}
+ {{item.newsContentPublishTime}}
+
+
+
+ {{item.newsContentTitle}}
+
+ 来源：{{item.newsContentResource}}
+ {{item.newsContentPublishTime}}
+
+
+
\ No newline at end of file
diff --git a/pages/newsList/newsList.wxss b/pages/newsList/newsList.wxss
index eb1acb2..a876635 100644
--- a/pages/newsList/newsList.wxss
+++ b/pages/newsList/newsList.wxss
@@ -5,6 +5,7 @@
right: 0;
background: #fff;
overflow-x: auto;
+ z-index: 100;
}
.type{
display: flex;
@@ -41,6 +42,7 @@
right: 20rpx;
}
.area{
+ z-index: 100;
overflow-x: auto;
white-space: nowrap;
position: fixed;
@@ -110,12 +112,34 @@
.news-info text{
margin-right: 20rpx;
}
+.voice-box{
+ padding-right: 30px;
+ position: relative;
+}
+.voice-box iamge{
+ position: absolute;
+ top: 0;
+ right: 0;
+ width:25rpx;
+ height: 25rpx;
+}
.news-big-pic, .news-small-pic{
margin-top: 10rpx;
}
+.news-big-pic{
+ position: relative;
+}
.news-big-pic image{
width: 100%;
}
+.news-big-pic image.play-btn{
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 80rpx;
+ height: 80rpx;
+}
.news-small-pic image{
width: 30%;
height: 150rpx;