优化

Pages/yaoshi/home/home.wxss

@@ -1,7 +1,8 @@
-.container{
+page{
   background-color: #F4F5F7;
+}
+.container{
   width: 100vw;
-  height: 100vh;
 }
 .main{
   width: 90vw;

Pages/yishi/cash/index.json

@@ -3,6 +3,7 @@
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
     "t-image": "tdesign-miniprogram/image/image",
+    "van-icon": "@vant/weapp/icon/index",
     "van-button": "@vant/weapp/button/index"
   }
 }

Pages/yishi/cash/index.wxml

@@ -3,7 +3,7 @@
 <view class="container">
   <view class="top">
     <view class="txt_title">结算银行卡</view>
-    <view class="rule">提现规则</view>
+    <view class="rule">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
   </view>
   <view class="bankcard">
     <view class="bankcard_icon">

Pages/yishi/cashrecord/index.js

@@ -13,11 +13,21 @@ Page({
     current_page: 0,
     total: 0,
     per_page: 0,
-    last_page: 0
+    last_page: 0,
+    dateVisible: false,
+    select_date: '2023',
+    years: [
+      { label: '2022年', value: '2022' },
+      { label: '2023年', value: '2023' },
+      { label: '2024年', value: '2024' },
+    ],
   },
   onLoad(){
+    this.getDoctorWithdrawalRecord();
+  },
+  getDoctorWithdrawalRecord(){
     //获取提现数据
-    api.getDoctorWithdrawalRecord({year:'2023'}).then(response => {
+    api.getDoctorWithdrawalRecord({year: this.data.select_date}).then(response => {
       console.log(response);
       if(response.data.total > 0){
         this.setData({
@@ -28,8 +38,36 @@ Page({
           last_page: response.data.last_page,
         })
       }
-    }).catch(errors => {
+    }).catch(errors => { console.error(errors); })
-      console.error(errors);
+  },
+  onDatePicker() {
+    this.setData({ dateVisible: true });
+  },
+  onPickerChange(e) {
+    const { key } = e.currentTarget.dataset;
+    const { value } = e.detail;
+
+    console.log('picker change:', e.detail);
+
+    this.setData({
+      select_date: value
     })
+
+    this.getDoctorWithdrawalRecord();
+
+  },
+  onColumnChange(e) {
+    const { key } = e.currentTarget.dataset;
+    const { value } = e.detail;
+
+    console.log('Column change:', e.detail);
+    
+  },
+  onPickerCancel(e) {
+    const { key } = e.currentTarget.dataset;
+    const { value } = e.detail;
+
+    console.log('picker Cancel:', e.detail);
+
   }
 })

Pages/yishi/cashrecord/index.json

@@ -3,6 +3,9 @@
   "usingComponents": {
     "te-nav-bar": "/commpents/te_navbar",
     "van-icon": "@vant/weapp/icon/index",
-    "t-image": "tdesign-miniprogram/image/image"
+    "van-empty": "@vant/weapp/empty/index",
+    "t-image": "tdesign-miniprogram/image/image",
+    "t-picker": "tdesign-miniprogram/picker/picker",
+    "t-picker-item": "tdesign-miniprogram/picker-item/picker-item"
   }
 }

Pages/yishi/cashrecord/index.wxml

@@ -2,8 +2,8 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="top">
-    <view class="top_txt">
+    <view class="top_txt" bindtap="onDatePicker">
-        <view class="month">2022年<van-icon name="arrow-down" color="#fff" size="40rpx" /></view>
+        <view class="month">{{select_date}}年<van-icon name="arrow-down" color="#fff" size="40rpx" /></view>
     </view>
   </view>
   <view class="data_list">
@@ -47,25 +47,23 @@
       <view class="data_item_bottom">个人所得税：￥12.00</view>
     </view>
 
-    <view class="data_item">
+    
-      <view class="data_item_top">
+    <van-empty description="暂无数据" wx:if="{{record_list.length == 0}}" />
-        <view class="data_item_top_icon">
-          <t-image custom-style="" src="/static/images/yishi/bankcard/js_icon.png" mode="heightFix" height="50rpx" aria-label="role" />
-        </view>
-        <view class="data_item_top_content">
-          <view class="name">张三三<text style="margin-left:20rpx;font-size: 28rpx;corlor:#999;">（尾号9900）</text></view>
-          <view class="date">12.09  13:23</view>
-        </view>
-        <view class="data_item_top_num">
-          <view class="jine">￥123.00</view>
-          <view class="status_box">
-            <view class="status status_ing">结算中</view>
-          </view>
-        </view>
-      </view>
-      <view class="data_item_bottom">个人所得税：￥12.00</view>
-    </view>
-
     
   </view>
+
+  <t-picker
+    visible="{{dateVisible}}"
+    value="{{[select_date]}}"
+    data-key="date"
+    title="选择年份"
+    cancelBtn="取消"
+    confirmBtn="确认"
+    bindchange="onPickerChange"
+    bindpick="onColumnChange"
+    bindcancel="onPickerCancel"
+  > 
+  <t-picker-item options="{{years}}" />
+</t-picker>
+
 </view>

Pages/yishi/cashrecord/index.wxss

@@ -93,4 +93,7 @@ page{
   justify-content: flex-end;
   margin-right: 20rpx;
   color: #666;
+}
+.t-picker__confirm{
+  color: #3CC7C0 !important;
 }

Pages/yishi/chat/index.wxss

@@ -2,7 +2,4 @@
   background-color: #F4F4F4;
   width: 100vw;
   height: 100vh;
-}
-.top{
-  
 }

Pages/yishi/identity/index.js

@@ -307,6 +307,7 @@ Page({
   },
   //新增实名认证信息
   postDoctorAuthReal(){
+
     const realname = this.data.realname.trim();
     const idcard = this.data.idcard.trim();
 
@@ -333,16 +334,23 @@ Page({
       wx.showToast({title: '身份证输入有误', icon:'error'})
       return false;
     }
-    
+
-    var params = {
+    wx.requestSubscribeMessage({
-      card_name: realname,
+      tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
-      card_num: idcard,
+      success (res) {
-    }
+        console.log(res)
-    api.postDoctorAuthReal(params).then(response => {
+        var params = {
-      console.log(response);
+          card_name: realname,
-    }).catch(errors => {
+          card_num: idcard,
-      console.error(errors);
+        }
+        api.postDoctorAuthReal(params).then(response => {
+          console.log(response);
+        }).catch(errors => {
+          console.error(errors);
+        })
+      }
     })
+    
   },
   onTabsChange(event) {
     console.log(`Change tab, tab-panel value is ${event.detail.value}.`);

Pages/yishi/index/index.js

@@ -22,6 +22,7 @@ Page({
     },
     iden_auth_status_txt: "未认证",
     multi_point_status_txt: "未认证",
+    shiming_status_url: "",
     iden_auth_status_url: "/Pages/yishi/identity/index",
     multi_point_status_url: "/Pages/yishi/zhiye_identity/index",
     current: 0,
@@ -87,7 +88,8 @@ Page({
         case_text: "已全部通过"
       },
     ],
-    skeleton_loading: true
+    skeleton_loading: true,
+    contactKeFu: false
   },
   //  获取状态栏信息
   getMenuButtonBound() {
@@ -249,7 +251,13 @@ Page({
         return;
       }
     }
-
+    let url = e.currentTarget.dataset.url;
+    console.log(url);
+    if(url.indexOf("wenzhen") > -1){
+      wx.switchTab({
+        url: url,
+      })
+    }
     app.go(e.currentTarget.dataset.url)
 
   },
@@ -283,6 +291,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "认证失败",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/identity/index",
         dialog_content: "实名认证失败",
         dialog_visible: true
       });
@@ -295,6 +304,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "前往医师身份认证",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/identity/index",
         dialog_content: "请您前往医师身份认证",
         dialog_visible: true
       });
@@ -304,6 +314,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "审核中",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/identity/index",
         dialog_content: "您的医师身份认证正在审核中",
         dialog_visible: true
     });
