From 50da1d7e38f116c68aa322278ae5513b4eea24ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=93=BC=E5=94=A7L?= Date: Mon, 8 Jan 2024 13:50:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E5=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 +- pages.json | 12 + pages/agreement/yhxyPage.vue | 187 +++++ pages/agreement/yszcPage.vue | 191 +++++ pages/comments/comments.vue | 8 +- pages/comments/commentsList.vue | 12 +- pages/eBook/bookContent.vue | 24 +- pages/library/library.vue | 25 +- pages/peanut/home.vue | 2 +- pages/talkBook/talkBookML.vue | 101 ++- pages/user/login.vue | 438 ++++++++--- pages/user/persData.vue | 697 ++++++++++++----- pages/user/visitor.vue | 1255 +++++++++++++++++++++++++++++++ static/json/yinsiP.vue | 1 + 14 files changed, 2610 insertions(+), 347 deletions(-) create mode 100644 pages/agreement/yhxyPage.vue create mode 100644 pages/agreement/yszcPage.vue create mode 100644 pages/user/visitor.vue create mode 100644 static/json/yinsiP.vue diff --git a/manifest.json b/manifest.json index d222dcc..2233c69 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,8 @@ "src" : "图片路径" } ], - "versionName" : "1.2.23", - "versionCode" : 1223, + "versionName" : "1.2.26", + "versionCode" : 1226, "app-plus" : { "compatible" : { "ignoreVersion" : true diff --git a/pages.json b/pages.json index 808ca3a..e0400bb 100644 --- a/pages.json +++ b/pages.json @@ -177,6 +177,12 @@ "navigationBarTitleText": "一路健康用户登录" } }, + { + "path": "pages/user/visitor", + "style": { + "navigationBarTitleText": "游客登录" + } + }, { "path": "pages/bookShop/bookShopIndex", "style": { @@ -524,6 +530,12 @@ "enablePullDownRefresh": false } } + // { + // "path": "pages/agreement/yszcPage", + // "style": { + // "navigationBarTitleText": "隐私政策" + // } + // } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/agreement/yhxyPage.vue b/pages/agreement/yhxyPage.vue new file mode 100644 index 0000000..e582a57 --- /dev/null +++ b/pages/agreement/yhxyPage.vue @@ -0,0 +1,187 @@ + + + + \ No newline at end of file diff --git a/pages/agreement/yszcPage.vue b/pages/agreement/yszcPage.vue new file mode 100644 index 0000000..a247ec9 --- /dev/null +++ b/pages/agreement/yszcPage.vue @@ -0,0 +1,191 @@ + + + \ No newline at end of file diff --git a/pages/comments/comments.vue b/pages/comments/comments.vue index 164604a..0252599 100644 --- a/pages/comments/comments.vue +++ b/pages/comments/comments.vue @@ -15,13 +15,13 @@ {{productInfo.name}} - 作者：{{productInfo.authorName}} + 作者：{{productInfo.authorName}} - 听书 - 读书打卡 - 立即购买 + 听书 + 读书打卡 + 立即购买 diff --git a/pages/comments/commentsList.vue b/pages/comments/commentsList.vue index 3a45931..f174b2e 100644 --- a/pages/comments/commentsList.vue +++ b/pages/comments/commentsList.vue @@ -171,17 +171,17 @@ import { data } from 'jquery'; status:3, shupingList:[], bfaid:null, - commentsTabs: [{ + commentsTabs: [ { + name: '书集', + value: 3 + },{ name: '最新', value: 1 }, { name: '最热', value: 2 - }, { - name: '书集', - value: 3 }], - commentsListTab: 1, + commentsListTab: 3, newestpage: 1, hotestpage: 1, booksetpage: 1, @@ -221,7 +221,7 @@ import { data } from 'jquery'; this.windowWidth = uni.getSystemInfoSync().windowWidth; console.log(e,'onload') // this.bookid = e.bookid - this.getBookList(1, false) + this.getBookList(3, false) }, computed:{ ...mapState(['userInfo']), diff --git a/pages/eBook/bookContent.vue b/pages/eBook/bookContent.vue index c905e35..caa942f 100644 --- a/pages/eBook/bookContent.vue +++ b/pages/eBook/bookContent.vue @@ -10,7 +10,7 @@ {{bookMessage.name}} - +

{{bookMessage.author.authorName}} [著] >

@@ -18,7 +18,7 @@ {{item.title}} >

--> - + @@ -28,7 +28,16 @@ - + + 立即购买 @@ -193,14 +202,15 @@ // .post('book/book/appinfo/' + this.bookId + '/' + this.userInfo.id) .post('book/book/getBookInfo', { 'bookId': this.bookId, + // 'bookId': this.bookId, 'userId': this.userInfo.id }) .then(res => { console.log('书详细', res.book) this.bookMessage = res.book this.bokMesDet.bookId = res.book.id - this.bokMesDet.bookName = res.book.name, - this.bokMesDet.images = res.book.images + this.bokMesDet.bookName = res.book.name + this.bokMesDet.images = res.book.images this.isBuy = res.book.isBuy this.freeChapterCount = res.book.freeChapterCount this.bokMesDet.userId = this.userInfo.id @@ -285,6 +295,7 @@ 'userId': this.userInfo.id, 'bookId': this.bookId } + checkBookRight(data,res=>{ console.log(res) if(res.success){ @@ -408,9 +419,6 @@ - - - }, }; diff --git a/pages/library/library.vue b/pages/library/library.vue index 43653bc..ed3de1c 100644 --- a/pages/library/library.vue +++ b/pages/library/library.vue @@ -5,6 +5,7 @@ + @@ -101,6 +102,18 @@ 讲 书 + + + + + + + + + + 古 书 + + @@ -353,6 +366,12 @@ url: '../talkBook/talkBookDetail?bookId='+ val.id }) }, + // 跳转到古籍 + goGuji(val){ + uni.navigateTo({ + url: '../eBook/bookContent?Id='+ val.relationId + }) + }, // 跳转到打卡 goDaKa(val){ uni.navigateTo({ @@ -392,7 +411,7 @@ image{ display: block; height: 108rpx; } - .v1{margin-top: -30rpx;} + .v1{margin-top: -10rpx;} } } .author{ @@ -401,7 +420,7 @@ .info{width:200rpx; image{width:100% ; height: 280rpx; border-radius: 20rpx;} } - .icons{ margin-top: 10rpx; + .icons{ margin-top: 10rpx;margin-left: -10rpx; text{font-size: 26rpx; margin-top: -10rpx; color: #999;} } } @@ -469,7 +488,7 @@ } .bookName { - margin-top: 10rpx; + margin-top: 30rpx; display: block; white-space: nowrap; // font-weight: bold; diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue index 0029573..a436d24 100644 --- a/pages/peanut/home.vue +++ b/pages/peanut/home.vue @@ -3,7 +3,7 @@ - + diff --git a/pages/talkBook/talkBookML.vue b/pages/talkBook/talkBookML.vue index 4e82dd7..b8446bb 100644 --- a/pages/talkBook/talkBookML.vue +++ b/pages/talkBook/talkBookML.vue @@ -1,11 +1,11 @@