From f1150528fae9c49ea51ae55753d64675c48400c1 Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Thu, 2 Jul 2020 18:46:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=8B=E5=8F=8B=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.json | 8 +++-
pages/friendCircle/friendCircle.js | 66 ++++++++++++++++++++++++++++
pages/friendCircle/friendCircle.json | 3 ++
pages/friendCircle/friendCircle.wxml | 59 +++++++++++++++++++++++++
pages/friendCircle/friendCircle.wxss | 48 ++++++++++++++++++++
5 files changed, 182 insertions(+), 2 deletions(-)
create mode 100644 pages/friendCircle/friendCircle.js
create mode 100644 pages/friendCircle/friendCircle.json
create mode 100644 pages/friendCircle/friendCircle.wxml
create mode 100644 pages/friendCircle/friendCircle.wxss
diff --git a/app.json b/app.json
index d4c96db..e1f57e6 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,12 @@
{
"pages": [
- "pages/venue/venue",
+ "pages/friendCircle/friendCircle",
"pages/index/index",
+ "pages/venue/venue",
+ "pages/broadcastList/broadcastList",
+ "pages/orderDetail/orderDetail",
+ "pages/myVenueOrder/myVenueOrder",
+ "pages/book/book",
"pages/broadcast/broadcast",
"pages/activityDialog/activityDialog",
"pages/teamDetail/teamDetail",
@@ -11,7 +16,6 @@
"pages/heritage/heritage",
"pages/broadcastDetail/broadcastDetail",
"pages/venueDetail/venueDetail",
- "pages/book/book",
"pages/register/register",
"pages/login/login",
"pages/newVolunteerActivity/newVolunteerActivity",
diff --git a/pages/friendCircle/friendCircle.js b/pages/friendCircle/friendCircle.js
new file mode 100644
index 0000000..dd7887d
--- /dev/null
+++ b/pages/friendCircle/friendCircle.js
@@ -0,0 +1,66 @@
+// pages/friendCircle/friendCircle.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ 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/friendCircle/friendCircle.json b/pages/friendCircle/friendCircle.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/friendCircle/friendCircle.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/friendCircle/friendCircle.wxml b/pages/friendCircle/friendCircle.wxml
new file mode 100644
index 0000000..0005b82
--- /dev/null
+++ b/pages/friendCircle/friendCircle.wxml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+ 张三
+ 内容内容内容内容内容
+ 2020-01-01 00:00:00
+
+
+
+
+
+
+
+ 张三
+ 内容内容内容内容内容
+
+
+
+ 2020-01-01 00:00:00
+
+
+
+
+
+
+
+ 张三
+ 内容内容内容内容内容
+
+
+
+
+
+
+
+
+
+
+
+ 2020-01-01 00:00:00
+
+
+
+
+
+
+
+ 张三
+ 内容内容内容内容内容
+
+
+
+ 2020-01-01 00:00:00
+
+
+
\ No newline at end of file
diff --git a/pages/friendCircle/friendCircle.wxss b/pages/friendCircle/friendCircle.wxss
new file mode 100644
index 0000000..b8dc371
--- /dev/null
+++ b/pages/friendCircle/friendCircle.wxss
@@ -0,0 +1,48 @@
+.friend-circle{
+ padding: 30rpx;
+}
+.friend-circle-box{
+ margin-bottom: 20rpx;
+ display: flex;
+ justify-content: space-between;
+ border-bottom: 1px solid #DEDEDE;
+ padding-bottom: 10rpx;
+}
+.avatar{
+ width: 8%;
+}
+.avatar image{
+ width: 100%;
+ height: 50rpx;
+}
+.content{
+ width: 90%;
+}
+.name{
+ font-size: 30rpx;
+ color: #949494;
+}
+.text{
+ font-size: 32rpx;
+ color: #000;
+ margin: 10rpx 0;
+}
+.date{
+ font-size: 28rpx;
+ color: #949494;
+}
+.photo-one image{
+ width: 80%;
+}
+.photo-more image{
+ width: 32%;
+ height: 150rpx;
+ margin-right: 2%;
+ margin-bottom: 10rpx;
+}
+.photo-more image:nth-child(3n){
+ margin-right: 0;
+}
+.video video{
+ width: 80%;
+}
\ No newline at end of file
From de4dd4652a3683c9a0b0072569b306249dd5ad11 Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Thu, 2 Jul 2020 19:03:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E7=BB=91=E5=AE=9A?=
=?UTF-8?q?=E6=89=8B=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/center/center.js | 116 ------------------------------------
pages/index/index.js | 132 ++++++++++++++++++++++++++++++++++++++++-
pages/index/index.wxml | 16 +++++
pages/index/index.wxss | 79 ++++++++++++++++++++++++
4 files changed, 226 insertions(+), 117 deletions(-)
diff --git a/pages/center/center.js b/pages/center/center.js
index de7bca9..98033a9 100644
--- a/pages/center/center.js
+++ b/pages/center/center.js
@@ -120,126 +120,10 @@ Page({
url: '../myVolunteerActivity/myVolunteerActivity',
})
},
- // 判断用户是否为随机名称
- isRandomName: function () {
- var self = this
- wx.getStorage({
- key: 'isRandomUsername',
- success: function (res) {
- if (res.data == 1) {
- wx.hideTabBar()
- self.setData({
- randomName: true
- })
- }
- }
- })
- },
- // 取消绑定手机
- cancelPhone: function () {
- this.setData({
- showPhone: false
- })
- wx.showTabBar()
- },
- // 获取输入的手机号
- phoneNum: function (res) {
- this.setData({
- phone: res.detail.value
- })
- console.log(this.data.phone)
- },
- // 校验手机号
- testPhone: function () {
- var self = this
- if (self.data.phone) {
- if (!/^1(3|4|5|6|7|8|9)\d{9}$/.test(self.data.phone)) {
- wx.showToast({
- title: '请输入正确的手机号',
- icon: 'none',
- duration: 1500
- })
- } else {
- self.getCode()
- }
- } else {
- wx.showToast({
- title: '手机号不能为空',
- icon: 'none',
- duration: 1500
- })
- }
- },
- // 获取验证码
- getCode: function () {
- var self = this
- app.restAjax.get(app.restAjax.path('{usercenterUrl}/api/sms/getverificationcode/' + self.data.phone, [app.usercenterUrl]), {}, null,
- function (code, data) {
- if (code == 200) {
- console.log(data)
- self.setData({
- gotCode: true
- })
- self.data.timer = setInterval(function () {
- var cur = self.data.restTime - 1
- console.log(cur)
- if (cur == 0) {
- clearInterval(self.data.timer)
- self.setData({
- restTime: 120,
- gotCode: false
- })
- }
- self.setData({
- restTime: cur
- })
- }, 1000)
- }
- },
- function (code, data) {
- console.log(data)
- wx.showToast({
- title: data.msg,
- icon: 'none',
- duration: 1500
- })
- } )
- },
- // 提交绑定手机
- submitPhone: function () {
- var self = this
- app.restAjax.put(app.restAjax.path('{usercenterUrl}/app/user/updateminiappdefaultusername', [app.usercenterUrl]), {
- phone: self.data.phone,
- verificationCode: self.data.code
- }, {
- headers: {
- token: self.data.token
- }
- }, function (code, data) {
- console.log(data)
- wx.setStorageSync('token', data.data);
- wx.setStorageSync('isRandomUsername', 0)
- clearInterval(self.data.timer)
- self.setData({
- showPhone: false,
- restTime: 120
- })
- self.getUserInfo()
- }, function (code, data) {
- console.log(data)
- })
- },
- // 验证码
- inputCode: function (e) {
- this.setData({
- code: e.detail.value
- })
- },
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- this.isRandomName()
this.getToken()
},
diff --git a/pages/index/index.js b/pages/index/index.js
index c3a68b2..cb3b660 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -4,6 +4,11 @@ Page({
* 页面的初始数据
*/
data: {
+ randomName: '',
+ showPhone: true,
+ gotCode: false,
+ restTime: 120,
+ timer: '',
indicatorDots: true,
autoplay: true,
token: '',
@@ -26,7 +31,8 @@ Page({
live: {
liveUrl: app.liveUrl,
liveList: []
- }
+ },
+ usercenterUrl: app.usercenterUrl
},
doLogin: function () {
var self = this;
@@ -158,6 +164,129 @@ Page({
url: '../heritage/heritage',
})
},
+ // 获取输入的手机号
+ phoneNum: function (res) {
+ this.setData({
+ phone: res.detail.value
+ })
+ console.log(this.data.phone)
+ },
+ // 校验手机号
+ testPhone: function () {
+ var self = this
+ if (self.data.phone) {
+ if (!/^1(3|4|5|6|7|8|9)\d{9}$/.test(self.data.phone)) {
+ wx.showToast({
+ title: '请输入正确的手机号',
+ icon: 'none',
+ duration: 1500
+ })
+ } else {
+ self.getCode()
+ }
+ } else {
+ wx.showToast({
+ title: '手机号不能为空',
+ icon: 'none',
+ duration: 1500
+ })
+ }
+ },
+ // 获取验证码
+ getCode: function () {
+ var self = this
+ app.restAjax.get(app.restAjax.path('{usercenterUrl}/api/sms/getverificationcode/' + self.data.phone, [app.usercenterUrl]), {}, null,
+ function (code, data) {
+ if (code == 200) {
+ console.log(data)
+ self.setData({
+ gotCode: true
+ })
+ self.data.timer = setInterval(function () {
+ var cur = self.data.restTime - 1
+ console.log(cur)
+ if (cur == 0) {
+ clearInterval(self.data.timer)
+ self.setData({
+ restTime: 120,
+ gotCode: false
+ })
+ }
+ self.setData({
+ restTime: cur
+ })
+ }, 1000)
+ }
+ },
+ function (code, data) {
+ console.log(data)
+ wx.showToast({
+ title: data.msg,
+ icon: 'none',
+ duration: 1500
+ })
+ } )
+ },
+ // 提交绑定手机
+ submitPhone: function () {
+ var self = this
+ app.restAjax.put(app.restAjax.path('{usercenterUrl}/app/user/updateminiappdefaultusername', [app.usercenterUrl]), {
+ phone: self.data.phone,
+ verificationCode: self.data.code
+ }, {
+ headers: {
+ token: self.data.token
+ }
+ }, function (code, data) {
+ console.log(data)
+ wx.setStorageSync('token', data.data);
+ wx.setStorageSync('isRandomUsername', 0)
+ clearInterval(self.data.timer)
+ self.setData({
+ showPhone: false,
+ restTime: 120
+ })
+ self.getUserInfo()
+ }, function (code, data) {
+ console.log(data)
+ })
+ },
+ // 验证码
+ inputCode: function (e) {
+ this.setData({
+ code: e.detail.value
+ })
+ },
+ // 判断用户是否为随机名称
+ isRandomName: function () {
+ var self = this
+ wx.getStorage({
+ key: 'isRandomUsername',
+ success: function (res) {
+ if (res.data == 1) {
+ wx.hideTabBar()
+ self.setData({
+ randomName: true
+ })
+ }
+ }
+ })
+ },
+ // 获取用户信息
+ 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)
+ })
+ },
/**
* 生命周期函数--监听页面加载
*/
@@ -169,6 +298,7 @@ Page({
self.doGetLiveList();
self.doGetVenueList();
self.doGetActivityList();
+ self.isRandomName();
},
/**
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 456d041..763dda0 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -125,4 +125,20 @@
错误
+
+
+
+ 您还没有绑定手机号，请先绑定手机号
+
+
+
+
+
+ 获取验证码
+ {{restTime}}
+
+
+ 确认
+
+
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index b0993d1..b51d0d4 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -156,4 +156,83 @@
color: #fff;
font-size: 26rpx;
border-radius: 10rpx;
+}
+.set-phone{
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0, 0, 0, .6);
+ z-index: 100;
+}
+.set-phone-box{
+ width: 96%;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ background: #fff;
+ border-radius: 10rpx;
+ padding: 30rpx;
+ box-sizing: border-box;
+}
+.tips{
+ font-size: 28rpx;
+ color: #000;
+}
+.phone-input{
+ margin: 25rpx 0;
+}
+.code-input{
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 25rpx;
+}
+.code-input input{
+ width: 70%;
+ height: 55rpx;
+ border: 1px solid #dedede;
+ border-radius: 10rpx;
+ padding: 0 10rpx;
+ box-sizing: border-box;
+ font-size: 28rpx;
+}
+.phone-input input{
+ width: 100%;
+ height: 55rpx;
+ border: 1px solid #dedede;
+ border-radius: 10rpx;
+ padding: 0 10rpx;
+ box-sizing: border-box;
+ font-size: 28rpx;
+}
+.get-code, .got-code{
+ font-size: 28rpx;
+ background: rgba(159,21,18,.1);
+ color: #9F1512;
+ width: 28%;
+ line-height: 55rpx;
+ text-align: center;
+ border-radius: 10rpx;
+}
+.got-code{
+ background: #fff;
+ color: #4a4d52;
+ border: 1px solid #eaeaea;
+}
+.set-phone-btn-box{
+ display: flex;
+ justify-content: space-between;
+}
+.set-phone-btn{
+ width: 100%;
+ height: 65rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 28rpx;
+ color: #fff;
+ background: #9F1512;
+ border-radius: 10rpx;
}
\ No newline at end of file