@@ -324,6 +335,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "前往多点执业认证",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "请您先进行多点执业认证",
         dialog_visible: true
       });
@@ -333,6 +345,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "审核中",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "您的多点执业认证正在审核中",
         dialog_visible: true
     });
@@ -342,6 +355,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "认证失败",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "您的多点执业认证失败",
         dialog_visible: true
     });
@@ -355,6 +369,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "绑定结算银行卡",
         "info.info_shiming_status": "info_shiming_status_yes",
+        shiming_status_url: "/Pages/yishi/bankcard/index",
         dialog_content: "请您先绑定结算银行卡",
         dialog_visible: true
     });
@@ -366,14 +381,31 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "开启在线问诊",
         "info.info_shiming_status": "info_shiming_status_yes",
-        multi_point_status_url: "/Pages/yishi/onlinesetup/index",
+        shiming_status_url: "/Pages/yishi/onlinesetup/index",
         dialog_content: "请您先前往在线问诊管理中开通在线问诊",
         dialog_visible: true
     });
       return false;
     }
-    this.setData({"info.info_shiming_status_txt": "去接诊"});
+    this.setData({
+      "info.info_shiming_status_txt": "去接诊",
+      shiming_status_url: "/Pages/yishi/wenzhen_v2/wenzhen",
+    });
     this.setData({"info.info_shiming_status": "info_shiming_status_yes"});
     return true;
