Merge branch 'dev' into bugfix 10.23

components/consultList/consultList.js

@@ -43,22 +43,22 @@ Component({
   methods: {
     goFree:throttle(function(){
       app.method.navigateTo({
-        url: '/pages/expertConsult/expertConsult?type=free',
+        url: '/patient/pages/expertConsult/expertConsult?type=free',
       })
     }),
     goQuick:throttle(function(){
       app.method.navigateTo({
-        url: '/pages/quickConsult/quickConsult'
+        url: '/patient/pages/quickConsult/quickConsult'
       })
     }),
     goExpert:throttle(function(){
       app.method.navigateTo({
-        url: '/pages/expertConsult/expertConsult'
+        url: '/patient/pages/expertConsult/expertConsult'
       })
     }),
     goBuyMedince:throttle(function(){
       app.method.navigateTo({
-        url: '/pages/quickConsult/quickConsult?inquiry_type=4'
+        url: '/patient/pages/quickConsult/quickConsult?inquiry_type=4'
       })
     }),
     getPrice(){

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/nav/nav.js

@@ -20,7 +20,8 @@ Component({
    * 组件的初始数据
    */
   data: {
-    name:''
+    name:'',
+    img_host:app.hostConfig().imghost
   },
 
   /**

components/nav/nav.wxml

@@ -1,5 +1,5 @@
 <!--components/nav.wxml-->
 <view class="ui-navigatorbar" style="background: #FFFFFF;border-bottom: 1rpx solid #E3E4E5;">
-    <image class="ui-navigatorbar-back" bindtap="goBack" src="../../assets/images/back.png" />
+    <image class="ui-navigatorbar-back" bindtap="goBack" src="{{img_host+'/back.png'}}" />
     <view class="ui-title">{{name}}</view>
   </view>

components/navbar/navbar.js

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