4.7提交

Pages/yishi/index/index.wxml

@@ -115,7 +115,7 @@
       <text class="fun_box_item_txt">个人简介管理</text>
       <view class="introicon" wx:if="{{info.introduction_status==3}}">!</view>
     </view>
-    <view bindtap="go" data-moudle="4" data-url="/user/pages/yishi/onlinesetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
+    <view bindtap="go" data-moudle="4" data-url="/user/pages/yishi/onlinesetup/index?multi_point_status={{info.multi_point_status}}" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"

Pages/yishi/wenzhen_v2/wenzhen.wxml

@@ -43,7 +43,7 @@
          <view class="content" wx:for="{{ data_list_1 }}" wx:key="order_inquiry_id">
           <view class="content_1">
             <view class="name">
-                <view class="parallelogram {{item.inquiry_mode==1?'':item.inquiry_mode==2?'video':item.inquiry_mode==6?'yinan':'other'}}">{{item.inquiry_mode==1?'图文':item.inquiry_mode==2?'视频':item.inquiry_mode==6?'疑难问诊':item.inquiry_mode==7?'附赠回复':'其他'}}</view>
+                <view class="parallelogram {{item.inquiry_mode==1?'':item.inquiry_mode==2?'video':item.inquiry_mode==6?'yinan':item.inquiry_mode==8?'healthy':item.inquiry_mode==9?'visit':'other'}}">{{item.inquiry_mode==1?'图文':item.inquiry_mode==2?'视频':item.inquiry_mode==6?'疑难问诊':item.inquiry_mode==7?'附赠回复':item.inquiry_mode==8?'健康包':item.inquiry_mode==9?'随访包':'其他'}}</view>
               <text style="font-size: 34rpx;color: #333;">就诊人：</text>
               {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
             </view>

Pages/yishi/wenzhen_v2/wenzhen.wxss

@@ -175,4 +175,10 @@ page{
 }
 .parallelogram.yinan.parallelogram::before{
     background:#ffb700;
+}
+.parallelogram.healthy.parallelogram::before{
+    background:#ff5d6a;
+}
+.parallelogram.visit.parallelogram::before{
+    background:#03b5e3;
 }

user/pages/yishi/addServiceContent/index.js

@@ -14,18 +14,219 @@ Page({
       
       },
       cycle_columns:['1个月', '3个月', '6个月', '12个月'],
-      showCycle:false
+      service_columns:['10次','不限次'],
+      showCycle:false,
+      showServiceNumber:false,
+      monthly_frequency:'',
+      isAdd:false,
+      service_rounds:0,
+      cur_id:'',
+      items:[{
+        service_period:'',
+        service_price:''
+      }]
   },
-  confirmCycle(event){
+  openCycle(event){
-    const { picker, value, index } = event.detail;
+    let {id} =event.currentTarget.dataset;
-    console.log(value);
+    console.log(id);
     this.setData({
-        showCycle:true
+        showCycle:true,
+        cur_id:id,
     })
   },
+  
+  confirmCycle(event){
+    const { picker, value, index} = event.detail;
+    let {items,cur_id}=this.data;
+
+    let obj='items['+cur_id+'].service_period';
+    let day=null;
+    if(index==0){
+        day=30
+    }else if(index==1){
+        day=90
+    }else if(index==2){
+        day=180
+    }else if(index==3){
+        day=360
+    }
+   for (let index = 0; index < items.length; index++) {
+     if(items[index].service_period==day){
+         wx.showToast({
+           title: '此服务周期不能重复设置',
+           icon:'none'
+         })
+         return false
+     };
+      
+   }
+    this.setData({
+        showCycle:false,
+        [obj]:day
+    })
+   
+  },
+ changeIpt(event){
+  let {value}=event.detail;
+  let {id}=event.currentTarget.dataset;
+  console.log(id);
+  let obj='items['+id+'].service_price';
+  this.setData({
+    [obj]:value
+  })
+
+ },
+  delService(event){
+    let {items}=this.data;
+   let {id} =event.currentTarget.dataset;
+     items.splice(1,id);
+    this.setData({
+        items
+    })
+  },
+  handle(){
+    this.data.isAdd?this.addService():this.editService();
+  },
+  addServiceArr(){
+      let {items}=this.data;
+   this.setData({
+       items:items.concat({
+          service_period:'' ,
+          service_price:''
+       })
+   })
+  },
   cancelCycle(){
     this.setData({
-        showCycle:true
+        showCycle:false
+    })
+  },
+  getService(){
+    api.getFollow().then(response=>{
+       if(response.code==200){
+          if(response.data){
+              let {monthly_frequency,service_rounds,items}=response.data
+              this.setData({
+                monthly_frequency,
+                service_rounds,
+                items,
+                isAdd:false
+              })
+          }else{
+            this.setData({
+                isAdd:true
+            })
+          }
+       }
+    })
+  },
+  addService(){
+      let {monthly_frequency,service_rounds,items}=this.data;
+      if(!monthly_frequency && monthly_frequency===''){
+        wx.showToast({
+          title: '请选择服务次数',
+          icon:'none'
+        })
+        return false
+      };
+      for (let i = 0; i < items.length; i++) {
+         if(!items[i].service_period){
+            wx.showToast({
+                title: '请选择第'+(i+1)+'个的服务周期',
+                icon:'none'
+              })
+              return false
+         }
+         if(!items[i].service_price){
+            wx.showToast({
+                title: '请设置第'+(i+1)+'个的服务价格',
+                icon:'none'
+              })
+              return false
+         }
+      }
+    api.postFollow({
+        monthly_frequency,
+        service_rounds,
+        items
+    }).then(response=>{
+       if(response.code==200){
+           wx.showToast({
+             title: '保存成功',
+             icon:'none'
+           })
+           wx.navigateBack()
+       }
+    })
+  },
+  editService(){
+    let {monthly_frequency,service_rounds,items}=this.data;
+    if(!monthly_frequency && monthly_frequency!=0){
+      wx.showToast({
+        title: '请选择服务次数',
+        icon:'none'
+      })
+      return false
+    };
+    for (let i = 0; i < items.length; i++) {
+       if(!items[i].service_period){
+          wx.showToast({
+              title: '请选择第'+(i+1)+'的服务周期',
+              icon:'none'
+            })
+            return false
+       }
+       if(!items[i].service_price){
+          wx.showToast({
+              title: '请设置第'+(i+1)+'的服务价格',
+              icon:'none'
+            })
+            return false
+       }
+    }
+  api.editFollow({
+      monthly_frequency,
+      service_rounds,
+      items
+  }).then(response=>{
+     if(response.code==200){
+         wx.showToast({
+           title: '修改成功',
+         });
+         wx.navigateBack()
+     }
+  })
+},
+getFollowDetail(){
+    api.getFollowDetail().then(response=>{
+       if(response.code==200){
+         if(response.data){
+             let res=response.data.map((item)=>{
+              return {service_period:item.service_period,service_price:item.service_price}
+             })
+           this.setData({
+               items:res
+           })
+         }
+       }
+    })
+},
+  openServiceNumber(){
+    this.setData({
+        showServiceNumber:true
+    })
+  },
+  confirmServiceNumber(event){
+    const { picker, value, index } = event.detail;
+    
+    this.setData({
+        showServiceNumber:false,
+        monthly_frequency:index==0?10:0
+    })
+  },
+  cancelServiceNumber(){
+    this.setData({
+        showServiceNumber:false
     })
   },
   /**
@@ -46,7 +247,8 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    this.getService();
+    this.getFollowDetail();
   },
 
   /**

user/pages/yishi/addServiceContent/index.wxml

@@ -4,8 +4,11 @@
   <view class="price_steup_box">
     <view class="price_steup_box_top">
       <view class="price_steup_box_top_title">服务次数/月</view>
-      <view class="price_steup_box_top_stepper">
+      <view class="price_steup_box_top_stepper" bind:tap="openServiceNumber">
-        <van-icon name="arrow" color="#999" />
+        <text class="amount nodata" wx:if="{{monthly_frequency===''}}">请选择服务次数</text>
+        <text class="amount" wx:else>{{monthly_frequency===0?'不限次数':'10次'}}</text>
+
+        <van-icon name="arrow" color="#999" style="margin-top: 2rpx;"/>
       </view>
     </view>
     <view class="price_steup_box_bottom">
@@ -17,30 +20,35 @@
     </view>
   </view>
 </view>
-<view class="checked_box">
+<view class="vontent">
+    <view class="checked_box">
   <view class="title">服务内容</view>
-  <view class="price_steup_box" style="height:240rpx">
+  <view class="price_steup_box" style="height:240rpx" wx:for="{{items}}" wx:key="index">
-    <view class="price_steup_box_top">
+    <view class="price_steup_box_top" bind:tap="openCycle" data-id="{{index}}">
       <view class="price_steup_box_top_title">服务周期</view>
       <view class="price_steup_box_top_stepper">
-        <van-icon name="arrow" color="#999" />
+        <text class="amount " wx:if="{{item.service_period}}">{{item.service_period/30}}个月</text>
+        <text class="amount nodata" wx:else>请选择周期</text>
+        <van-icon name="arrow" color="#999" style="margin-top: 2rpx;"/>
       </view>
     </view>
     <view class="price_steup_box_bottom" style="border-bottom:0.5px solid #e7e7e7;padding-bottom: 25rpx;">
       <view class="price_steup_box_bottom_title">服务价格（元）</view>
       <view class="price_steup_box_bottom_num"> 
-       <input type="number" class="ipt"/><text class="unit">元</text>
+       <input type="number" class="ipt" value="{{item.service_price}}" placeholder="请设置价格"  placeholder-style="font-size:28rpx;color: rgba(0,0,0,0.45);" 	bindinput="changeIpt" data-id="{{index}}" /><text class="unit" wx:if="{{item.service_price}}">元</text>
       </view>
      
     </view>
     <view class="tips">
-        <view>建议服务价格设置为：单次图文*10次*5~8折</view>
+        <view >建议服务价格设置为：{{(item.service_period/30)==1?'单次图文*10次*5~8折':(item.service_period/30)==3?'单次图文*30次*4~7折':(item.service_period/30)==6?'单次图文*60次*3~6折':(item.service_period/30)==12?'单次图文*120次*2~5折':'单次图文*10次*5'}}</view>
+        <view wx:if="{{items.length>1}}" bind:tap="delService" data-id="{{index}}">删除</view>
     </view>
   </view>
 </view>
-<view class="continueadd">继续添加服务内容</view>
+<view class="continueadd" bind:tap="addServiceArr">继续添加服务内容</view>
-<view class="btn">保存</view>
 </view>
+</view>
+<view class="btn" bind:tap="handle">保存</view>
 <van-popup
   show="{{ showCycle }}"
   round
@@ -48,4 +56,12 @@
   custom-style="height: 35%"
 >
 <van-picker columns="{{ cycle_columns }}" show-toolbar bind:confirm="confirmCycle" title="周期" bind:cancel="cancelCycle"/>
+</van-popup>
+<van-popup
+  show="{{ showServiceNumber }}"
+  round
+  position="bottom"
+  custom-style="height: 35%"
+>
+<van-picker columns="{{ service_columns }}" show-toolbar bind:confirm="confirmServiceNumber" title="服务次数" bind:cancel="cancelServiceNumber"/>
 </van-popup>

user/pages/yishi/addServiceContent/index.wxss

@@ -1,6 +1,11 @@
 page{
     background-color: #F6F6F6;
   }
+  .page{
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+  }
   .title{
       width:90vw;
       margin: 0 auto 20rpx;
@@ -23,7 +28,7 @@ page{
     display: flex;
     width: 90vw;
     height: 180rpx;
-    margin: 0 auto;
+    margin: 0 auto 20rpx;
     border-radius: 20rpx;
     flex-direction: column;
     background-color: rgb(255, 255, 255);
@@ -48,8 +53,10 @@ page{
     font-size: 32rpx;
     color: #333;
   }
+
   .price{
       text-align: right!important;
+      font-size: 28rpx;
   }
   .price_steup_box_bottom_num{
     flex: 1.5;
@@ -77,7 +84,7 @@ page{
     transform: scaleY(0.5);
   }
   .price_steup_box_top_stepper{
-    flex: 1;
+   display: flex;
     text-align: right;
     align-items: center;
   }
@@ -125,7 +132,7 @@ color: #E34D59;
       justify-content: center;
       width:90vw;
       height: 80rpx;
-      margin:160rpx auto 0;
+      margin:80rpx auto 0;
 background: rgba(44,241,248,0.28);
 border-radius: 8rpx;
   }
@@ -158,4 +165,13 @@ color: rgba(0,0,0,0.6)!important;
   }
   .van-picker__toolbar{
       border-bottom:.5px solid #E7E7E7;
+  }
+  .amount.nodata{
+    font-size: 28rpx;
+color: rgba(0,0,0,0.45);
+  }
+  .vontent{
+      flex:1;
+      margin-bottom: 150rpx;
+      overflow-y: scroll;
   }

user/pages/yishi/onlinesetup/index.js

@@ -16,6 +16,7 @@ Page({
     note: "",
     inquiry_type: 1,
     inquiry_mode: 1,
+    multi_point_status:'',
     config_setting:{},
     info:{
       is_open: false,
@@ -24,6 +25,7 @@ Page({
     },
     active:0,
     myprice: "",
+    healthPrice:'图文价格*0.5*6',
     config:{
       "max_work_num_day": 30,
       "min_inquiry_price": 0,
@@ -43,8 +45,11 @@ Page({
     showOpenchuFang:false,
     showOpenTuWen:false,
   },
-  onLoad(){
+  onLoad(options){
-
+      console.log(options.multi_point_status);
+    this.setData({
+        multi_point_status:options.multi_point_status
+    })
   },
   cancelOpenChuFang(){
     this.setData({
@@ -71,10 +76,25 @@ Page({
   onShow(){
       let {active}=this.data;
     this.getDoctorconfig();
+     this.getDoctorOpen();
+     this.getSysconfig();
     if(active==4){
         this.getConfig()
     }
   },
+
+  getDoctorOpen(){
+    let {inquiry_type,inquiry_mode}=this.data;
+    api.getOpen({
+        inquiry_type,
+        inquiry_mode
+    }).then(response => {
+      this.setData({
+        note: response.data,
+        'info.is_open': response.data
+      })
+    }).catch(errors => {console.error(errors);})
+  },
   getDoctorconfig(){
   let {inquiry_type,inquiry_mode}=this.data;
   //接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
@@ -86,9 +106,10 @@ Page({
     }).then(response => {
       console.log(response);
       this.setData({
-        info: response.data.info,
+        'info.inquiry_price': response.data.inquiry_price,
-        config: response.data.config,
+        'info.work_num_day': response.data.work_num_day,
-        note: response.data.info.is_open
+        // config: response.data.config,
+        // note: response.data.info.is_open
       })
     }).catch(errors => {console.error(errors);})
   },
@@ -106,6 +127,7 @@ Page({
   onChange({ detail }) {
     this.doChange(detail)
   },
+
   getConfig(){
     let {inquiry_type,inquiry_mode}=this.data;
     api.getServiceConfig({
@@ -132,7 +154,7 @@ Page({
   addServiceContent(){
     app.go('/user/pages/yishi/addServiceContent/index')
   },
-  doChange(detail){
+  async doChange(detail){
     console.log("onChange: ", detail);
     let is_open = 0;
     if(detail){
@@ -141,7 +163,23 @@ Page({
       if(this.data.active==0){
         let check = this.checkPrice(inquiry_price);
         if(!check) return;
-      }
+      };
+      if(this.data.active==2 && detail){
+        let {data}=await api.getOpen({inquiry_type:1,inquiry_mode:1});
+        if(data==0){
+            this.setData({
+                showOpenTuWen:true
+            })
+           return false
+        }
+        if(this.data.multi_point_status!=1){
+            this.setData({
+                showOpenchuFang:true
+            })
+           return false
+        }
+    };
+     
       if(this.data.active==3 && detail){
         wx.showToast({
           title: '即将开通',
@@ -250,6 +288,17 @@ Page({
                inquiry_type:1,
                inquiry_mode:1, 
            })
+       }else if(index==1){
+        this.setData({
+            inquiry_type:1,
+            inquiry_mode:9, 
+        })
+       }else if(index==2){
+        this.setData({
+            inquiry_type:1,
+            inquiry_mode:8, 
+        })
+        this.getHealthy()
        }else if(index==3){
         this.setData({
             inquiry_type:1,
@@ -263,6 +312,8 @@ Page({
         this.getConfig();
        }
        this.getDoctorconfig();
+       this.getDoctorOpen();
+       this.getSysconfig();
   },
   putDoctorInquiryConfig(){
     //修改医生问诊配置
@@ -284,6 +335,27 @@ Page({
     })
 
   },
+  getHealthy(){
+    api.getHealthy().then(response => {
+        this.setData({
+          healthPrice:(response.data.inquiry_price*response.data.service_rate/100).toFixed(2)
+        })
+      }).catch(errors => {console.error(errors);})
+  },
+  getSysconfig(){
+    let {inquiry_type,inquiry_mode}=this.data;
+  api.getSysconfig({
+      inquiry_type,
+      inquiry_mode
+  }).then(response => {
+      this.setData({
+        'config': response.data
+        // config: response.data.config,
+        // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
+      })
+    }).catch(errors => {console.error(errors);})
+  
+},
   myToast(message){
     Toast({
       context: this,

user/pages/yishi/onlinesetup/index.wxml

@@ -89,7 +89,7 @@
             </view> -->
         </view>
             <view class="go">
-                <van-button disabled="{{info.is_open!=1}}" bind:click="addServiceContent" color="#3CC7C0" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>添加服务内容</van-button>
+                <van-button  bind:click="addServiceContent" color="#3CC7C0" custom-style="border-radius: 20rpx;font-size:30rpx;" type="primary" block>添加服务内容</van-button>
             </view>
         </van-tab>
         <van-tab title="健康包">
@@ -114,8 +114,12 @@
               <view class="price_title">服务价格</view>
               <view class="price_steup_box  pricebox" style="overflow: hidden;padding-bottom: 10rpx;">
                   <van-cell size="large" custom-style="font-size:32rpx;" title="服务价格（元）"  >
-                      <view class="cell_value">
+                      <view class="cell_value cell_value_heal">
-                         <input type="number"/>
+                         <input type="number" placeholder="请设置价格" 
+                          value="{{healthPrice}}"
+                          disabled="{{true}}"
+                          class="healthPrice"
+                          placeholder-style="font-size:28rpx;color: rgba(0,0,0,0.45);" /><text class="unit" wx:if="{{healthPrice}}">元</text>
                       </view>
                   </van-cell>
               </view>

user/pages/yishi/onlinesetup/index.wxss

@@ -182,4 +182,15 @@ page{
     font-size: 28rpx;
     color: rgba(0,0,0,0.65);
     margin: 20rpx auto 0 auto;   
+}
+.healthPrice{
+    font-size: 28rpx;
+    color: #E34D59;
+}
+.unit{
+    color: #333;  
+}
+.cell_value_heal{
+    display: flex;
+    align-items: center;
 }

user/pages/yishi/onlinesetupprice/index.js

@@ -46,11 +46,28 @@ Page({
     api.getDoctorInquiryConfig(params).then(response => {
       console.log(response);
       this.setData({
-        info: response.data.info,
+        'info.inquiry_price': response.data.inquiry_price,
-        config: response.data.config,
+        'info.work_num_day': response.data.work_num_day,
-        note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
+        // config: response.data.config,
+        // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
       })
     }).catch(errors => {console.error(errors);})
+    this.getSysconfig();
+  },
+  getSysconfig(){
+      let {inquiry_type,inquiry_mode}=this.data;
+    api.getSysconfig({
+        inquiry_type,
+        inquiry_mode
+    }).then(response => {
+        console.log(response);
+        this.setData({
+          'config': response.data
+          // config: response.data.config,
+          // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
+        })
+      }).catch(errors => {console.error(errors);})
+    
   },
   onStepperChange(event) {
     console.log(event.detail);

user/pages/yishi/orderdetail/index.wxml

@@ -5,7 +5,7 @@
     <view class="order_item" wx:for="{{list}}">
       <view class="order_item_content">
         <view class="order_item_content_top ">
-          {{ item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'其他' }}
+          {{ item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==1 && item.inquiry_mode==8?'在线问诊-健康包':item.inquiry_type==1 && item.inquiry_mode==9?'在线问诊-随访包':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'其他' }}
         <!-- <view class="order_status order_status_cancle">{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'问诊结束':item.inquiry_status==7?'已取消':'其他' }}</view> -->
         <view class="order_status order_status_cancle {{item.entry_status==1?'entrying':item.entry_status==2?'entrysuccess':item.entry_status==3?'entryfail':'' }}">{{ item.entry_status==1?'入账中':item.entry_status==2?'入账成功':item.entry_status==3?'入账失败':'未知' }}</view>
         </view>

user/pages/yishi/wenzhenorderV2/index.wxml

@@ -5,7 +5,7 @@
         <view class="order_item" wx:for="{{order_list}}">
           <view class="order_item_content" data-index="{{index}}" bindtap="selectOrder">
             <!-- （1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） -->
-            <view class="order_item_content_top">{{item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':item.inquiry_type==5?'糖组检测':'未知'}}</view>
+            <view class="order_item_content_top">{{item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==1 && item.inquiry_mode==8?'在线问诊-健康包':item.inquiry_type==1 && item.inquiry_mode==9?'在线问诊-随访包':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':item.inquiry_type==5?'糖组检测':'未知'}}</view>
             <view class="order_item_content_data">
               <view class="order_id">订单编号：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.inquiry_no	}}</text></view>
               <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>

user/pages/yishi/yizhensetup/index.js

@@ -11,7 +11,6 @@ Page({
     },
     height: app.globalData.height, 
     checked: true,
-    canFree:false,
     showSetting:false,
     open_note: "已开启，可在问诊消息中进行接诊",
     close_note: "已关闭，暂不接收公益问诊",
@@ -46,11 +45,12 @@ Page({
 
   },
   onShow(){
-    let doctor_id=wx.getStorageSync('client_user_id_2');
+    this.getDoctorOpen()
-    console.log(doctor_id);
+    // let doctor_id=wx.getStorageSync('client_user_id_2');
-    if(doctor_id){
+    // console.log(doctor_id);
-        this.getService(doctor_id)
+    // if(doctor_id){
-    }
+    //     this.getService(doctor_id)
+    // }
     let params = {};
     params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
     params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员）
@@ -58,12 +58,33 @@ Page({
     api.getDoctorInquiryConfig(params).then(response => {
       console.log(response);
       this.setData({
-        info: response.data.info,
+       'info.inquiry_price': response.data.inquiry_price,
-        config: response.data.config,
+        'info.work_num_day': response.data.work_num_day
+        // config: response.data.config,
       })
-      this.formatAmounts();
+    //   this.formatAmounts();
-      this.formatAmountValue();
+    //   this.formatAmountValue();
     }).then(re =>{
+    //   let is_open = this.data.info.is_open;
+    //   let note = this.data.note;
+    //   if(is_open == 1) note = this.data.open_note;
+    //   if(is_open == 0) note = this.data.close_note;
+    //   this.setData({
+    //     note: note
+    //   })
+    }).catch(errors => {console.error(errors);})
+    this.getSysconfig();
+  },
+  getDoctorOpen(){
+    let {inquiry_type,inquiry_mode}=this.data;
+    api.getOpen({
+        inquiry_type,
+        inquiry_mode
+    }).then(response => {
+      this.setData({
+        note: response.data,
+        'info.is_open': response.data
+      })
       let is_open = this.data.info.is_open;
       let note = this.data.note;
       if(is_open == 1) note = this.data.open_note;
@@ -108,6 +129,23 @@ Page({
       amountText: val
     })
   },
+  getSysconfig(){
+    let {inquiry_type,inquiry_mode}=this.data;
+  api.getSysconfig({
+      inquiry_type,
+      inquiry_mode
+  }).then(response => {
+      console.log(response);
+      this.setData({
+        'config': response.data
+        // config: response.data.config,
+        // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
+      })
+         this.formatAmounts();
+      this.formatAmountValue();
+    }).catch(errors => {console.error(errors);})
+  
+},
   changeON(){
     let is_open = this.data.info.is_open
     console.log("changeON:", is_open)

user/pages/yishi/yizhensetup/index.wxml

@@ -28,7 +28,7 @@
       border="{{true}}" 
       url="/user/pages/yishi/yizhensetupprice/index"
       >
-        <view class="num" wx:if="{{canFree}}">
+        <view class="num" wx:if="{{info.work_num_day}}">
           {{ info.work_num_day }}
         </view>
        <view calss="cell_value_seting" wx:else>去设置</view>
@@ -39,7 +39,7 @@
         border="{{false}}" 
         url="/user/pages/yishi/yizhensetupprice/index"
         >
-          <view wx:if="{{canFree}}">
+          <view wx:if="{{info.inquiry_price}}">
             <text class="price">{{ amountText }}</text>
             <text style="color: #000;"> 元</text>
           </view>

user/pages/yishi/yizhensetupprice/index.js

@@ -48,21 +48,40 @@ Page({
     api.getDoctorInquiryConfig(params).then(response => {
       console.log(response);
       this.setData({
-        info: response.data.info,
+        'info.inquiry_price': response.data.inquiry_price,
-        config: response.data.config,
+        'info.work_num_day': response.data.work_num_day
+        // config: response.data.config,
       })
-      this.formatAmounts();
+    //   this.formatAmounts();
-      this.formatAmountValue();
+    //   this.formatAmountValue();
     }).then(re =>{
-      let is_open = this.data.info.is_open;
+    //   let is_open = this.data.info.is_open;
-      let note = this.data.note;
+    //   let note = this.data.note;
-      if(is_open == 1) note = this.data.open_note;
+    //   if(is_open == 1) note = this.data.open_note;
-      if(is_open == 0) note = this.data.close_note;
+    //   if(is_open == 0) note = this.data.close_note;
-      this.setData({
+    //   this.setData({
-        note: note
+    //     note: note
-      })
+    //   })
     }).catch(errors => {console.error(errors);})
+    this.getSysconfig()
   },
+  getSysconfig(){
+    let {inquiry_type,inquiry_mode}=this.data;
+  api.getSysconfig({
+      inquiry_type,
+      inquiry_mode
+  }).then(response => {
+      console.log(response);
+      this.setData({
+        'config': response.data
+        // config: response.data.config,
+        // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note
+      })
+         this.formatAmounts();
+      this.formatAmountValue();
+    }).catch(errors => {console.error(errors);})
+  
+},
   formatAmounts(){
     let list = this.data.config.system_inquiry_price.map(item => {
       let it = {};

utils/network/api.js

@@ -912,7 +912,7 @@ getJob() {//获取职业
 }
 getServiceConfig(params) {//获取医生问诊配置-服务设置
     return this.request({
-      url: `${this.baseUrl}/doctor/inquiry/config/service`,
+      url: `${this.baseUrl}/doctor/inquiry/config/difficult`,
       method: 'GET',
       data: {
         ...params
@@ -922,7 +922,7 @@ getServiceConfig(params) {//获取医生问诊配置-服务设置
 
 postServiceConfig(params) {//新增医生问诊配置-服务设置
     return this.request({
-      url: `${this.baseUrl}/doctor/inquiry/config/service`,
+      url: `${this.baseUrl}/doctor/inquiry/config/difficult`,
       method: 'POST',
       data: {
         ...params
@@ -931,7 +931,7 @@ postServiceConfig(params) {//新增医生问诊配置-服务设置
   }
   putServiceConfig(params,id) {//修改医生问诊配置-服务设置
     return this.request({
-      url: `${this.baseUrl}/doctor/inquiry/config/service/${id}`,
+      url: `${this.baseUrl}/doctor/inquiry/config/difficult/${id}`,
       method: 'PUT',
       data: {
         ...params
@@ -1005,13 +1005,67 @@ postServiceConfig(params) {//新增医生问诊配置-服务设置
             method: 'GET'
         }) 
     }
-    getDoctorService(params){
+    getOpen(params){//获取医生问诊服务开启状态
         return this.request({
-            url: `${this.baseUrl}/doctor/inquiry/service/${params}`,
+            url: `${this.baseUrl}/doctor/inquiry/config/open`,
-            method: 'GET'
+            method: 'GET',
+            data: {
+                ...params
+              }
+        }) 
+    }
+    
+    getSysconfig(params){
+        return this.request({//获取系统问诊配置
+            url: `${this.baseUrl}/system/inquiry/config`,
+            method: 'GET',
+            data: {
+                ...params
+              }
         }) 
     }
 
+    getFollow(params){
+        return this.request({//获取医生问诊配置-随访包
+            url: `${this.baseUrl}/doctor/inquiry/config/follow`,
+            method: 'GET',
+            data: {
+                ...params
+              }
+        }) 
+    }
+
+    postFollow(params){
+        return this.request({//新增医生问诊配置-随访包
+            url: `${this.baseUrl}/doctor/inquiry/config/follow`,
+            method: 'POST',
+            data: {
+                ...params
+              }
+        }) 
+    }
+    getFollowDetail(){
+        return this.request({//获取医生问诊配置-随访包-明细
+            url: `${this.baseUrl}/doctor/inquiry/config/follow/item`,
+            method: 'GET'
+        }) 
+    }
+    editFollow(params){
+        return this.request({//修改医生问诊配置-随访包
+            url: `${this.baseUrl}/doctor/inquiry/config/follow`,
+            method: 'PUT',
+            data: {
+                ...params
+              }
+        }) 
+    }
+     getHealthy(){
+        return this.request({//获取医生问诊配置-健康包
+            url: `${this.baseUrl}/doctor/inquiry/config/health`,
+            method: 'GET'
+        }) 
+    }
+   
 }
 
 export { API }