diff --git a/pages/comments/commentsList.vue b/pages/comments/commentsList.vue
index b96eeb7..3a45931 100644
--- a/pages/comments/commentsList.vue
+++ b/pages/comments/commentsList.vue
@@ -167,7 +167,7 @@ import { data } from 'jquery';
Files:[],
page:1,
pageSize:10,
- total:0,
+ total:0, // 资源的总页数1
status:3,
shupingList:[],
bfaid:null,
@@ -202,14 +202,20 @@ import { data } from 'jquery';
this.newList = []
this.hotList = []
this.bookList = []
+ this.total = 0
this.getBookList(this.commentsListTab, false)
},
onReachBottom() {
+ if(this.newestpage + 1 <= this.total || this.hotestpage +1 <= this.total || this.booksetpage + 1 <= this.total){
this.newestpage++
this.hotestpage++
- this.booksetpage++
- this.getBookList(this.commentsListTab, false)
+ this.booksetpage++
+ this.getBookList(this.commentsListTab, false)
+ }else{
+ this.status = 1
+ }
+
},
onLoad(e) {
this.windowWidth = uni.getSystemInfoSync().windowWidth;
@@ -261,6 +267,7 @@ import { data } from 'jquery';
this.newestpage = 1
this.hotestpage = 1
this.booksetpage = 1
+ this.total = 0
this.newList = []
this.hotList = []
this.bookList = []
@@ -366,6 +373,7 @@ import { data } from 'jquery';
}else{
this.bookList = this.bookList.concat(res.page.records)
}
+ this.total = res.page.pages
console.log(this.newList,'this.newList')
// let list = res.page.records
// console.log(list,'list')
@@ -391,11 +399,11 @@ import { data } from 'jquery';
// console.log(e,'e')
// })
// }
- if(res.page.records.length != 10){
- this.status = 1
- } else {
+ // if(res.page.records.length != 10){
+ // this.status = 1
+ // } else {
this.status = 0
- }
+ // }
// uni.hideLoading();
}).catch((e)=>{
console.log(e,'e')
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 3e9d3dc..e7bbc91 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -838,7 +838,7 @@
}
.home_nar {
background-color: #fff;
- padding: 20rpx 10rpx;
+ padding: 40rpx 10rpx;
justify-content: space-between;
display: flex;
color: #333;
diff --git a/pages/yian/yian.vue b/pages/yian/yian.vue
index 43dbfcc..6d70105 100644
--- a/pages/yian/yian.vue
+++ b/pages/yian/yian.vue
@@ -17,41 +17,33 @@
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
- 暂无医案内容~
-
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+ 努力加载中
+
+
+
+
+
+
-
-
- 努力加载中
-
-
-
-
-
@@ -113,48 +105,40 @@ import { data } from 'jquery';
},
// 查看本书更多书评
toMore(val){
- // console.log(val,'val')
- // let data = {
- // 'userId': this.userInfo.id,
- // 'bookId': val.id
- // }
- // checkBookRight(data,res=>{
- // console.log(res)
- // if(res.success){
- uni.navigateTo({
- url: '../yian/yianList?bookid='+val.id + '&bookname='+val.name,
- });
- // }else{
- // uni.showToast({
- // title:'购买本书后方可查看此内容!',
- // icon:'none'
- // })
- // }
- // })
-
- },
- // 医案详情
- toDetail1(val){
- // console.log(val,'val')
- let data = {
- 'userId': this.userInfo.id,
- 'bookId': val.bookid
+ if (this.contentShow == 1) {
+ uni.navigateTo({
+ url: '../yian/yianList?bookid='+val.id + '&bookname='+val.name,
+ })
}
- checkBookRight(data,res=>{
- console.log(res)
- if(res.success){
- uni.navigateTo({
- url: '../yian/yianDetail?medicalRecordsId='+val.medicalRecordsId
- })
- }else{
- uni.showToast({
- title:'购买本书后方可查看此内容!',
- icon:'none'
- })
- }
- })
-
+ if (this.contentShow == 2) {
+ uni.navigateTo({
+ url: '../eBook/bookContent?Id=' + val.id
+ });
+ }
+ // console.log(val,'val')
},
+ // // 医案详情
+ // toDetail1(val){
+ // // console.log(val,'val')
+ // let data = {
+ // 'userId': this.userInfo.id,
+ // 'bookId': val.bookid
+ // }
+ // checkBookRight(data,res=>{
+ // console.log(res)
+ // if(res.success){
+ // uni.navigateTo({
+ // url: '../yian/yianDetail?medicalRecordsId='+val.medicalRecordsId
+ // })
+ // }else{
+ // uni.showToast({
+ // title:'购买本书后方可查看此内容!',
+ // icon:'none'
+ // })
+ // }
+ // })
+
+ // },
getYianList(tushuflag){
// uni.showLoading({
@@ -206,261 +190,7 @@ import { data } from 'jquery';
diff --git a/pages/yian/yianDetail.vue b/pages/yian/yianDetail.vue
index df302a5..96bae24 100644
--- a/pages/yian/yianDetail.vue
+++ b/pages/yian/yianDetail.vue
@@ -150,8 +150,16 @@
this.$http
.post('book/bookMedicalRecords/getById?medicalRecordsId=' + this.medicalRecordsId )
.then(res => {
- console.log(res,'res')
+ // console.log(res,'res')
this.productInfo = res.entity
+ // console.log('cursor: nwse-resize', this.productInfo.content.includes('cursor: nwse-resize'))
+ // if(this.productInfo.content.includes('cursor: nwse-resize')){
+ // // this.productInfo.content = this.productInfo.content.replaceAll('cursor: nwse-resize;', 'cursor: nwse-resize;max-width:100%;')
+ // }else{
+ this.productInfo.content = this.productInfo.content.replaceAll('img src', 'img style="max-width:100%;" src')
+ // }
+
+ // console.log(this.productInfo.content,'res')
uni.hideLoading();
}).catch((e)=>{
console.log(e,'e')
@@ -305,6 +313,9 @@
+
+ .container {
+ background-color: #fff;
+ }
+
+ .playTitle {
+ width: 80%;
+ margin: 20rpx auto;
+ margin-top: 50rpx;
+ }
+
+ .libTitle {
+ font-size: 40rpx;
+ margin: 40rpx 0;
+ display: block;
+ text-align: center;
+ }
+
+ .tanchu {
+ padding: 40rpx 30rpx 40rpx 30rpx;
+ }
+
+ .playList {
+ padding: 20rpx;
+ color: #666;
+ }
+
+ .playList .item {
+ display: block;
+ line-height: 80rpx;
+ white-space: nowrap;
+ overflow-x: hidden;
+ font-size: 36rpx;
+ text-overflow: ellipsis;
+ }
+
+ .tag {
+ margin-left: 20rpx;
+ }
+
+ .playNow {
+ color: #27b386;
+ }
+
+ .pageTabBox {
+ width: 150px;
+ margin: 20rpx auto;
+ font-size: 60rpx;
+ }
+
+ .cxAdudioPlay {
+ position: fixed;
+ bottom: 150rpx;
+ left: 0;
+ }
+
\ No newline at end of file
diff --git a/pages/yian/yianList1.vue b/pages/yian/yianList1.vue
new file mode 100644
index 0000000..a61d1af
--- /dev/null
+++ b/pages/yian/yianList1.vue
@@ -0,0 +1,481 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+ 暂无医案内容~
+
+
+
+
+
+ 努力加载中
+
+
+
+
+
+
+
+
+
+
+
+