diff --git a/src/components/global-toast/index.scss b/src/components/global-toast/index.scss index a36ccd1..d102159 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: 651rpx; + height: 781rpx; box-sizing: border-box; .title { @@ -24,6 +24,12 @@ color: #65686c; text-align: center; } + .close { + margin: 120rpx auto 0; + display: block; + width: 72rpx; + height: 72rpx; + } } .popup3 { diff --git a/src/components/global-toast/index.wxml b/src/components/global-toast/index.wxml index 6e32296..fdf44eb 100644 --- a/src/components/global-toast/index.wxml +++ b/src/components/global-toast/index.wxml @@ -1,16 +1,21 @@ - - 关注适中健康微信公众号 - + + 关注适中信息微信公众号 + 长按识别二维码关注 + - 添加我的企业微信 - + 添加适中信息企业微信 + 长按识别二维码添加 + diff --git a/src/images/copnay-code.png b/src/images/copnay-code.png deleted file mode 100644 index 5c08e8f..0000000 Binary files a/src/images/copnay-code.png and /dev/null differ diff --git a/src/images/icon-close.png b/src/images/icon-close.png new file mode 100644 index 0000000..5934bee Binary files /dev/null and b/src/images/icon-close.png differ diff --git a/src/images/icon-play.png b/src/images/icon-play.png index cf3781f..3ae7ad9 100644 Binary files a/src/images/icon-play.png and b/src/images/icon-play.png differ diff --git a/src/images/icon-stop.png b/src/images/icon-stop.png index 7aac7d7..02c9aa6 100644 Binary files a/src/images/icon-stop.png and b/src/images/icon-stop.png differ diff --git a/src/images/qyPic.jpg b/src/images/qyPic.jpg index de18da2..5c08e8f 100644 Binary files a/src/images/qyPic.jpg and b/src/images/qyPic.jpg differ diff --git a/src/images/topic-card-bg.png b/src/images/topic-card-bg.png index 94d96f9..dfc03ab 100644 Binary files a/src/images/topic-card-bg.png and b/src/images/topic-card-bg.png differ diff --git a/src/pages/article/index.scss b/src/pages/article/index.scss index c61819d..048c6fc 100644 --- a/src/pages/article/index.scss +++ b/src/pages/article/index.scss @@ -8,10 +8,26 @@ line-height: 48rpx; } - .page-date { - margin-top: 24rpx; - font-size: 28rpx; - color: #999999; + .page-info { + display: flex; + align-items: center; + justify-content: space-between; + .page-date { + margin-top: 24rpx; + font-size: 28rpx; + color: #999999; + } + .view-num { + font-size: 28rpx; + color: #999999; + display: flex; + align-items: center; + gap: 12rpx; + .icon { + width: 28rpx; + height: 28rpx; + } + } } .audio-bar { @@ -43,8 +59,8 @@ } .icon { - width: 42rpx; - height: 42rpx; + width: 64rpx; + height: 64rpx; } } @@ -69,9 +85,10 @@ background: #f9fafb; line-height: 48rpx; border-radius: 16rpx 16rpx 16rpx 16rpx; + color: #3795f7; + font-size: 36rpx; .label { - font-size: 32rpx; color: #3795f7; } } @@ -115,6 +132,7 @@ align-items: center; justify-content: center; gap: 12rpx; + font-size: 36rpx; .icon { width: 56rpx; @@ -136,6 +154,7 @@ margin-left: 10rpx; width: 24rpx; height: 24rpx; + transform: rotate(180deg); } } } @@ -150,7 +169,6 @@ display: flex; align-items: center; flex-wrap: wrap; - gap: 24rpx; .label { font-size: 32rpx; @@ -158,16 +176,14 @@ } .item { - padding: 6rpx 24rpx; border-radius: 40rpx; font-size: 32rpx; - color: #fff; - background-color: #3795f7; + color: #3795f7; } } .p-scroll { max-height: 50vh; - padding-bottom: calc(32rpx + env(safe-area-inset-bottom)); + font-size: 36rpx; .row { padding: 32rpx; position: relative; @@ -187,5 +203,8 @@ background: rgba(55, 149, 247, 0.06); } } + .place-row{ + height: 120rpx; + } } } diff --git a/src/pages/article/index.ts b/src/pages/article/index.ts index 7f0eed4..e008ed3 100644 --- a/src/pages/article/index.ts +++ b/src/pages/article/index.ts @@ -85,6 +85,9 @@ Page({ time, }); } + wx.setNavigationBarTitle({ + title: res.book.BookName, + }); this.handleView(); }) .catch((err) => { @@ -250,6 +253,12 @@ Page({ url: '/pages/login/index?back=1', }); }, + + handleType() { + wx.redirectTo({ + url: `/pages/classify/index?id=${this.data.chapter.CateId}`, + }); + }, }); export {}; diff --git a/src/pages/article/index.wxml b/src/pages/article/index.wxml index 9f5f3d0..a867ac1 100644 --- a/src/pages/article/index.wxml +++ b/src/pages/article/index.wxml @@ -1,7 +1,13 @@ {{chapter.ChapterName}} - {{book.PublishDate}} + + {{book.PublishDate}} + + + {{~~book.OperateNum + ~~book.BrowseNum}} + + @@ -53,7 +59,7 @@ 下一篇： {{prevAndNext.next.ChapterName}} - + 分类 {{chapter.CateName}} @@ -83,8 +89,8 @@ {{book.BookName}} - - 分类 + + 分类： {{chapter.CateName}} @@ -95,8 +101,9 @@ bind:tap="handleSwitchDirectory" data-id="{{item.Id}}" > - {{index+1}}.{{item.ChapterName}} + {{index+1}}. {{item.ChapterName}} + diff --git a/src/pages/classify/index.json b/src/pages/classify/index.json index e312441..abf9db4 100644 --- a/src/pages/classify/index.json +++ b/src/pages/classify/index.json @@ -1,6 +1,6 @@ { "navigationStyle": "default", - "navigationBarTitleText": "分类", + "navigationBarTitleText": "", "usingComponents": { "van-icon": "@vant/weapp/icon/index", "van-divider": "@vant/weapp/divider/index" diff --git a/src/pages/classify/index.scss b/src/pages/classify/index.scss index 28ee06f..0a660db 100644 --- a/src/pages/classify/index.scss +++ b/src/pages/classify/index.scss @@ -5,6 +5,10 @@ page { padding-bottom: 80rpx; .scroll { + position: sticky; + top: 0; + left: 0; + z-index: 10; background-color: #fff; } .nav { @@ -61,6 +65,7 @@ page { } } .der{ + margin-top: 32rpx; font-size: 28rpx; color: #999999; text-align: center; @@ -98,7 +103,6 @@ page { flex: 1; font-size: 32rpx; color: #999999; - line-height: 28rpx; } .stat { margin-top: 42rpx; diff --git a/src/pages/classify/index.ts b/src/pages/classify/index.ts index 9807ed8..55b89a3 100644 --- a/src/pages/classify/index.ts +++ b/src/pages/classify/index.ts @@ -155,7 +155,7 @@ Page({ data: { BookId: Id }, }).then(() => { wx.showToast({ - title: '收藏成功', + title: '您已收藏这本书，可在我的页查看', icon: 'none', }); this.setData({ diff --git a/src/pages/classify/index.wxml b/src/pages/classify/index.wxml index 42b6ef2..de8e150 100644 --- a/src/pages/classify/index.wxml +++ b/src/pages/classify/index.wxml @@ -34,7 +34,7 @@ - {{item.BrowseNum || 0}} + {{~~item.OperateNum + ~~item.BrowseNum}} - {{item.BrowseNum || 0}} + {{~~item.OperateNum + ~~item.BrowseNum}} - {{item.BrowseNum || 0}} + {{~~item.OperateNum + ~~item.BrowseNum}} { this.getCateList(); this.getBanner(); this.getRemarkCount(); + app.getUserInfo(this, (res) => { + if (res.showQuestion === 1) { + this.setData({ + show: true, + }); + } + }); }); }, getBanner() { @@ -115,6 +123,13 @@ Page({ this.setData({ show: false, }); + wx.ajax({ + method: 'POST', + url: '?r=shizhong/account/visit', + data: { + type: 1, + }, + }); }, }); diff --git a/src/pages/login/index.ts b/src/pages/login/index.ts index 270e915..273b903 100644 --- a/src/pages/login/index.ts +++ b/src/pages/login/index.ts @@ -19,6 +19,9 @@ Page({ back: options.back === '1', }); }, + onShow() { + wx.hideShareMenu(); + }, getCode() { if (timer) return; const mobile = this.data.mobile; @@ -72,9 +75,10 @@ Page({ show: true, }); return; - } else { + } else if (show) { this.setData({ show: false, + protool: true, }); } if (!mobile) { @@ -110,9 +114,10 @@ Page({ show: true, }); return; - } else { + } else if (show) { this.setData({ show: false, + protool: true, }); } const { iv, encryptedData } = e.detail; @@ -142,7 +147,9 @@ Page({ wx.navigateTo({ url: `/pages/protocol/index` }); }, handleVisitor() { - app.globalData.isLogin = 999; + if (app.globalData.isLogin !== 1) { + app.globalData.isLogin = 999; + } wx.reLaunch({ url: '/pages/home/index', }); diff --git a/src/pages/longPicture/index.json b/src/pages/longPicture/index.json index 1cf0579..11cc17e 100644 --- a/src/pages/longPicture/index.json +++ b/src/pages/longPicture/index.json @@ -1,5 +1,5 @@ { "navigationStyle": "default", - "navigationBarTitleText": "预览", + "navigationBarTitleText": "详情", "usingComponents": {} } diff --git a/src/pages/my/index.scss b/src/pages/my/index.scss index 1607fc4..a9de4c9 100644 --- a/src/pages/my/index.scss +++ b/src/pages/my/index.scss @@ -25,6 +25,7 @@ page { line-height: 1; word-break: break-all; .icon { + vertical-align: -4rpx; width: 36rpx; height: 36rpx; } diff --git a/src/pages/my/index.ts b/src/pages/my/index.ts index 2e035c3..2e5f48f 100644 --- a/src/pages/my/index.ts +++ b/src/pages/my/index.ts @@ -8,6 +8,7 @@ Page({ userInfo: {} as any, }, onShow() { + wx.showTabBar({}); app.waitLogin().then(() => { app.getUserInfo(this); }); @@ -63,17 +64,22 @@ Page({ toastShow: true, toastType: 1, }); + wx.hideTabBar({}); }, handleCompanyOffice() { this.setData({ toastShow: true, toastType: 2, }); + wx.hideTabBar({}); }, handleToastClose() { this.setData({ toastShow: false, }); + setTimeout(() => { + wx.showTabBar({}); + }, 1000); }, handleTopic() { wx.navigateTo({ diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index 59fcb2d..8c6d72d 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -27,7 +27,7 @@ 我的收藏 - + 问卷调查 diff --git a/src/pages/search/index.scss b/src/pages/search/index.scss index 14b671b..187a809 100644 --- a/src/pages/search/index.scss +++ b/src/pages/search/index.scss @@ -70,7 +70,6 @@ page { .type { font-size: 32rpx; color: #999999; - line-height: 28rpx; } .stat { flex-shrink: 0; diff --git a/src/pages/search/index.ts b/src/pages/search/index.ts index 16e0ff9..f72b2ac 100644 --- a/src/pages/search/index.ts +++ b/src/pages/search/index.ts @@ -14,7 +14,7 @@ Page({ list: [], }, onLoad() { - app.waitLogin(false, true).then(() => { + app.waitLogin().then(() => { this.setData({ focus: true, }); diff --git a/src/pages/search/index.wxml b/src/pages/search/index.wxml index ec3d820..3022450 100644 --- a/src/pages/search/index.wxml +++ b/src/pages/search/index.wxml @@ -23,7 +23,7 @@ /> 以下为搜到的内容 - + {{item.ChapterName}} diff --git a/src/pages/topic/index.scss b/src/pages/topic/index.scss index 81cbc91..c5c3d63 100644 --- a/src/pages/topic/index.scss +++ b/src/pages/topic/index.scss @@ -1,5 +1,5 @@ page { - background: linear-gradient(180deg, #d2f1fe 0%, rgba(244, 248, 249, 0) 100%) no-repeat top center/100% 442rpx; + background: #f3f4f5 linear-gradient(180deg, #d2f1fe 0%, rgba(244, 248, 249, 0) 100%) no-repeat top center/100% 442rpx; } .page { @@ -8,16 +8,38 @@ page { .swiper { width: 100%; - height: 1232rpx; + height: 1632rpx; box-sizing: border-box; } .topic { position: relative; - padding: 86rpx 88rpx; - width: 100%; - height: 1232rpx; + margin: 16rpx 48rpx; + padding: 48rpx 40rpx 0; box-sizing: border-box; + background: #ffffff; + box-shadow: 0rpx 8rpx 32rpx 0rpx rgba(188, 188, 188, 0.18); + border-radius: 24rpx 24rpx 24rpx 24rpx; + &::before { + content: ''; + position: absolute; + bottom: -50rpx; + left: 52rpx; + width: calc(100% - 104rpx); + height: 50rpx; + background: rgba(55, 149, 247, 0.24); + border-radius: 0 0 24rpx 24rpx; + } + &::after { + content: ''; + position: absolute; + bottom: -30rpx; + left: 22rpx; + width: calc(100% - 44rpx); + height: 30rpx; + background: rgba(55, 149, 247, 0.8); + border-radius: 0 0 24rpx 24rpx; + } .order { font-size: 60rpx; @@ -38,7 +60,8 @@ page { margin-top: 34rpx; font-size: 36rpx; color: #222222; - line-height: 1.4; + line-height: 64rpx; + white-space: pre-line; } .btn { @@ -59,7 +82,7 @@ page { .footer { width: 100%; - padding: 80rpx 0; + padding: 60rpx 0; box-sizing: border-box; display: flex; align-items: center; diff --git a/src/pages/topic/index.ts b/src/pages/topic/index.ts index 04d3f8c..789e817 100644 --- a/src/pages/topic/index.ts +++ b/src/pages/topic/index.ts @@ -2,7 +2,7 @@ const app = getApp(); Page({ data: { - nav: 0, + nav: 11, percentage: 0, question: [] as { questionId: string; title: string; answer?: '1' | '2' }[], diff --git a/src/pages/topic/index.wxml b/src/pages/topic/index.wxml index d013155..15aac9b 100644 --- a/src/pages/topic/index.wxml +++ b/src/pages/topic/index.wxml @@ -1,6 +1,6 @@ @@ -12,10 +12,7 @@ style="margin-top:{{menuButtonInfo.bottom+73}}px;" > - + {{index + 1}}/ {{question.length}}