diff --git a/pages/prescript/CNMedicineSearch.vue b/pages/prescript/CNMedicineSearch.vue
index d202681..17a4431 100644
--- a/pages/prescript/CNMedicineSearch.vue
+++ b/pages/prescript/CNMedicineSearch.vue
@@ -5,14 +5,14 @@
-
+
- {{item.title}}
+ {{item.title}}
-
+
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
- {{index}}
-
- {{item1.title}}
-
-
-
-
-
-
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
-
- 性味选择
-
-
-
+
+
+
+
@@ -84,13 +130,65 @@
xingweiShow: false, // 查询条件弹出层，性味
gongxiaoShow: false, // 查询条件弹出层，功效
sanpinShow: false, // 查询条件弹出层，sanpin
+ xingSelectionList: [
+ {title: "寒"},
+ {title: "凉"},
+ {title: "平"},
+ {title: "温"},
+ {title: "热"},
+ ],
+ weiSelectionList: [
+ {title: "酸"},
+ {title: "涩"},
+ {title: "甘"},
+ {title: "苦"},
+ {title: "辛"},
+ {title: "咸"},
+ {title: "淡"},
+ ],
+ guijingSelectionList: [
+ {title: "心"},
+ {title: "肝"},
+ {title: "脾"},
+ {title: "肺"},
+ {title: "肾"},
+ {title: "肠"},
+ {title: "膀胱"},
+ {title: "胃"},
+ ],
+ curXingIndex: [],
+ curWeiIndex: [],
+ curGuijingIndex: [],
+ gongxiaoSelectionList: [
+ {title: "解表"},
+ {title: "清热"},
+ {title: "泻下"},
+ {title: "祛风湿"},
+ {title: "芳香化湿"},
+ {title: "利水渗湿"},
+ {title: "温里"},
+ {title: "理气"},
+ {title: "消食"},
+ {title: "驱虫"},
+ {title: "止血"},
+ {title: "活血祛瘀"},
+ {title: "化痰止咳平喘"},
+ {title: "安神"},
+ {title: "平肝息风"},
+ {title: "开窍"},
+ {title: "补虚"},
+ {title: "收涩"},
+ {title: "涌吐"},
+ {title: "外用及其他"},
+ ],
+ curGongxiaoIndex: [],
searchValue: '',
twoCateList: [
{title:"性味", id: 1},
{title:"功效", id: 2},
- {title:"三品", id: 3}
+ // {title:"三品", id: 3}
], // 二级分类标题
titleList: [], // 方剂标题
curFirstTabIndex: 0, // 20240128需求：在原来一级分类基础上再新加一级分类：方剂检索、药物检索
@@ -106,7 +204,8 @@
}
},
onLoad() {
- this.getUserInfo()
+ this.goToSearch()
+ // this.getUserInfo()
// this.getCateList()
},
@@ -118,72 +217,46 @@
...mapState(['userInfo']),
},
methods: {
- // 检查是有权限使用搜索功能
- checkDisable() {
- console.log('点击了')
- },
- // 显示无权限弹窗
- // showNoRights() {
- // let that = this
- // uni.showModal({
- // content: "",
- // confirmText: '好的',
- // showCancel: false,
- // success: function(res) {
- // if (res.confirm) {
- // // console.log('用户点击确定');
- // that.clear()
- // }
- // }
- // })
- // },
- // 获取用户详情
- getUserInfo() {
- // 用户详情
- if (this.userInfo.id != undefined) {
- this.$http
- .post('book/user/info/' + this.userInfo.id)
- .then(res => {
- this.userMes = res.user
- this.getCateList()
- console.log(this.userMes, '呼呼')
- });
+ 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);
}
+ console.log(arr);
},
- // 方剂详情
- gotoDetail(item) {
- if (this.userMes.prescriptAPower == 0 && this.curOneCateIndex == 0) {
- this.limitShow = true
- return
- }
-
- if (this.userMes.prescriptBPower == 0 && this.curOneCateIndex == 3) {
- this.limitShow = true
- return
- }
- // 等于1 就是有权限
- uni.navigateTo({
- url: "./prescriptDetail?id=" + item.prescriptId
- })
- },
- // 获取方剂名称
- getTitles(id) {
+ goToSearch() {
$http.request({
- url: "book/prescript/prescriptList",
+ url: "book/materials/getMaterialsList",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
data: {
// loadAnimate: 'none', // 请求加载动画
- 'prescriptCategoryId': id,
- "limit": 1000,
- "page": 1
+ "limit": 100,
+ "current": 1,
+ "name":"",
+ "type": "", // 植物、矿物、动物
+ "effect": this.curGongxiaoIndex.join(','),//功效
+ "taste": this.curWeiIndex.join(','), //味
+ "property": this.curXingIndex.join(','), //性
+ "tropism":this.curGuijingIndex.join(',') //归经
},
header: { //默认 无 说明：请求头
'Content-Type': 'application/json'
},
}).then(res => {
console.log(res, '内容获取成功')
- if (res.code == 0 && res.page.records.length > 0) {
- this.titleList = res.page.records
+ if (res.code == 0 && res.result.records.length > 0) {
+ this.titleList = res.result.records
+
+ this.xingweiShow = false
+ this.gongxiaoShow = false
+ this.sanpinShow = false
} else {
this.titleList = []
}
@@ -192,6 +265,27 @@
console.log(e)
})
},
+ gotoCNDetail(item) {
+ uni.navigateTo({
+ url: "./CNMedicineSearchDetail?id=" + item.id
+ })
+ },
+ // // 方剂详情
+ // gotoDetail(item) {
+ // if (this.userMes.prescriptAPower == 0 && this.curOneCateIndex == 0) {
+ // this.limitShow = true
+ // return
+ // }
+
+ // if (this.userMes.prescriptBPower == 0 && this.curOneCateIndex == 3) {
+ // this.limitShow = true
+ // return
+ // }
+ // // 等于1 就是有权限
+ // uni.navigateTo({
+ // url: "./prescriptDetail?id=" + item.prescriptId
+ // })
+ // },
setTwoCateIndex(item, index) {
let id = item.id
this.curTwoCateIndex = index
@@ -200,47 +294,11 @@
this.gongxiaoShow = false
this.sanpinShow = false
}
- },
-
- getSearch() {
- $http.request({
- url: "book/prescript/searchPrescript",
- method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
- data: {
- loadAnimate: 'none', // 请求加载动画
- 'keywords': this.searchValue,
- type: this.curOneCateIndex + 1
- },
- header: { //默认 无 说明：请求头
- 'Content-Type': 'application/json'
- },
- }).then(res => {
- console.log(res, '搜索结果')
- if (res.code == 0 && res.list.length >= 0) {
- this.showSearchList = true
- this.searchList = res.list
- } else {
- this.searchList = []
- }
- }).catch(e => {
- // this.titleList = []
- this.searchList = []
- console.log(e)
- })
- },
- search(res) {
- console.log(res, 'res')
- // uni.showToast({
- // title: '搜索：' + res,
- // icon: 'none'
- // })
- if (res == '') {
- this.showSearchList = false
- this.searchList = []
- } else {
- this.getSearch()
- }
-
+ if(id == 2){
+ this.xingweiShow = false
+ this.gongxiaoShow = true
+ this.sanpinShow = false
+ }
},
},
onBackPress() {
@@ -309,7 +367,10 @@
color: #55aa7f;
}
- // .u-grid-list{border: 0.5px solid #dadbde;}
+ .u-grid-list{
+ // border-top: 0.5px solid #dadbde;
+ // border-bottom: 0.5px solid #dadbde;
+ }
}
.titleList {
diff --git a/pages/prescript/CNMedicineSearchDetail.vue b/pages/prescript/CNMedicineSearchDetail.vue
index e636741..8072932 100644
--- a/pages/prescript/CNMedicineSearchDetail.vue
+++ b/pages/prescript/CNMedicineSearchDetail.vue
@@ -15,7 +15,7 @@
-
+
{{prescriptDetail.latinname}}
diff --git a/pages/prescript/medicineSearch.vue b/pages/prescript/medicineSearch.vue
index 46aebc3..9491402 100644
--- a/pages/prescript/medicineSearch.vue
+++ b/pages/prescript/medicineSearch.vue
@@ -106,14 +106,14 @@ export default {
this.searchList = []
this.showSearchList = false
if (index == 1) { // 西药检索
- this.getXiYao(1,1)
+ this.getXiYao('抗感染类',1)
} else { // 中药检索
// this.getTowCateList(id)
this.getCNYao() // book/materials/getMaterialsList
}
},
setTwoCateIndex(item, index) {
- let id = item.prescriptCategoryId
+ let id = item.title
this.curTwoCateIndex = index
this.getXiYao(id,1)
},
diff --git a/pages/prescript/prescript.vue b/pages/prescript/prescript.vue
index 7c8ea5a..de25a65 100644
--- a/pages/prescript/prescript.vue
+++ b/pages/prescript/prescript.vue
@@ -58,7 +58,7 @@
-
+
@@ -223,7 +223,9 @@
// this.setOneCateIndex(id)
console.log(this.$refs)
console.log(this.$refs.mSearch)
- this.$refs.mSearch.getCNYao()
+ this.$nextTick(() => {
+ this.$refs.mSearch.getCNYao()
+ })
}else{
this.setOneCateIndex(this.oneCateList[0], 0)
}
diff --git a/style/common.scss b/style/common.scss
index dee4c17..3ee9e3b 100644
--- a/style/common.scss
+++ b/style/common.scss
@@ -26,4 +26,39 @@ button::after {
// 主题字体色
.themeFontColor {
color: $themeColor !important;
+}
+// 中药检索弹出层样式
+.CNMedicineSearchPopup {
+ .dp_title {
+ font-size: 28rpx;
+ font-weight: 700;
+ padding: 20rpx 20rpx 0;
+ }
+ .twoCateList {
+ font-size: 28rpx;
+ margin-top: 20rpx;
+ .u-border-bottom{
+ border-bottom-width: 0 !important
+ }
+ .u-border-right{
+ border-right-width: 0 !important
+ }
+ .grid-text {
+ width: 212rpx;
+ padding: 10rpx;
+ margin-bottom: 10rpx;
+ text-align: center;
+ border: 0.5px solid #dadbde;
+ }
+
+ .cur {
+ color: #55aa7f;
+ border: 0.5px solid #55aa7f;
+ }
+
+ .u-grid-list{
+ // border-top: 0.5px solid #dadbde;
+ // border-bottom: 0.5px solid #dadbde;
+ }
+ }
}
\ No newline at end of file