-
+
+
-
+
@@ -57,47 +58,49 @@
-
-
- 精彩试听
-
-
-
-
-
+
+
+
+ 精彩试听
+
+
+
+
+
- {{item.chapter}}
-
-
+ {{item.chapter}}
+
+
+
-
-
- 查看完整目录
-
-
-
-
-
-
- 热门书评
-
-
-
- {{item.title}}
-
-
-
+
+ 查看完整目录
- 立即查看
-
- 查看更多
+
+
+
+
+ 热门书评
+
+
+ {{item.title}}
+
+
+
+
+ 立即查看
+
+
+ 查看更多
+
+
+
-
{
+ checkBookRight(data, res => {
console.log(res)
- if(res.success){
+ if (res.success) {
uni.navigateTo({
url: '../talkBook/talkBookML?bookid=' + this.bookId
});
- }else{
+ } else {
uni.showToast({
- title:'购买本书后方可查看此内容!',
- icon:'none'
+ title: '购买本书后方可查看此内容!',
+ icon: 'none'
})
}
})
-
+
},
// 去听书
gotoListen() {
@@ -275,18 +278,18 @@
'userId': this.userInfo.id,
'bookId': this.bookId
}
- checkBookRight(data,res=>{
+ checkBookRight(data, res => {
console.log(res)
- if(res.success){
+ if (res.success) {
this.onPageJump('../clock/clock?bookid=' + this.bookId)
- }else{
+ } else {
uni.showToast({
- title:'购买本书后方可参与打卡!',
- icon:'none'
+ title: '购买本书后方可参与打卡!',
+ icon: 'none'
})
}
})
-
+
},
// 查看本书更多书评
toMore(val) {
@@ -295,21 +298,21 @@
'userId': this.userInfo.id,
'bookId': this.bookId
}
-
- checkBookRight(data,res=>{
+
+ checkBookRight(data, res => {
console.log(res)
- if(res.success){
+ if (res.success) {
uni.navigateTo({
url: '../comments/comments?bookid=' + this.bookId,
});
- }else{
+ } else {
uni.showToast({
- title:'购买本书后方可查看此内容!',
- icon:'none'
+ title: '购买本书后方可查看此内容!',
+ icon: 'none'
})
}
})
-
+
},
// 去购买
goBuy() {
diff --git a/pages/library/library.vue b/pages/library/library.vue
index 423dda4..4948f5d 100644
--- a/pages/library/library.vue
+++ b/pages/library/library.vue
@@ -67,7 +67,7 @@
-->
-
+
@@ -88,11 +88,14 @@
听 书
-
+
-
+
+
+
+
书 评
diff --git a/pages/listen/home.vue b/pages/listen/home.vue
index 3c49102..1022468 100644
--- a/pages/listen/home.vue
+++ b/pages/listen/home.vue
@@ -119,15 +119,16 @@
// ],
}
},
- onLoad() {
- },
- onShow() {
+ onLoad() {
this.page = 1, // 页码
this.tjPage = 1
this.tjBookLIst = []
this.bookList = []
this.getListDate()
this.getfreeBook()
+ },
+ onShow() {
+
},
onPullDownRefresh() {
console.log('下拉刷新了')
diff --git a/pages/listen/listen.vue b/pages/listen/listen.vue
index 4671fc0..e0d388f 100644
--- a/pages/listen/listen.vue
+++ b/pages/listen/listen.vue
@@ -25,12 +25,12 @@
{{bookInfo.name}}
-
+
diff --git a/pages/listen/listenNotBuy.vue b/pages/listen/listenNotBuy.vue
index 24f1e17..d53f381 100644
--- a/pages/listen/listenNotBuy.vue
+++ b/pages/listen/listenNotBuy.vue
@@ -21,12 +21,12 @@
{{bookInfo.name}}
-
+
￥98.00
diff --git a/pages/peanut/aboutUs.vue b/pages/peanut/aboutUs.vue
index fc9cfbf..bcc423d 100644
--- a/pages/peanut/aboutUs.vue
+++ b/pages/peanut/aboutUs.vue
@@ -60,15 +60,15 @@
uni.showModal({
title: '提示',
content: '微信号：yilujiankangkefu',
- success: function (res) {
- if (res.confirm) {
- uni.makePhoneCall({
- phoneNumber: '022-24142321' //仅为示例
- });
- } else if (res.cancel) {
+ // success: function (res) {
+ // if (res.confirm) {
+ // uni.makePhoneCall({
+ // phoneNumber: '022-24142321' //仅为示例
+ // });
+ // } else if (res.cancel) {
- }
- }
+ // }
+ // }
})
}
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index cb856b5..71a0353 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -47,7 +47,7 @@
-->
-
+
diff --git a/pages/peanut/mine.vue b/pages/peanut/mine.vue
index b67ed89..486622a 100644
--- a/pages/peanut/mine.vue
+++ b/pages/peanut/mine.vue
@@ -42,16 +42,16 @@
>
-
+
{{userMes.peanutCoin}}
天医币
-
+
{{userMes.conponsCount}}
优惠券
- 充 值
+ 充 值
@@ -62,10 +62,10 @@
-
+
我的听书
-
+
听书设置
diff --git a/pages/prescript/CNMedicineSearch.vue b/pages/prescript/CNMedicineSearch.vue
index 1eaaa06..583b0f7 100644
--- a/pages/prescript/CNMedicineSearch.vue
+++ b/pages/prescript/CNMedicineSearch.vue
@@ -26,27 +26,18 @@
-
+
性味：
-
+
{{item}}
- ,
-
-
- {{item}}
- ,
-
-
- {{item}}
- ,
+ ,
-
+
功效：
-
+
{{item}}
- ,
+ ,
+
+
+ 查询
+
+
+
+
+
+
+
+
+
@@ -117,6 +229,150 @@
titleList: [], // 药物标题
curOneCateIndex: 0, // 当前选中的一级分类
curTwoCateIndex: 0, // 当前选中的二级分类
+ CNateList: [{
+ title: "功效",
+ id: 1
+ }, {
+ title: "性味",
+ id: 2
+ }, ],
+ CNCateIndex: 0,
+ page: 1,
+ status: 3,
+ totalPage: 1,
+ xingweiShow: false, // 查询条件弹出层，性味
+ gongxiaoShow: false, // 查询条件弹出层，功效
+ sanpinShow: false, // 查询条件弹出层，sanpin
+ curXWGMark: [],
+ curGongxiaoMark: [],
+ curXingIndex: [],
+ curWeiIndex: [],
+ curGuijingIndex: [],
+ curGongxiaoIndex: [],
+ gongxiaoSelectionList: [{
+ title: "解表"
+ },
+ {
+ title: "清热"
+ },
+ {
+ title: "泻下"
+ },
+ {
+ title: "祛风湿"
+ },
+ {
+ title: "芳香化湿"
+ },
+ {
+ title: "利水渗湿"
+ },
+ {
+ title: "温里"
+ },
+ {
+ title: "理气"
+ },
+ {
+ title: "消食"
+ },
+ {
+ title: "驱虫"
+ },
+ {
+ title: "止血"
+ },
+ {
+ title: "活血祛瘀"
+ },
+ {
+ title: "化痰止咳平喘"
+ },
+ {
+ title: "安神"
+ },
+ {
+ title: "平肝息风"
+ },
+ {
+ title: "开窍"
+ },
+ {
+ title: "补虚"
+ },
+ {
+ title: "收涩"
+ },
+ {
+ title: "涌吐"
+ },
+ {
+ title: "外用及其他"
+ },
+ ],
+ xingSelectionList: [{
+ title: "寒"
+ },
+ {
+ title: "凉"
+ },
+ {
+ title: "平"
+ },
+ {
+ title: "温"
+ },
+ {
+ title: "热"
+ },
+ ],
+ weiSelectionList: [{
+ title: "酸"
+ },
+ {
+ title: "涩"
+ },
+ {
+ title: "甘"
+ },
+ {
+ title: "苦"
+ },
+ {
+ title: "辛"
+ },
+ {
+ title: "咸"
+ },
+ {
+ title: "淡"
+ },
+ ],
+ guijingSelectionList: [{
+ title: "心"
+ },
+ {
+ title: "肝"
+ },
+ {
+ title: "脾"
+ },
+ {
+ title: "肺"
+ },
+ {
+ title: "肾"
+ },
+ {
+ title: "肠"
+ },
+ {
+ title: "膀胱"
+ },
+ {
+ title: "胃"
+ },
+ ],
searchList: [], // 搜索结果数组
showSearchList: false,
userMes: {}, // 用户信息
@@ -129,6 +385,8 @@
// onLoad() {
// this.getCNYao()
// },
+
+
methods: {
setOneCateIndex(item, index) {
// let id = item.prescriptCategoryId
@@ -141,7 +399,7 @@
this.getXiYao('抗感染类', 1)
} else { // 中药检索
// this.getTowCateList(id)
- this.getCNYao() // book/materials/getMaterialsList
+ this.goNewSearch() // book/materials/getMaterialsList
}
},
setTwoCateIndex(item, index) {
@@ -187,20 +445,69 @@
})
},
// 获取中药
- getCNYao(id, type) {
+
+ gotoCNDetail(item) {
+ console.log('2222')
+ uni.navigateTo({
+ url: "./CNMedicineSearchDetail?id=" + item.id
+ })
+ },
+
+ gotoSousuo() {
+ uni.navigateTo({
+ url: "./CNMedicineText"
+ })
+ },
+
+ setXingIndex(item, index, arr) {
+ // let arr = this.curXingIndex
+ if (arr.includes(item.title)) {
+ // 若包含，则从数组中删除该值
+ var index = arr.indexOf(item.title);
+ if (index > -1) {
+ arr.splice(index, 1);
+ }
+ } else {
+ // 若不包含，则向数组中添加该值
+ arr.push(item.title);
+ }
+ },
+
+ setCNIndex(item, index) {
+ let id = item.id
+ this.CNCateIndex = index
+ if (id == 2) {
+ this.xingweiShow = true
+ this.gongxiaoShow = false
+ this.sanpinShow = false
+ }
+ if (id == 1) {
+ this.xingweiShow = false
+ this.gongxiaoShow = true
+ this.sanpinShow = false
+ }
+ },
+
+ goNewSearch() {
+ this.page = 1
+ this.titleList = []
+ this.goToSearch()
+ },
+
+ goToSearch() {
$http.request({
url: "book/materials/getMaterialsList",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
data: {
// loadAnimate: 'none', // 请求加载动画
- "limit": 10,
- "current": 1,
+ "limit": 20,
+ "current": this.page,
"name": "",
"type": "", // 植物、矿物、动物
- "effect": "", //功效
- "taste": "", //味
- "property": "", //性
- "tropism": "" //归经
+ "effect": this.curGongxiaoIndex.join(','), //功效
+ "taste": this.curWeiIndex.join(','), //味
+ "property": this.curXingIndex.join(','), //性
+ "tropism": this.curGuijingIndex.join(',') //归经
},
header: { //默认 无 说明：请求头
'Content-Type': 'application/json'
@@ -208,31 +515,51 @@
}).then(res => {
console.log(res, '内容获取成功')
if (res.code == 0 && res.result.records.length > 0) {
- this.titleList = res.result.records
+ for (var i = 0; i < res.result.records.length; i++) {
+ this.titleList.push(res.result.records[i])
+ }
+
} else {
this.titleList = []
}
+
+ this.xingweiShow = false
+ this.gongxiaoShow = false
+ this.sanpinShow = false
+
+ this.totalPage = res.result.pages
+ if (this.page == this.totalPage) {
+ this.status = 1
+ } else {
+ this.status = 3
+ }
+
+ // 标记
+ this.curGongxiaoMark = JSON.parse(JSON.stringify(this.curGongxiaoIndex))
+ this.curXWGMark = JSON.parse(JSON.stringify(this.curXingIndex.concat(this.curWeiIndex)
+ .concat(this.curGuijingIndex)))
+
}).catch(e => {
this.titleList = []
console.log(e)
})
},
- gotoCNDetail(item) {
- console.log('2222')
- uni.navigateTo({
- url: "./CNMedicineSearchDetail?id=" + item.id
- })
+
+
+ goToBottom() {
+ console.log(this.curOneCateIndex)
+ // this.loadingNow = true
+ if (this.curOneCateIndex != 1) {
+ console.log('到底了')
+ if (this.page + 1 <= this.totalPage) {
+ this.page++
+ this.goToSearch()
+ } else {
+ this.status = 1
+ }
+ }
+
},
- gotoSousuo() {
- uni.navigateTo({
- url: "./CNMedicineText"
- })
- },
- gotoFenlei() {
- uni.navigateTo({
- url: "./CNMedicineSearch"
- })
- }
}
};
@@ -246,11 +573,6 @@
}
}
- .scroll-view_H {
- background-color: #fff;
- white-space: nowrap;
- padding: 10rpx;
- }
.contentBox {
.oneCateList {
@@ -298,6 +620,8 @@
color: #55aa7f;
}
+
+
// .u-grid-list{border: 0.5px solid #dadbde;}
}
@@ -336,7 +660,7 @@
margin-top: 30rpx;
margin-bottom: 20rpx;
-
+
}
.flexbox {
@@ -351,4 +675,74 @@
font-size: 28rpx;
line-height: 46rpx;
}
+
+ .CNCateList {
+ font-size: 28rpx;
+ margin-top: 20rpx;
+
+ .grid-text {
+ padding: 16rpx 20rpx;
+ text-align: center;
+ }
+
+ .grid-text>b {
+ margin-left: 10rpx;
+ display: inline-block;
+ vertical-align: middle;
+ }
+
+ .cur {
+ color: #55aa7f;
+ }
+
+ .u-grid-list {
+ // border-top: 0.5px solid #dadbde;
+ // border-bottom: 0.5px solid #dadbde;
+ }
+
+ }
+
+
+ .CNMedicineSearchPopup {
+ .grid-text {
+ padding: 16rpx 20rpx !important;
+ }
+
+ .grid-text>b {
+ margin-left: 10rpx;
+ display: inline-block;
+ vertical-align: middle;
+ }
+
+ .cur {
+ color: #55aa7f;
+ }
+
+ .u-grid-list {
+ // border-top: 0.5px solid #dadbde;
+ // border-bottom: 0.5px solid #dadbde;
+ }
+ }
+
+
+ .marYao {
+ background-color: #55aa7f1c;
+ padding: 10rpx 20rpx 10rpx 20rpx;
+ margin-bottom: 10rpx;
+ font-size: 26rpx;
+ color: #225f40;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+
+ span {
+
+ color: #55aa7f;
+
+ font {
+ display: inline-block;
+ margin: 0 5rpx;
+ }
+ }
+ }
\ No newline at end of file
diff --git a/pages/prescript/prescript.vue b/pages/prescript/prescript.vue
index acc8619..83cc1e0 100644
--- a/pages/prescript/prescript.vue
+++ b/pages/prescript/prescript.vue
@@ -11,11 +11,11 @@
{{item.title}}
+ v-for="(item, index) in oneCateList" :key="item.prescriptCategoryId" v-show="!iosHide&&index!=0">{{item.title}}
-
+
@@ -27,7 +27,7 @@
-
+
+ @click="gotoDetail(item)"
+ style="align-items: flex-start;border-bottom: 2px solid #fff;">
{{item.title}}
@@ -93,10 +94,10 @@
},
data() {
return {
- firstTabList:[{
+ firstTabList: [{
firstTabId: 1,
title: '方剂检索'
- },{
+ }, {
firstTabId: 2,
title: '药物检索'
}],
@@ -218,18 +219,18 @@
setFirstTabIndex(item, index) {
let id = item.firstTabId
this.curFirstTabIndex = index
-
+
if (index == 1) {
// this.setOneCateIndex(id)
console.log(this.$refs)
console.log(this.$refs.mSearch)
this.$nextTick(() => {
- this.$refs.mSearch.getCNYao()
+ this.$refs.mSearch.goToSearch()
})
- }else{
+ } else {
this.setOneCateIndex(this.oneCateList[0], 0)
}
-
+
},
setOneCateIndex(item, index) {
// if(this.userMes.tgdzPower == 0){
@@ -263,10 +264,10 @@
} else if (index == 3) {
this.twoCateList = []
this.getTitles(id)
- } else{
+ } else {
this.getTowCateList(id)
}
-
+
},
getTowCateList(id) {
$http.request({
@@ -452,6 +453,14 @@
plus.key.hideSoftKeybord();
// #endif
},
+
+ onReachBottom() {
+ this.$nextTick(() => {
+ this.$refs.mSearch.goToBottom()
+ })
+
+ },
+
}
@@ -473,6 +482,7 @@
.contentBox {
.oneCateList {
justify-content: space-between;
+
text {
text-align: center;
display: inline-block;
@@ -481,17 +491,17 @@
font-size: 32rpx;
font-weight: bold;
}
-
+
.cur {
border-bottom: 5rpx solid #55aa7f;
color: #55aa7f;
}
}
-
- .oneCateBot{
+
+ .oneCateBot {
margin-top: 15rpx;
justify-content: space-between;
-
+
text {
text-align: center;
display: inline-block;
@@ -500,14 +510,15 @@
font-size: 30rpx;
border-radius: 10rpx;
}
-
+
.cur {
background-color: #55aa7f3d;
color: #55aa7f;
font-weight: bold;
}
}
- .firstTab{
+
+ .firstTab {
text {
text-align: center;
display: inline-block;
@@ -604,8 +615,8 @@
.uni-modal .uni-modal__bd {
text-align: left;
}
-
- .limiTy{
+
+ .limiTy {
font-size: 28rpx;
line-height: 46rpx;
}
diff --git a/pages/prescript/prescriptDetail.vue b/pages/prescript/prescriptDetail.vue
index 027f531..610820b 100644
--- a/pages/prescript/prescriptDetail.vue
+++ b/pages/prescript/prescriptDetail.vue
@@ -50,6 +50,10 @@
+
+ 辨病治症仅供参考，若有身体问题请及时到医院问诊
+
+
+
+
diff --git a/pages/talkBook/talkBookML.vue b/pages/talkBook/talkBookML.vue
index b8446bb..e746eda 100644
--- a/pages/talkBook/talkBookML.vue
+++ b/pages/talkBook/talkBookML.vue
@@ -24,12 +24,12 @@
-
+
注册账号
忘记密码？
-->
-
+
第三方登录
diff --git a/pages/user/persCount.vue b/pages/user/persCount.vue
index f45f90f..cc1378f 100644
--- a/pages/user/persCount.vue
+++ b/pages/user/persCount.vue
@@ -5,15 +5,18 @@
+ :activeStyle="{color: '#303133',fontWeight: 'bold',transform: 'scale(1.1)'}" v-if="iosHide">
+
+
{{userMes.peanutCoin}}
天医币
-
+
充值
-
+
@@ -57,7 +60,7 @@
满{{item.coupons.useLevel}}元可用
使用类型：商品类
- 使用类型：电子书
+ 使用类型：电子书
@@ -67,7 +70,8 @@