+  },
+  contactKeFu(){
+    let _this = this;
+    console.log("concatKeFu");
+    wx.requestSubscribeMessage({
+      tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'],
+      success (res) {
+        console.log(res);
+        _this.setData({
+          contactKeFu: true
+        })
+
+      }
+    })
   }
 })

Pages/yishi/index/index.json

@@ -4,6 +4,7 @@
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
     "van-image": "@vant/weapp/image/index",
     "van-button": "@vant/weapp/button/index",
+    "van-dialog": "@vant/weapp/dialog/index",
     "t-swiper": "tdesign-miniprogram/swiper/swiper",
     "t-swiper-nav": "tdesign-miniprogram/swiper-nav/swiper-nav",
     "t-badge": "tdesign-miniprogram/badge/badge",

Pages/yishi/index/index.wxml

@@ -23,7 +23,7 @@
         </view>
         
       </view>
-      <view class="info_shiming">
+      <view class="info_shiming" bindtap="go" data-url="{{shiming_status_url}}">
         <view class="info_shiming_status {{info.info_shiming_status}}">{{info.info_shiming_status_txt}}</view>
       </view>
     </view>
@@ -131,7 +131,7 @@
       <t-badge dot="{{info.reject_prescription_number ? true : false}}" offset="{{ ['-14rpx', '10rpx'] }}" class="wrapper" content="处方管理" />
       </view>
     </view>
-    <view class="fun_box_item" bindtap="go" data-moudle="8">
+    <view class="fun_box_item" data-moudle="8" bindtap="contactKeFu">
       <image class="fun_box_item_img"
           mode="widthFix"
           src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/kefu.png"
@@ -152,4 +152,12 @@
     确定
   </view>
   </t-dialog>
+
+  <van-dialog
+    title="立即联系客服"
+    show="{{ contactKeFu }}"
+    show-cancel-button
+    confirm-button-color="#3CC7C0"
+    confirm-button-open-type="contact"
+  />
 </view>

Pages/yishi/index/index.wxss

@@ -201,4 +201,4 @@
 .dialog_confirm_btn{
   border-top: 1px solid #E9E9E9;
   color: #3CC7C0;
-}
+}

Pages/yishi/kuaisusetup/index.wxml

@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="switch_box">
     <view class="switch_box_top">
       <view class="switch_box_item">

Pages/yishi/kuaisusetup/index.wxss

