diff --git a/components/segment/index.wxss b/components/segment/index.wxss
index 248d591..aa5d0dc 100644
--- a/components/segment/index.wxss
+++ b/components/segment/index.wxss
@@ -6,7 +6,8 @@
padding: 5px;
}
.title {
- min-width: 150rpx;
+ min-width: 100rpx;
+ padding: 0 20rpx;
white-space: nowrap;
display: flex;
align-items: center;
diff --git a/pages/article/index.js b/pages/article/index.js
index 8ba67ea..20949b1 100644
--- a/pages/article/index.js
+++ b/pages/article/index.js
@@ -21,6 +21,8 @@ Page({
unStar: '/images/common/star.png',
star: '/images/common/star_light.png',
disable: true,
+ readNum: 0,
+ collectNum: 0,
},
onClickCollect () {
// 收藏功能
@@ -51,7 +53,7 @@ Page({
fetchArticeApi () {
artice.getDetail(this.data.aId, (res) => {
//console.log('artice detail')
- //console.log(res)
+ console.log(res)
const data = res.result
const date = dayjs(data.createTime).format('MM月DD日')
this.setData({
@@ -63,6 +65,8 @@ Page({
isStar: data.isCollection ? true : false,
showBtn: data.typeFlag >= 2 ? true : false,
disable: data.typeFlag == 3 ? true : false,
+ readNum: data.readNum,
+ collectNum: data.collectNum,
})
})
},
diff --git a/pages/article/index.wxml b/pages/article/index.wxml
index a125279..257ca2b 100644
--- a/pages/article/index.wxml
+++ b/pages/article/index.wxml
@@ -13,6 +13,10 @@
+
+ 阅读:{{readNum}}
+ 收藏:{{collectNum}}
+
diff --git a/pages/register/index.js b/pages/register/index.js
index 005465a..4cddcfd 100644
--- a/pages/register/index.js
+++ b/pages/register/index.js
@@ -34,9 +34,10 @@ Page({
onLoad: function (options) {
},
- onHide () {
+ onUnload () {
clearInterval(this.data.interval)
},
+
// 重新获取Code
refetchCodeDownTime () {
@@ -48,7 +49,7 @@ Page({
time: time,
btnTitle: title
})
- if (time == 0) {
+ if (time <= 0) {
this.setData({
fetchCode: true,
time: 60,
@@ -77,6 +78,8 @@ Page({
// console.log(this.data.formData)
this.fetchMsgCodeApi()
}
+ } else {
+ this.fetchMsgCodeApi()
}
})
},
diff --git a/pages/register/index.wxss b/pages/register/index.wxss
index c29235d..c97bc29 100644
--- a/pages/register/index.wxss
+++ b/pages/register/index.wxss
@@ -32,4 +32,7 @@
}
.register_form .weui-cells::before {
border-top: 0px solid white;
+}
+.register_form .weui-vcode-btn {
+ width: 100px;
}
\ No newline at end of file