diff --git a/Pages/yishi/medince_list/index.js b/Pages/yishi/medince_list/index.js
index b3c975b..93b04c2 100644
--- a/Pages/yishi/medince_list/index.js
+++ b/Pages/yishi/medince_list/index.js
@@ -14,6 +14,7 @@ Page({
title: '药品清单', //导航栏 中间的标题
},
page:1,
+ isLoding:false,
list:[],
isLock:false,
per_page:10,
@@ -62,13 +63,20 @@ Page({
* 生命周期函数--监听页面加载
*/
handleGetList(){
- const {page,per_page,keyword}=this.data;
+ const {page,per_page,keyword,isLoding}=this.data;
+ if(isLoding)return false;
+ this.setData({
+ isLoding:true
+ })
api.getMedinceList({
page,
per_page,
keyword,
}).then(data=>{
+ this.setData({
+ isLoding:false
+ })
let result=data.data.data;
if(result.length==0){
this.setData({
@@ -89,7 +97,7 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
-
+
},
/**
diff --git a/Pages/yishi/medince_list/index.wxml b/Pages/yishi/medince_list/index.wxml
index 3e27bea..20ca023 100644
--- a/Pages/yishi/medince_list/index.wxml
+++ b/Pages/yishi/medince_list/index.wxml
@@ -1,5 +1,6 @@
-
+
+
@@ -32,4 +33,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Pages/yishi/medince_list/index.wxss b/Pages/yishi/medince_list/index.wxss
index baefab1..2721dde 100644
--- a/Pages/yishi/medince_list/index.wxss
+++ b/Pages/yishi/medince_list/index.wxss
@@ -2,9 +2,14 @@
page{
height:100vh;
background-color: #F6F6F6;
+}
+.page{
+ height:100vh;
+ display: flex;
+ flex-direction: column;
}
.container{
- height:calc(100vh - 135rpx);
+ /* height:calc(100vh - 135rpx); */
display: flex;
overflow: hidden;
/* overflow-y: scroll; */
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index 4fd3d53..8f52fe4 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -565,11 +565,21 @@ Page({
show: false
})
},
+ onTabClick(e){
+ if(e.detail.name==6){
+ this.setData({
+ current_page:0,
+ data_list_6:[]
+ })
+ this.getDoctorInquiryFinishMessage();
+ }
+ },
vanTabsChange(e){
- // // console.log(e)
+ //console.log(e)
this.setData({
now_message_inquiry_type: e.detail.name
- })
+ });
+
},
onPullDownRefresh(){
// console.log("用户下拉动作")
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index 2f062ca..e3661c5 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -153,6 +153,7 @@
border="{{true}}"
id="tabs"
bind:change="vanTabsChange"
+ bind:click="onTabClick"
wx:if="{{ has_data }}"
>
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 912d2da..e5d1f3f 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,6 +1,6 @@
+active-color="#3CC7C0" inactive-color="#999999" wx:if="{{usertype != 3}}">