体现

Pages/yishi/index/index.js

@@ -15,6 +15,7 @@ Page({
       user_name: "医师姓名",
       not_accepted_inquiry_num: 0,
       accepting_inquiry_num: 0,
+      is_welfare_cooperation:null,
       info_shiming_status_txt: "未认证",
       info_shiming_status: "info_shiming_status_no",
       show_info_note: false,
@@ -268,6 +269,8 @@ Page({
       let multi_point_status = response.data.info.multi_point_status;
       //绑定结算银行卡
       let is_bind_bank = response.data.info.is_bind_bank;
+      let is_welfare_cooperation=response.data.info.is_welfare_cooperation;
+      
       api.getDoctorService(response.data.info.doctor_id).then(res=>{
         if(res.code==200){
             let result=res.data;
@@ -316,6 +319,7 @@ Page({
         "info.iden_auth_status": iden_auth_status,
         "info.multi_point_status": multi_point_status,
         "info.is_bind_bank": is_bind_bank,
+        'info.is_welfare_cooperation':is_welfare_cooperation
         // "info.is_img_expert_reception": is_img_expert_reception,
         // "info.is_img_quick_reception": is_img_quick_reception,
         // "info.is_img_welfare_reception": is_img_welfare_reception,

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?multi_point_status={{info.multi_point_status}}&&idcard_status={{info.idcard_status}}&&is_bind_bank={{info.is_bind_bank}}&&iden_auth_status={{info.iden_auth_status}}" 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}}&idcard_status={{info.idcard_status}}&is_bind_bank={{info.is_bind_bank}}&iden_auth_status={{info.iden_auth_status}}" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
@@ -131,7 +131,7 @@
         />
       <text class="fun_box_item_txt">快速问诊管理</text>
     </view>
-    <view bindtap="go" data-moudle="6" data-url="/user/pages/yishi/yizhensetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
+    <view bindtap="go" data-moudle="6" data-url="/user/pages/yishi/yizhensetup/index?is_welfare_cooperation={{info.is_welfare_cooperation}}" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"

TUIChatService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js

@@ -37,6 +37,7 @@ Component({
   lifetimes: {
     detached() {
       myaudio.stop();
+       wx.setStorageSync('currentAudioId', '')
     },
   },
 
@@ -80,6 +81,8 @@ Component({
     
       const  { id } = e.currentTarget.dataset;
       const { audioSave } = this.data;
+      console.log(id);
+      wx.setStorageSync('currentAudioId',id)
        this.triggerEvent("closeAudio",false)
       // 设置状态
       audioSave.forEach((message, index) => {
@@ -128,7 +131,9 @@ Component({
         return;
       });
     },
-
+    stopmy(){
+        myaudio.stop();
+    },
     // 音频停止
     audioStop(e) {
       const { key } = e.currentTarget.dataset;

TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js

@@ -120,6 +120,7 @@ Component({
     serviceInfo:{},
     baseInfo:{},
     family_id:'',
+    fresh:true,
     patient_user_id:'',
     extensionArea: false,
     sendMessageBtn: false,
@@ -188,10 +189,16 @@ Component({
   lifetimes: {
     attached() {
       let _this = this;
+     
       // 加载声音录制管理器
       this.recorderManager = wx.getRecorderManager();
       this.recorderManager.onStop(async(resData) => {
+        this.setData({
+            fresh:!this.data.fresh
+        })
+       
         wx.hideLoading();
+       
         if (this.data.canSend) {
           if (resData.duration < 1000) {
             wx.showToast({
@@ -596,6 +603,10 @@ this.setData({
    },
     // 长按录音
     handleLongPress(e) {
+       this.triggerEvent('closeAudio',false);
+        if(this.timer){
+            clearInterval(this.timer)
+        }
       this.openRecord(e,this.recording)
     },
     recording(e,THIS){
@@ -616,7 +627,7 @@ this.setData({
       THIS.timer=setInterval(()=>{
         if(THIS.data.recordtime>=60){
           THIS.handleTouchEnd();
-         clearInterval(THIS.timer);
+          //clearInterval(THIS.timer);
        
         };
         THIS.setData({

TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml

@@ -22,11 +22,21 @@
                 bindlinechange="inputBindLinechange"
                 />
         </view>
-        <view wx:if="{{isAudio}}" class="TUI-message-input-main"
+        <view wx:if="{{isAudio && fresh}}" 
+         id="talk1"
+        class="TUI-message-input-main"
+        catchlongpress="handleLongPress"
+        catchtouchmove="handleTouchMove"
+        catchtouchend="handleTouchEnd"
+        catchtouchcancel="handleTouchCancel"
+            style="display: flex; justify-content: center; font-size: 32rpx; font-family: PingFangSC-Regular; height: 30px">
+            <text >{{text}}</text>
+        </view>
+        <view wx:elif="{{isAudio && !fresh}}" 
+        id="talk2" class="TUI-message-input-main"
         catchlongpress="handleLongPress"
         catchtouchmove="handleTouchMove"
         catchtouchend="handleTouchEnd"
-        catchtap="handleTouchCancel"
         catchtouchcancel="handleTouchCancel"
             style="display: flex; justify-content: center; font-size: 32rpx; font-family: PingFangSC-Regular; height: 30px">
             <text >{{text}}</text>

TUIChatService/TUIKit/components/TUIChat/components/MessageList/index.js

@@ -320,12 +320,21 @@ Component({
     },
     closeAudio(data){
       //关闭其他语音
+      let currentAudioId= wx.getStorageSync('currentAudioId');
       this.data.messageList.forEach((item)=>{
         if(item.type=="TIMSoundElem"){
           let ele=this.selectComponent('#audio'+item.ID);
+          if(item.ID!=currentAudioId){
+           
+              ele.stopmy();
+          }
           ele.setData({
             isPlay:false
           })
+          //console.log(ele);
+         
+          //ele.stopmy();
+         //console.log(ele)
          
         }
         

TUIChatService/TUIKit/components/TUIChat/index.js

@@ -234,6 +234,9 @@ Component({
    * 组件的方法列表
    */
   methods: {
+      closeAudio(){
+        this.selectComponent('#MessageList').closeAudio();
+      },
       checkChuFang(order_inquiry_id){
         api.getDoctorPrescriptionCheck({order_inquiry_id: order_inquiry_id}).then(response => {
             let status = response.data.status

TUIChatService/TUIKit/components/TUIChat/index.wxml

@@ -73,8 +73,11 @@
   <!-- wx:if="{{baseInfo.inquiry_status==4}}" -->
   <view class="input-area" style="{{input_area_style}}" >
     <!-- wx:if="{{showChat}}" -->
+    <!-- bind:closeAudio="closeAudio" -->
     <view class="message-input" style="{{viewData.style}}" >
-      <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" baseInfo="{{baseInfo}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" from="{{from}}" hasCallKit="{{hasCallKit}}" 
+      <MessageInput bind:myhandleExtensions="myhandleExtensions" 
+      bind:closeAudio="closeAudio"
+      id="MessageInput" inquiry_type="{{inquiry_type}}" baseInfo="{{baseInfo}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" from="{{from}}" hasCallKit="{{hasCallKit}}" 
       serviceInfo="{{serviceInfo}}"
       isEditTime="{{isEditTime}}" 
       videoInfo="{{videoInfo}}"

user/pages/yishi/cash/index.wxml

@@ -70,9 +70,8 @@
       3、平台代扣个人所得税，根据公式：
     </text>
   </view> -->
-
   <view class="bottom">
-    <van-button bind:click="postDoctorWithdrawal" disabled="{{order_inquiry_ids.length == 0 || sub_btn_disabled || withdrawal_amount == 0}}" custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
+    <van-button bind:click="postDoctorWithdrawal" disabled="{{order_nos.length == 0 || sub_btn_disabled || withdrawal_amount == 0}}" custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
     <view class="kefu" bindtap="contactKeFu">
       <text>联系客服</text>
     </view>

user/pages/yishi/yizhensetup/index.js

@@ -9,6 +9,7 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '公益问诊设置', //导航栏 中间的标题
     },
+    is_welfare_cooperation:null,
     height: app.globalData.height, 
     checked: true,
     showSetting:false,
@@ -41,8 +42,13 @@ Page({
     sub_visible: false,
   },
 
-  onLoad(){
+  onLoad(options){
-
+    console.log(options.is_welfare_cooperation)
+   if(options.is_welfare_cooperation){
+       this.setData({
+        is_welfare_cooperation:options.is_welfare_cooperation
+       })
+   }
   },
   onShow(){
     this.getDoctorOpen()
@@ -62,8 +68,8 @@ Page({
         '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;
@@ -257,6 +263,7 @@ Page({
 
   onPickerChange(e) {
     console.log(e);
+   
     const { key } = e.currentTarget.dataset;
     const { value } = e.detail;
     console.log('picker change:', e.detail);

user/pages/yishi/yizhensetup/index.wxml

@@ -26,7 +26,7 @@
       <van-cell size="large" custom-style="font-size:32rpx;border-radius: 20rpx;" 
       title="每日接诊数量" is-link 
       border="{{true}}" 
-      url="/user/pages/yishi/yizhensetupprice/index"
+      url="/user/pages/yishi/yizhensetupprice/index?is_welfare_cooperation={{is_welfare_cooperation}}"
       >
         <view class="num" wx:if="{{info.work_num_day!==''}}">
           {{ info.work_num_day }}
@@ -37,7 +37,7 @@
         <van-cell size="large" custom-style="font-size:32rpx;border-radius: 20rpx;" 
         title="问诊单价" is-link 
         border="{{false}}" 
-        url="/user/pages/yishi/yizhensetupprice/index"
+        url="/user/pages/yishi/yizhensetupprice/index?is_welfare_cooperation={{is_welfare_cooperation}}"
         >
           <view wx:if="{{info.inquiry_price}}">
             <text class="price">{{ amountText }}</text>

user/pages/yishi/yizhensetupprice/index.js

@@ -9,6 +9,7 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '设置价格', //导航栏 中间的标题
     },
+    is_welfare_cooperation:null,
     height: app.globalData.height, 
     checked: true,
     open_note: "已开启，可在问诊消息中进行接诊",
@@ -39,7 +40,14 @@ Page({
     },
     sub_visible: false,
   },
-
+ onLoad(options){
+     console.log(options.is_welfare_cooperation)
+    if(options.is_welfare_cooperation){
+        this.setData({
+            is_welfare_cooperation:options.is_welfare_cooperation
+        })
+    }
+ },
   onShow(){
     let params = {};
     params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
@@ -199,6 +207,17 @@ Page({
     console.log(e);
     const { key } = e.currentTarget.dataset;
     const { value } = e.detail;
+    console.log(value);
+    if(this.data.is_welfare_cooperation==='0' && value[0] ==0){
+      wx.showToast({
+        title: `请联系客服开通权限~`,
+        icon:'none'
+      })
+      this.setData({
+        amountVisible:true
+      })
+      return false;
+    }
     console.log('picker change:', e.detail);
     this.setData({
       [`${key}Visible`]: false,