.cloudbase/container/debug.json

@@ -1 +0,0 @@
-{"containers":[],"config":{}}

Pages/agreement_page/index.js

@@ -1,5 +1,5 @@
 // Pages/webpage/index.js
-import { API } from '../../../utils/network/api'
+import { API } from './../../utils/network/api'
 const api = new API()
 Page({
 

Pages/index/index.js

@@ -1,63 +1,16 @@
 // Pages/index/index.js
-import { API } from '../../utils/network/api'
+import { API } from './../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({
   data: {
     loading: true,
-    showEntryTip:false,
-    showEntryTip_second:false,
-    beforeClose(action){
-      return new Promise((resolve) => {
-        if (action === 'confirm') {
-          resolve(true);
-        } else {
-          // 拦截取消操作
-          resolve(false);
-        }
-    })
-  },
     static_host: api.getStaticHost()
   },
-  onConfirmEntry(){
-    this.setData({
-      showEntryTip:false
-    })
-    //wx.setStorageSync('hasEntry', true);
-  },
-  onCloseEntry(){
-    this.setData({
-      showEntryTip_second:true,
-      showEntryTip:true
-    }) 
-  },
-  onConfirmEntry_second(){
-    this.setData({
-      showEntryTip_second:false,
-      //showEntryTip:false,
-    });
-    //wx.setStorageSync('hasEntry', true);
-    
-  },
-  onCloseEntry_second(){
-    
-     this.setData({
-      showEntryTip_second:false,
-      showEntryTip:false,
-    });
-     wx.exitMiniProgram({success: (res) => {}})
-   },
-  go(e){
-    let url = e.currentTarget.dataset.url;
-    app.go(url);
-  },
   onLoad(option){
     let from = option.from;
     let usertype = wx.getStorageSync('usertype');
     console.log("index onload: ", from, usertype)
-    this.setData({
-      beforeClose: this.data.beforeClose.bind(this),
-  })
     if(from === "navbar"){
       //切换身份
     }else{
@@ -75,32 +28,11 @@ Page({
         tabBarShow:false,  //true/false
       })
     }
-    wx.getPrivacySetting({
-      success: res => {
-        console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' }
-        if (res.needAuthorization) {
-          // 需要弹出隐私协议
-          this.setData({
-            showEntryTip:true
-          })
-        } else {
-          this.setData({
-            showEntryTip:false
-          })
-          // 用户已经同意过隐私协议，所以不需要再弹出隐私协议，也能调用已声明过的隐私
-        }
-      },
-      fail: () => {},
-      complete: () => {}
-    })
     this.setData({ loading: false });
-    if(app.globalData.isLogin){
-      let usertype = wx.getStorageSync('usertype');
-      this.guideTo(usertype)
-    }
   },
   
   goCheck(e){
+    console.log(e);
     let usertype = e.currentTarget.dataset.usertype;
     let url = e.currentTarget.dataset.url;
     wx.setStorageSync('usertype', usertype);
@@ -118,21 +50,13 @@ Page({
       app.imLogout();
       url = "/Pages/yaoshi/home/home";
     }
-    let token = '';
+    let token = wx.getStorageSync('AUTH_TOKEN_'+usertype);
-    const { envVersion } = wx.getAccountInfoSync().miniProgram;
-    if(envVersion=='release'){
-       token= wx.getStorageSync('AUTH_TOKEN_'+usertype)
-    }else{
-        token= wx.getStorageSync('DEV_AUTH_TOKEN_'+usertype)
-    }
     console.log(token);
-    console.log(url);
     if(token){
       wx.switchTab({
         url: url
       })
     }else{
-      console.log(app.globalData.login_url)
       app.go(app.globalData.login_url);
     }
     //test git

Pages/index/index.json

@@ -1,9 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "t-image": "tdesign-miniprogram/image/image",
+    "t-image": "tdesign-miniprogram/image/image"
-    "van-overlay": "@vant/weapp/overlay/index",
-    "van-icon": "@vant/weapp/icon/index",
-    "van-dialog": "@vant/weapp/dialog/index"
   }
 }

Pages/index/index.skeleton.wxml

@@ -1,3 +1,20 @@
+<!--
+此文件为开发者工具生成，生成时间: 2023/2/2 下午6:54:52
+使用方法：
+在 E:\WeChatProjects\test_miniprogram\Pages\index\index.wxml 引入模板
+
+```
+<import src="index.skeleton.wxml"/>
+<template is="skeleton" wx:if="{{loading}}" />
+```
+
+在 E:\WeChatProjects\test_miniprogram\Pages\index\index.wxss 中引入样式
+```
+@import "./index.skeleton.wxss";
+```
+
+更多详细信息可以参考文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
+-->
 <template name="skeleton">
   <view class="sk-container">
     <view class="title sk-transparent sk-text-14-2857-913 sk-text">请选择您的身份</view>

Pages/index/index.skeleton.wxss

@@ -1,4 +1,13 @@
+/*
+此文件为开发者工具生成，生成时间: 2023/2/2 下午6:54:52
 
+在 E:\WeChatProjects\test_miniprogram\Pages\index\index.wxss 中引入样式
+```
+@import "./index.skeleton.wxss";
+```
+
+更多详细信息可以参考文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
+*/
 .sk-transparent {
     color: transparent !important;
   }

Pages/index/index.wxml

@@ -28,71 +28,4 @@
   </view>
   
 </view>
-<van-overlay show="{{ showEntryTip }}" >
- <view class="wrapper">
-  <view class="privacyBox">
-  <view class="title">温馨提示</view>
-<view class="entrymsg" >
- <view> 亲爱的用户，感谢您信任并使用肝胆相照互联网医院医师端！我们依据最新法律法规的要求，制定了<text class="navigator" bindtap="go" data-url="/user/pages/agreement_page/index?agreement_id=9">《隐私协议》</text>。请您仔细阅《隐私协议》，并确认了解我们对您的个人信息处理原则。</view>
-<view>如您同意《隐私协议》，请点击“同意”开始使用我们的产品和服务。</view>
-</view>
-<view class="btnbox">
-   <view class="cancel" bindtap="onCloseEntry">不同意</view>
-  <button id="agree-btn" 
-  plain
-  class="confirm" 
-  open-type="agreePrivacyAuthorization" bindagreeprivacyauthorization="onConfirmEntry">同意并继续</button>
-</view>
-</view>
- </view>
-</van-overlay> 
-
- <!-- <van-dialog
-  use-slot
-  title="温馨提示"
-  show="{{ showEntryTip }}"
-  show-cancel-button
-  confirm-button-text="同意并继续"
-  cancel-button-text="不同意"
-  confirm-button-color="#3CC7C0"
-  bind:confirm="onConfirmEntry"
-  bind:cancel="onCloseEntry"
-  before-close="{{beforeClose}}"
-  confirm-button-open-type="agreePrivacyAuthorization"
->
-<view class="entrymsg" >
- <view> 亲爱的用户，感谢您信任并使用肝胆相照互联网医院医师端！我们依据最新法律法规的要求，制定了<text class="navigator" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>。请您仔细阅《隐私协议》，并确认了解我们对您的个人信息处理原则。</view>
-<view>如您同意《隐私协议》，请点击“同意”开始使用我们的产品和服务。</view>
-</view>
-
-</van-dialog>  -->
-<van-overlay show="{{ showEntryTip_second }}" >
- <view class="wrapper">
-  <view class="privacyBox">
-  <view class="title">温馨提示</view>
-<view class="entrymsg" >
- <view> 很抱歉，如您不同意《隐私协议》，可能无法继续正常使用我们的服务，请您先同意哦~</view>
-</view>
-<view class="btnbox">
-   <view class="cancel" bindtap="onCloseEntry_second">不同意</view>
-  <button id="agree-btn" 
-  plain
-  class="confirm" 
-  bindtap="onConfirmEntry_second">好的</button>
-</view>
-</view>
- </view>
-</van-overlay> 
-<!-- <van-dialog
-  title="温馨提示"
-  show="{{ showEntryTip_second }}"
-  message="很抱歉，如您不同意《隐私协议》，可能无法继续正常使用我们的服务，请您先同意哦~"
-  show-cancel-button
-  confirm-button-text="好的"
-  cancel-button-text="不同意"
-  confirm-button-color="#3CC7C0"
-  bind:confirm="onConfirmEntry_second"
-  bind:cancel="onCloseEntry_second"
->
-</van-dialog> -->
 

Pages/index/index.wxss

@@ -19,66 +19,3 @@
   display: flex;
   justify-content: center;
 }
-.entrymsg{
-  -webkit-overflow-scrolling: touch;
-    font-size: 28rpx;
-    line-height: 40rpx;
-    max-height: 60vh;
-    overflow-y: auto;
-    padding: 48rpx;
-    text-align: left;
-}
-.navigator{
-  color:#3CC7C0
-}
-
-
-.wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-
-}
-.privacyBox {
-  width:90%;
-  background-color: #fff;
-  border-radius: 30rpx;
-}
-.privacyBox .title{
-  margin: 0;
-  text-align: center;
-  font-weight: 500;
-    line-height:24px;
-    padding-top:24px;
-    text-align: center;
-  font-size:16px;
-}
-.btnbox{
-  display: flex;
-  align-items: center;
-  border-top:1rpx solid #efefef;
-  width:100%;
-  font-size: 17px;
-}
-.btnbox .cancel{
-  flex:1;
-  height: 50px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.btnbox .confirm{
-  margin: 0;
-  height: 50px;
-  padding: 0;
-  color: #3CC7C0;
-  flex:1; 
-  font-size: 17px;
-  border: none!important;
-  border-left:1rpx solid #efefef!important;
-  display: flex;
-  background-color: none!important;
-  justify-content: center;
-  align-items: center;
-}

Pages/login/index.js

@@ -0,0 +1,81 @@
+// Pages/login/index.js
+import { API } from './../../utils/network/api'
+const api = new API()
+const app = getApp()
+Page({
+  data: {
+    navbarData: {
+      showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
+      title: '登录', //导航栏 中间的标题
+    },
+    checked: false,
+    static_host: api.getStaticHost()
+  },
+  onLoad(){
+    let usertype =  wx.getStorageSync('usertype');
+    if(!usertype){
+      wx.navigateTo({
+        url: "/Pages/index/index"
+      })
+    }
+  },
+  onChange(event) {
+    this.setData({
+      checked: event.detail,
+    });
+  },
+  changeCheck(){
+    let checked = this.data.checked
+    this.setData({
+      checked: !checked
+    })
+  },
+  _navback() {
+    wx.navigateBack()
+  },
+  go(e){
+    let url = e.currentTarget.dataset.url;
+    app.go(url);
+  },
+  getPhoneNumber (e) {
+    console.log(e);
+    console.log(e.detail.code);
+    if(!this.data.checked){
+      wx.showToast({
+        title: '请同意协议',
+        icon: "error"
+      })
+      return;
+    }
+    let usertype =  wx.getStorageSync('usertype');
+    let next_url =  wx.getStorageSync('next_url');
+    wx.login({
+      success (res) {
+      if (res.code) {
+        console.log('登录成功！' + res.errMsg)
+        var params = {
+          phone_code: e.detail.code,
+          user_type: usertype,
+          wx_code: res.code
+        }
+        api.wechatMobileLogin(params).then(response => {
+          console.log(response);
+          wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
+          wx.setStorageSync('user_id_'+usertype, response.data.user_id);
+          wx.setStorageSync('client_user_id_'+usertype, response.data.client_user_id);
+          app.globalData.config.userID = response.data.user_id;
+          app.imInit();
+          //跳转页面
+          wx.switchTab({
+            url: next_url
+          })
+        }).catch(errors => {
+          console.error(errors);
+        })
+      } else {
+        console.log('登录失败！' + res.errMsg)
+      }
+      }
+    })
+  },
+})

Pages/login/index.json

@@ -3,8 +3,6 @@
     "van-button": "@vant/weapp/button/index",
     "van-image": "@vant/weapp/image/index", 
     "van-checkbox": "@vant/weapp/checkbox/index",
-    "van-overlay": "@vant/weapp/overlay/index",
-    "van-dialog": "@vant/weapp/dialog/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index"
   }
 }

