diff --git a/src/components/global-toast/index.scss b/src/components/global-toast/index.scss
index d102159..ef89137 100644
--- a/src/components/global-toast/index.scss
+++ b/src/components/global-toast/index.scss
@@ -1,7 +1,7 @@
.popup1 {
padding: 110rpx 0 0;
width: 651rpx;
- height: 781rpx;
+ height: 820rpx;
box-sizing: border-box;
.title {
diff --git a/src/pages/article/index.scss b/src/pages/article/index.scss
index 048c6fc..c837f62 100644
--- a/src/pages/article/index.scss
+++ b/src/pages/article/index.scss
@@ -68,9 +68,25 @@
display: block;
margin-top: 30rpx;
.custom-button {
- width: 64rpx;
- height: 64rpx;
- background-color: transparent;
+ position: relative;
+ flex-shrink: 0;
+ width: 20rpx;
+ height: 20rpx;
+ background: #ffffff;
+ border-radius: 50%;
+ border: 2rpx solid #3795f7;
+ box-sizing: border-box;
+ &::after {
+ content: '';
+ display: block;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 64rpx;
+ height: 64rpx;
+ background-color: transparent;
+ }
}
}
}
@@ -203,7 +219,7 @@
background: rgba(55, 149, 247, 0.06);
}
}
- .place-row{
+ .place-row {
height: 120rpx;
}
}
diff --git a/src/pages/article/index.ts b/src/pages/article/index.ts
index e008ed3..66a5c2c 100644
--- a/src/pages/article/index.ts
+++ b/src/pages/article/index.ts
@@ -137,7 +137,7 @@ Page({
data: { BookId: Id },
}).then(() => {
wx.showToast({
- title: '收藏成功',
+ title: '您已收藏这本书,可在我的页查看',
icon: 'none',
});
this.setData({
diff --git a/src/pages/article/index.wxml b/src/pages/article/index.wxml
index a867ac1..adefd9f 100644
--- a/src/pages/article/index.wxml
+++ b/src/pages/article/index.wxml
@@ -3,10 +3,10 @@
{{chapter.ChapterName}}
{{book.PublishDate}}
-
+
+
全部
{{item.CateName}}{{item.CateSecondName ? '/'+item.CateSecondName : ''}}
-
- {{~~item.OperateNum + ~~item.BrowseNum}}
+
+ 阅读 {{~~item.OperateNum + ~~item.BrowseNum}}
{{item.CateName}}{{item.CateSecondName ? '/'+item.CateSecondName : ''}}
-
- {{~~item.OperateNum + ~~item.BrowseNum}}
+
+ 阅读 {{~~item.OperateNum + ~~item.BrowseNum}}
{
wx.showToast({
- title: '收藏成功',
+ title: '您已收藏这本书,可在我的页查看',
icon: 'none',
});
this.setData({
diff --git a/src/pages/collection/index.wxml b/src/pages/collection/index.wxml
index c788c9a..a072214 100644
--- a/src/pages/collection/index.wxml
+++ b/src/pages/collection/index.wxml
@@ -16,8 +16,8 @@
{{item.CateName}}{{item.CateSecondName ? '/'+item.CateSecondName : ''}}
-
- {{~~item.OperateNum + ~~item.BrowseNum}}
+
+ 阅读 {{~~item.OperateNum + ~~item.BrowseNum}}
{
+ this.setData({
+ toastShow: true,
+ toastType: 1,
+ });
+ },
});
- wx.hideTabBar({});
},
handleCompanyOffice() {
- this.setData({
- toastShow: true,
- toastType: 2,
+ wx.hideTabBar({
+ success: () => {
+ this.setData({
+ toastShow: true,
+ toastType: 2,
+ });
+ },
});
- wx.hideTabBar({});
},
handleToastClose() {
this.setData({
diff --git a/src/pages/search/index.wxml b/src/pages/search/index.wxml
index 3022450..cd71eac 100644
--- a/src/pages/search/index.wxml
+++ b/src/pages/search/index.wxml
@@ -32,8 +32,8 @@
{{item.CateName}}{{item.CateSecondName ? '/'+item.CateSecondName : ''}}
-
- {{~~item.OperateNum + ~~item.BrowseNum}}
+
+ 阅读 {{~~item.OperateNum + ~~item.BrowseNum}}
diff --git a/src/pages/topic/index.ts b/src/pages/topic/index.ts
index 789e817..04d3f8c 100644
--- a/src/pages/topic/index.ts
+++ b/src/pages/topic/index.ts
@@ -2,7 +2,7 @@ const app = getApp();
Page({
data: {
- nav: 11,
+ nav: 0,
percentage: 0,
question: [] as { questionId: string; title: string; answer?: '1' | '2' }[],