5.17改动

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(){
-    app.method.navigateTo({
+      wx.showToast({
-      url: '/patient/pages/expertConsult/expertConsult'
+        title: '即将开通',
+        icon:'none'
       })
+    // app.method.navigateTo({
+    //   url: '/patient/pages/expertConsult/expertConsult'
+    // })
   }),
   goconsultandbuy:throttle(function(){
        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_disable.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,6 +54,9 @@
   color: #333333;
   font-size: 40rpx;
 }
+.wenzhencell .row .name_title{
+ width:160rpx
+}
 
 .wenzhencell .desc {
   margin-top: 16rpx;

patient/pages/expertConsult/expertConsult.js

@@ -323,6 +323,15 @@ Page({
         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.wxss

@@ -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/prescriptDetail/prescriptDetail.wxml

@@ -8,9 +8,9 @@
   <view class="form">
     <view class="imgbox">
       <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>