Pages/login/index.wxml

@@ -0,0 +1,42 @@
+<view class="container">
+  <view class="tui-navigatorbar">
+    <image wx:if="{{ navbarData.showCapsule==1 }}" class="tui-navigatorbar-back" bindtap="_navback" src="../../TUIKit/static/assets/ic_back_black.svg" />
+    <view class="conversation-title">{{ navbarData.title }}</view>
+  </view>
+  <view class="box">
+    <view class="top">
+      <view class="logo">
+        <van-image fit="heightFix" height="56rpx" src="{{static_host}}/applet/doctor/static/images/logo.png" use-loading-slot>
+          <van-loading slot="loading" type="spinner" size="20" vertical />
+        </van-image>
+      </view>
+      <view class="msg">你好！欢迎登录肝胆相照互联网医院</view>
+    </view>
+
+    <view class="btn">
+      <van-button 
+        wx:if="{{ checked }}"
+        open-type="getPhoneNumber" 
+        bindgetphonenumber="getPhoneNumber"
+        color="#09BB07" custom-style="font-size: 36rpx;" type="primary" round block>微信授权手机号登录</van-button>
+      <van-button 
+        wx:else
+        bindtap="getPhoneNumber"
+        color="#09BB07" custom-style="font-size: 36rpx;" type="primary" round block>微信授权手机号登录</van-button>
+      
+      <view style="display: flex;margin-top: 30rpx;line-height: 50rpx;">
+        <van-checkbox value="{{ checked }}" bind:change="onChange"></van-checkbox>
+        <view style="float: left;">
+          <text style="color: #000000;word-wrap: break-word;" bindtap="changeCheck">我已阅读并同意协议</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户注册及服务协议》</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=11">《劳务协议》</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="bottom">
+      <text class="bottom_txt" bindtap="go" data-url="/Pages/mobile_login/index">输入手机号登录/注册</text>
+    </view>
+  </view>
+</view>

Pages/login/index.wxss

@@ -78,65 +78,4 @@
 .van-checkbox {
   padding-top: 6rpx !important;
 }
-.entrymsg{
-  -webkit-overflow-scrolling: touch;
-    font-size: 28rpx;
-    line-height: 40rpx;
-    max-height: 60vh;
-    overflow-y: auto;
-    padding: 48rpx;
-    text-align: left;
-}
-.navigator{
-  color:#3CC7C0
-}
-.wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-
-}
-.privacyBox {
-  width:90%;
-  background-color: #fff;
-  border-radius: 30rpx;
-}
-.privacyBox .title{
-  margin: 0;
-  text-align: center;
-  font-weight: 500;
-    line-height:24px;
-    padding-top:24px;
-    text-align: center;
-  font-size:16px;
-}
-.btnbox{
-  display: flex;
-  align-items: center;
-  border-top:1rpx solid #efefef;
-  width:100%;
-  font-size: 17px;
-}
-.btnbox .cancel{
-  flex:1;
-  height: 50px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.btnbox .confirm{
-  margin: 0;
-  height: 50px;
-  padding: 0;
-  color: #3CC7C0;
-  flex:1; 
-  font-size: 17px;
-  border: none!important;
-  border-left:1rpx solid #efefef!important;
-  display: flex;
-  background-color: none!important;
-  justify-content: center;
-  align-items: center;
-}
 

Pages/mobile_login/index.js

@@ -1,4 +1,4 @@
-import { API } from '../../../utils/network/api'
+import { API } from './../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({
@@ -24,14 +24,6 @@ Page({
       })
     }
   },
