diff --git a/pages/comments/comments.vue b/pages/comments/comments.vue
index 0252599..2de4685 100644
--- a/pages/comments/comments.vue
+++ b/pages/comments/comments.vue
@@ -678,7 +678,7 @@ import { data } from 'jquery';
font-size: 26rpx;
margin-bottom: 20rpx;
margin-top:10rpx;
- height: 172rpx;
+ // height: 172rpx;
}
// .btns{
// font-size: 24rpx;
diff --git a/pages/medicaldes/medicaldes.vue b/pages/medicaldes/medicaldes.vue
index 67ae961..fea4e88 100644
--- a/pages/medicaldes/medicaldes.vue
+++ b/pages/medicaldes/medicaldes.vue
@@ -37,26 +37,36 @@
-
+
-
+
- ![]()
+ ![]()
-
+
-
-
+
+
{{item.name}}
-
+
+
+
+ ![]()
+ ![]()
+
+ {{item.name}}
+
+
+
@@ -99,13 +109,13 @@
playData: {},
searchValue: '',
oneCateList: [{
- title: "专著出版",
+ title: "专著出版",
type: 'medicaldesBookType'
- },{
- title: "学术传承",
+ }, {
+ title: "学术传承",
type: 'inheritType'
- },{
- title: "吴门之光",
+ }, {
+ title: "吴门之光",
type: 'lightType'
}], // 一级分类标题1
twoCateList: [], // 二级分类标题
@@ -168,107 +178,111 @@
},
// 详情
gotoDetail(item) {
- console.log('111',item)
- console.log('this.curOneCateIndex',this.curOneCateIndex)
- console.log('this.curTwoCateIndex',this.curTwoCateIndex)
- if(this.curOneCateIndex==0){
- uni.navigateTo({
- // url: '../bookShop/commodityDetail?id=' + item.id
- url: '../eBook/bookContent?Id=' + item.id
- })
- return
- }
- if(this.curOneCateIndex==1){
- uni.navigateTo({
- url: "./medicaldesDetail?id=" + item.id
- })
- return
- }
- if(this.curOneCateIndex == 2){
- console.log('111',item)
+ console.log('111', item)
+ console.log('this.curOneCateIndex', this.curOneCateIndex)
+ console.log('this.curTwoCateIndex', this.curTwoCateIndex)
+ if (this.curOneCateIndex == 0) {
uni.navigateTo({
- url: './video?title=' + item.name +'&src='+ item.url
- })
- return
+ // url: '../bookShop/commodityDetail?id=' + item.id
+ url: '../eBook/bookContent?Id=' + item.id
+ })
+ return
+ }
+ if (this.curOneCateIndex == 1) {
+ uni.navigateTo({
+ url: "./medicaldesDetail?id=" + item.id
+ })
+ return
+ }
+ if (this.curOneCateIndex == 2) {
+ console.log('111', item)
+ uni.navigateTo({
+ url: './video?title=' + item.name + '&src=' + item.url
+ })
+ return
}
},
// 获取名称
getTitles(dictType) {
- console.log('dictType',dictType)
- if(this.curOneCateIndex==0){
- $http.request({
- url: "book/medicaldes/bookListByType?type=" + dictType,
- method: "POST",
- data: {
- // loadAnimate: 'none', // 请求加载动画
- "limit": 1000,
- "page": 1,
- },
- header: { //默认 无 说明：请求头
- 'Content-Type': 'application/json'
- },
- }).then(res => {
- console.log(res, '内容获取成功')
- if (res.code == 0 && res.result.length > 0) {
- this.titleList = res.result
- } else {
- this.titleList = []
- }
- }).catch(e => {
- this.titleList = []
- console.log(e)
- })
- }
- if(this.curOneCateIndex==1){
- $http.request({
- url: "book/medicaldes/inheritListByPage",
- method: "POST",
- data: {
- // loadAnimate: 'none', // 请求加载动画
- 'dictType': dictType,
- "limit": 1000,
- "current": 1
- },
- header: { //默认 无 说明：请求头
- 'Content-Type': 'application/json'
- },
- }).then(res => {
- console.log(res, '内容获取成功')
- if (res.code == 0 && res.result.records.length > 0) {
- this.titleList = res.result.records
- } else {
- this.titleList = []
- }
- }).catch(e => {
- this.titleList = []
- console.log(e)
- })
- }
- if(this.curOneCateIndex==2){
- $http.request({
- url: "book/medicaldes/lightListByType?type=" + dictType,
- method: "POST",
- data: {
- // loadAnimate: 'none', // 请求加载动画
- "limit": 1000,
- "page": 1,
- },
- header: { //默认 无 说明：请求头
- 'Content-Type': 'application/json'
- },
- }).then(res => {
- console.log(res, '内容获取成功')
- if (res.code == 0 && res.result.length > 0) {
- this.titleList = res.result
- } else {
- this.titleList = []
- }
- }).catch(e => {
- this.titleList = []
- console.log(e)
- })
- }
-
+ console.log('dictType', dictType)
+ if (this.curOneCateIndex == 0) {
+ $http.request({
+ url: "book/medicaldes/bookListByType?type=" + dictType,
+ method: "POST",
+ data: {
+ // loadAnimate: 'none', // 请求加载动画
+ "limit": 1000,
+ "page": 1,
+ },
+ header: { //默认 无 说明：请求头
+ 'Content-Type': 'application/json'
+ },
+ }).then(res => {
+ console.log(res, '内容获取成功')
+ if (res.code == 0 && res.result.length > 0) {
+ this.titleList = res.result
+ } else {
+ this.titleList = []
+ }
+ }).catch(e => {
+ this.titleList = []
+ console.log(e)
+ })
+ }
+ if (this.curOneCateIndex == 1) {
+ $http.request({
+ url: "book/medicaldes/inheritListByPage",
+ method: "POST",
+ data: {
+ // loadAnimate: 'none', // 请求加载动画
+ 'dictType': dictType,
+ "limit": 1000,
+ "current": 1
+ },
+ header: { //默认 无 说明：请求头
+ 'Content-Type': 'application/json'
+ },
+ }).then(res => {
+ console.log(res, '内容获取成功')
+ if (res.code == 0 && res.result.records.length > 0) {
+ this.titleList = res.result.records
+ for (let i = 0; i < this.titleList.length; i++) {
+ this.titleList[i].imageslist = [];
+ this.titleList[i].imageslist = this.titleList[i].img.split(";");
+ }
+ } else {
+ this.titleList = []
+ }
+ }).catch(e => {
+ this.titleList = []
+ console.log(e)
+ })
+ }
+ if (this.curOneCateIndex == 2) {
+ $http.request({
+ url: "book/medicaldes/lightListByType?type=" + dictType,
+ method: "POST",
+ data: {
+ // loadAnimate: 'none', // 请求加载动画
+ "limit": 1000,
+ "page": 1,
+ },
+ header: { //默认 无 说明：请求头
+ 'Content-Type': 'application/json'
+ },
+ }).then(res => {
+ console.log(res, '内容获取成功')
+ if (res.code == 0 && res.result.length > 0) {
+ this.titleList = res.result
+ } else {
+ this.titleList = []
+ }
+ }).catch(e => {
+ this.titleList = []
+ console.log(e)
+ })
+ }
+
},
setTwoCateIndex(item, index) {
let dictType = item.dictType
@@ -303,7 +317,7 @@
this.searchList = []
this.showSearchList = false
// if (index != 2) {
- this.getTowCateList(type)
+ this.getTowCateList(type)
// } else {
// this.getJFList(dictType)
// }
@@ -323,9 +337,18 @@
console.log(res, '二级分类获取成功')
if (res.code == 0 && res.result.length >= 0) {
this.twoCateList = res.result
- if(this.curOneCateIndex==2){
- this.twoCateList = [{'dictType':"1","dictValue":"吴门之歌"},{'dictType':"2","dictValue":"巴山夜语"},{'dictType':"3","dictValue":"吴门之徽"}]
- }
+ if (this.curOneCateIndex == 2) {
+ this.twoCateList = [{
+ 'dictType': "1",
+ "dictValue": "吴门之歌"
+ }, {
+ 'dictType': "2",
+ "dictValue": "巴山夜语"
+ }, {
+ 'dictType': "3",
+ "dictValue": "吴门之徽"
+ }]
+ }
this.getTitles(this.twoCateList[0].dictType)
} else {
this.twoCateList = []
@@ -393,19 +416,19 @@
// 'Content-Type': 'application/json'
// },
// }).then(res => {
- // console.log(res, '脉穴分类获取成功')
- // if (res.code == 0 && res.list.length > 0) {
- // this.oneCateList = res.list
- this.getTowCateList(this.oneCateList[0].type)
- // } else {
- // this.oneCateList = []
- // }
+ // console.log(res, '脉穴分类获取成功')
+ // if (res.code == 0 && res.list.length > 0) {
+ // this.oneCateList = res.list
+ this.getTowCateList(this.oneCateList[0].type)
+ // } else {
+ // this.oneCateList = []
+ // }
// }).catch(e => {
// this.oneCateList = []
// console.log(e)
// })
},
-
+
// 放大图片
previewImage(url) {
console.log(url)
@@ -581,10 +604,10 @@
border-bottom: 0.5px solid #f8f9fa;
}
- .wmzhimg{
- width: 220rpx;
- height: 220rpx;
- }
+ .wmzhimg {
+ width: 220rpx;
+ height: 220rpx;
+ }
}
}
@@ -639,9 +662,13 @@
.uni-modal .uni-modal__bd {
text-align: left;
}
-
- .limiTy{
+
+ .limiTy {
font-size: 28rpx;
line-height: 46rpx;
}
+
+ .chImage {
+ height: 100rpx;
+ }
\ No newline at end of file
diff --git a/pages/medicaldes/medicaldesDetail.vue b/pages/medicaldes/medicaldesDetail.vue
index f1849ba..942994c 100644
--- a/pages/medicaldes/medicaldesDetail.vue
+++ b/pages/medicaldes/medicaldesDetail.vue
@@ -3,7 +3,8 @@
-
+
@@ -13,18 +14,19 @@
-
+
{{prescriptDetail.name}}
-
+
-
+
-
+
@@ -56,13 +58,13 @@
return {
playData: {},
prescriptDetail: {
- images:[]
+ images: []
},
id: null,
indicatorDots: true,
autoplay: true,
interval: 5000,
- duration: 500
+ duration: 500,
}
},
onLoad(e) {
@@ -101,7 +103,7 @@
console.log(res, '内容获取成功')
if (res.code == 0) {
this.prescriptDetail = res.result
- if(this.prescriptDetail.img){
+ if (this.prescriptDetail.img) {
this.prescriptDetail.images = this.prescriptDetail.img.split(';');
}
}
@@ -109,7 +111,8 @@
// this.titleList = []
console.log(e)
})
- }
+ },
+
},
components: {
musicPlay
@@ -118,25 +121,49 @@
\ No newline at end of file
diff --git a/pages/medicaldes/video.vue b/pages/medicaldes/video.vue
index 8045506..1c63d4c 100644
--- a/pages/medicaldes/video.vue
+++ b/pages/medicaldes/video.vue
@@ -51,7 +51,8 @@ export default {
progressDrag: false,
// 视频总长度
duration: 0,
- videoCtx: null
+ videoCtx: null,
+ objId:''
};
},
onLoad(e) {
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index d08ab29..cb856b5 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -24,11 +24,9 @@
经典查阅
-