Merge branch 'dev' into bugfix 10.23

TUIService/TUIKit/components/TUIChat/index.js

@@ -244,7 +244,7 @@ Component({
     showModal() {
       this.setData({
         hideModal: true,
-        blockHeight:"1130rpx"
+        blockHeight:"830rpx"
       })
     },
     // 隐藏遮罩层

app.json

@@ -13,6 +13,7 @@
         "pages/login/login",
         "pages/mobileLogin/mobileLogin",
         "pages/expertConsult/expertConsult",
+        "pages/hivConsult/hivConsult",
         "pages/expertDetail/expertDetail",
         "pages/selectPatient/selectPatient",
         "pages/writeSick/writeSick",

components/consultList/consultList.wxml

@@ -4,7 +4,7 @@
           <view class="leftimg">
             <image src="{{img_host+'/freezx.png'}}" class="zxicon"></image>
             <view class="right">
-              <view class="name">公益咨询</view>
+              <view class="name">特惠咨询</view>
               <view class="price">¥{{price.welfare_inquiry_price}}<text class="unit">起</text></view>
             </view>
           </view>
@@ -12,7 +12,7 @@
             <view class="btn" bindtap="goFree">去咨询</view>
           </view>
         </view>
-        <view class="viewwrap">
+        <!-- <view class="viewwrap">
           <view class="leftimg">
             <image src="https://img.applets.igandanyiyuan.com/applet/patient/static/quickzx.png" class="zxicon"></image>
             <view class="right">
@@ -23,12 +23,12 @@
           <view class="consultbtn">
             <view class="btn" bindtap="goQuick">去咨询</view>
           </view>
-        </view>
+        </view> -->
         <view class="viewwrap">
           <view class="leftimg">
             <image src="https://img.applets.igandanyiyuan.com/applet/patient/static/expertzx.png" class="zxicon"></image>
             <view class="right">
-              <view class="name">专家问诊</view>
+              <view class="name">找专家</view>
               <view class="price">¥{{price.expert_inquiry_price}}<text class="unit">起</text></view>
             </view>
           </view>
@@ -36,7 +36,7 @@
             <view class="btn" bindtap="goExpert">去咨询</view>
           </view>
         </view>
-        <view class="viewwrap">
+        <!-- <view class="viewwrap">
           <view class="leftimg">
             <image src="https://img.applets.igandanyiyuan.com/applet/patient/static/buyyao.png" class="zxicon"></image>
             <view class="right">
@@ -47,5 +47,5 @@
           <view class="consultbtn">
             <view class="btn" bindtap="goBuyMedince">去咨询</view>
           </view>
-        </view>
+        </view> -->
       </view>

components/navbar/navbar.js

@@ -25,9 +25,11 @@ Component({
       this.triggerEvent('handleFocus',true)
     },
     goInquirtForm(){
-    //   wx.navigateTo({
+
-    //     url: '/healthyService/pages/visitList/visitList',
+      wx.navigateTo({
-    //   })
+        url: '/healthyService/pages/visitList/visitList',
+      })
+
     }
   },
   

healthyService/pages/writeSick/writeSick.js

@@ -293,8 +293,11 @@ Page({
         signature,
         host
       } = resdata;
-      let index = File.lastIndexOf("/");
+    //   let index = File.lastIndexOf("/");
-      let filename = File.substring(index + 1, File.length);
+    //   let filename = File.substring(index + 1, File.length);
+    let index = File.lastIndexOf(".");
+    let houzhui=File.substring(index, File.length);
+    let filename = this.data.family_id+new Date().getTime().toString()+(this.data.fileList.length).toString()+houzhui;
       return new Promise((resolve, reject) => {
         wx.uploadFile({
           url: host, // 仅为示例，非真实的接口地址

pages/index/index.js

@@ -242,7 +242,7 @@ Page({
   }),
   goquickExpert:throttle(function(){
     app.method.navigateTo({
-      url: '/patient/pages/quickConsult/quickConsult'
+      url:'/patient/pages/expertConsult/expertConsult' //'/patient/pages/quickConsult/quickConsult'
     })
   }),
   goExpertAndCloseOld:throttle(function(){
@@ -273,14 +273,21 @@ Page({
     this.onClickHide();
   }),
   goExpert:throttle(function(){
+    //   wx.showToast({
+    //     title: '敬请期待',
+    //     icon:'none'
+    //   })
     app.method.navigateTo({
-      url: '/patient/pages/expertConsult/expertConsult'
+      url: '/patient/pages/hivConsult/hivConsult'
     })
   }),
   goconsultandbuy:throttle(function(){
-    app.method.navigateTo({
+       app.method.navigateTo({
-      url: '/patient/pages/quickConsult/quickConsult?inquiry_type=4'
+      url: '/patient/pages/expertConsult/expertConsult?type=buyYao'
     })
+    // app.method.navigateTo({
+    //   url: '/patient/pages/quickConsult/quickConsult?inquiry_type=4'
+    // })
    
   }),
   watchBack(){

pages/index/index.wxml

@@ -60,27 +60,33 @@
       <view class="wenzhenbox">
         <view class="wenzhencell" bindtap="goquickExpert">
           <view class="row">
-            <view>快速问诊</view>
+            <view class="name_title">找专家</view>
-            <image src="{{img_host+'/kswz.png'}}"></image>
+            <image src="{{img_host+'/find_expert.png'}}" style="width:80rpx;height:80rpx"></image>
+            <!-- <image src="{{img_host+'/kswz.png'}}"></image> -->
           </view>
           <view class="desc">
-            5分钟接诊不耽误
+            专业医生，服务保障
           </view>
         </view>
         <view class="wenzhencell" bindtap="goExpert">
           <view class="row">
-            <view>专家问诊</view>
+            <view class="name_title">HIV</view>
-            <image src="{{img_host+'/zjwz.png'}}"></image>
+            <!-- <image src="{{img_host+'/zjwz.png'}}"></image> -->
+            <image src="{{img_host+'/hiv.png'}}" style="width:80rpx;height:80rpx"></image>
           </view>
           <view class="desc">
-            专业医生，服务保障
+            恐艾咨询，健康指导
+            <!-- 专业医生，服务保障 -->
           </view>
         </view>
       </view>
       <view class="buybox" bindtap="goconsultandbuy">
         <view class="left">
           <view>问诊购药</view>
-          <view class="desc">在线复诊，正品无忧，送药到家</view>
+          <view class="desc">
+            正品无忧，品质护航，送药到家
+                <!-- 在线复诊，正品无忧，送药到家 -->
+          </view>
         </view>
         <view class="right">
           <image src="{{img_host+'/yao.png'}}"></image>
@@ -91,7 +97,7 @@
     <view class="cellbox">
       <view class="cell" bindtap="freeConsult">
         <image src="{{img_host+'/gywz.png'}}"></image>
-        <view class="name">公益问诊</view>
+        <view class="name">特惠问诊</view>
       </view>
       <view class="cell" bindtap="goMall">
         <image src="{{img_host+'/gdmall.png'}}"></image>

pages/index/index.wxss

@@ -54,11 +54,14 @@
   color: #333333;
   font-size: 40rpx;
 }
+.wenzhencell .row .name_title{
+ width:160rpx
+}
 
 .wenzhencell .desc {
   margin-top: 16rpx;
   color: #666;
-  font-size: 30rpx;
+  font-size: 28rpx;
 }
 
 .buybox {

patient/pages/expertConsult/expertConsult.js

@@ -316,13 +316,22 @@ Page({
   onLoad(options) {
     if(options.type=="free"){
       wx.setNavigationBarTitle({
-        title: "公益问诊"
+        title: "特惠问诊"
       });
       this.setData({
-        navName:"公益问诊",
+        navName:"特惠问诊",
         inquiry_type:3,
         inquiry_mode:1
       })
+    }else if(options.type=="buyYao"){
+      wx.setNavigationBarTitle({
+        title: "问诊购药"
+      });
+      this.setData({
+        navName:"问诊购药",
+        inquiry_type:4,
+        inquiry_mode:1
+      })
     }
     this.getSickType();
     this.getDoctorList();

patient/pages/expertConsult/expertConsult.json

@@ -3,6 +3,7 @@
     "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
     "van-dropdown-item": "@vant/weapp/dropdown-item/index",
     "van-picker": "@vant/weapp/picker/index",
+    
     "van-popup": "@vant/weapp/popup/index",
     "van-sticky": "@vant/weapp/sticky/index",
     "nav":"../../../components/nav/nav"

patient/pages/expertConsult/expertConsult.wxss

@@ -69,7 +69,7 @@
 }
 
 .page-section-spacing .row{
-  margin-top: 40rpx;
+  margin-top: 30rpx;
   margin-bottom: 30rpx;
 }
 .page-section-spacing .row:last-child{
@@ -265,6 +265,7 @@ font-size: 30rpx;
   justify-content: center;
   align-items: center;
   width:33.33%;
+  font-size: 30rpx;
 }
 .viewcell .left{
   position: relative;

patient/pages/expertDetail/expertDetail.js

@@ -498,7 +498,7 @@ bindchange(e){
   },
   // 禁止用户滑动
   catchTouchMove() {
-    return false;
+    //return false;
   },
 
   getDeatil(id) {

patient/pages/expertDetail/expertDetail.wxml

@@ -161,7 +161,8 @@
       </view>
       </scroll-view>
     <swiper current="{{currentData}}" class="swiperbox"  bindchange="bindchange" style="height:{{tab3Height+'px'}};margin-top:{{tab3Height==0?'0rpx':'20rpx'}}" disable-touch="{{true}}">
-          <swiper-item   catchtouchmove="catchTouchMove">
+     
+          <swiper-item   catchtouchmove="catchTouchMove" class="swipercell">
             
             <view class="swiper-item" id="swiperitem1">
               <image src="{{img_host+'/tuwen_bg.png'}}" class="itembg" style="height:auto;" mode="widthFix" wx:if="{{canTuwen}}"></image>
@@ -272,6 +273,7 @@
              
             </view>
           </swiper-item>
+         
       </swiper>
     </view>
     <!-- <view class="drbox" wx:if="{{current_inquiry_config}}">

patient/pages/expertDetail/expertDetail.wxss

@@ -580,7 +580,19 @@ text-decoration: line-through;
 }
 .swiperbox{
   margin-top: 35rpx;
+  position: relative;
 }
+.swiperbox::after{
+    content:'';
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 2;
+    position: absolute;
+}
+
+
 .swiper-item{
   border-radius: 20rpx;
 

patient/pages/hivConsult/hivConsult.js

@@ -0,0 +1,406 @@
+// pages/expertConsult/expertConsult.js
+const app = getApp()
+import {doctorList,getProvince,getCity,getCountry} from "../../../api/consultExpert"
+import {sickType} from "../../../api/common"
+let provinceArr=[{area_id:'', area_name: "全国"}];
+let cityArr=[];
+import {throttle} from "../../../utils/util"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    page:1,
+    pageNumber:10,
+    isTriggered:false,
+    show:false,
+    expertise_id:21,
+    province_id:'',
+    city_id:'',
+    keyword:'',
+    lock:false,
+    is_online:0,
+    sort_order:1,
+    inquiry_type:'1,3',
+    inquiry_mode:'1,2',
+    navName:"专家问诊",
+    scrollHeight:53,
+    sickList:[],
+    img_host:'https://oss.prod.applets.igandanyiyuan.com/applet/patient/static',
+    option: [
+      { text: '综合', value: 1 },
+      { text: '响应时间快', value: 2 },
+      { text: '价格从低到高', value: 3 },
+      { text: '价格从高到低', value: 4 },
+      { text: '服务数从多到少', value: 5},
+    ],
+    overlay:true,
+    selectkind:false,
+    selectkarea:false,
+    position:"全国",
+    doctorList: [],
+    triggered: false,
+    scrollTop: 0,
+    offsetTop: 0,
+    columns: [
+      {
+        values:[],
+        className: 'column1',
+      },
+      {
+        values: [],
+        className: 'column2',
+        defaultIndex: 1,
+      }
+    ],
+    isLoding:false,
+    tabId:-1
+  },
+  goBack(){
+    wx.navigateBack({
+      delta: 1,
+    })
+  },
+  toggleOnline(){
+    this.setData({
+      is_online:this.data.is_online==0?1:0
+    })
+    this.onfresh();
+  },
+  onScroll(event) {
+    let {doctorList}=this.data;
+    wx.createSelectorQuery().select('#scroller')
+      .boundingClientRect((res) => {
+          let H=0;
+        if(event.detail.scrollTop>78){
+            if(doctorList.length<=3){
+                H=53;
+            }else{
+                H=1;  
+            }
+         
+        }else{
+          H=53
+        }
+        this.setData({
+          scrollHeight:H
+        });
+        
+      }).exec();
+  },
+  transforpage(arr) {
+    const pages = [];
+    let L= Math.ceil(arr.length / 2);
+    arr.forEach((item, index) => {
+      const page = Math.floor(index / L)
+      if (!pages[page]) {
+        pages[page] = []
+      }
+      pages[page].push(item)
+    });
+    return pages
+  },
+  goSearch:throttle(function(){
+    wx.hideKeyboard();
+   app.method.navigateTo({
+     url: '/patient/pages/search/search',
+   })
+  }),
+  switchTab(event){
+    this.setData({
+      tabId:event.target.dataset.id,
+      expertise_id:event.target.dataset.id
+    })
+    this.onfresh();
+  },
+  changeSorder({ detail }){
+    this.setData({ 
+      sort_order: detail,
+      selectkind:true
+    });
+    this.onfresh();
+  },
+  getIptvalue(event){
+    this.setData({
+      keyword:event.detail.value
+    })
+    this.onfresh();
+  },
+  goExpertDetail:throttle(function(event){
+    app.method.navigateTo({
+      url: '/patient/pages/expertDetail/expertDetail?doctor_id='+event.currentTarget.dataset.doctorid
+    })
+  }),
+  openCity(){
+    this.setData({
+      show:true,
+      overlay:false
+    })
+  },
+  closeCity(){
+    this.setData({
+      show:false,
+      overlay:true
+    })
+  },
+  onChange(event) {
+    const { picker, value, index } = event.detail;
+   if(index===0){
+      let currentIndex=picker.getIndexes()[0];
+      if(provinceArr[currentIndex].area_id){
+        this.cityList(provinceArr[currentIndex].area_id);
+      }else{
+        this.setData({
+         'columns[1].values':[]
+        })
+      }
+     
+   }
+  },
+
+  onConfirm(event) {
+    const { picker, value, index } = event.detail;
+    let currentPosition=''
+    for (let index = 0; index < value.length; index++) {
+      if(!value[0].area_id){
+        currentPosition="全国";
+        this.setData({
+          province_id:'',
+          city_id:''
+        })
+      }else{
+          currentPosition+=value[index].area_name;
+        if(index===0){
+          this.setData({
+            province_id:value[index].area_id
+          })
+        }else if(index==1){
+          this.setData({
+            city_id:value[index].area_id
+          })
+        }
+    }
+  }
+   this.setData({
+     show:false,
+     selectarea:true,
+     position:currentPosition
+   })
+   this.selectComponent('#item').toggle();
+   this.onfresh();
+  },
+
+  onCancel() {
+    this.setData({
+      show:false
+    })
+    this.selectComponent('#item').toggle(false);
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+   getSickType(){
+    sickType().then((res)=>{
+        this.setData({
+          sickList:this.transforpage(res)
+        })
+    })
+   },
+   handleRefresher(){
+
+    this.setData({
+      lock:false,
+      page:1,
+      scrollHeight:53,
+      doctorList:[]
+    });
+    this.getDoctorList()
+   },
+   getDoctorList(){
+     let {expertise_id,province_id, city_id,sort_order,keyword,page,pageNumber,is_online,inquiry_type,inquiry_mode}=this.data;
+    doctorList({
+      expertise_id:expertise_id,
+      province_id:province_id,
+      city_id:city_id,
+      sort_order: sort_order,
+      is_first_online:is_online,
+      keyword:keyword,
+      inquiry_type,
+      inquiry_mode,
+      page:page,
+      per_page:pageNumber
+    }).then((res)=>{
+      let {doctorList}=this.data;
+       if(res.data.length==0){
+        this.setData({
+          lock:true,
+          isTriggered:false
+        });
+        return false;
+       }else{
+          this.setData({
+            isTriggered:false,
+            doctorList:doctorList.concat(res.data)
+          })
+       }
+   
+
+    })
+   },
+   provinceList(){
+    getProvince().then((res)=>{
+       provinceArr= provinceArr.concat(res);
+      let province=[{area_id:'', area_name: "全国"}];//
+       for (let i = 0; i < res.length; i++) {
+        province.push(res[i]);   
+       };
+       this.setData({
+        'columns[0].values':province
+      })
+      //this.cityList(province[0].area_id);
+
+    })
+  },
+  cityList(area_id){
+    getCity({
+      area_id:area_id
+    }).then((res)=>{
+     
+      cityArr=res;
+      let city=[];
+      for (let i = 0; i < res.length; i++) {
+         city.push(res[i]);   
+       };
+       this.setData({
+        'columns[1].values':city,
+ 
+      })
+      //this.countryList(res[0].area_id);  
+    })
+  },
+  countryList(area_id){
+    getCountry({
+      area_id:area_id
+    }).then((res)=>{
+      let area=[];
+      for (let i = 0; i < res.length; i++) {
+        area.push(res[i]);   
+       };
+       this.setData({
+        'columns[2].values':area,
+        isLoding:false
+      })
+    })
+  },
+  onfresh(){
+    this.setData({
+      page:1,
+      doctorList:[],
+      lock:false
+    })
+    this.getDoctorList();
+  },
+  lower(e) {
+    let {lock}=this.data;
+    let addPage=this.data.page+1;
+    if(!lock){
+      this.setData({
+        page:addPage
+      });
+      this.getDoctorList();
+    }  
+  },
+  onLoad(options) {
+    if(options.type=="free"){
+      wx.setNavigationBarTitle({
+        title: "特惠问诊"
+      });
+      this.setData({
+        navName:"特惠问诊",
+        inquiry_type:3,
+        inquiry_mode:1
+      })
+    }else if(options.type=="buyYao"){
+      wx.setNavigationBarTitle({
+        title: "问诊购药"
+      });
+      this.setData({
+        navName:"问诊购药",
+        inquiry_type:4,
+        inquiry_mode:1
+      })
+    }
+    this.getSickType();
+    this.getDoctorList();
+    this.provinceList();
+   
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+  
+  },
+
+
+  onRefresh() {
+    if (this._freshing) return
+    this._freshing = true
+    setTimeout(() => {
+      this.setData({
+        triggered: false,
+      })
+      this._freshing = false
+    }, 3000)
+  },
+  onRestore(e) {
+    console.log('onRestore:', e)
+  },
+
+  onAbort(e) {
+    console.log('onAbort', e)
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    this.setData({
+      img_host:app.hostConfig().imghost
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  
+})

patient/pages/hivConsult/hivConsult.json

@@ -0,0 +1,14 @@
+{
+  "usingComponents": {
+    "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
+    "van-dropdown-item": "@vant/weapp/dropdown-item/index",
+    "van-picker": "@vant/weapp/picker/index",
+    
+    "van-popup": "@vant/weapp/popup/index",
+    "van-sticky": "@vant/weapp/sticky/index",
+    "nav":"../../../components/nav/nav"
+  },
+  "navigationStyle":"custom",
+  "disableScroll":true,
+  "navigationBarTitleText": "肝胆相照互联网医院"
+}

patient/pages/hivConsult/hivConsult.wxml

@@ -0,0 +1,115 @@
+<!--pages/expertConsult/expertConsult.wxml-->
+<nav navName="HIV"></nav>
+<wxs src="../../../filters/filter.wxs" module="moduleFilter"></wxs>
+
+<view class="wraper">
+  <view class="containexpert" style="{{'height:'+scrollHeight+'px'}}">
+    <view class="searchbox">
+      <input type="text" placeholder="输入姓名或医院查找医生"  disabled="{{true}}"		bindtap="goSearch"	bindconfirm="getIptvalue"/>
+      <image src="{{img_host+'/ss.png'}}"></image>
+    </view>
+   <view class="page-section-spacing" >
+      <scroll-view class="scroll-view_H" scroll-x="true" style="width: 100%">
+        <view class="row"  wx:for="{{sickList}}" wx:for-index="idx" wx:for-item="itemName" wx:key="idx">
+          <view class="scroll-view-item_H {{tabId==item.expertise_id?'active':''}}" wx:for="{{itemName}}" wx:key="expertise_id"   data-id="{{item.expertise_id}}"  bindtap="switchTab" >{{item.expertise_name}}</view>
+        </view>
+      </scroll-view>
+    </view> 
+  </view>
+
+    <view class="dropdown">
+   <van-dropdown-menu active-color="#3CC7C0" overlay="{{overlay}}" style="width:66.66%;position: relative;">
+     <view class="bar"></view>
+     <van-dropdown-item  title-class="droptitle {{selectarea?'active':''}}" title="{{position}}" bind:open="openCity" bind:close="closeCity" id="item" popup-style="itemPop" > </van-dropdown-item>
+     <view class="dropbar"></view>
+     <van-dropdown-item  title-class="droptitle {{selectkind?'active':''}}" value="{{ sort_order }}" options="{{ option }}" bind:change="changeSorder" />
+   </van-dropdown-menu>
+   <view class="dropOnline {{is_online==1?'active':''}}" bindtap="toggleOnline">优先在线</view>
+ </view>
+
+
+
+
+  <view class="scrollwraper">
+    <scroll-view scroll-y style="width: 100%;height:100%" 	bindrefresherrefresh="handleRefresher" refresher-triggered="{{isTriggered}}"	refresher-threshold="100"	refresher-enabled="true"  bindscrolltolower="lower" bind:scroll="onScroll" id="scroller" 	bounces="false">
+      <view wx:if="{{doctorList.length>0}}">
+        <view class="viewcell" bindtap="goExpertDetail" wx:for="{{doctorList}}" wx:key="doctor_id" data-doctorid="{{item.doctor_id}}">
+        <view class="left">
+        
+          <image src="{{item.avatar}}" wx:if="{{item.avatar}}" mode="aspectFill"></image>
+          <image src="{{img_host+'/doctor_avatar.png'}}"  wx:else></image>
+          <view class="onlinebox" wx:if="{{item.user.is_online==1}}">
+           <image src="{{img_host+'/online.gif'}}" mode="" class="icon"/>
+          </view>
+        </view>
+        <view class="right">
+          <view class="namebox">
+            <view class="name">{{item.user_name}}</view>
+            <!-- <view class="position" >{{item.doctor_title_name}}</view> -->
+            <view class="type" wx:if="{{item.hospital.hospital_level_name != '未知'&& item.hospital.hospital_level_name}}">{{item.hospital.hospital_level_name}}</view>
+            <view class="type" wx:if="{{item.multi_point_status == 1 && moduleFilter.formatChufang(item.doctor_inquiry_config)}}">可处方</view>
+          </view>
+          <view class="hospital"><text class="hospital_name"  wx:if="{{item.doctor_title_name}}">{{item.doctor_title_name}}</text> <text wx:if="{{item.department_custom_name}}">{{item.department_custom_name}}</text></view>
+          <view class="hospital"><text class="hospital_name" >{{item.hospital.hospital_name}}</text></view>
+          <view class="goodjob" wx:if="{{item.be_good_at}}">擅长：{{item.be_good_at}}</view>
+          <view class="diseaseType" wx:for="{{item.doctor_expertise}}" wx:for-item="cell" wx:key="index">{{cell.expertise_name}}</view>
+          <view class="detail" wx:if="{{item.is_display_score}}">
+            <view>评分: <text wx:if="{{item.praise_rate>0}}">{{item.praise_rate}} </text><text wx:else>暂无</text></view>
+            <view>问诊量: <text  wx:if="{{item.served_patients_num>0}}">{{item.served_patients_num}}</text><text wx:else>暂无</text></view>
+            <view>平均回复: <text  wx:if="{{item.avg_response_time>0}}"> {{moduleFilter.formatReply(item.avg_response_time)}}h</text><text wx:else>暂无</text></view>
+          </view>
+          <view class="consultbox">
+            <view class="price {{(itemName.inquiry_mode==2 && moduleFilter.hasTuWen(item.doctor_inquiry_config))?'videocell':''}}" wx:for="{{item.doctor_inquiry_config}}" wx:for-item="itemName" wx:if="{{((itemName.inquiry_type==1 && !(moduleFilter.hasFree(item.doctor_inquiry_config) && itemName.inquiry_mode==1 && itemName.is_enable==1) && ((itemName.inquiry_mode==1 && itemName.is_enable==1) || itemName.inquiry_mode==2) ) || itemName.inquiry_type==3 && itemName.is_enable==1)}}">
+              <view  class="pricecell" wx:if="{{itemName.inquiry_type==3  }}">图文问诊：<text>￥{{itemName.inquiry_price}}</text>
+              </view>
+              <view  class="pricecell" wx:elif="{{itemName.inquiry_type==1 && !(moduleFilter.hasFree(item.doctor_inquiry_config) && itemName.inquiry_mode==1) && ((itemName.inquiry_mode==1 && itemName.is_enable==1) || itemName.inquiry_mode==2) }}" > {{itemName.inquiry_mode==1?'图文问诊':itemName.inquiry_mode==2?'视频问诊':'其他问诊'}}：<text class="{{(itemName.is_enable==0 && itemName.inquiry_mode==2)?'priceactive':'' }}">￥{{itemName.inquiry_price}}</text></view>
+            </view>
+          </view>
+        </view>
+      </view>
+      </view>
+  
+      <view class="nonedata" wx:else>暂无数据！</view>
+      <!-- <view class="viewcell">
+        <view class="left">
+          <image src="https://img.applets.igandanyiyuan.com/applet/patient/static/home.png"></image>
+        </view>
+        <view class="right">
+          <view class="namebox">
+            <view class="name">魏胜昭</view>
+            <view class="position"> 教授</view>
+            <view class="type">三甲</view>
+            <view class="type">可处方</view>
+          </view>
+          <view class="hospital">首都医科大学佑安医院 <text decode="true">&nbsp;耳鼻科</text></view>
+          <view class="goodjob">擅长：治疗耳鼻喉疑难病。比如： 人工关节置换、传导性耳聋、人工晶体植入、肾移···</view>
+          <view class="diseaseType">中西医结合</view>
+          <view class="detail">
+            <view>好评率: <text>5 </text> </view>
+            <view>服务患者数: <text>100</text></view>
+            <view>平均回复: <text> 0.5h </text></view>
+          </view>
+          <view class="consultbox">
+            <view class="price">公益问诊：<text>￥100</text></view>
+            <view class="consult">立即咨询</view>
+          </view>
+        </view>
+      </view> -->
+    </scroll-view>
+  </view>
+</view>
+<van-popup
+  show="{{ show }}"
+  round
+  position="bottom"
+  custom-style="height: 50%"
+  bind:close="onClose"
+>
+<van-picker columns="{{ columns }}" loading="{{isLoding}}"  show-toolbar
+  title="选择城市"
+  columns="{{ columns }}"
+  value-key="area_name"
+  bind:cancel="onCancel"
+  bind:change="onChange"
+  bind:confirm="onConfirm"/>
+</van-popup>

patient/pages/hivConsult/hivConsult.wxss

@@ -0,0 +1,306 @@
+/* pages/expertConsult/expertConsult.wxss */
+.wraper{
+ 
+  height: 100%;
+}
+.containexpert{
+  margin-top: 172rpx;
+  padding: 0 30rpx 0rpx;
+  overflow: hidden;
+  position: relative;
+  transform: all 0.3s ease;
+}
+.droptitle,.van-ellipsis{
+  font-size: 30rpx!important;
+}
+.namebox .name{
+    max-width:400rpx;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+.droptitle.active{
+  color:#3CC7C0;
+}
+.searchbox {
+  width: 100%;
+  height: 72rpx;
+  display: flex;
+  border-radius: 40rpx;
+  align-items: center;
+  margin-top: 20rpx;
+  background: #FBFBFB;
+  border-radius: 36px;
+  border: 1rpx solid #CCCCCC;
+}
+
+.searchbox input {
+  margin-left: 30rpx;
+  flex: 1;
+  font-size: 32rpx;
+  height: 80rpx;
+}
+
+.searchbox image {
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 28rpx;
+}
+
+.scroll-view_H {
+  height:195rpx;
+  white-space: nowrap;
+  vertical-align: top;
+}
+.scroll-view-item_H{
+  /* width: 154rpx; */
+  padding:0 15rpx;
+  background: #F4F4F4;
+  border-radius: 30rpx;
+  font-size: 28rpx;
+  color: #666666;
+  margin-left: 36rpx;
+  border: 1rpx solid #F4F4F4;
+  height: 58rpx;
+  display: inline-block;
+  text-align: center;
+  line-height: 58rpx;
+}
+
+.page-section-spacing .row{
+  margin-top: 30rpx;
+  margin-bottom: 30rpx;
+}
+.page-section-spacing .row:last-child{
+  margin-top: 30rpx;
+  margin-bottom: 10rpx;
+}
+.scroll-view_H .scroll-view-item_H:first-child{
+  margin-left: 0rpx;
+ 
+}
+.scroll-view-item_H.active {
+  background: #E2FFFE;
+  color: #3CC7C0;
+  border: 1rpx solid #3CC7C0;
+}
+.van-dropdown-menu{
+  box-shadow: none!important;
+ 
+}
+.viewcell{
+  display: flex;
+  overflow: hidden;
+  box-sizing: border-box;
+  padding:40rpx 30rpx 30rpx;
+  width:100%;
+  border-radius: 10rpx;
+  background-color: #fff;
+  border-bottom: 1rpx solid #E7E7E7;
+}
+.viewcell:last-child{
+  border-bottom: none;
+}
+.viewcell .type{
+  height: 32rpx;
+  margin-bottom: 6rpx;
+  line-height: 32rpx;
+  display: flex;
+  white-space: nowrap;
+  align-items: center;
+  margin-left: 18rpx;
+  padding:0rpx 6rpx;
+  background: #ED9C00;
+  border-radius: 4rpx;
+  color: #FFFFFF;
+  font-size: 24rpx;
+}
+.viewcell .hospital{
+  margin-top: 12rpx;
+  color: #333333;
+  display: flex;
+  font-size: 30rpx;
+  word-wrap: break-word;
+}
+.hospital_name{
+  word-wrap: break-word;
+  margin-right: 10rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.goodjob{
+color: #666666;
+margin-top: 28rpx;
+line-height: 42rpx;
+font-size: 28rpx;
+word-break: break-all;
+text-overflow: ellipsis;
+display: -webkit-box;
+-webkit-box-orient: vertical;
+-webkit-line-clamp: 2; /* 这里是超出几行省略 */
+overflow: hidden;
+}
+.price{
+  font-size: 28rpx;
+ position: relative;
+}
+
+.price text{
+  margin-left: 5rpx;
+  font-size: 32rpx;
+  color:#EF4F20;
+}
+.viewcell .right{
+  flex:1;
+  margin-left: 20rpx;
+}
+.viewcell  image{
+  width:80rpx;
+  height:80rpx;
+  border-radius:50%;
+}
+.namebox{
+  display: flex;
+  font-size: 34rpx;
+  font-weight: 600;
+  color:#333;
+  align-items: flex-end;
+}
+.namebox .position{
+  font-weight: normal;
+  margin-left: 15rpx;
+  font-size: 30rpx;
+}
+.dropOnline.active{
+  color: #3CC7C0;
+}
+.diseaseType{
+height: 40rpx;
+background: #E2FFFE;
+border-radius: 20rpx;
+margin-right: 20rpx;
+border: 1rpx solid #3CC7C0;
+color: #3CC7C0;
+font-size: 24rpx;
+display: inline-flex;
+text-align: center;
+padding:0 15rpx;
+align-items: center;
+justify-content: center;
+margin-top: 20rpx;
+white-space: nowrap;
+}
+.detail{
+  margin-top: 20rpx;
+  display: flex;
+  font-size: 24rpx;
+}
+.detail view{
+  margin-right:40rpx;
+}
+
+.detail view text{
+  font-size: 28rpx;
+  color:#3CC7C0;
+}
+.consultbox{
+    position: relative;
+  height: 60rpx;
+  margin-top: 28rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.consult{
+  height: 60rpx;
+background: #3CC7C0;
+border-radius: 30rpx;
+color: #FFFFFF;
+display: flex;
+align-items: center;
+padding:0 20rpx;
+font-size: 30rpx;
+}
+
+.wraper{
+ display: flex;
+  flex-direction: column;
+}
+.scrollwraper{
+  flex: 1;
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+} 
+.dropdown{
+  width:100%;
+  position: relative;
+  justify-content:center;
+  background-color: #fff;
+  align-items: center;
+  border-bottom: 1rpx solid #E7E7E7;
+  display: flex;
+}
+.dropdown .bar{
+
+  height:40rpx;
+  width:1rpx;
+  left: 50%;
+  top:50%;
+  transform: translate(-50%,-50%);
+  position: absolute; 
+  background:#ccc;
+  opacity: 0.9;
+}
+.dropbar{
+  background:#ccc;
+  opacity: 0.9;
+  height:40rpx;
+  width:1rpx;
+  position: static;
+  margin-top: 30rpx;
+}
+.dropOnline{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width:33.33%;
+  font-size: 30rpx;
+}
+.viewcell .left{
+  position: relative;
+}
+.price  .expert_prcie{
+    text-decoration: line-through;
+    color:#999;
+}
+.price  .expert_prcie .priceactive{
+    color:#999;
+}
+.pricecell{
+    display: flex;
+    font-size: 30rpx;
+    align-items: center;
+    white-space: nowrap;
+}
+.videocell{
+    position: absolute;
+    right:0rpx;
+}
+.price.qs{
+    display: none;
+}
+.price.gy,.price.hasfree{
+    display: none;
+}
+.nonekaitong{
+    position: absolute;
+    top:0rpx;
+    font-size: 30rpx;
+    right:320rpx;
+}
+.nonekaitong text{
+    font-size: 30rpx;
+}

patient/pages/payOrder/payOrder.js

@@ -26,6 +26,7 @@ Page({
     showOrderMsg:false,
     showMsgOrder:false,
     time: '',
+    canPay:true,
     inquiry_no: '',
     amount_total: "",
     discount_amount:'',
@@ -207,11 +208,15 @@ Page({
 
   },
   handleThrottle:throttle(function() {
-      console.log(this.data.isLock)
+    if(!this.data.canPay){
+        wx.showToast({
+          title: '订单异常',
+          icon:'none'
+        })
+        return false;
+    }
    if(!this.data.isLock){
-       console.log(11111)
        this.goPayPlatform();
-       console.log(222222)
      this.setData({
        isLock:true
      });
@@ -447,6 +452,13 @@ Page({
       })
       }
      
+    }).catch(error=>{
+        if(error.code==500){
+            this.setData({
+                canPay:false
+            })
+        };
+       
     })
   },
   orderMsg(callback){

patient/pages/personCenter/personCenter.js

@@ -56,7 +56,7 @@ Page({
     } = resdata;
     let imgUrl = file.url;
     let index = imgUrl.lastIndexOf("/");
-    let filename = imgUrl.substring(index + 1, imgUrl.length);
+    let filename = new Date().getTime()+this.data.user_info.patient_id+imgUrl.substring(index + 1, imgUrl.length);
     wx.uploadFile({
       url: host, // 仅为示例，非真实的接口地址
       filePath: file.url,

patient/pages/prescriptDetail/prescriptDetail.wxml

@@ -7,10 +7,10 @@
   </view> -->
   <view class="form">
     <view class="imgbox">
-      <image src="{{prescript.prescription_img_oss_path}}" class="prescription" ></image>
+      <image src="{{prescript.prescription_img_oss_path}}" class="prescription"  ></image>
-      <image src="{{prescript.doctor_sign_image}}"  mode="aspectFill"   class="doctorSign" ></image>
+      <image src="{{prescript.doctor_sign_image}}"  mode="aspectFill"   class="doctorSign" wx:if="{{prescript.is_converted_pdf==0}}"></image>
-      <image src="{{prescript.pharmacist_sign_image}}" class="pharmacistSign"  mode="aspectFill"></image>
+      <image src="{{prescript.pharmacist_sign_image}}" class="pharmacistSign" wx:if="{{prescript.is_converted_pdf==0}}" mode="aspectFill"></image>
-      <image src="{{prescript.hospital_sign_image}}" class="hospitalSign"></image>
+      <image src="{{prescript.hospital_sign_image}}" class="hospitalSign" wx:if="{{prescript.is_converted_pdf==0}}" ></image>
     </view>
    
    

patient/pages/writeSick/writeSick.js

@@ -292,8 +292,9 @@ Page({
         signature,
         host
       } = resdata;
-      let index = File.lastIndexOf("/");
+      let index = File.lastIndexOf(".");
-      let filename = File.substring(index + 1, File.length);
+      let houzhui=File.substring(index, File.length);
+      let filename = this.data.family_id+new Date().getTime().toString()+(this.data.fileList.length).toString()+houzhui;//File.substring(index + 1, File.length);
       return new Promise((resolve, reject) => {
         wx.uploadFile({
           url: host, // 仅为示例，非真实的接口地址
@@ -847,7 +848,7 @@ Page({
       })
     }
     //this.getSick();
-   
+    this.getlocalInfo(options.family_id);
     this.handleIsExist();
     this.getlocalInfo(options.family_id);
   },
@@ -884,6 +885,7 @@ Page({
     console.log(pathography_id)
     if(pathography_id){
       this.handlepathographyDetail(pathography_id)
+
     }
     // else{
      
@@ -891,6 +893,7 @@ Page({
     // }
 
    
+   
   },
 
   /**

utils/request.js

@@ -120,6 +120,8 @@ function request(url, method, data, loding = false) {
             }
             reject(res.data);
            
+        }else if(Number(res.data.code) == 500){
+            reject(res.data);
         } else {
           wx.showToast({
             title: res.data.message,