Pages/yishi/index/index.js

@@ -266,45 +266,8 @@ Page({
       let iden_auth_status = response.data.info.iden_auth_status;
       //多点执业认证
       let multi_point_status = response.data.info.multi_point_status;
-      console.log(multi_point_status);
       //绑定结算银行卡
       let is_bind_bank = response.data.info.is_bind_bank;
-      api.getDoctorService(response.data.info.doctor_id).then(res=>{
-         if(res.code==200){
-             let result=res.data;
-            for (let i = 0; i < result.length; i++) {
-              if(result[i].inquiry_type=1 && result[i].inquiry_mode==1 && result[i].is_enable==1){
-                this.setData({
-                   'info.is_img_expert_reception':1
-                })
-              }else{
-                this.setData({
-                    'info.is_img_expert_reception':0
-                 })
-              };
-              if(result[i].inquiry_type=2 && result[i].is_enable==1){
-                this.setData({
-                   'info.is_img_quick_reception':1
-                })
-              }else{
-                this.setData({
-                    'info.is_img_quick_reception':0
-                 })
-              };
-              if(result[i].inquiry_type=3 && result[i].is_enable==1){
-                this.setData({
-                   'info.is_img_welfare_reception':1
-                })
-              }else{
-                this.setData({
-                    'info.is_img_welfare_reception':0
-                 })
-              };
-                
-            }
-
-         }
-      })
       // //是否参加专家图文接诊（0:否 1:是）
       // let is_img_expert_reception = response.data.info.is_img_expert_reception;
       // //是否参加专家快速接诊（0:否 1:是）
@@ -711,7 +674,6 @@ Page({
     let is_bind_bank = this.data.info.is_bind_bank;
     //是否参加专家图文接诊（0:否 1:是）
     let is_img_expert_reception = this.data.info.is_img_expert_reception;
-    console.log(is_img_expert_reception)
     //是否参加专家快速接诊（0:否 1:是）
     let is_img_quick_reception = this.data.info.is_img_quick_reception;
     //是否参加专家公益接诊（0:否 1:是）
@@ -746,12 +708,11 @@ Page({
     }
 
     let retult = true;
-    console.log(statusArr);
     statusArr.forEach(status => {
       let now_case = this.data.mycase.find(item => {
         return item.case_status == status;
       });
-       console.log("now_case: ", now_case);
+      // console.log("now_case: ", now_case);
       //所属模块
       let moudle = e.currentTarget.dataset.moudle;
       // console.log("moudle: ", moudle);
@@ -771,7 +732,7 @@ Page({
         }
       }
     })
-   console.log(retult);
+
     return retult;
   },
   onClickHideOverlay(){

user/commpents/myprofile/index.js

@@ -82,7 +82,6 @@ Component({
     qualification_cert_reason: "",
     work_cert_reason: "",
     email_reason:'',
-    expertise_reason:'',
     department_custom_name_reason: '',
     zhuanchang_note: '请选择专长',
     jianjie_show: false,
@@ -91,10 +90,6 @@ Component({
     img_cropper_src: '',
     img_cropper_width: 250, //宽度
     img_cropper_height: 250, //高度
-    old_be_good_at:'',
-    old_avatar:'',
-    old_doctor_expertise:'',
-    old_brief_introduction:''
   },
   options: {
     addGlobalClass: true,
@@ -111,9 +106,7 @@ Component({
             this.setData({
               doctorauthiden_data_ready: true,
               textarea_jianjie: response.data.brief_introduction,
-              old_brief_introduction: response.data.brief_introduction,
               textarea_shanchang: response.data.be_good_at,
-              old_be_good_at:response.data.be_good_at,
               custom_keshi: response.data.department_custom_name,
               office_phone: response.data.department_custom_mobile,
               select_keshi_id: response.data.department_custom_id,
@@ -181,7 +174,6 @@ Component({
             if(avatar){
               this.setData({
                 "avatar": avatar,
-                old_avatar:avatar,
                 is_avatar: true,
               })
             }
@@ -192,7 +184,6 @@ Component({
                 this.setData({
                     avatar_reason: response.data.avatar,
                     brief_introduction_reason: response.data.brief_introduction,
-                    expertise_reason:response.data.doctor_expertise,
                     be_good_at_reason: response.data.be_good_at,
                    
                   })
@@ -332,18 +323,13 @@ Component({
       //加载专长列表
       api.getDoctorExpertise().then(response => {
         console.log(response);
-        let arr=response.data.filter(e => e.is_selected == 1 ).map(e => e.expertise_id);
-        let  old_doctor_expertise=JSON.stringify(arr);
         _this.setData({
-          zhuanchang_columns: response.data,
+          zhuanchang_columns: response.data
-          old_doctor_expertise:old_doctor_expertise
         })
       }).then(()=>{
-        
         let index = this.data.zhuanchang_columns.findIndex(item => {
           return item.is_selected == 1;
         })
-       
         if(index != undefined) {
           this.setData({
             zhuanchang_note: ""
@@ -889,10 +875,7 @@ Component({
       }
     },
     zhuanchangConfirm(e){
-      this.setData({ 
+      this.setData({ zhuanchang_show: false });
-          zhuanchang_show: false,
-          expertise_reason:''
-         });
       this.triggerEvent('hidePageMeta');
     },
     zhuanchangConcle(e){
@@ -900,32 +883,28 @@ Component({
       this.triggerEvent('hidePageMeta');
     },
     handleUpdateIntroduction(){
-        let {avatar,textarea_jianjie,textarea_shanchang,old_avatar,old_brief_introduction,old_be_good_at,old_doctor_expertise}=this.data;
+        let {avatar,textarea_jianjie,textarea_shanchang}=this.data;
         let doctor_expertise= this.data.zhuanchang_columns.filter(e => e.is_selected == 1 ).map(e => e.expertise_id);
         if(!avatar){wx.showToast({title: '请上传头像',icon: "error"});return}
         if(doctor_expertise.length == 0){wx.showToast({title: '请选择专长',icon: "error"});return}
         if(!textarea_jianjie){wx.showToast({title: '请输入简介',icon: "error"});return}
-        if(!textarea_shanchang){wx.showToast({title: '请输入擅长',icon: "error"});return};
+        if(!textarea_shanchang){wx.showToast({title: '请输入擅长',icon: "error"});return}
-      console.log(textarea_jianjie,old_brief_introduction)
+
-      console.log(textarea_shanchang, old_be_good_at )
+        api.updateIntroduction({
-     if(avatar==old_avatar && textarea_jianjie==old_brief_introduction &&textarea_shanchang== old_be_good_at && JSON.stringify(doctor_expertise)==old_doctor_expertise){
+            avatar,
-        wx.showToast({title: '请修改数据后再提交',icon: "none"});return
+            brief_introduction:textarea_jianjie,
-     }
+            be_good_at:textarea_shanchang,
-        // api.updateIntroduction({
+            doctor_expertise
-        //     avatar,
+        }).then(response=>{
-        //     brief_introduction:textarea_jianjie,
+            wx.showToast({
-        //     be_good_at:textarea_shanchang,
+            title: '提交成功',
-        //     doctor_expertise
+            icon: "success"
-        // }).then(response=>{
+            })
-        //     wx.showToast({
+            this.setData({
-        //     title: '提交成功',
+                introduction_status:2,
-        //     icon: "success"
+                iden_auth_status_txt: "资料已提交，审核中" 
-        //     })
+            })
-        //     this.setData({
+        })
-        //         introduction_status:2,
-        //         iden_auth_status_txt: "资料已提交，审核中" 
-        //     })
-        // })
     },
     addDoctorAuthIden(e){
       console.log("addDoctorAuthIden addDoctorAuthIden")

user/commpents/myprofile/index.wxml

@@ -342,7 +342,7 @@
           </view>
         </view>
         <view wx:if="{{indentity}}">
-            <view class="zhuanchang {{expertise_reason?'hasnoborder':''}}" bindtap="{{iden_auth_disabled?'':'onZhuanChangShow'}}">
+            <view class="zhuanchang" bindtap="{{iden_auth_disabled?'':'onZhuanChangShow'}}">
           <view class="title">专长 <text class="required"> *</text></view>
           <view class="content">
             <view class="content_item" wx:key="expertise_name" wx:if="{{data.is_selected == 1}}" wx:for="{{ zhuanchang_columns }}" wx:for-item="data">
@@ -359,7 +359,7 @@
         </view>
         </view>
         <view wx:else>
-            <view class="zhuanchang {{expertise_reason?'hasnoborder':''}}" bindtap="{{introduction_status==2?'':'onZhuanChangShow'}}">
+            <view class="zhuanchang" bindtap="{{introduction_status==2?'':'onZhuanChangShow'}}">
           <view class="title">专长 <text class="required"> *</text></view>
           <view class="content">
             <view class="content_item" wx:key="expertise_name" wx:if="{{data.is_selected == 1}}" wx:for="{{ zhuanchang_columns }}" wx:for-item="data">
@@ -375,12 +375,7 @@
           </view>
         </view>
         </view>
-        <view class="has_error" wx:if="{{expertise_reason != '' }}" >
+
-          <view class="error_box">
-            <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />
-            <text class="error_msg">{{ expertise_reason }}</text>
-          </view>
-        </view>
         <m-textarea-cell 
         textarea_cell_name="个人简介" 
         t_icon_name="view-module" 
@@ -391,10 +386,8 @@
         disabled="{{(indentity && iden_auth_disabled) || (!indentity && introduction_status==2)}}"
         has_error_content="{{ brief_introduction_reason }}"
         data-textarea_name="textarea_jianjie" 
-        bind:TextAreaBlur="getTextAreaVal" />
+        bindTextAreaBlur="getTextAreaVal" />
-        <view class="has_error" wx:if="{{brief_introduction_reason != '' }}" >
+
-         
-        </view>
         <m-textarea-cell 
         textarea_cell_name="擅长领域" 
         t_icon_name="view-module" 
@@ -404,8 +397,8 @@
         textarea_val="{{textarea_shanchang}}"
         has_error_content="{{ be_good_at_reason }}"
         textarea_cell_content_placeholder="描述您所擅长治疗的疾病或者研究方向（10~1000字）" 
-        data-textarea_name="textarea_shanchang"   bind:TextAreaBlur="getTextAreaVal" />
+        data-textarea_name="textarea_shanchang" bindTextAreaBlur="getTextAreaVal" />
-      
+
         <m-upload-cell
         upload_cell_name="医师执业证" 
         t_icon_name="view-module" 

user/commpents/myprofile/index.wxss

@@ -74,9 +74,6 @@
   transform: scaleY(0.5);
   left: 32rpx;
 }
-.zhuanchang.hasnoborder::after{
-    border-bottom: none;
-}
 .zhuanchang .content{
   flex: 1;
   display: flex;
@@ -266,5 +263,4 @@
   color: #FF0000;
   letter-spacing: 3rpx;
   font-weight: 600;
-  word-break: break-all;
 }

user/commpents/textarea-cell/index.wxml

@@ -7,7 +7,7 @@
     </view>
   </view>
   <view class="textarea-cell-content">
-    <textarea disabled="{{disabled}}" 	bindinput="bindTextAreaBlur" maxlength="1000" style="margin: 20rpx 20rpx 0 20rpx; width: 100%; height: 90%; background-color: #FAFAFA;" name="" id="" placeholder="{{ textarea_cell_content_placeholder }}" value="{{textarea_val}}"></textarea>
+    <textarea disabled="{{disabled}}" bindblur="bindTextAreaBlur" maxlength="1000" style="margin: 20rpx 20rpx 0 20rpx; width: 100%; height: 90%; background-color: #FAFAFA;" name="" id="" placeholder="{{ textarea_cell_content_placeholder }}" value="{{textarea_val}}"></textarea>
   </view>
   <view class="error_box" wx:if="{{ has_error_content != '' }}" >
     <t-icon color="red" name="close-circle-filled" size="48rpx" data-name="close-circle-filled" />

user/commpents/textarea-cell/index.wxss

@@ -74,5 +74,4 @@
   color: #FF0000;
   letter-spacing: 3rpx;
   font-weight: 600;
-  word-break: break-all;
 }

user/pages/yishi/identity/index.js

@@ -354,7 +354,7 @@ Page({
     console.log("idcard: ", idcard);
     realname = realname.replace(/•/g,"·");
     var realname_reg= /^(([a-zA-Z+\.?\·?a-zA-Z+]{2,30}$)|([\u4e00-\u9fa5+\·?\u4e00-\u9fa5+]{2,30}$))/;
-    var idcard_reg=/^(?:1[1-5]|2[1-3]|3[1-7]|4[1-6]|5[0-4]|6[1-5])\d{4}(?:1[89]|20)\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])\d{3}[\dxX]$/;
+    var idcard_reg=/^(^[1-9]\d{5}[1-9]\d{3}(((0[2])([0|1|2][0-8])|(([0-1][1|4|6|9])([0|1|2][0-9]|[3][0]))|(((0[1|3|5|7|8])|(1[0|2]))(([0|1|2]\d)|3[0-1]))))((\d{4})|\d{3}[Xx])$)$/;
 
     //判断用户输入的真实姓名是否为空
     if(realname.length == 0){