diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml index 625cfb6..71911e1 100644 --- a/Pages/login/index.wxml +++ b/Pages/login/index.wxml @@ -1,6 +1,6 @@ - + {{ navbarData.title }} diff --git a/Pages/login/index.wxss b/Pages/login/index.wxss index c1bbc34..3a3756a 100644 --- a/Pages/login/index.wxss +++ b/Pages/login/index.wxss @@ -7,7 +7,7 @@ top: 0; width: 750rpx; height: 170rpx; - background-color: #69d85f; + background-color: #ffffff; z-index: 99; } .tui-navigatorbar-back{ diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml index 3dfcddc..12c0ed4 100644 --- a/Pages/mobile_login/index.wxml +++ b/Pages/mobile_login/index.wxml @@ -7,12 +7,14 @@ model:value="{{ phone }}" label="+86" placeholder="请输入手机号" + type="number" input-align="left" /> - 请确定开户人姓名与账户医生的姓名一致 + + 请确定开户人姓名与账户医生的姓名一致 @@ -19,6 +20,8 @@ placeholder="请输入卡号" model:value="{{ bankcard }}" input-align="right" + type="number" + clearable placeholder-style="font-size: 16px;" > 银行卡号 diff --git a/Pages/yishi/bindcard/index.wxss b/Pages/yishi/bindcard/index.wxss index f979002..50c7748 100644 --- a/Pages/yishi/bindcard/index.wxss +++ b/Pages/yishi/bindcard/index.wxss @@ -10,6 +10,8 @@ color: #3CC7C0; background-color: #F0FFFB; font-size: 30rpx; + display: flex; + align-items: center; } .bankcard{ margin-top: 20rpx; @@ -20,4 +22,16 @@ width: 92vw; margin: 50rpx auto; line-height: 50rpx; +} +.t-tabs__item--active{ + color: #49B9AD !important; +} +.t-tabs__track{ + background-color: #49B9AD !important; +} +.t-icon-check{ + color: #49B9AD !important; +} +.van-picker__confirm{ + color: #3cc7c0 !important; } \ No newline at end of file diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js index 542115a..6154f39 100644 --- a/Pages/yishi/identity/index.js +++ b/Pages/yishi/identity/index.js @@ -15,7 +15,7 @@ Page({ height: app.globalData.height, //选项卡 stickyProps: { - zIndex: 999999, + zIndex: 9, offsetTop: (app.globalData.height * 2) }, selected_tab: 0, diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml index 3784610..8b0f92e 100644 --- a/Pages/yishi/identity/index.wxml +++ b/Pages/yishi/identity/index.wxml @@ -26,6 +26,7 @@ placeholder-style="font-size:28rpx; color: #C5C8CB;" input-align="right" clearable + type="text" custom-style="font-size:30rpx;" disabled="{{next_btn_disabled}}" > diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss index a97e304..6d9a117 100644 --- a/Pages/yishi/identity/index.wxss +++ b/Pages/yishi/identity/index.wxss @@ -61,7 +61,10 @@ color: #49B9AD !important; } .t-tabs__track{ - background-color: var(--td-tab-track-color, var(--td-primary-color, #49B9AD)) !important; + background-color: #49B9AD !important; +} +.t-icon-check{ + color: #49B9AD !important; } .t-cell__note { font-size: 25rpx !important; @@ -171,4 +174,7 @@ .van-search { top: -270px !important; position: relative !important; +} +.van-picker__confirm{ + color: #3cc7c0 !important; } \ No newline at end of file diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js index 7613934..db5a047 100644 --- a/Pages/yishi/index/index.js +++ b/Pages/yishi/index/index.js @@ -8,7 +8,7 @@ Page({ navHeight: 0, stateHeight: 0, info:{ - user_name: "xxx", + user_name: "医师姓名", not_accepted_inquiry_num: 0, accepting_inquiry_num: 0, info_shiming_status_txt: "未认证", @@ -76,16 +76,23 @@ Page({ { case_status: 4, case_module: [7], - case_text: "请您先进行多点执业认证证" + case_text: "请您先多点执业认证" }, { case_status: 5, case_module: [], case_text: "已全部通过" }, + { + case_status: 6, + case_module: [7], + case_text: "请您先多点执业认证" + }, ], skeleton_loading: true, - contactKeFu: false + contactKeFu: false, + jiesuan_dialog_show: false, + jiesuan_dialog_visible: false }, // 获取状态栏信息 getMenuButtonBound() { @@ -106,7 +113,16 @@ Page({ stateHeight: stateHeight + top, // 状态栏高度 }); }, - + confirmJieSuanDialog(){ + this.setData({ + jiesuan_dialog_visible: false + }) + }, + cancelJieSuanDialog(){ + this.setData({ + jiesuan_dialog_visible: false + }) + }, onLoad(){ }, @@ -229,6 +245,7 @@ Page({ }, go(e){ let checkDialog = this.checkDialog(e); + console.log("checkDialog: ", checkDialog); if(checkDialog){ let url = e.currentTarget.dataset.url; console.log(url); @@ -343,7 +360,7 @@ Page({ "info.info_shiming_status_txt": "审核中", "info.info_shiming_status": "info_shiming_status_yes", shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1", - dialog_content: "您的医师身份认证正在审核中", + // dialog_content: "您的医师身份认证正在审核中", // default_dialog_show: true }); return false; @@ -385,7 +402,7 @@ Page({ if(multi_point_status == 0){ if(!this.data.default_dialog_show){ this.setData({ - dialog_visible: true, + // dialog_visible: true, }); } this.setData({ @@ -400,7 +417,7 @@ Page({ if(multi_point_status == 2){ if(!this.data.default_dialog_show){ this.setData({ - dialog_visible: true, + // dialog_visible: true, }); } this.setData({ @@ -415,7 +432,7 @@ Page({ if(multi_point_status == 3){ if(!this.data.default_dialog_show){ this.setData({ - dialog_visible: true, + // dialog_visible: true, }); } this.setData({ @@ -445,6 +462,14 @@ Page({ }) return false; } + + if(!app.globalData.jiesuan_dialog_show){ + this.setData({ + jiesuan_dialog_visible: true, + }); + app.globalData.jiesuan_dialog_show = true + } + this.setData({ "info.info_shiming_status_txt": "去接诊", shiming_status_url: "/Pages/yishi/wenzhen_v2/wenzhen", @@ -482,8 +507,8 @@ Page({ let is_bind_bank = this.data.info.is_bind_bank; //是否参加专家图文接诊（0:否 1:是） let is_img_expert_reception = this.data.info.is_img_expert_reception; - let status = 0; - + let statusArr = []; + // 未实名认证和医师身份认证 0 // 已实名认证，未医师身份认证 1 // 已实名认证和医师身份认证，未绑定结算银行卡 2 @@ -491,41 +516,52 @@ Page({ // 已实名认证和医师身份认证且绑定结算银行卡，开通了在线问诊，未开通多点执业认证 4 // 已实名认证和医师身份认证且绑定结算银行卡，开通了在线问诊，已开通多点执业认证 5 if(idcard_status == 0 && iden_auth_status == 0){ - status = 0; - }else if(idcard_status == 1 && iden_auth_status != 1){ - status = 1; - }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank != 1){ - status = 2; - }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception != 1){ - status = 3; - }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status != 1){ - status = 4; - }else{ - status = 5; + statusArr.push(0); + } + if(idcard_status == 1 && iden_auth_status != 1){ + statusArr.push(1); + } + if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank != 1){ + statusArr.push(2); + } + if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception != 1){ + statusArr.push(3); + } + if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status != 1){ + statusArr.push(4); + } + if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status == 1){ + statusArr.push(5); + } + if(idcard_status == 1 && iden_auth_status == 1 && multi_point_status != 1){ + statusArr.push(6); } - let now_case = this.data.mycase.find(item => { - return item.case_status == status; - }); - - console.log("now_case: ", now_case); - //所属模块 - let moudle = e.currentTarget.dataset.moudle; - console.log("moudle: ", moudle); - if(now_case){ - let now_moudle = now_case.case_module.find(item => { - return item == moudle; - }) - console.log("now_moudle: ", now_moudle); - if(now_moudle != undefined){ - this.setData({ - dialog_content: now_case.case_text, - dialog_visible: true - }); - return false; + let retult = true; + statusArr.forEach(status => { + let now_case = this.data.mycase.find(item => { + return item.case_status == status; + }); + console.log("now_case: ", now_case); + //所属模块 + let moudle = e.currentTarget.dataset.moudle; + console.log("moudle: ", moudle); + if(now_case){ + let now_moudle = now_case.case_module.find(item => { + return item == moudle; + }) + console.log("now_moudle: ", now_moudle); + if(now_moudle != undefined){ + this.setData({ + dialog_content: now_case.case_text, + dialog_visible: true + }); + retult = false; + return; + } } - } + }) - return true; + return retult; } }) \ No newline at end of file diff --git a/Pages/yishi/index/index.json b/Pages/yishi/index/index.json index 2408ea5..73081fe 100644 --- a/Pages/yishi/index/index.json +++ b/Pages/yishi/index/index.json @@ -6,6 +6,7 @@ "van-dialog": "@vant/weapp/dialog/index", "t-swiper": "tdesign-miniprogram/swiper/swiper", "t-badge": "tdesign-miniprogram/badge/badge", - "t-dialog": "tdesign-miniprogram/dialog/dialog" + "t-dialog": "tdesign-miniprogram/dialog/dialog", + "van-image": "@vant/weapp/image/index" } } \ No newline at end of file diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml index 82147a0..4edc999 100644 --- a/Pages/yishi/index/index.wxml +++ b/Pages/yishi/index/index.wxml @@ -22,8 +22,8 @@ - 新问诊：{{info.not_accepted_inquiry_num}} - 接诊中：{{info.accepting_inquiry_num}} + 新问诊：{{info.not_accepted_inquiry_num}} + 接诊中：{{info.accepting_inquiry_num}} @@ -50,8 +50,8 @@ - @@ -67,8 +67,8 @@ - @@ -91,38 +91,41 @@ - 简介管理 - 在线问诊管理 - 快速问诊管理 - 公益问诊管理 - @@ -130,8 +133,9 @@ - 联系客服 @@ -140,6 +144,7 @@ + + + + + 已了解 + + + 不了解 + + + + { + let is_open = this.data.info.is_open; + let note = this.data.note; + if(is_open == 1) note = this.data.open_note; + if(is_open == 0) note = this.data.close_note; + this.setData({ + note: note + }) + }).catch(errors => {console.error(errors);}) }, onChange({ detail }) { @@ -67,6 +76,15 @@ Page({ params.is_open = detail?1:0; api.putDoctorInquiryOpen(params).then(response => { console.log(response); + }).then(()=>{ + if(detail){ + wx.requestSubscribeMessage({ + tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'], + success (res) { + console.log(res);//同意授权 + } + }) + } }).catch(errors => {console.error(errors);}) }, @@ -75,29 +93,6 @@ Page({ url: "/Pages/yishi/wenzhen_v2/wenzhen" }) }, - onStepperChange(event) { - console.log(event.detail); - this.setData({ - "info.work_num_day": event.detail - }); - }, - onPriceChange(e){ - console.log(e.detail); - let value = e.detail.value; - let min = this.data.config.min_inquiry_price; - let max = this.data.config.max_inquiry_price; - if(value < min){ - value = min; - Toast.fail('价格不能低于' + min + '元'); - }else if(value >= min && value <=max ){ - value = value; - }else{ - value = max; - Toast.fail('价格不能高于' + max + '元'); - } - this.setData({ - "info.inquiry_price": value - }) - } + }) \ No newline at end of file diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js index c683bad..da2eba8 100644 --- a/Pages/yishi/my/index.js +++ b/Pages/yishi/my/index.js @@ -6,13 +6,13 @@ Page({ title: "个人中心", navHeight: 0, stateHeight: 0, - user_name: "", - iden_auth_status: "", - idcard_status: "", - multi_point_status: "", + user_name: "医师姓名", + iden_auth_status: "0", + idcard_status: "0", + multi_point_status: "0", avatar: "https://img.applets.igandanyiyuan.com/applet/doctor/static/images/default_photo.png", - balance_account: "", - estimate_income: "", + balance_account: "0", + estimate_income: "0", doctor_id: "" }, diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml index dc34f43..6303acb 100644 --- a/Pages/yishi/my/index.wxml +++ b/Pages/yishi/my/index.wxml @@ -1,19 +1,19 @@ {{ title }} - + - + - {{user_name}} + {{user_name}} - {{iden_auth_status==1?'已医师认证':'未医师认证'}}> - {{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}> + {{iden_auth_status==1?'已医师认证':'未医师认证'}}> + {{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}> - + diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss index 50b3661..4584c3e 100644 --- a/Pages/yishi/my/index.wxss +++ b/Pages/yishi/my/index.wxss @@ -108,7 +108,9 @@ border-radius: 20rpx; padding: 20rpx 0; } - +.t-badge__content-text { + line-height: 70rpx !important; +} diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js index 076d713..3cbd0b3 100644 --- a/Pages/yishi/myinfo/index.js +++ b/Pages/yishi/myinfo/index.js @@ -13,8 +13,9 @@ Page({ doctor_id: "", idcard_status: 0, iden_auth_status: 0, + is_bind_bank: 0, user_name: "", - brief_introduction: "我的简介", + brief_introduction: "点击编辑", v_show: false, v_message: "", next_url: "/Pages/yishi/identity/index" @@ -33,6 +34,13 @@ Page({ }) }).catch(errors => {console.error(errors);}) }, + onShow(){ + let user_id = wx.getStorageSync("user_id"); + let is_bind_bank = wx.getStorageSync(user_id+'_is_bind_bank'); + this.setData({ + is_bind_bank: is_bind_bank + }) + }, logOut(){ console.log("退出登录"); let usertype = wx.getStorageSync('usertype'); @@ -69,6 +77,14 @@ Page({ }) return; } + if(this.data.is_bind_bank != 1){ + this.setData({ + v_show: true, + v_message: "请您先绑定结算银行卡", + next_url: "/Pages/yishi/bankcard/index", + }) + return; + } app.go(e.currentTarget.dataset.url) }, go1(e){ @@ -83,6 +99,14 @@ Page({ app.go(e.currentTarget.dataset.url) }, go2(e){ + if(this.data.idcard_status != 1){ + this.setData({ + v_show: true, + v_message: "请先进行实名认证", + next_url: "/Pages/yishi/identity/index" + }) + return; + } if(this.data.iden_auth_status != 1){ this.setData({ v_show: true, @@ -94,7 +118,15 @@ Page({ app.go(e.currentTarget.dataset.url) }, goIn(){ + this.setData({ + v_show: false + }) app.go(this.data.next_url) + }, + cancelDialog(){ + this.setData({ + v_show: false + }) } }) \ No newline at end of file diff --git a/Pages/yishi/myinfo/index.json b/Pages/yishi/myinfo/index.json index cd86b08..50f4f38 100644 --- a/Pages/yishi/myinfo/index.json +++ b/Pages/yishi/myinfo/index.json @@ -5,6 +5,6 @@ "van-cell": "@vant/weapp/cell/index", "van-cell-group": "@vant/weapp/cell-group/index", "van-button": "@vant/weapp/button/index", - "van-dialog": "@vant/weapp/dialog/index" + "t-dialog": "tdesign-miniprogram/dialog/dialog" } } \ No newline at end of file diff --git a/Pages/yishi/myinfo/index.wxml b/Pages/yishi/myinfo/index.wxml index 0013b44..20f2995 100644 --- a/Pages/yishi/myinfo/index.wxml +++ b/Pages/yishi/myinfo/index.wxml @@ -2,21 +2,35 @@ - + - 退出登录 - + /> --> + + + + 取消 + + + 确定 + + + \ No newline at end of file diff --git a/Pages/yishi/myinfo/index.wxss b/Pages/yishi/myinfo/index.wxss index 1b690af..c1bc9b2 100644 --- a/Pages/yishi/myinfo/index.wxss +++ b/Pages/yishi/myinfo/index.wxss @@ -2,4 +2,18 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; +} +.dialog{ + width: 50%; + text-align: center; + height: 100rpx; + line-height: 100rpx; +} +.dialog_cancel_btn{ + border-top: 1px solid #E9E9E9; + border-right: 1px solid #E9E9E9; +} +.dialog_confirm_btn{ + border-top: 1px solid #E9E9E9; + color: #3CC7C0; } \ No newline at end of file diff --git a/Pages/yishi/myprofile/index.js b/Pages/yishi/myprofile/index.js index a296466..d2f2349 100644 --- a/Pages/yishi/myprofile/index.js +++ b/Pages/yishi/myprofile/index.js @@ -2,7 +2,7 @@ const app = getApp() Page({ data: { navbarData: { - showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 + showCapsule: 2, //是否显示左上角图标 1表示显示 0表示不显示 title: '我的简介', //导航栏 中间的标题 }, }, diff --git a/Pages/yishi/myprofile/index.wxss b/Pages/yishi/myprofile/index.wxss index 68b5268..ba4595b 100644 --- a/Pages/yishi/myprofile/index.wxss +++ b/Pages/yishi/myprofile/index.wxss @@ -46,4 +46,19 @@ } .van-cell--required::before { left: 4.7rem !important; +} +.required{ + color: #e34d59; +} +.van-picker__confirm{ + color: #3cc7c0 !important; +} +.t-tabs__item--active{ + color: #49B9AD !important; +} +.t-tabs__track{ + background-color: #49B9AD !important; +} +.t-icon-check{ + color: #49B9AD !important; } \ No newline at end of file diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml index 32a9bf2..3fd8665 100644 --- a/Pages/yishi/onlinechufang/index.wxml +++ b/Pages/yishi/onlinechufang/index.wxml @@ -116,6 +116,7 @@ { console.log(response); + }).then(()=>{ + if(detail){ + wx.requestSubscribeMessage({ + tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'], + success (res) { + console.log(res);//同意授权 + } + }) + } }).catch(errors => {console.error(errors);}) }, putDoctorInquiryConfig(){ //修改医生问诊配置 - let params = {}; - params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） - params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员） - params.inquiry_price = this.data.info.inquiry_price; - params.work_num_day = this.data.info.work_num_day; - api.putDoctorInquiryConfig(params).then(response => { - console.log(response); - Toast.success("修改成功"); - wx.switchTab({ - url: "/Pages/yishi/wenzhen_v2/wenzhen" - }) - }).catch(errors => {console.error(errors);}) + // let params = {}; + // params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） + // params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员） + // params.inquiry_price = this.data.info.inquiry_price; + // params.work_num_day = this.data.info.work_num_day; + // api.putDoctorInquiryConfig(params).then(response => { + // console.log(response); + // Toast.success("修改成功"); + // wx.switchTab({ + // url: "/Pages/yishi/wenzhen_v2/wenzhen" + // }) + // }).catch(errors => {console.error(errors);}) + + wx.switchTab({ + url: "/Pages/yishi/wenzhen_v2/wenzhen" + }) + }, onStepperChange(event) { console.log(event.detail); this.setData({ "info.work_num_day": event.detail }); + + this.updateConfig(); + }, onPriceChange(e){ console.log(e.detail); - this.checkPrice(e.detail.value) - this.setData({ - "info.inquiry_price": e.detail.value + let price = e.detail.value; + let check = this.checkPrice(price); + if(!check){ + price = this.data.info.inquiry_price + return + } + let result = this.updateConfig(price); + console.log("result result result:", result); + result.then((res)=>{ + console.log(res) + if(!res) price = this.data.info.inquiry_price + this.setData({ + "info.inquiry_price": price + }) }) }, myToast(message){ @@ -107,7 +137,7 @@ Page({ context: this, selector: '#t-toast', message: message, - theme: 'warning', + theme: 'success', direction: 'column', }); }, @@ -128,5 +158,24 @@ Page({ this.myToast(message); return false; } + }, + async updateConfig(price){ + //修改医生问诊配置 + let params = {}; + params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） + params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员） + params.inquiry_price = price; + params.work_num_day = this.data.info.work_num_day; + const result = await api.putDoctorInquiryConfig(params).then(response => { + console.log(response); + this.myToast("修改成功"); + return true; + }).catch(errors => { + console.error(errors); + return false; + }) + + console.log("updateConfig result result: ", result); + return result; } }) \ No newline at end of file diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml index d9646a2..fb84dd1 100644 --- a/Pages/yishi/onlinesetup/index.wxml +++ b/Pages/yishi/onlinesetup/index.wxml @@ -26,13 +26,13 @@ 每日接诊数量 - + 问诊单价（元） - + 元 diff --git a/Pages/yishi/quickreply/index.js b/Pages/yishi/quickreply/index.js index bec4627..55c2cb0 100644 --- a/Pages/yishi/quickreply/index.js +++ b/Pages/yishi/quickreply/index.js @@ -1,11 +1,12 @@ import { API } from './../../../utils/network/api' +import Toast from 'tdesign-miniprogram/toast/index'; const api = new API() const app = getApp() Page({ data: { navbarData: { - showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 + showCapsule: 2, //是否显示左上角图标 1表示显示 0表示不显示 title: '常用语', //导航栏 中间的标题 }, height: app.globalData.height, @@ -18,7 +19,17 @@ Page({ show: false, add_message: "", current_words_type: 1, - focus: true + focus: true, + words_css: "border-radius: 20rpx;margin-bottom: 20rpx;", + from: "" + }, + onLoad(options){ + let from = options.from; + if(from) { + this.setData({ + from: from + }) + } }, onTabChange(e){ this.setData({ @@ -45,17 +56,33 @@ Page({ api.postDoctorWords({words_type: words_type, words: words}).then(response => { console.log(response); - let list_name = "list_" + words_type; - let list = this.data[list_name]; - let obj = {}; - obj.words = words; - list.push(obj); - console.log(list_name); this.setData({ - [list_name]: list, add_message: "", show: false }) + }).then(()=>{ + this.getList(words_type) + }).catch(errors => {console.error(errors);}) + }, + delWords(e){ + console.log(e); + let words_type = this.data.current_words_type; + let doctor_words_id = e.currentTarget.dataset.doctor_words_id; + if(doctor_words_id == ""){ + Toast({ + context: this, + selector: '#t-toast', + message: '系统常用语,无法删除', + theme: 'warning', + direction: 'column', + }); + return + } + api.delDoctorWords({doctor_words_id: doctor_words_id}).then(response => { + console.log(response); + + }).then(()=>{ + this.getList(words_type) }).catch(errors => {console.error(errors);}) }, showAdd(){ @@ -63,7 +90,6 @@ Page({ show: true, }); }, - onClose() { this.setData({ show: false, @@ -73,5 +99,38 @@ Page({ this.setData({ focus: true }) + }, + wordsClose(e){ + console.log(e); + const { position, instance } = e.detail; + console.log(position) + console.log(instance) + switch (position) { + case 'left': + case 'cell': + instance.close(); + break; + case 'right': + Dialog.confirm({ + message: '确定删除吗？', + }).then(() => { + instance.close(); + }); + break; + } + }, + wordsOpen(e){ + console.log("open") + console.log(e); + }, + wordsClick(e){ + console.log("click") + console.log(e); + let words = e.currentTarget.dataset.words; + let from = this.data.from; + if(from){ + wx.setStorageSync('words', words); + wx.navigateBack() + } } }) \ No newline at end of file diff --git a/Pages/yishi/quickreply/index.json b/Pages/yishi/quickreply/index.json index 41f9533..cfe5079 100644 --- a/Pages/yishi/quickreply/index.json +++ b/Pages/yishi/quickreply/index.json @@ -7,6 +7,8 @@ "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel", "van-button": "@vant/weapp/button/index", "van-popup": "@vant/weapp/popup/index", - "van-field": "@vant/weapp/field/index" + "van-field": "@vant/weapp/field/index", + "van-swipe-cell": "@vant/weapp/swipe-cell/index", + "t-toast": "tdesign-miniprogram/toast/toast" } } \ No newline at end of file diff --git a/Pages/yishi/quickreply/index.wxml b/Pages/yishi/quickreply/index.wxml index 5ad237e..8f92b0e 100644 --- a/Pages/yishi/quickreply/index.wxml +++ b/Pages/yishi/quickreply/index.wxml @@ -4,6 +4,7 @@ - + + + + + 删除 + 添加常用语 - - - - + + + + + 删除 + 添加常用语 @@ -59,4 +77,5 @@ --> - \ No newline at end of file + + \ No newline at end of file diff --git a/Pages/yishi/quickreply/index.wxss b/Pages/yishi/quickreply/index.wxss index 08c4d3f..a0f9d85 100644 --- a/Pages/yishi/quickreply/index.wxss +++ b/Pages/yishi/quickreply/index.wxss @@ -55,4 +55,13 @@ page{ } .popup_box_content{ flex: 5; +} +.delWords{ + background-color: red; + height: 100%; + display: flex; + align-items: center; + width: 65px; + justify-content: center; + color: #fff; } \ No newline at end of file diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index 4c4717b..6093403 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -227,10 +227,12 @@ Page({ let session_data_list_2 = []; let session_data_list_3 = []; let session_data_list_4 = []; + let session_data_list_5 = []; session_list.push(session_data_list_1); session_list.push(session_data_list_2); session_list.push(session_data_list_3); session_list.push(session_data_list_4); + session_list.push(session_data_list_5); this.data.conversationList.forEach(item => { let conversationID = item.conversationID; @@ -274,7 +276,7 @@ Page({ data_list_4: session_data_list_4, }) - if(session_data_list_1.length > 0 && session_data_list_2.length > 0 && session_data_list_3.length > 0 && session_data_list_4.length > 0 && session_data_list_5.length > 0){ + if(session_data_list_1.length == 0 && session_data_list_2.length == 0 && session_data_list_3.length == 0 && session_data_list_4.length == 0 && session_data_list_5.length == 0){ this.setData({has_data: false}) }else{ this.setData({has_data: true}) diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js index 1443d0b..134c366 100644 --- a/Pages/yishi/yizhensetup/index.js +++ b/Pages/yishi/yizhensetup/index.js @@ -39,7 +39,7 @@ Page({ }, onLoad(){ - this.setData({ note: this.data.open_note }); + }, onShow(){ let params = {}; @@ -54,6 +54,14 @@ Page({ }) this.formatAmounts(); this.formatAmountValue(); + }).then(re =>{ + let is_open = this.data.info.is_open; + let note = this.data.note; + if(is_open == 1) note = this.data.open_note; + if(is_open == 0) note = this.data.close_note; + this.setData({ + note: note + }) }).catch(errors => {console.error(errors);}) }, formatAmounts(){ @@ -91,6 +99,15 @@ Page({ params.is_open = detail?1:0; api.putDoctorInquiryOpen(params).then(response => { console.log(response); + }).then(()=>{ + if(detail){ + wx.requestSubscribeMessage({ + tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'], + success (res) { + console.log(res);//同意授权 + } + }) + } }).catch(errors => {console.error(errors);}) }, @@ -104,9 +121,6 @@ Page({ api.putDoctorInquiryConfig(params).then(response => { console.log(response); Toast.success("修改成功"); - wx.switchTab({ - url: "/Pages/yishi/wenzhen_v2/wenzhen" - }) }).catch(errors => {console.error(errors);}) }, onStepperChange(event) { @@ -114,6 +128,7 @@ Page({ this.setData({ "info.work_num_day": event.detail }); + this.putDoctorInquiryConfig() }, onAmountPicker() { @@ -135,6 +150,8 @@ Page({ [`${key}Text`]: value+' 元', "info.inquiry_price": value[0] }); + + this.putDoctorInquiryConfig() }, onPickerCancel(e) { @@ -145,5 +162,10 @@ Page({ [`${key}Visible`]: false, }); }, - + go(e){ + let url = e.currentTarget.dataset.url; + wx.switchTab({ + url: url + }) + } }) \ No newline at end of file diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml index 6794dca..2a3f793 100644 --- a/Pages/yishi/yizhensetup/index.wxml +++ b/Pages/yishi/yizhensetup/index.wxml @@ -49,7 +49,7 @@ - 去接诊 + 去接诊 - 医生手写签名 * + 医生手写签名 * 点击签名 diff --git a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss index 3bb26d7..ff371b8 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss +++ b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss @@ -1,7 +1,7 @@ .text-message { max-width: 60vw; - min-height: 80rpx; - line-height: 80rpx; + min-height: 50rpx; + line-height: 50rpx; padding: 10rpx 24rpx; background: #F8F8F8; border: 1rpx solid #D9D9D9; @@ -20,7 +20,7 @@ .my-text::after{ content:''; position: absolute; - top: 45rpx; + top: 35rpx; right: -19rpx; transform: translate(-50%,-50%) rotate(-135deg); width: 16rpx; @@ -38,7 +38,7 @@ .your-text::after{ content:''; position: absolute; - top: 45rpx; + top: 35rpx; left: 0; transform: translate(-50%,-50%) rotate(45deg); width: 16rpx; diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js index 63becfd..eddcb4c 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -75,6 +75,8 @@ Component({ isEmoji: false, fileList: [], hasCallKit: false, + showChangYongYu: false, + ChangYongYu: [] }, lifetimes: { @@ -111,6 +113,21 @@ Component({ }); }); }, + + }, + pageLifetimes:{ + show(){ + //获得常用语 + let words = wx.getStorageSync('words'); + console.log("words from chat: ", words); + if(words){ + this.setData({ + message: words, + sendMessageBtn: true + }) + wx.setStorageSync('words', ""); + } + } }, /** @@ -730,5 +747,10 @@ Component({ displayServiceEvaluation: true, }); }, + + showChangYongYu(){ + app.go("/Pages/yishi/quickreply/index?from=chat") + }, + }, }); diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml index 7ecbbb1..03fcbe7 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml @@ -45,7 +45,7 @@ 照片 - + 常用语 @@ -101,3 +101,4 @@ {{title}} + diff --git a/TUIKit/static/assets/ic_back_black.svg b/TUIKit/static/assets/ic_back_black.svg new file mode 100644 index 0000000..7e22047 --- /dev/null +++ b/TUIKit/static/assets/ic_back_black.svg @@ -0,0 +1,12 @@ + + + + ic_back_white + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/app.js b/app.js index c7650ff..f07d216 100644 --- a/app.js +++ b/app.js @@ -46,7 +46,11 @@ App({ this.aegisInit() console.warn("app.js wx.aegis: ", wx.aegis); - + //监听网络状态变化事件 + wx.onNetworkStatusChange(function (res) { + console.log(res.isConnected) + console.log(res.networkType) + }) }, onShow(){ this.imInit(); @@ -152,6 +156,7 @@ App({ height: 0, login_url: "/Pages/login/index", chat_sdk_ready: false, + jiesuan_dialog_show: false, config: { userID: "", SDKAPPID: 1400796919, // Your SDKAppID diff --git a/commpents/mynavbar/index.wxml b/commpents/mynavbar/index.wxml index ee5f9c8..e131b2b 100644 --- a/commpents/mynavbar/index.wxml +++ b/commpents/mynavbar/index.wxml @@ -1,6 +1,6 @@ - + {{ navbarData.title }} diff --git a/commpents/mynavbar/index.wxss b/commpents/mynavbar/index.wxss index 261410f..3de4ad5 100644 --- a/commpents/mynavbar/index.wxss +++ b/commpents/mynavbar/index.wxss @@ -7,7 +7,7 @@ top: 0; width: 750rpx; height: 170rpx; - background-color: #e94d4d; + background-color: #ffffff; z-index: 99; } .tui-navigatorbar-back{ diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js index c19e37d..685eba9 100644 --- a/commpents/myprofile/index.js +++ b/commpents/myprofile/index.js @@ -20,7 +20,7 @@ Component({ showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 title: '医师身份认证', //导航栏 中间的标题 }, - height: app.globalData.height, + height: app.globalData.height, //选项卡 stickyProps: { zIndex: 2, @@ -96,7 +96,8 @@ Component({ license_cert_reason: "", qualification_cert_reason: "", work_cert_reason: "", - department_custom_name_reason: '' + department_custom_name_reason: '', + zhuanchang_note: '请选择专长', }, options: { @@ -108,15 +109,11 @@ Component({ console.log("myprofile attached") let _this = this; - console.log(_this.data.zhicheng_columns); - console.log(_this.data.zhicheng_columns); - //获得医师身份认证 api.getDoctorAuthIden({source: this.data.indentity?1:2}).then(response => { console.log("getDoctorAuthIden: ",response); this.setData({ - doctorauthiden_data_ready: true, textarea_jianjie: response.data.brief_introduction, textarea_shanchang: response.data.be_good_at, @@ -217,6 +214,15 @@ Component({ _this.setData({ zhuanchang_columns: response.data }) + }).then(()=>{ + let index = this.data.zhuanchang_columns.findIndex(item => { + return item.is_selected == 1 + }) + if(index) { + this.setData({ + zhuanchang_note: "" + }) + } }).catch(errors => {console.error(errors); }) let keshi_huixian = false; @@ -235,10 +241,13 @@ Component({ console.log("select_keshi_id: ", _this.data.select_keshi_id); return item.value == _this.data.select_keshi_id }) - if(index){ + console.log("科室：", index) + let keshi_note = _this.data.keshi_columns[index].text; + console.log("科室 keshi_note：", keshi_note); + if(index != undefined){ _this.setData({ select_keshi_index: index, - keshi_note: _this.data.keshi_columns[index].text + keshi_note: keshi_note }) } keshi_huixian = true; @@ -479,7 +488,7 @@ Component({ this.setData({ yiyuan_show: true }); }else{ wx.showToast({ - title: '请先选择省市', + title: '请先选择城市', icon: "error" }) } @@ -650,6 +659,7 @@ Component({ } }) + console.log("countcountcountcount: ",count) if(count >= 10 && e.currentTarget.dataset.is_selected==0){ wx.showToast({ title: '最多10个专长', @@ -661,6 +671,27 @@ Component({ let data = "zhuanchang_columns["+index+"].is_selected"; this.setData({[data]: is_selected==1?0:1}) } + + this.checkZhuanchangNote() + }, + checkZhuanchangNote(){ + let count = 0 + this.data.zhuanchang_columns.forEach(item => { + if(item.is_selected == 1){ + count = count + 1; + } + }) + + if(count > 0){ + this.setData({ + zhuanchang_note: "" + }) + } + if(count == 0){ + this.setData({ + zhuanchang_note: "请选择专长" + }) + } }, zhuanchangConfirm(e){ this.setData({ zhuanchang_show: false }); @@ -881,5 +912,8 @@ Component({ [file_name]: img_list }) }, + moveZhuanChang(){ + + } } }) diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml index d4eff7f..b4a08ed 100644 --- a/commpents/myprofile/index.wxml +++ b/commpents/myprofile/index.wxml @@ -1,6 +1,6 @@ 头像 * - + 真人正脸 @@ -19,7 +19,7 @@ - + - + - + - + @@ -142,8 +146,10 @@ - - + + 取消 选择专长 @@ -169,7 +175,8 @@ - + - - - + + + + + diff --git a/commpents/te_navbar/index.wxss b/commpents/te_navbar/index.wxss index 78c64df..de4d259 100644 --- a/commpents/te_navbar/index.wxss +++ b/commpents/te_navbar/index.wxss @@ -20,4 +20,7 @@ width: 1px; height: 36rpx; background: #e7e7e7; +} +.custom-capsule-home{ + margin-left: 36rpx; } \ No newline at end of file diff --git a/commpents/textarea-cell/index.js b/commpents/textarea-cell/index.js index 0ab622b..ae77c03 100644 --- a/commpents/textarea-cell/index.js +++ b/commpents/textarea-cell/index.js @@ -12,6 +12,10 @@ Component({ type: Boolean, value: true, }, + disabled: { + type: Boolean, + value: false, + }, textarea_cell_note: { type: String, value: '示例备注', diff --git a/commpents/textarea-cell/index.wxml b/commpents/textarea-cell/index.wxml index dbc67b3..08fde3c 100644 --- a/commpents/textarea-cell/index.wxml +++ b/commpents/textarea-cell/index.wxml @@ -7,7 +7,7 @@ - + diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml index 3576289..1bca8fc 100644 --- a/custom-tab-bar/index.wxml +++ b/custom-tab-bar/index.wxml @@ -105,4 +105,4 @@ active-color="#74A2FA" inactive-color="#999999" wx:if="{{usertype == 3}}" > 确定 - \ No newline at end of file + diff --git a/utils/network/api.js b/utils/network/api.js index 4111e8c..1d98035 100644 --- a/utils/network/api.js +++ b/utils/network/api.js @@ -436,6 +436,18 @@ class API extends HTTP { ...params } }) +} + //删除常用语列表 + delDoctorWords(params) { + let doctor_words_id = params.doctor_words_id; + params = {}; + return this.request({ + url: `${this.baseUrl}/doctor/words/`+doctor_words_id, + method: 'DELETE', + data: { + ...params + } + }) } //搜索疾病分类-系统 getBasicDiseaseSearch(params) { diff --git a/utils/network/request.js b/utils/network/request.js index cf4b2c1..7918d56 100644 --- a/utils/network/request.js +++ b/utils/network/request.js @@ -46,16 +46,16 @@ class HTTP { url: app.globalData.login_url }) } else { - reject(res.data.message) + reject(res.data.message);//向后传递错误信息，catch会拿到 this._show_error(showLoading, res.data.message) } } else { - reject(res.data) + reject(res.data)//向后传递错误信息，catch会拿到 this._show_error(showLoading, err.data.message) } }, fail: (err) => { - reject() + reject(err)//向后传递错误信息，catch会拿到 this._show_error(showLoading, err.data.message) }, complete: (res) => { @@ -70,6 +70,9 @@ class HTTP { _show_error(showLoading, _message) { if(showLoading) wx.hideLoading(); + if(_message == undefined){ + _message = "网络错误"; + } wx.showToast({ title: `${_message}`, icon: 'none',