@@ -1,7 +1,8 @@
+page{
+  background-color: #F6F6F6;
+}
 .container{
   width: 100vw;
-  height: 100vh;
-  background-color: #F6F6F6;
 }
 .switch_box{
   display: flex;

Pages/yishi/myaccount/index.wxss

@@ -62,6 +62,8 @@ page{
   border-radius: 20rpx;
   padding: 20rpx 0;
 }
-
+.t-picker__confirm{
+  color: #3CC7C0 !important;
+}
 
 

Pages/yishi/notice_deatil/index.wxss

@@ -1,6 +1,7 @@
-.container{
+page{
   background-color: #F4F4F4;
-  height: 100vh;
+}
+.container{
   width: 100vw;
 }
 .data{

Pages/yishi/onlinesetup/index.js

@@ -91,9 +91,9 @@ Page({
   },
   onPriceChange(e){
     console.log(e.detail);
-    let value = e.detail.value;
+    let value = Number(e.detail.value);
-    let min = this.data.config.min_inquiry_price;
+    let min = Number(this.data.config.min_inquiry_price);
-    let max = this.data.config.max_inquiry_price;
+    let max = Number(this.data.config.max_inquiry_price);
     if(value < min){
       value = min;
       Toast.fail('价格不能低于' + min + '元');

Pages/yishi/wenzhenorder/index.js

@@ -24,8 +24,8 @@ Page({
   onLoad(){
     //可提现问诊订单列表
     let params = {};
-    params.page = page;
+    params.page = this.data.page;
-    params.per_page = per_page;
+    params.per_page = this.data.per_page;
     api.getDoctorWithdrawalOrder(params).then(response => {
       console.log(response);
       if(response.data.total > 0){

Pages/yishi/wenzhenorder/index.json

@@ -4,6 +4,7 @@
     "te-nav-bar": "/commpents/te_navbar",
     "van-checkbox": "@vant/weapp/checkbox/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "van-empty": "@vant/weapp/empty/index"
   }
 }

Pages/yishi/wenzhenorder/index.wxml

@@ -37,7 +37,8 @@
             </view>
           </view>
         </view>
-      
+        
+        <van-empty description="暂无数据" wx:if="{{order_list.length == 0}}" />
         
     </view>
   </van-checkbox-group>

Pages/yishi/yizhensetup/index.wxml

@@ -1,5 +1,5 @@
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<view class="container" style="height: calc(100vh - 96rpx - {{height}}px);">
+<view class="container">
   <view class="switch_box">
     <view class="switch_box_top">
       <view class="switch_box_item">

Pages/yishi/yizhensetup/index.wxss

@@ -1,7 +1,8 @@
+page{
+  background-color: #F6F6F6;
+}
 .container{
   width: 100vw;
-  height: 100vh;
-  background-color: #F6F6F6;
 }
 .switch_box{
   display: flex;

Pages/yishi/zhiye_identity/index.js

@@ -63,46 +63,66 @@ Page({
     }
   },
   add(){
-    let id_card_front = this.data.id_card_front[0].url;
+    let _this = this;
-    console.log("id_card_front: ", id_card_front);
+    wx.requestSubscribeMessage({
-    if(id_card_front == ""){
+      tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
-      wx.showToast({
+      success (res) { 
-        title: '请上传身份证',
+        console.log(res);
-        icon: "error"
+        let id_card_front = _this.data.id_card_front[0].url;
-      })
+        console.log("id_card_front: ", id_card_front);
-      return;
+        if(id_card_front == ""){
-    }
+          wx.showToast({
-    let id_card_back = this.data.id_card_back[0].url;
+            title: '请上传身份证',
-    console.log("id_card_back: ", id_card_back);
+            icon: "error"
-    if(id_card_back == ""){
+          })
-      wx.showToast({
+          return;
-        title: '请上传身份证',
+        }
-        icon: "error"
+        let id_card_back = _this.data.id_card_back[0].url;
-      })
+        console.log("id_card_back: ", id_card_back);
-      return;
+        if(id_card_back == ""){
-    }
+          wx.showToast({
-    let sign_image = this.data.sign_image;
+            title: '请上传身份证',
-    console.log("sign_image: ", sign_image);
+            icon: "error"
-    if(sign_image == ""){
+          })
-      wx.showToast({
+          return;
-        title: '请上传签名',
+        }
-        icon: "error"
+        let sign_image = _this.data.sign_image;
-      })
+        console.log("sign_image: ", sign_image);
-      return;
+        if(sign_image == ""){
-    }
+          wx.showToast({
-    let params = {};
+            title: '请上传签名',
-    params.id_card_front = id_card_front;
+            icon: "error"
-    params.id_card_back = id_card_back;
+          })
-    params.sign_image = sign_image;
+          return;
-    api.postDoctorAuthMulti(params).then(response => {
+        }
-      console.log("postDoctorAuthMulti: ",response);
+        let params = {};
-      wx.showToast({
+        params.id_card_front = id_card_front;
-        title: '提交成功',
+        params.id_card_back = id_card_back;
-        icon: "success"
+        params.sign_image = sign_image;
-      })
+        api.postDoctorAuthMulti(params).then(response => {
-    }).catch(errors => {
+          console.log("postDoctorAuthMulti: ",response);
-      console.error(errors);
+          wx.showToast({
+            title: '提交成功',
+            icon: "success"
+          })
+
+          
+          // 订阅处方审核结果通知（长期）
+          wx.requestSubscribeMessage({
+            tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
+            success (res) { console.log(res); }
+          })
+
+
+        }).catch(errors => {
+          console.error(errors);
+        })
+      },
+      fail (res) { console.log(res) },
+      complete (res) { console.log(res) },
     })
+
+    
   },
   doUploadFile(event) {
     console.log("index douploadFIle: ", event);

Pages/yishi/zhiye_identity/index.wxml

@@ -59,5 +59,8 @@
       <!-- <van-button custom-style="font-size:30rpx; color:#fff; border-radius: 20rpx; background-color: #999"  block>资料未填写完</van-button> -->
       <van-button bind:click="add" custom-style="font-size:30rpx; color:#fff; border-radius: 20rpx; background-color: #3CC7C0"  block>提交</van-button>
     </view>
+    <view style="height: 50rpx;"> 
+      
+    </view>
   </van-cell-group>
 </view>

commpents/myprofile/index.js

@@ -638,23 +638,26 @@ Component({
       params.qualification_cert = this.data.zige_file_list.map(e => e.url);//医生资格证
       if(this.data.zhicheng_file_list.length == 0){wx.showToast({title: '请上传职称证',icon: "error"});return}
       params.work_cert = this.data.zhicheng_file_list.map(e => e.url);//工作证，职称证
-      
-  
       console.log(params);
   
-      api.postDoctorAuthIden(params).then(response => {
+      let _this = this;
-        console.log(response);
+      wx.requestSubscribeMessage({
-        wx.showToast({
+        tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
-          title: '提交成功',
+        success (res) {
-          icon: "success"
+          console.log(res);
-        })
+          api.postDoctorAuthIden(params).then(response => {
-  
+            console.log(response);
-        this.setData({
+            wx.showToast({
-          iden_auth_status_txt: "审核中",
+              title: '提交成功',
-          iden_auth_disabled: true
+              icon: "success"
-        })
+            })
-  
+            _this.setData({
-      }).catch(errors => {console.error(errors);})
+              iden_auth_status_txt: "审核中",
+              iden_auth_disabled: true
+            })
+          }).catch(errors => {console.error(errors);})
+        }
+      })
     },
     doUploadFile(event) {
       console.log("index douploadFIle: ", event);

commpents/wenzhen_data/index.js

@@ -80,10 +80,16 @@ Component({
       })
     },
     goChat(e){
-      let from_account = e.currentTarget.dataset.from_account;
+      wx.requestSubscribeMessage({
-      let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+        tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
-      wx.navigateTo({
+        success (res) {
-        url: e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id
+          console.log(res);
+          let from_account = e.currentTarget.dataset.from_account;
+          let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
+          wx.navigateTo({
+            url: e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id
+          })
+        }
       })
     },
     tabShow(){

utils/network/request.js

@@ -47,9 +47,6 @@ class HTTP {
             } else {
               reject(res.data.message)
               this._show_error(res.data.message)
-              wx.navigateTo({
-                url: "/Pages/index/index"
-              })
             }
         } else {
             resolve(res.data)