From 1cec02e26e84a85d64ff4a623195728a578a7a64 Mon Sep 17 00:00:00 2001 From: kola-web Date: Wed, 15 Jan 2025 18:26:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=20&=20=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E8=AF=A6=E6=83=85=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.config.json | 10 +-- project.private.config.json | 168 +++++++++++++++++++++--------------------- src/app.ts | 12 +-- src/images/item-tip-close.png | Bin 0 -> 1271 bytes src/pages/article/index.scss | 31 ++++++++ src/pages/article/index.ts | 19 ++++- src/pages/article/index.wxml | 8 +- src/pages/login/index.scss | 49 ++++-------- src/pages/login/index.wxml | 17 +++-- 9 files changed, 175 insertions(+), 139 deletions(-) create mode 100644 src/images/item-tip-close.png diff --git a/project.config.json b/project.config.json index 36aa6d4..15ace81 100644 --- a/project.config.json +++ b/project.config.json @@ -42,24 +42,24 @@ "packOptions": { "ignore": [ { - "value": "src/images/*.*", + "value": "/images/*.*", "type": "glob" }, { - "value": "src/images/**/*.*", + "value": "/images/**/*.*", "type": "glob" }, { - "value": "src/images/**/**/*.*", + "value": "/images/**/**/*.*", "type": "glob" } ], "include": [ { - "value": "src/images/tabbar/*.*", + "value": "/images/tabbar/*.*", "type": "glob" } ] }, - "appid": "wxbdf6f933281b1eb4" + "appid": "wxa4a28b299df7d921" } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index d45e31a..4f35377 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -1,85 +1,85 @@ -{ - "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "projectname": "shizhong-miniprogram", - "setting": { - "compileHotReLoad": true, - "urlCheck": true - }, - "condition": { - "miniprogram": { - "list": [ - { - "name": "文章详情", - "pathName": "pages/article/index", - "query": "id=3", - "launchMode": "default", - "scene": null - }, - { - "name": "个人信息", - "pathName": "pages/userInfo/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "隐私协议", - "pathName": "pages/protocol/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "搜索", - "pathName": "pages/search/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "分类列表", - "pathName": "pages/classify/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "我的收藏", - "pathName": "pages/collection/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "我的", - "pathName": "pages/my/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "首页", - "pathName": "pages/home/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "调研", - "pathName": "pages/topic/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "登录", - "pathName": "pages/login/index", - "query": "", - "launchMode": "default", - "scene": null - } - ] - } - }, - "libVersion": "3.7.0" +{ + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", + "projectname": "shizhong-miniprogram", + "setting": { + "compileHotReLoad": true, + "urlCheck": true + }, + "condition": { + "miniprogram": { + "list": [ + { + "name": "文章详情", + "pathName": "pages/article/index", + "query": "id=8", + "launchMode": "default", + "scene": null + }, + { + "name": "个人信息", + "pathName": "pages/userInfo/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "隐私协议", + "pathName": "pages/protocol/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "搜索", + "pathName": "pages/search/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "分类列表", + "pathName": "pages/classify/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "我的收藏", + "pathName": "pages/collection/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "我的", + "pathName": "pages/my/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "首页", + "pathName": "pages/home/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "调研", + "pathName": "pages/topic/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "登录", + "pathName": "pages/login/index", + "query": "", + "launchMode": "default", + "scene": null + } + ] + } + }, + "libVersion": "3.7.0" } \ No newline at end of file diff --git a/src/app.ts b/src/app.ts index d8bc7db..9cd3e3a 100644 --- a/src/app.ts +++ b/src/app.ts @@ -17,14 +17,14 @@ App({ // 测试号 wx2b0bb13edf717c1d // dev // appid:wxbdf6f933281b1eb4 - url: 'https://m.shizhong.hbraas.com', - upFileUrl: 'https://m.shizhong.hbraas.com/', - imageUrl: 'https://m.shizhong.hbraas.com/api/shizhong/', + // url: 'https://m.shizhong.hbraas.com', + // upFileUrl: 'https://m.shizhong.hbraas.com/', + // imageUrl: 'https://m.shizhong.hbraas.com/api/shizhong/', // pro // appid:wxa4a28b299df7d921 - // url: 'https://m.shizhong.hbsaas.com', - // upFileUrl: 'https://m.shizhong.hbsaas.com/', - // imageUrl: 'https://m.shizhong.hbsaas.com/api/shizhong/', + url: 'https://m.shizhong.hbsaas.com', + upFileUrl: 'https://m.shizhong.hbsaas.com/', + imageUrl: 'https://m.shizhong.hbsaas.com/api/shizhong/', loginState: '', isLogin: 0, diff --git a/src/images/item-tip-close.png b/src/images/item-tip-close.png new file mode 100644 index 0000000000000000000000000000000000000000..c414d8411db1c70b328eee2ba380a6c84f818e2c GIT binary patch literal 1271 zcmVPx(u}MThR9HvNn0si`R}{z3rD;h@1Cf@}Woy#7VLO)&VGbNaHgTJbHM6zRv`yPo z#HmyFkUE*xmCnu~3Eiu%bDP*#+NLIbEERDN922&I6^6+qDVu59Et8;FNNGwR+;Ku8 z=`X)m+6cXWCimX+x!>Qp=l4B70;_D0RmKC$2BMTo0H6o})BunZJ=k3U@B@H{5VEkG z!zKk3g)q!5EL3i+87 zx0^b=2v zO<92`rE0%_!d0&HfGDNXa5(&%u2jDv5D2718RjOc z{Cv1*v;HoZ%QrL20~^r6kI$G}ySjTG3QTO%-KH8iT7TpaA>?d)pd~=4PB0ksz4EFq zZ*Fexp#r6)rNQvv#XD;?n*4Z`m_R18rKSBsM;9+lQQx?fRMo5go5JbkaVBNC7a6%T{|?W!+PB?)@tRk$M!%WN~yM|x6jpl`ix-iFax7fIAY3hsmHc)2@8QZvK!JXw^M3t*zhgYC83iphBrk>J!J0fw8iJHK`>o zw>xC0tda5&;TyZ(W)*eqD~+azo8%jPJ)P(-*CbqfTr@vF?|fm)%e;jVtMq`~CaN&L zrYi&AICr(i!uad8t0RPv#KMR`lv1PF($Xz-^)&?rkqXUqdQ?%R%IB@p7%%#QeUQ*g zZdnva;`5D9zFwx!OV+9iCLUt~THEh0JJD}z;=MMj{V-cvT7^_f7Jxawrn(B=KX#Pg ze#BG?g+kYM8jPD(>Z7@!mC8rJIpjdo{~WUu;j*w#c)erSjkR?OE{m~Tg)%c`;OOt2 zR;$%`)e|zF&*X0%9lbHK|KMS1s-O_2?QF#4V>`s!c?h*Z+x&jNea{;QvI2qsmMcnR z9s20cKCz&=$2N$y<4Cw=Y!NA?1>tab@YBy*H`w~^kgT;ut6E!K1^f5yMN?lx2>FZe zWP+V*G|{no?+FHj4IQ1`d4t1Fm=b8E*C-T#FV6DvGW5;ZN}m(+0YVf|>_pfE0Du7i z^fz6u7v1hZv;O%v5P?G_&`qjUDpv+W$A&R6`n^-~j*t002ovPDHLkV1m_xWTOB8 literal 0 HcmV?d00001 diff --git a/src/pages/article/index.scss b/src/pages/article/index.scss index 79d314b..8a33293 100644 --- a/src/pages/article/index.scss +++ b/src/pages/article/index.scss @@ -143,6 +143,7 @@ background: #ffffff; .item { + position: relative; flex: 1; display: flex; align-items: center; @@ -154,6 +155,36 @@ width: 56rpx; height: 56rpx; } + .item-tip { + position: absolute; + left: 0; + top: -45rpx; + transform: translateY(-100%); + padding: 16rpx 32rpx; + font-size: 36rpx; + color: #ffffff; + background: rgba(0, 0, 0, 0.8); + border-radius: 8rpx 8rpx 8rpx 8rpx; + white-space: nowrap; + .close { + position: absolute; + top: -12rpx; + right: -12rpx; + width: 36rpx; + height: 36rpx; + } + &::after { + content: ''; + position: absolute; + bottom: -10rpx; + left: 40%; + width: 0; + height: 0; + border-left: 12rpx solid transparent; + border-right: 12rpx solid transparent; + border-top: 12rpx solid rgba(0, 0, 0, 0.9); + } + } } } } diff --git a/src/pages/article/index.ts b/src/pages/article/index.ts index d6c405e..75a9e4a 100644 --- a/src/pages/article/index.ts +++ b/src/pages/article/index.ts @@ -19,6 +19,8 @@ Page({ currentTime: 0, drag: false, + chapterTip: false, + toastShow: false, toastType: 3, }, @@ -82,6 +84,7 @@ Page({ next: Array.isArray(res.prevAndNext.next) ? null : res.prevAndNext.next, }, ChapterId: res.chapter.Id, + show: !this.data.ChapterId, }); if (res.chapter.AudioUrl?.url) { const time = `00:00/${this.formatTime(res.chapter.AudioUrl.duration)}`; @@ -128,9 +131,16 @@ Page({ this.handlePause(); }, onClose() { + const chapterTip = !wx.getStorageSync('chapterTip'); this.setData({ show: false, + chapterTip, }); + if (chapterTip) { + setTimeout(() => { + this.handleTipClsoe(); + }, 5000); + } }, handleCollect() { @@ -266,12 +276,19 @@ Page({ url: '/pages/login/index?back=1', }); }, - handleType() { wx.redirectTo({ url: `/pages/classify/index?id=${this.data.chapter.CateId}`, }); }, + handleTipClsoe() { + if (this.data.chapterTip) { + wx.setStorageSync('chapterTip', 'open'); + } + this.setData({ + chapterTip: false, + }); + }, }); export {}; diff --git a/src/pages/article/index.wxml b/src/pages/article/index.wxml index 87cfb70..6b76749 100644 --- a/src/pages/article/index.wxml +++ b/src/pages/article/index.wxml @@ -39,7 +39,7 @@ - + 目录 + + 查看全文目录，可点击这里 + + @@ -84,7 +88,7 @@ - 收起 + 目录收起 diff --git a/src/pages/login/index.scss b/src/pages/login/index.scss index 8cde0f4..386f93f 100644 --- a/src/pages/login/index.scss +++ b/src/pages/login/index.scss @@ -30,12 +30,12 @@ display: flex; align-items: center; gap: 30rpx; + background-color: #f4f7fa; + border-radius: 96rpx; .code { flex: 1; padding: 24rpx 48rpx; - background-color: #f4f7fa; - border-radius: 96rpx; font-size: 32rpx; } @@ -48,9 +48,8 @@ padding: 24rpx; width: 7em; text-align: center; - color: #fff; + color: #3795f7; font-size: 32rpx; - background-color: #3795f7; border-radius: 96rpx; } } @@ -72,43 +71,27 @@ } .submit { - margin-top: 88rpx; - padding: 22rpx; + margin-top: 70rpx; text-align: center; font-size: 36rpx; - color: #fff; - line-height: 44rpx; - background: linear-gradient(90deg, #134df6 36%, #3795f7 100%); + color: #3795f7; + line-height: 84rpx; + border: 1px solid rgba(55, 149, 247, 0.2); border-radius: 96rpx 96rpx 96rpx 96rpx; } .tel-btn { - margin: 78rpx auto 0; - padding: 12rpx 44rpx; - border-radius: 52rpx; - width: 352rpx; - font-size: 32rpx; - line-height: 40rpx; - color: rgba(153, 153, 153, 1); - display: flex; - gap: 12rpx; - align-items: center; - justify-content: center; - outline: none; - - .icon { - width: 28rpx; - height: 40rpx; - } - - &::after { - border: none; - outline: none; - } + margin-top: 32rpx; + text-align: center; + font-size: 36rpx; + color: #ffffff; + line-height: 88rpx; + border-radius: 96rpx 96rpx 96rpx 96rpx; + background: linear-gradient(90deg, #134df6 16%, #3795f7 100%); } .visitor { - margin-top: 196rpx; + margin-top: 236rpx; display: flex; align-items: center; justify-content: center; @@ -153,7 +136,7 @@ .cancel { padding: 32rpx 0; font-size: 32rpx; - color: #3795F7; + color: #3795f7; text-align: center; } } diff --git a/src/pages/login/index.wxml b/src/pages/login/index.wxml index a8c49ee..4b96c45 100644 --- a/src/pages/login/index.wxml +++ b/src/pages/login/index.wxml @@ -12,7 +12,12 @@ class="page" style="background: url('{{imageUrl}}login-bg.png?t={{Timestamp}}') no-repeat top center/100% 624rpx;padding-top:{{menuButtonInfo.bottom}}px;" > - + 《用户隐私协议》 - 登录 + 手机验证码登录 - + 游客访问