-  onShow(){
-    let usertype =  wx.getStorageSync('usertype');
-    if(!usertype){
-      wx.navigateTo({
-        url: "/Pages/index/index"
-      })
-    }
-  },
   onChange(event) {
     this.setData({
       checked: event.detail,
@@ -59,7 +51,6 @@ Page({
       })
     }
   },
- 
   getCodePhone(e){
     let phone_reg = /^1[3-9]\d{9}$/;
     let phone = this.data.phone;
@@ -100,7 +91,7 @@ Page({
     })
   },
   mobileLogin(e){
-    let THIS=this;
+
     let phone_reg = /^1[3-9]\d{9}$/;
     let phone = this.data.phone;
     let sms = this.data.sms;
@@ -137,25 +128,15 @@ Page({
           params.wx_code = res.code;
       
           api.mobileLogin(params).then(response => {
-            app.globalData.isLogin=true;
+            console.log(response);
-            const { envVersion } = wx.getAccountInfoSync().miniProgram;
+            wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
-            if(envVersion=='release'){
-                wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
-            }else{
-                wx.setStorageSync('DEV_AUTH_TOKEN_'+usertype, response.data.token);
-                
-            }
-            // wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token);
             wx.setStorageSync('user_id_'+usertype, response.data.user_id);
             wx.setStorageSync('client_user_id_'+usertype, response.data.client_user_id);
             app.globalData.config.userID = response.data.user_id;
-            let handleGo=function(){
+            app.imInit();
-              wx.switchTab({
+            wx.switchTab({
-                url:  wx.getStorageSync('next_url')
+              url:  wx.getStorageSync('next_url')
-              })
+            })
-            }
-            app.imInit({path:'Pages/mobile_login/index'},1,handleGo);
-          
           }).catch(errors => {console.error(errors);})
         } else {
           wx.showToast({

Pages/mobile_login/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "m-nav-bar": "../../commpents/mynavbar/index",
+    "m-nav-bar": "/commpents/mynavbar/index",
     "van-field": "@vant/weapp/field/index",
     "van-button": "@vant/weapp/button/index",
     "van-checkbox": "@vant/weapp/checkbox/index",

Pages/mobile_login/index.wxml

@@ -31,9 +31,9 @@
         <van-checkbox value="{{ checked }}" bind:change="onChange"></van-checkbox>
         <view style="float: left;">
           <text style="color: #000000;word-wrap: break-word;" bindtap="changeCheck">我已阅读并同意协议</text>
-          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/user/pages/agreement_page/index?agreement_id=10">《肝胆相照用户注册及服务协议》</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户注册及服务协议》</text>
-          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/user/pages/agreement_page/index?agreement_id=9">《隐私协议》</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=9">《隐私协议》</text>
-          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/user/pages/agreement_page/index?agreement_id=11">《劳务协议》</text>
+          <text style="color: #4384FE;word-wrap: break-word;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=11">《劳务协议》</text>
         </view>
       </view>
   </view>

Pages/yaoshi/authentication/authentication.js

@@ -1,4 +1,4 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({

Pages/yaoshi/authentication/authentication.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",

Pages/yaoshi/info/info.js

@@ -1,4 +1,4 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({

Pages/yaoshi/info/info.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index"

Pages/yaoshi/medicalrecord/medicalrecord.js

@@ -1,4 +1,4 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({

Pages/yaoshi/medicalrecord/medicalrecord.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "van-button": "@vant/weapp/button/index"
   },
   "navigationBarBackgroundColor": "#ffffff",

Pages/yaoshi/medicalrecord/medicalrecord.wxml

@@ -21,7 +21,7 @@
     <view class="item"><text class="item_title">您是否处于备孕、妊娠、哺乳期：</text>{{case_detail.is_pregnant==0?'否':'是'}}</view>
     <view class="item"><text class="item_title">复诊凭证</text></view>
   </view>
-  <view class="go_check" bindtap="go" data-url="/user/pages/yaoshi/prescription/prescription?order_prescription_id={{order_prescription_id}}">
+  <view class="go_check" bindtap="go" data-url="/Pages/yaoshi/prescription/prescription?order_prescription_id={{order_prescription_id}}">
     <van-button wx:if="{{from == '1'}}" color="linear-gradient(to right, #4CABEA, #64CFE9)" block round type="info">前往审方</van-button>
   </view>
   <view class="bottom"></view>

Pages/yaoshi/my/my.js

@@ -35,18 +35,9 @@ Page({
       success (res) {
         if (res.confirm) {
           console.log('用户点击确定')
-          //wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
+          wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
-          const { envVersion } = wx.getAccountInfoSync().miniProgram;
-          if(envVersion=='release'){
-              wx.setStorageSync('AUTH_TOKEN_'+usertype, '');
-          }else{
-              wx.setStorageSync('DEV_AUTH_TOKEN_'+usertype,'');
-              
-          }
           wx.setStorageSync('user_id_'+usertype, "");
           wx.setStorageSync('client_user_id_'+usertype, "");
-          app.globalData.isLogin=false;
-          wx.setStorageSync('usertype','')
           app.go("/Pages/index/index");
         } else if (res.cancel) {
           console.log('用户点击取消')

Pages/yaoshi/my/my.wxml

@@ -5,9 +5,9 @@
     <text class="name">{{info.user_name}}</text>
   </view>
   <view class="content">
-    <view class="my" bindtap="go" data-url="/user/pages/yaoshi/info/info">个人中心</view>
+    <view class="my" bindtap="go" data-url="/Pages/yaoshi/info/info">个人中心</view>
     <view class="item_list">
-      <view class="item" bindtap="go" data-url="/user/pages/yaoshi/authentication/authentication">
+      <view class="item" bindtap="go" data-url="/Pages/yaoshi/authentication/authentication">
         <van-icon name="user-o" size="50rpx" color="#55B0E5"/>
         <text class="item_name">实名认证</text>
       </view>

Pages/yaoshi/prescription/prescription.js

@@ -1,5 +1,5 @@
 import Toast from '@vant/weapp/toast/toast'
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({

Pages/yaoshi/prescription/prescription.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "van-button": "@vant/weapp/button/index",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",

Pages/yishi/addzhenduan/index.js

@@ -1,4 +1,4 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 const api = new API()
 // const app = getApp()
 Page({

Pages/yishi/addzhenduan/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "van-field": "@vant/weapp/field/index"
   }
 }

Pages/yishi/agreement_detail/index.js

@@ -1,4 +1,4 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 let api = new API()
 Page({
 

Pages/yishi/agreement_detail/index.json

@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index"
+    "te-nav-bar": "/commpents/te_navbar"
   }
-}
+}

Pages/yishi/appraise/index.js

@@ -1,4 +1,4 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({

Pages/yishi/appraise/index.json

@@ -1,8 +1,8 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
-    "appraise-data": "../../../commpents/appraise_data/index",
+    "appraise-data": "/commpents/appraise_data/index",
     "van-empty": "@vant/weapp/empty/index",
     "van-tab": "@vant/weapp/tab/index",
     "van-tabs": "@vant/weapp/tabs/index",

Pages/yishi/appraise/index.wxml

@@ -12,27 +12,13 @@
         <view class="item_list">
           <view class="item" wx:for="{{appraise_list_1}}">
             <view class="top">
-              <view class="namebox">
+              <view class="name">{{item.name_mask}}</view>
-                <view class="name">{{item.name_mask}}</view>
-              <view class="comemntType" wx:if="{{item.inquiry_mode==1}}">
-                 图文
-                </view>
-                <view class="comemntType video" wx:elif="{{item.inquiry_mode==2 && item.inquiry_type==1}}">
-                视频
-                </view>
-                <view class="comemntType yinan" wx:elif="{{item.inquiry_mode==6 && item.inquiry_type==1}}">
-                疑难会诊
-                </view>
-              </view>
               <view class="start">
                 <t-rate value="{{item.avg_score}}" count="5" color="#ED9C00"/>
               </view>
             </view>
             <view class="content">{{item.content}}</view>
-            <view class="datebox">
+            <view class="date">{{dateSubstr.substring(item.created_at,0,16)}}</view>
-                <view class="sick_name">{{item.disease_class_name}}</view>
-                <view class="date">{{dateSubstr.substring(item.created_at,0,16)}}</view>
-            </view>
           </view>
         </view>
         <van-empty description="暂无数据" wx:if="{{appraise_list_1.length == 0}}" />
@@ -42,27 +28,13 @@
         <view class="item_list">
           <view class="item" wx:for="{{appraise_list_2}}">
             <view class="top">
-                <view class="namebox">
+              <view class="name">{{item.name_mask}}</view>
-                <view class="name">{{item.name_mask}}</view>
-              <view class="comemntType" wx:if="{{item.inquiry_mode==1}}">
-                 图文
-                </view>
-                <view class="comemntType video" wx:elif="{{item.inquiry_mode==2 && item.inquiry_type==1}}">
-                视频
-                </view>
-                <view class="comemntType yinan" wx:elif="{{item.inquiry_mode==6 && item.inquiry_type==1}}">
-                疑难会诊
-                </view>
-              </view>
               <view class="start">
                 <t-rate value="{{item.avg_score}}" count="5" color="#ED9C00"/>
               </view>
             </view>
             <view class="content">{{item.content}}</view>
-            <view class="datebox">
+            <view class="date">{{dateSubstr.substring(item.created_at,0,16)}}</view>
-                <view class="sick_name">{{item.disease_class_name}}</view>
-                <view class="date">{{dateSubstr.substring(item.created_at,0,16)}}</view>
-            </view>
           </view>
         </view>
         <van-empty description="暂无数据" wx:if="{{appraise_list_2.length == 0}}" />
@@ -72,31 +44,68 @@
         <view class="item_list">
           <view class="item" wx:for="{{appraise_list_3}}">
             <view class="top">
-                <view class="namebox">
+              <view class="name">{{item.name_mask}}</view>
-                <view class="name">{{item.name_mask}}</view>
-              <view class="comemntType" wx:if="item.inquiry_mode==1">
-                 图文
-                </view>
-                <view class="comemntType video" wx:elif="{{item.inquiry_mode==2 && item.inquiry_type==1}}">
-                视频
-                </view>
-                <view class="comemntType yinan" wx:elif="{{item.inquiry_mode==6 && item.inquiry_type==1}}">
-                疑难会诊
-                </view>
-              </view>
               <view class="start">
                 <t-rate value="{{item.avg_score}}" count="5" color="#ED9C00"/>
               </view>
             </view>
             <view class="content">{{item.content}}</view>
-            <view class="datebox">
+            <view class="date">{{dateSubstr.substring(item.created_at,0,16)}}</view>
-                <view class="sick_name">{{item.disease_class_name}}</view>
-                <view class="date">{{dateSubstr.substring(item.created_at,0,16)}}</view>
-            </view>
           </view>
         </view>
         <van-empty description="暂无数据" wx:if="{{appraise_list_3.length == 0}}" />
         <van-divider contentPosition="center" wx:if="{{appraise_list_3.length > 0 && current_page == last_page}}">到底了~</van-divider>
       </van-tab>
     </van-tabs>
+
+  <!-- <t-tabs
+      defaultValue="{{1}}"
+      sticky
+      stickyProps="{{stickyProps}}"
+      bind:change="onTabsChange"
+      bind:click="onTabsClick"
+      t-class="custom-tabs"
+      catch:scroll="onStickyScroll"
+      theme="line"
+      custom-style="font-size: 32rpx"
+    >
+      <t-tab-panel label="全部（{{total_quantity}}）" value="1">
+        <view class="item_list">
+          <appraise-data 
+            name="{{item.name_mask}}"
+            start="{{item.avg_score	}}"
+            content="{{item.content}}"
+            date="{{item.created_at}}"
+            wx:for="{{appraise_list_1}}"
+          />
+        </view>
+        <van-empty description="暂无数据" wx:if="{{appraise_list_1.length == 0}}" />
+
+      </t-tab-panel>
+      <t-tab-panel label="好评（{{good_quantity}}）" value="2">
+        <view class="item_list">
+          <appraise-data 
+            name="{{item.name_mask}}"
+            start="{{item.avg_score	}}"
+            content="{{item.content}}"
+            date="{{item.created_at}}"
+            wx:for="{{appraise_list_2}}"
+            />
+        </view>
+        <van-empty description="暂无数据" wx:if="{{appraise_list_2.length == 0}}" />
+      </t-tab-panel>
+
+      <t-tab-panel label="中/差评（{{bad_quantity}}）" value="3">
+        <view class="item_list">
+          <appraise-data 
+            name="{{item.name_mask}}"
+            start="{{item.avg_score	}}"
+            content="{{item.content}}"
+            date="{{item.created_at}}"
+            wx:for="{{appraise_list_3}}"
+            />
+        </view>
+        <van-empty description="暂无数据" wx:if="{{appraise_list_3.length == 0}}" />
+      </t-tab-panel>
+    </t-tabs> -->
 </view>

Pages/yishi/appraise/index.wxss

@@ -0,0 +1,50 @@
+page{
+  background-color: #F6F6F6;
+}
+.container{
+  width: 100vw;
+}
+.item_list{
+  width: 92vw;
+  margin: 20rpx auto;
+  background-color: #fff;
+  border-radius: 20rpx;
+}
+
+
+
+.item{
+  display: flex;
+  padding: 20rpx;
+  flex-direction: column;
+}
+.item:not(:last-child){
+  border-bottom: 1px solid #E7E7E7;
+}
+.top{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex: 1;
+}
+.name{
+  flex: 1;
+  font-size: 30rpx;
+  color: #666666;
+}
+.start{
+  flex: 1;
+  display: flex;
+  justify-content: flex-end;
+}
+.content{
+  flex: 2;
+  font-size: 34rpx;
+  color: #333333;
+  margin: 20rpx 0;
+}
+.date{
+  flex: 1;
+  font-size: 28rpx;
+  color: #666666;
+}

Pages/yishi/attestation/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index"
   }

Pages/yishi/bankcard/index.js

@@ -1,4 +1,4 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({

Pages/yishi/bankcard/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "van-image": "@vant/weapp/image/index",
     "t-icon": "tdesign-miniprogram/icon/icon",
     "van-button": "@vant/weapp/button/index"

Pages/yishi/bankcard/index.wxml

@@ -5,7 +5,7 @@
     <view class="help_title">
       <text wx:if="{{ !banklist_empty }}">我的银行卡</text>
     </view>
-    <view class="help_note" data-url="/user/pages/yishi/manual/index" bindtap="go">
+    <view class="help_note" data-url="/Pages/yishi/manual/index" bindtap="go">
       操作手册-银行卡<t-icon size="26rpx" style="display: inline-block;" name="chevron-right" size="48rpx" data-name="chevron-right" />
     </view>
   </view>
@@ -13,7 +13,7 @@
     <view class="bankcard_empty">
       <van-image src="{{static_host}}/applet/doctor/static/images/yishi/bankcard_empty.png" fit="widthFix" width="500rpx" aria-label="空" />
     </view>
-      <van-button data-url="/user/pages/yishi/bindcard/index" bind:click="go" custom-style="font-size: 30rpx;border-radius: 10rpx;background-color:#3CC7C0;border: none;width: 92vw;margin: 50rpx auto;" type="primary" block>添加结算银行卡</van-button>
+      <van-button data-url="/Pages/yishi/bindcard/index" bind:click="go" custom-style="font-size: 30rpx;border-radius: 10rpx;background-color:#3CC7C0;border: none;width: 92vw;margin: 50rpx auto;" type="primary" block>添加结算银行卡</van-button>
     <view class="note">提示：每人只能绑定一张银行卡，银行卡绑定成功后每月只能修改结算银行卡一次，请谨慎绑定。</view>
   </view>
   <view class="bankcard_list" wx:if="{{ !banklist_empty }}">
@@ -23,7 +23,7 @@
       <view class="bankcard_list_item_num">{{bank_card_code_mask}}</view>
     </view>
 
-    <van-button data-url="/user/pages/yishi/bindcard/index" bind:click="go" custom-style="font-size: 30rpx;border-radius: 10rpx;background-color:#3CC7C0;border: none;width: 92vw;margin: 50rpx auto;" type="primary" block>更换银行卡</van-button>
+    <van-button data-url="/Pages/yishi/bindcard/index" bind:click="go" custom-style="font-size: 30rpx;border-radius: 10rpx;background-color:#3CC7C0;border: none;width: 92vw;margin: 50rpx auto;" type="primary" block>更换银行卡</van-button>
     <view class="note">
     <text>提示： 1、每人只能绑定一张银行卡，银行卡绑定成功后才可提取问诊费，请谨慎绑定。
     2、每人每月限定只能修改一次结算银行卡。</text>

Pages/yishi/bindcard/index.js

@@ -1,5 +1,5 @@
 import Toast from '@vant/weapp/toast/toast';
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({

Pages/yishi/bindcard/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-button": "@vant/weapp/button/index",

Pages/yishi/case/index.js

@@ -1,5 +1,5 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
-import debounce from '../../../utils/debounce'
+import debounce from './../../../utils/debounce'
 let api = new API()
 const app = getApp()
 Page({
@@ -75,7 +75,7 @@ Page({
   },
   onShow(){
     //获取患者问诊病例
-    api.getInquiryDetail({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
+    api.getDoctorInquiryCase({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
       console.log(response);
       this.setData({
         case_detail: response.data

Pages/yishi/case/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "van-icon": "@vant/weapp/icon/index",
     "van-uploader": "@vant/weapp/uploader/index"
   }

Pages/yishi/case/index.wxml

@@ -1,4 +1,4 @@
-<wxs module="dateSubstr" src="../../../../utils/substr.wxs"></wxs>
+<wxs module="dateSubstr" src="./../../../utils/substr.wxs"></wxs>
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
   <view class="main_title">基础信息</view>

Pages/yishi/cash/index.js

@@ -1,5 +1,5 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
-import { requestSubscribeMessage } from '../../../../utils/requestSubscribeUtil';
+import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
 
 const api = new API()
 const app = getApp()
@@ -17,19 +17,16 @@ Page({
     bank_name	: "xx银行",
     bank_card_code_mask: "888 xxxx xxxx 888",
     withdrawal_amount: "xxxx",
-    amount_total:'',
     income_tax: "xx",
     contactKeFu: false,
     sub_visible: false,
     skeleton_loading: true,
     order_inquiry_ids: [],
-    order_nos:[],
     sub_btn_disabled: false
   },
   onLoad(option){
     let order_inquiry_ids = option.order_inquiry_ids;
     let params = {};
-    console.log(order_inquiry_ids)
     if(order_inquiry_ids){
       params.order_inquiry_ids = order_inquiry_ids;
       this.setData({
@@ -94,8 +91,7 @@ Page({
           bank_name	: response.data.bank.bank_name,
           bank_card_code_mask: response.data.bank.bank_card_code_mask,
           withdrawal_amount: response.data.withdrawal_amount,
-          amount_total:response.data.amount_total,
+          order_inquiry_ids: response.data.order_inquiry_ids,
-          order_nos:response.data.order_nos,
           bank_card_name: response.data.bank.bank_card_name_mask,
           income_tax: response.data.income_tax,
           skeleton_loading: false
@@ -111,7 +107,7 @@ Page({
       sub_btn_disabled: true
     })
     let params = {};
-    params.order_no = this.data.order_nos.join(",");
+    params.order_inquiry_id = this.data.order_inquiry_ids.join(",");
     params.withdrawal_amount_total = this.data.withdrawal_amount;
     params.bank_card_id = this.data.bank_card_id;
     //获取提现数据

Pages/yishi/cash/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "van-image": "@vant/weapp/image/index",
     "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" bindtap="go" data-url="/user/pages/agreement_page/index?agreement_id=12">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
+    <view class="rule" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=12">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
   </view>
   <view class="bankcard" wx:if="{{!skeleton_loading}}">
     <view class="bankcard_icon">
@@ -21,44 +21,30 @@
   <view class="cash" wx:if="{{!skeleton_loading}}">
     <view class="cash_top">
       <view class="cash_left">
-        <!-- <view class="cash_left_title">实际到账（元）</view> -->
+        <view class="cash_left_title">实际到账（元）</view>
         <view class="cash_num">
           <view>
-            <text style="font-size: 34rpx;">账户余额：￥</text>{{amount_total}}
+            <text style="font-size: 42rpx;">￥</text>{{withdrawal_amount}}
           </view>
         </view>
         <view class="shui">扣除个人所得税： 
           <text style="color: red;">{{income_tax}}元</text>
         </view>
       </view>
-      <!-- <view class="cash_right">
+      <view class="cash_right">
         <navigator url="/Pages/yishi/wenzhenorderV2/index" open-type="navigate" hover-class="other-navigator-hover">
           <van-button custom-style="text-align: center;border-radius: 10rpx;padding: 20rpx 50rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);">
             查看订单
           </van-button>
         </navigator>
-      </view> -->
+      </view>
     </view>
     <view class="cash_bottom">
-        <view class="title">
+      <navigator url="/Pages/yishi/cashrecord/index" open-type="navigate" hover-class="other-navigator-hover">
-          实际到账（元）
+      提现记录 >
-        </view>
+      </navigator>
-        <view class="moneybox">
-        <view class="money"><text class="mark">￥</text><text class="moneyNum">{{withdrawal_amount}}</text></view>
-        <navigator url="/user/pages/yishi/wenzhenorderV2/index?amount_total={{amount_total}}" open-type="navigate" hover-class="other-navigator-hover">
-          <van-button custom-style="text-align: center;border-radius: 10rpx;height:70rpx;width:200rpx;" color="linear-gradient(310deg, #FF931A 0%, #FF931A 0%, #FCB75D 100%);">
-            查看订单
-          </van-button>
-        </navigator>
-        </view>
-    
     </view>
   </view>
-  <view class="tixian">
-    <navigator url="/user/pages/yishi/cashrecord/index" open-type="navigate" hover-class="other-navigator-hover">
-      提现记录 <van-icon name="arrow" />
-      </navigator> 
-  </view>
   <view class="cash_loading" wx:if="{{skeleton_loading}}">
     <t-skeleton theme="text" row-col="{{[{width: '30%'},{width: '80%'},{width: '50%'},{width: '30%'}]}}" animation="gradient" loading="{{skeleton_loading}}" />
   </view>

Pages/yishi/cash/index.wxss

@@ -66,7 +66,7 @@ page{
 }
 .cash{
   width: 92vw;
-
+  height: 300rpx;
   margin: 20rpx auto;
   background-color: #fff;
   border-radius: 20rpx;
@@ -74,26 +74,20 @@ page{
   flex-direction: column;
 }
 .cash_top{
-  margin-top:30rpx;
+  margin-top: 20rpx;
   display: flex;
   flex: 3;
 }
 .cash_bottom{
-  padding:20rpx 20rpx 30rpx;
   border-top: 1px solid #E5E5E5;
- 
+  flex: 1.2;
+  color: #3CC7C0;
   font-size: 32rpx;
   display: flex;
-
+  align-items: center;
-  flex-direction: column;
+  justify-content: flex-end;
   padding-right: 20rpx;
 }
-.cash_bottom .title{
-  margin-top: 10rpx;
-  font-size: 30rpx;
- 
-  color: #000000;
-}
 .cash_left{
   flex: 3;
   display: flex;
@@ -110,12 +104,10 @@ page{
   flex: 2;
   display: flex;
   align-items: center;
-  font-size: 34rpx;
+  font-size: 64rpx;
 }
 .shui{
   flex: 1;
-  margin-top: 20rpx;
-  margin-bottom: 30rpx;
   display: flex;
   align-items: center;
   font-size: 28rpx;
@@ -162,31 +154,3 @@ page{
   color: #3CC7C0;
 }
 
-.moneybox{
-  display: flex;
-}
-.moneybox{
-  display: flex;
-  margin-top: 20rpx;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.money .mark{
-  font-size: 42rpx;
-font-weight: 400;
-color: #333333;
-}
-.moneyNum{
-  font-size: 64rpx;
-font-family: ArialMT;
-color: #333333;
-}
-.tixian{
-  display: flex;
-  margin:0 30rpx;
-  color: #3CC7C0;
-  font-size: 32rpx;
-  align-items: center;
-  justify-content: flex-end;
-}

Pages/yishi/cashrecord/index.js

@@ -1,4 +1,4 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 
 const api = new API()
 const app = getApp()

Pages/yishi/cashrecord/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "van-icon": "@vant/weapp/icon/index",
     "van-empty": "@vant/weapp/empty/index",
     "van-image": "@vant/weapp/image/index",

Pages/yishi/cashrecord/index.wxml

@@ -1,6 +1,5 @@
 <!-- 提现记录 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
-<wxs src="../../../../filters/filter.wxs" module="moduleFilter"></wxs>
 <view class="container">
   <view class="top">
     <view class="top_txt" bindtap="onDatePicker">
@@ -11,24 +10,19 @@
 
     <view class="data_item" wx:for="{{record_list}}">
       <view class="data_item_top">
-      
+        <view class="data_item_top_icon">
-        <view class="data_item_top_content">
-         <view class="namebox">
-          <view class="data_item_top_icon">
           <van-image custom-style="" src="{{static_host}}/applet/doctor/static/images/yishi/bankcard/js_icon.png" fit="heightFix" height="50rpx" aria-label="role" />
         </view>
+        <view class="data_item_top_content">
           <view class="name">{{item.account_name}}<text style="margin-left:20rpx;font-size: 28rpx;color:#999;">（尾号{{item.bank_card_code_four}}）</text></view>
-         </view>
+          <view class="date">{{item.created_at}}</view>
-         <view class="status_box">
-            <!-- 审核状态（1:审核中 2:审核通过 3:审核未通过） -->
-            <view class="status {{item.examine_status==1?'paying':item.examine_status==2?'paysuccess':item.examine_status==3?'payfail':''}}">{{item.examine_status==1?'结算中':item.examine_status==2?'结算成功':item.examine_status==3?'结算失败':'未知'}}</view>
-          </view>
-        
         </view>
         <view class="data_item_top_num">
-          <view class="date">{{moduleFilter.transforDay(item.created_at,"noyear")}}</view>
+          <view class="jine">￥{{item.actual_withdrawal_amount}}</view>
-          <view class="jine"><text class="jinename">实际到账金额：</text>￥{{item.actual_withdrawal_amount}}</view>
+          <view class="status_box">
-          
+            <!-- 审核状态（1:审核中 2:审核通过 3:审核未通过） -->
+            <view class="status status_ing">{{item.examine_status==1?'审核中':item.examine_status==2?'审核通过':item.examine_status==3?'审核未通过':'未知'}}</view>
+          </view>
         </view>
       </view>
       <view class="data_item_bottom">个人所得税：￥{{item.income_tax}}</view>

Pages/yishi/cashrecord/index.wxss

@@ -25,57 +25,46 @@ page{
 .data_item{
   display: flex;
   flex-direction: column;
-  margin-bottom: 20rpx;
+  margin-bottom: 50rpx;
+  height: 200rpx;
   background-color: #ffffff;
   border-radius: 20rpx;
-  padding: 30rpx 0 0 0;
+  padding: 20rpx 0 0 0;
 }
 .data_item_top{
-  margin:0 30rpx;
+  flex: 2;
+  display: flex;
   border-bottom: 1px solid #E7E7E7;
 }
 .data_item_top_icon{
-
+  flex: 1;
   text-align: center;
-
+  height: 70%;
+  align-self: start;
 }
 .data_item_top_content{
- 
+  flex: 3;
- justify-content: space-between;
   display: flex;
+  flex-direction: column;
 }
 .name{
-  margin-left: 10rpx;
   font-size: 32rpx;
   color: #333333;
- 
+  flex: 1;
 }
 .date{
+  flex: 1;
   font-size: 28rpx;
-  display: flex;
- margin-left: 28rpx;
   color: #999999;
-  white-space: nowrap;
 }
 .data_item_top_num{
-  justify-content: space-between;
+  flex: 2;
   display: flex;
-  align-items: center;
+  flex-direction: column;
-  margin:0 30rpx 25rpx;
+  justify-content: space-between;
-
   text-align: center;
 }
-.jinename{
-  font-size: 30rpx;
-  font-weight: 400;
-  color: #666666;
-}
-.namebox{
-  display: flex;
-}
 .jine{
-  display: flex;
-  align-items: center;
   color: #FF0000;
   font-size: 34rpx;
 }
@@ -84,38 +73,27 @@ page{
   justify-content: center;
 }
 .status{
-  width: 125rpx;
+  border-radius: 10px;
-  height: 50rpx;
-  background: #FFF2E8;
-  border-radius: 10rpx;
-  margin-bottom: 20rpx;
   font-size: 24rpx;
- font-weight: 400;
+  padding: 10rpx 40rpx;
- display: flex;
+  margin-bottom: 20rpx;
- align-items: center;
- justify-content: center;
- color: #FFFFFF;
 }
-.status.paying{
+.status_ing{
-  background: #FFF2E8;
+  background-color: #FFF2E8;
   color: #FA541C;
 }
-.status.paysuccess{
+.status_end{
-  background: #E2FFFE;
-  color: #3CC7C0;
-}
-.status.payfail{
   background-color: #C5C5C5;
   color: #FFFFFF;
 }
 .data_item_bottom{
-  padding:20rpx 30rpx 26rpx;
+  flex: 1;
   display: flex;
   align-items: center;
   justify-content: flex-end;
   margin-right: 20rpx;
   color: #666;
-  font-size: 28rpx;
+  font-size: 32rpx;
 }
 .t-picker__confirm{
   color: #3CC7C0 !important;

Pages/yishi/chat/index.js

@@ -6,16 +6,13 @@ Page({
     title: '',
     height: app.globalData.height,
     order_inquiry_id: "",
-    from:'',
     baseInfo: {}
   },
   onLoad(option) {
     // console.log("chat onload", option);
     let order_inquiry_id = option.order_inquiry_id;
-    let from=option.from;
     this.setData({
       order_inquiry_id: order_inquiry_id,
-      from:from?from:''
     })
     this.getInquiryMessageBasic();
   },
@@ -57,14 +54,6 @@ Page({
       this.setData({
         baseInfo: response.data
       })
-      let promise=wx.$TUIKit.getUserProfile({
-        userIDList: [response.data.patient_user_id] 
-      });
-      promise.then(function(imResponse) {
-          wx.setStorageSync('patient_avatar',imResponse.data[0].avatar);
-      }).catch(function(imError) {
-        console.warn('getUserProfile error:', imError); // 获取其他用户资料失败的相关信息
-      });
     }).then(res => {
       this.initChat();
     }).catch(errors => {console.error(errors);})

Pages/yishi/chat/index.json

@@ -1,6 +1,6 @@
 {
   "usingComponents": {
-   
+    "TUIChat": "../../../TUIKit/components/TUIChat/index"
   },
   "navigationStyle": "custom",
   "disableScroll":true

Pages/yishi/chat/index.wxml

@@ -1,5 +1,5 @@
 <!-- 一对一聊天  不带会话列表 -->
 <view>
     <TUIChat id="TUIChat" currentConversationID="C2C{{baseInfo.patient_user_id}}" inquiry_type="{{baseInfo.inquiry_type}}" order_inquiry_id="{{order_inquiry_id}}" baseInfo="{{baseInfo}}"
-    hasCallKit="{{ true }}" from="{{from}}" bind:handleCall="handleCall"></TUIChat>
+    hasCallKit="{{ true }}" bind:handleCall="handleCall"></TUIChat>
 </view>

Pages/yishi/chat_session/index.json

@@ -1,6 +1,6 @@
 {
   "usingComponents": {
-    "TUIKit": "../../../../TUIKit/index"
+    "TUIKit": "../../../TUIKit/index"
   },
     "navigationStyle": "custom"
 }

Pages/yishi/chufangsetup/index.js

@@ -1,4 +1,4 @@
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
 const api = new API()
 const app = getApp()
 Page({
@@ -14,7 +14,6 @@ Page({
     },
     prescription_status: 0,
     chufang_list_0: [],
-    chufang_list_1: [],
     chufang_list_2: [],
     current_page: 0,
     total: 0,
@@ -22,23 +21,13 @@ Page({
     last_page: 0,
     
   },
-  onLoad(options){
-    console.log(options.status)
-     if(options.status){
-       this.setData({
-        pharmacist_audit_status:options.status,
-        prescription_status:options.status
-       })
-     }
-  },
   onShow(){
-
     this.getList();
   },
   onTabsChange(e) {
-   // console.log(e);
+    console.log(e);
     let list_name = "chufang_list_" + e.detail.value;
-    //console.log(list_name)
+    console.log(list_name)
     this.setData({
       prescription_status: e.detail.value,
       current_page: 0,
@@ -74,10 +63,10 @@ Page({
     params.pharmacist_audit_status = this.data.prescription_status;//处方审核状态（0:审核中 2:审核驳回）
     params.page = this.data.current_page + 1;
     api.getDoctorPrescription(params).then(response => {
-      //console.log(response);
+      console.log(response);
       if(response.data.total > 0){
         let list_name = "chufang_list_" + this.data.prescription_status;
-        //console.log(list_name);
+        console.log(list_name);
         let apprise_list = this.data[list_name];
         this.setData({
           [list_name]: apprise_list.concat(response.data.data),
@@ -91,29 +80,12 @@ Page({
   },
   go(e){
     let url = e.currentTarget.dataset.url;
-    //console.log(url);
+    console.log(url);
     app.go(url);
   },
-  handlegetLastInquiry(patient_id,doctor_id,order_inquiry_id){
-    api.getLastInquiry({
-      patient_id:patient_id,
-      doctor_id:doctor_id
-    }).then(data=>{
-      let result=data.data;
-      let url='';
-      if(result){
-        url = "/TUIChatService/pages/index?order_inquiry_id="+result+"&from=prescription";
-      }else{
-        url = "/TUIChatService/pages/index?order_inquiry_id="+order_inquiry_id+"&from=prescription";
-       
-      }
-      
-      app.go(url);
-    })
-  },
   gochat(e){
-    let {order_inquiry_id,patient_id,doctor_id} = e.currentTarget.dataset;
+    let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
-     this.handlegetLastInquiry(patient_id,doctor_id,order_inquiry_id);
+    let url = "/Pages/yishi/chat/index?order_inquiry_id="+order_inquiry_id;
-   
+    app.go(url);
   }
 })

Pages/yishi/chufangsetup/index.json

@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
     "van-empty": "@vant/weapp/empty/index"

Pages/yishi/chufangsetup/index.wxml

@@ -2,23 +2,20 @@
 <view class="container">
   <view class="tabs">
     <t-tabs
-      value="{{prescription_status}}"
+      defaultValue="{{0}}"
       bind:change="onTabsChange"
       bind:click="onTabsClick"
       bind:scroll="onStickyScroll"
       t-class="custom-tabs"
     >
-     
+      <t-tab-panel label="审核中" value="0" style="overflow: scroll;">
-      <t-tab-panel label="审核中" name ="0" value="0" style="overflow: scroll;">
         <view class="item_list" style="overflow: scroll;">
           <view class="item" wx:for="{{chufang_list_0}}">
           
             <!-- 头部 -->
             <view class="item_top">
-              <view class="namebox">
               <view class="item_top_name">{{item.patient_name}}</view>
               <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
-             </view>
               <view class="item_top_status_box">
                 <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
                 <view class="item_top_status">
@@ -36,55 +33,7 @@
                 <view class="item_content_li_title">病情描述：</view>
                 <view class="item_content_li_txt">{{item.disease_desc}}</view>
               </view>
-              <view class="item_content_li" wx:if="{{item.diagnosis_date}}">
-                <view class="item_content_li_title">确诊日期：</view>
-                <view class="item_content_li_txt" >{{item.diagnosis_date}}</view>
-              </view>
               <view class="item_content_li">
-                <view class="item_content_li_title">病情诊断：</view>
-                <view class="item_content_li_txt">
-                  <text wx:for="{{item.order_prescription_icd}}" wx:for-item="icd">{{icd.icd_name}};</text>
-                </view>
-              </view>
-            </view>
-            <!-- 底部按钮 -->
-            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}" data-doctor_id="{{item.doctor_id}}"  data-patient_id="{{item.patient_id}}">
-              <view class="item_bottom_btn" >问诊记录</view>
-            </view>
-          </view>
-          
-          <van-empty description="暂无数据" wx:if="{{chufang_list_0.length == 0}}" />
-        </view>
-      </t-tab-panel>
-       <!-- 审核通过面板 -->
-       <t-tab-panel label="审核通过" value="1"  name ="1" style="overflow: scroll;">
-        <view class="item_list" style="overflow: scroll;">
-          <view class="item" wx:for="{{chufang_list_1}}">
-          
-            <!-- 头部 -->
-            <view class="item_top">
-              <view class="namebox">
-              <view class="item_top_name">{{item.patient_name}}</view>
-              <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
-             </view>
-              <view class="item_top_status_box">
-                <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
-                <view class="item_top_status">
-                {{item.pharmacist_audit_status==0?'审核中':item.pharmacist_audit_status==1?'审核成功':'审核驳回'}}
-                </view>
-              </view>
-            </view>
-            <!-- 中间内容部分 -->
-            <view class="item_content">
-              <view class="item_content_li">
-                <view class="item_content_li_title">开方时间：</view>
-                <view class="item_content_li_txt">{{item.created_at}}</view>
-              </view>
-              <view class="item_content_li">
-                <view class="item_content_li_title">病情描述：</view>
-                <view class="item_content_li_txt">{{item.disease_desc}}</view>
-              </view>
-              <view class="item_content_li" wx:if="{{item.diagnosis_date}}">
                 <view class="item_content_li_title">确诊日期：</view>
                 <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
               </view>
@@ -96,25 +45,24 @@
               </view>
             </view>
             <!-- 底部按钮 -->
-            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}" data-doctor_id="{{item.doctor_id}}"  data-patient_id="{{item.patient_id}}">
+            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">
               <view class="item_bottom_btn">问诊记录</view>
             </view>
           </view>
           
-          <van-empty description="暂无数据" wx:if="{{chufang_list_1.length == 0}}" />
+          <van-empty description="暂无数据" wx:if="{{chufang_list_0.length == 0}}" />
         </view>
       </t-tab-panel>
+
       <!-- 驳回面板 -->
-      <t-tab-panel label="驳回" value="2"  name ="2" style="overflow: scroll;">
+      <t-tab-panel label="驳回" value="2" style="overflow: scroll;">
         <view class="item_list" style="overflow: scroll;">
 
           <view class="item" wx:for="{{chufang_list_2}}">
             <!-- 头部 -->
             <view class="item_top">
-             <view class="namebox">
               <view class="item_top_name">{{item.patient_name}}</view>
               <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
-             </view>
               <view class="item_top_status_box">
                 <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
                 <view class="item_top_status item_top_status_no">
@@ -132,7 +80,7 @@
                 <view class="item_content_li_title">病情描述：</view>
                 <view class="item_content_li_txt">{{item.disease_desc}}</view>
               </view>
-              <view class="item_content_li" wx:if="{{item.diagnosis_date}}">
+              <view class="item_content_li">
                 <view class="item_content_li_title">确诊日期：</view>
                 <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
               </view>
@@ -147,8 +95,8 @@
             </view>
             <!-- 底部按钮 -->
             <view class="item_bottom">
-              <view class="item_bottom_btn" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}" data-doctor_id="{{item.doctor_id}}"  data-patient_id="{{item.patient_id}}">问诊记录</view>
+              <view class="item_bottom_btn" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">问诊记录</view>
-              <view class="item_bottom_btn item_bottom_btn_repeat" bindtap="go" data-url="/user/pages/yishi/onlinechufang/index?order_inquiry_id={{item.order_inquiry_id}}&order_prescription_id={{item.order_prescription_id}}">
+              <view class="item_bottom_btn item_bottom_btn_repeat" bindtap="go" data-url="/Pages/yishi/onlinechufang/index?order_inquiry_id={{item.order_inquiry_id}}&order_prescription_id={{item.order_prescription_id}}">
                   重开处方
               </view>
             </view>

Pages/yishi/chufangsetup/index.wxss

@@ -23,14 +23,10 @@ page{
   background-color: #fff;
   margin: 20rpx 0;
 }
-.namebox{
-  display: flex;
-}
 .item_top{
   position: relative;
   height: 100rpx;
   display: flex;
-  justify-content:space-between;
   align-items: center;
   padding: 0 32rpx;
 }
@@ -46,17 +42,16 @@ page{
   transform: scaleY(0.5);
 }
 .item_top_name{
- 
+  flex: 1;
   color: #3CC7C0;
   font-size: 34rpx;
 }
 .item_top_sex{
- margin-left: 30rpx;
+  flex: 1;
   font-size: 34rpx;
   color: #666;
 }
 .item_top_status_box{
- 
 }
 .item_top_status{
   padding: 10rpx;
@@ -83,7 +78,6 @@ page{
 .item_content_li_txt{
   margin-left: 10rpx;
   flex: 1;
-  word-break: break-all;
   color: #666666;
   font-size: 28rpx;
 }

Pages/yishi/identity/index.js

@@ -1,6 +1,6 @@
 // Pages/yishi/identity/index.js
-import { API } from '../../../../utils/network/api'
+import { API } from './../../../utils/network/api'
-import { FileUtil } from '../../../utils/fileutil'
+import { FileUtil } from './../../../utils/fileutil'
 
 const api = new API()
 const app = getApp()
@@ -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){

Pages/yishi/identity/index.json

@@ -1,8 +1,8 @@
 {
   "component": true,
   "usingComponents": {
-    "te-nav-bar": "../../../../commpents/te_navbar/index",
+    "te-nav-bar": "/commpents/te_navbar",
-    "myprofile": "../../../commpents/myprofile/index",
+    "myprofile": "/commpents/myprofile/index",
     "t-tabs": "tdesign-miniprogram/tabs/tabs",
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
     "t-cell": "tdesign-miniprogram/cell/cell",

Pages/yishi/index/index.js

@@ -10,7 +10,6 @@ Page({
     title: "肝胆相照互联网医院",
     navHeight: 0,
     stateHeight: 0,
-    doctor_inquiry_config:null,
     info:{
       user_name: "医师姓名",
       not_accepted_inquiry_num: 0,
@@ -22,15 +21,14 @@ Page({
       avg_response_time: 0,
       number_of_fans: 0,
       avatar: api.getStaticHost()+"/applet/doctor/static/images/default_photo.png",
-      introduction_status:'',
       reject_prescription_number: false,//处方管理小红点
     },
     static_host: api.getStaticHost(),
     iden_auth_status_txt: "未认证",
     multi_point_status_txt: "未认证",
     shiming_status_url: "",
-    iden_auth_status_url: "/user/pages/yishi/identity/index",
+    iden_auth_status_url: "/Pages/yishi/identity/index",
-    multi_point_status_url: "/user/pages/yishi/zhiye_identity/index",
+    multi_point_status_url: "/Pages/yishi/zhiye_identity/index",
     duration: 500,
     interval: 5000,
     swiperList: [],
@@ -64,31 +62,31 @@ Page({
         case_status: 0,
         case_module: [0,1,2,3,4,5,6,7,8],
         case_text: "请您先完成实名认证",
-        case_url: "/user/pages/yishi/identity/index"
+        case_url: "/Pages/yishi/identity/index"
       },
       {
         case_status: 1,
         case_module: [0,1,2,3,4,5,6,7,8],
         case_text: "请您先医师身份认证",
-        case_url: "/user/pages/yishi/identity/index?selected_tab=1"
+        case_url: "/Pages/yishi/identity/index?selected_tab=1"
       },
       {
         case_status: 2,
         case_module: [0,1,2,3,4,5,6,7,8],
         case_text: "请您先绑定结算银行卡",
-        case_url: "/user/pages/yishi/bankcard/index"
+        case_url: "/Pages/yishi/bankcard/index"
       },
       {
         case_status: 3,
         case_module: [7],
         case_text: "请您先进行多点执业认证",
-        case_url: "/user/pages/yishi/zhiye_identity/index"
+        case_url: "/Pages/yishi/zhiye_identity/index"
       },
       {
         case_status: 4,
         case_module: [7],
         case_text: "请您先进行多点执业认证",
-        case_url: "/user/pages/yishi/zhiye_identity/index"
+        case_url: "/Pages/yishi/zhiye_identity/index"
       },
       {
         case_status: 5,
@@ -160,7 +158,7 @@ Page({
       wx.setStorageSync('overlay_show', "1")
     }
 
-    app.go("/user/pages/yishi/manual_detail/index?manual_id=1")
+    app.go("/Pages/yishi/manual_detail/index?manual_id=1")
   },
   cancelJieSuanDialog(){
     this.setData({
@@ -242,7 +240,7 @@ Page({
     this.getMenuButtonBound();
     
     api.yiShiIndex().then(response => {
-      console.log(response);
+      // console.log(response);
       let avatar = response.data.info.avatar;
       this.setData({
         "info.user_name": response.data.info.user_name,
@@ -250,9 +248,7 @@ Page({
         "info.accepting_inquiry_num": response.data.info.accepting_inquiry_num,
         "info.praise_rate": response.data.info.praise_rate,
         "info.avg_response_time": response.data.info.avg_response_time,
-        "info.introduction_status":response.data.info.introduction_status,
         "info.number_of_fans": response.data.info.number_of_fans,
-        doctor_inquiry_config:response.data.doctor_inquiry_config
       })
       if(avatar){
         this.setData({
@@ -268,68 +264,32 @@ Page({
       let multi_point_status = response.data.info.multi_point_status;
       //绑定结算银行卡
       let is_bind_bank = response.data.info.is_bind_bank;
-      api.getDoctorService(response.data.info.doctor_id).then(res=>{
+      //是否参加专家图文接诊（0:否 1:是）
-        if(res.code==200){
+      let is_img_expert_reception = response.data.info.is_img_expert_reception;
-            let result=res.data;
+      //是否参加专家快速接诊（0:否 1:是）
-           for (let i = 0; i < result.length; i++) {
+      let is_img_quick_reception = response.data.info.is_img_quick_reception;
-             if(result[i].inquiry_type=1 && result[i].inquiry_mode==1 && result[i].is_enable==1){
+      //是否参加专家公益接诊（0:否 1:是）
-               this.setData({
+      let is_img_welfare_reception = response.data.info.is_img_welfare_reception;
-                  '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:是）
-      // let is_img_quick_reception = response.data.info.is_img_quick_reception;
-      // //是否参加专家公益接诊（0:否 1:是）
-      // let is_img_welfare_reception = response.data.info.is_img_welfare_reception;
 
       this.setData({
         "info.idcard_status": idcard_status,
         "info.iden_auth_status": iden_auth_status,
         "info.multi_point_status": multi_point_status,
         "info.is_bind_bank": is_bind_bank,
-        // "info.is_img_expert_reception": is_img_expert_reception,
+        "info.is_img_expert_reception": is_img_expert_reception,
-        // "info.is_img_quick_reception": is_img_quick_reception,
+        "info.is_img_quick_reception": is_img_quick_reception,
-        // "info.is_img_welfare_reception": is_img_welfare_reception,
+        "info.is_img_welfare_reception": is_img_welfare_reception,
       });
 
       //iden_auth_status 0:未认证 1:认证通过 2:审核中 3:认证失败
       if(iden_auth_status == 0) this.setData({iden_auth_status_txt: "未认证"});
-      if(iden_auth_status == 1) this.setData({iden_auth_status_txt: "已认证", iden_auth_status_url: "/user/pages/yishi/attestation/index"});
+      if(iden_auth_status == 1) this.setData({iden_auth_status_txt: "已认证", iden_auth_status_url: "/Pages/yishi/attestation/index"});
       if(iden_auth_status == 2) this.setData({iden_auth_status_txt: "审核中"});
       if(iden_auth_status == 3) this.setData({iden_auth_status_txt: "认证失败"});
 
       //multi_point_status 0:未认证 1:认证通过 2:审核中 3:认证失败
       if(multi_point_status == 0) this.setData({multi_point_status_txt: "未认证"});
-      if(multi_point_status == 1) this.setData({multi_point_status_txt: "已认证", multi_point_status_url: "/user/pages/yishi/practicing/index"});
+      if(multi_point_status == 1) this.setData({multi_point_status_txt: "已认证", multi_point_status_url: "/Pages/yishi/practicing/index"});
       if(multi_point_status == 2) this.setData({multi_point_status_txt: "审核中"});
       if(multi_point_status == 3) this.setData({multi_point_status_txt: "认证失败"});
 
@@ -376,7 +336,7 @@ Page({
     if(open_with == 1){//小程序页面
       app.go(banner_link);
     }else if(open_with == 2){//webview 页面
-      app.go("/user/pages/webpage/index?src="+banner_link);
+      app.go("/Pages/webpage/index?src="+banner_link);
     }
   },
   onChangeAD(e) {
@@ -404,7 +364,7 @@ Page({
     if(idcard_status != 1){
       this.setData({
         dialog_content: "请您先完成实名认证",
-        shiming_status_url: "/user/pages/yishi/identity/index",
+        shiming_status_url: "/Pages/yishi/identity/index",
         dialog_visible: true,
       });
       return;
@@ -412,7 +372,7 @@ Page({
     if(iden_auth_status != 1){
       this.setData({
         dialog_content: "请您先医师身份认证",
-        shiming_status_url: "/user/pages/yishi/identity/index?selected_tab=1",
+        shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
         dialog_visible: true,
       });
       return;
@@ -420,7 +380,7 @@ Page({
     if(is_bind_bank != 1){
       this.setData({
         dialog_content: "请您先绑定结算银行卡",
-        shiming_status_url: "/user/pages/yishi/bankcard/index",
+        shiming_status_url: "/Pages/yishi/bankcard/index",
         dialog_visible: true,
       });
       return;
@@ -450,7 +410,12 @@ Page({
      let multi_point_status = this.data.info.multi_point_status;
       //绑定结算银行卡
      var is_bind_bank = this.data.info.is_bind_bank;
-
+        //是否参加专家图文接诊（0:否 1:是）
+    let is_img_expert_reception = this.data.info.is_img_expert_reception;
+    //是否参加专家快速接诊（0:否 1:是）
+    let is_img_quick_reception = this.data.info.is_img_quick_reception;
+    //是否参加专家公益接诊（0:否 1:是）
+    let is_img_welfare_reception = this.data.info.is_img_welfare_reception;
 
      let usertype =  wx.getStorageSync('usertype');
      let userID = wx.getStorageSync('user_id_'+usertype);
@@ -469,8 +434,8 @@ Page({
         "info.info_shiming_status_txt": "未认证",
         "info.info_shiming_status": "info_shiming_status_no",
         dialog_content: "请您先完成实名认证",
-        shiming_status_url: "/user/pages/yishi/identity/index",
+        shiming_status_url: "/Pages/yishi/identity/index",
-        dialog_url: "/user/pages/yishi/identity/index",
+        dialog_url: "/Pages/yishi/identity/index",
         default_dialog_show: true
       });
       return false;
@@ -485,8 +450,8 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "认证失败",
         "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/user/pages/yishi/identity/index",
+        shiming_status_url: "/Pages/yishi/identity/index",
-        dialog_url: "/user/pages/yishi/identity/index",
+        dialog_url: "/Pages/yishi/identity/index",
         dialog_content: "实名认证失败",
         default_dialog_show: true
       });
@@ -502,8 +467,8 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "前往医师身份认证",
         "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/user/pages/yishi/identity/index?selected_tab=1",
+        shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
-        dialog_url: "/user/pages/yishi/identity/index?selected_tab=1",
+        dialog_url: "/Pages/yishi/identity/index?selected_tab=1",
         dialog_content: "请您先医师身份认证",
         default_dialog_show: true
       });
@@ -518,8 +483,8 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "审核中",
         "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/user/pages/yishi/identity/index?selected_tab=1",
+        shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
-        dialog_url: "/user/pages/yishi/identity/index?selected_tab=1",
+        dialog_url: "/Pages/yishi/identity/index?selected_tab=1",
         // dialog_content: "您的医师身份认证正在审核中",
         // default_dialog_show: true
       });
@@ -534,8 +499,8 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "认证失败",
         "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/user/pages/yishi/identity/index?selected_tab=1",
+        shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1",
-        dialog_url: "/user/pages/yishi/identity/index?selected_tab=1",
+        dialog_url: "/Pages/yishi/identity/index?selected_tab=1",
         dialog_content: "您的医师身份认证失败",
         // default_dialog_show: true
       });
@@ -552,8 +517,8 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "绑定结算银行卡",
         "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/user/pages/yishi/bankcard/index",
+        shiming_status_url: "/Pages/yishi/bankcard/index",
-        dialog_url: "/user/pages/yishi/bankcard/index",
+        dialog_url: "/Pages/yishi/bankcard/index",
         dialog_content: "请您先绑定结算银行卡",
         default_dialog_show: true
       });
@@ -570,7 +535,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "前往多点执业认证",
         "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/user/pages/yishi/zhiye_identity/index",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "请您先进行多点执业认证",
         // default_dialog_show: true
       });
@@ -586,7 +551,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "审核中",
         "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/user/pages/yishi/zhiye_identity/index",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "您的多点执业认证正在审核中",
         // default_dialog_show: true
       });
@@ -602,7 +567,7 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "认证失败",
         "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/user/pages/yishi/zhiye_identity/index",
+        shiming_status_url: "/Pages/yishi/zhiye_identity/index",
         dialog_content: "您的多点执业认证失败",
         // default_dialog_show: true
       });
@@ -616,14 +581,8 @@ Page({
       });
       wx.setStorageSync('jiesuan_dialog_show', true);
     }
-  
+
-    let flag=false;
+    if((is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) == 0){
-    if(this.data.doctor_inquiry_config){
-      flag=this.data.doctor_inquiry_config.every((item)=>{
-        return item.is_enable==0
-      })
-    };
-    if(!this.data.doctor_inquiry_config || flag){
       if(!this.data.default_dialog_show){
         this.setData({
           // dialog_visible: true,
@@ -632,13 +591,13 @@ Page({
       this.setData({
         "info.info_shiming_status_txt": "开启在线问诊",
         "info.info_shiming_status": "info_shiming_status_yes",
-        shiming_status_url: "/user/pages/yishi/onlinesetup/index",
+        shiming_status_url: "/Pages/yishi/onlinesetup/index",
         // default_dialog_show: true
       });
       return false;
     }
-    //(is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) > 0
+
-    if(this.data.doctor_inquiry_config && !flag){
+    if((is_img_expert_reception + is_img_quick_reception + is_img_welfare_reception) > 0){
       if(!this.data.default_dialog_show){
         this.setData({
           // dialog_visible: true,
@@ -652,6 +611,29 @@ Page({
       });
       return false;
     }
+
+    
+    
+    //开启在线问诊
+    // var is_img_expert_reception = this.data.info.is_img_expert_reception;
+    // if(is_img_expert_reception == 0 ){
+    //   if(!this.data.default_dialog_show){
+    //       this.setData({
+    //         // dialog_visible: true,
+    //     });
+    //   }
+    //   this.setData({
+    //     "info.info_shiming_status_txt": "开启在线问诊",
+    //     "info.info_shiming_status": "info_shiming_status_yes",
+    //     shiming_status_url: "/Pages/yishi/onlinesetup/index",
+    //     dialog_content: "请您先前往在线问诊管理中，开通在线问诊",
+    //     default_dialog_show: true
+    //   })
+    //   return false;
+    // }
+
+   
+
     this.setData({
       "info.info_shiming_status_txt": "去接诊",
       shiming_status_url: "/Pages/yishi/wenzhen_v2/wenzhen",

Pages/yishi/index/index.json

@@ -3,9 +3,9 @@
   "usingComponents": {
     "t-avatar": "tdesign-miniprogram/avatar/avatar",
     "van-button": "@vant/weapp/button/index",
+    "t-swiper": "tdesign-miniprogram/swiper/swiper",
     "t-badge": "tdesign-miniprogram/badge/badge",
     "t-dialog": "tdesign-miniprogram/dialog/dialog",
-    "van-icon": "@vant/weapp/icon/index",
     "van-image": "@vant/weapp/image/index",
     "t-skeleton": "tdesign-miniprogram/skeleton/skeleton",
     "van-overlay": "@vant/weapp/overlay/index"

Pages/yishi/index/index.wxml

@@ -10,7 +10,7 @@
   <view class="info_box">
     <view class="info">
       <view class="info_top">
-        <view class="info_photo" bindtap="go" data-url="/user/pages/yishi/myinfo/index">
+        <view class="info_photo" bindtap="go" data-url="/Pages/yishi/myinfo/index">
           <!-- 跳转我的信息 -->
             <t-avatar alt="头像" class="avatar" size="medium" image="{{info.avatar}}"  wx:if="{{!skeleton_loading}}"/>
             <!-- 骨架屏 -->
@@ -56,7 +56,7 @@
     <view class="renzheng_left" wx:if="{{skeleton_loading}}">
       <t-skeleton theme="image" row-col="{{[1]}}" animation="gradient" loading="{{skeleton_loading}}" />
     </view>
-    <view class="renzheng_left" bindtap="go" data-url="/user/pages/yishi/identity/index" wx:if="{{!skeleton_loading}}">
+    <view class="renzheng_left" bindtap="go" data-url="/Pages/yishi/identity/index" wx:if="{{!skeleton_loading}}">
       <view class="renzheng_content_left">
         <view class="renzheng_content_name">医师身份认证</view>
         <view class="renzheng_content_status">
@@ -75,7 +75,7 @@
     <view class="renzheng_right" wx:if="{{skeleton_loading}}">
       <t-skeleton theme="image" row-col="{{[1,1,1]}}" animation="gradient" loading="{{skeleton_loading}}" />
     </view>
-    <view class="renzheng_right" bindtap="gozhiye" data-url="/user/pages/yishi/zhiye_identity/index" wx:if="{{!skeleton_loading}}">
+    <view class="renzheng_right" bindtap="gozhiye" data-url="/Pages/yishi/zhiye_identity/index" wx:if="{{!skeleton_loading}}">
       <view class="renzheng_content_left">
         <view class="renzheng_content_name">多点执业认证</view>
         <view class="renzheng_content_status">
@@ -94,6 +94,18 @@
   </view>
   <!-- 广告版块 -->
   <view class="ad">
+    <!-- <t-swiper
+      height="110rpx"
+      duration="{{duration}}"
+      interval="{{interval}}"
+      navigation="{{ { type: 'dots' } }}"
+      list="{{swiperList}}"
+      bind:click="onTapAD"
+      bind:change="onChangeAD"
+      data-url="123"
+      wx:if="{{!skeleton_loading}}"
+    >
+    </t-swiper> -->
     <swiper class="swiper" indicator-dots="{{true}}" circular="{{true}}"  indicator-active-color="#3CC7C0" autoplay="{{true}}" interval="3000">
         <block wx:for="{{banner}}" wx:key="*this">
           <swiper-item>
@@ -106,16 +118,15 @@
   </view>
   <!-- 功能模块 -->
   <view class="fun_box">
-    <view bindtap="go" data-moudle="3" data-url="/user/pages/yishi/myprofile/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
+    <view bindtap="go" data-moudle="3" data-url="/Pages/yishi/myprofile/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
           fit="heightFix"
           height="70rpx"
           src="{{static_host}}/applet/doctor/static/images/yishi/jianjie.png"
         />
       <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="/Pages/yishi/onlinesetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
@@ -123,7 +134,7 @@
         />
       <text class="fun_box_item_txt">在线问诊管理</text>
     </view>
-    <view bindtap="go" data-moudle="5" data-url="/user/pages/yishi/kuaisusetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
+    <view bindtap="go" data-moudle="5" data-url="/Pages/yishi/kuaisusetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
@@ -131,7 +142,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="/Pages/yishi/yizhensetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
@@ -139,7 +150,7 @@
         />
       <text class="fun_box_item_txt">公益问诊管理</text>
     </view>
-    <view bindtap="go" data-moudle="7" data-url="/user/pages/yishi/chufangsetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
+    <view bindtap="go" data-moudle="7" data-url="/Pages/yishi/chufangsetup/index" class="fun_box_item" style="height: {{funbox_height}}rpx;">
       <van-image class="fun_box_item_img"
       fit="widthFix"
       width="70rpx"
@@ -199,7 +210,19 @@
   <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelContactDialog">
     取消
   </view>
+  <!-- <view slot="confirm-btn" class="dialog dialog_confirm_btn" open-type="contact">
+    <t-button theme="primary" size="large" open-type="contact">确认</t-button>
+  </view> -->
   </t-dialog>
+
+  <!-- <van-dialog
+    title="立即联系客服"
+    show="{{ contactKeFu }}"
+    show-cancel-button
+    confirm-button-color="#3CC7C0"
+    confirm-button-open-type="contact"
+  /> -->
+
   <van-overlay show="{{ overlay_show }}" z-index="999999999999">
     <van-image class="overlay_show"
       fit="widthFix"
@@ -222,6 +245,7 @@
     确定
   </view>
 </t-dialog>
+
 </view>