From 4b76fbfb74fbd361d23b757fd090f62451137425 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 29 Mar 2024 17:33:31 +0800 Subject: [PATCH] =?UTF-8?q?3.29=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/commpents/myprofile/index.js | 28 ++++++++--- user/pages/yishi/addServiceContent/index.js | 16 ++++++- user/pages/yishi/addServiceContent/index.json | 2 + user/pages/yishi/addServiceContent/index.wxml | 15 ++++-- user/pages/yishi/addServiceContent/index.wxss | 26 ++++++++++- user/pages/yishi/onlinesetup/index.js | 42 +++++++++++++---- user/pages/yishi/onlinesetup/index.wxml | 46 ++++++++++++------- user/pages/yishi/onlinesetup/index.wxss | 9 ++++ 8 files changed, 146 insertions(+), 38 deletions(-) diff --git a/user/commpents/myprofile/index.js b/user/commpents/myprofile/index.js index 468f9d9..16116ee 100644 --- a/user/commpents/myprofile/index.js +++ b/user/commpents/myprofile/index.js @@ -81,8 +81,8 @@ Component({ license_cert_reason: "", qualification_cert_reason: "", work_cert_reason: "", - expertise_reason:"", email_reason:'', + expertise_reason:'', department_custom_name_reason: '', zhuanchang_note: '请选择专长', jianjie_show: false, @@ -91,6 +91,10 @@ Component({ img_cropper_src: '', img_cropper_width: 250, //宽度 img_cropper_height: 250, //高度 + old_be_good_at:'', + old_avatar:'', + old_doctor_expertise:'', + old_brief_introduction:'' }, options: { addGlobalClass: true, @@ -107,7 +111,9 @@ Component({ this.setData({ doctorauthiden_data_ready: true, textarea_jianjie: response.data.brief_introduction, + old_brief_introduction: response.data.brief_introduction, textarea_shanchang: response.data.be_good_at, + old_be_good_at:response.data.be_good_at, custom_keshi: response.data.department_custom_name, office_phone: response.data.department_custom_mobile, select_keshi_id: response.data.department_custom_id, @@ -175,6 +181,7 @@ Component({ if(avatar){ this.setData({ "avatar": avatar, + old_avatar:avatar, is_avatar: true, }) } @@ -185,7 +192,7 @@ Component({ this.setData({ avatar_reason: response.data.avatar, brief_introduction_reason: response.data.brief_introduction, - expertise_reason:response.data.expertise, + expertise_reason:response.data.doctor_expertise, be_good_at_reason: response.data.be_good_at, }) @@ -325,13 +332,18 @@ Component({ //加载专长列表 api.getDoctorExpertise().then(response => { console.log(response); + let arr=response.data.filter(e => e.is_selected == 1 ).map(e => e.expertise_id); + let old_doctor_expertise=JSON.stringify(arr); _this.setData({ - zhuanchang_columns: response.data + zhuanchang_columns: response.data, + old_doctor_expertise:old_doctor_expertise }) }).then(()=>{ + let index = this.data.zhuanchang_columns.findIndex(item => { return item.is_selected == 1; }) + if(index != undefined) { this.setData({ zhuanchang_note: "" @@ -878,9 +890,9 @@ Component({ }, zhuanchangConfirm(e){ this.setData({ - zhuanchang_show: false, + zhuanchang_show: false, expertise_reason:'' - }); + }); this.triggerEvent('hidePageMeta'); }, zhuanchangConcle(e){ @@ -888,13 +900,15 @@ Component({ this.triggerEvent('hidePageMeta'); }, handleUpdateIntroduction(){ - let {avatar,textarea_jianjie,textarea_shanchang}=this.data; + let {avatar,textarea_jianjie,textarea_shanchang,old_avatar,old_brief_introduction,old_be_good_at,old_doctor_expertise}=this.data; let doctor_expertise= this.data.zhuanchang_columns.filter(e => e.is_selected == 1 ).map(e => e.expertise_id); if(!avatar){wx.showToast({title: '请上传头像',icon: "error"});return} if(doctor_expertise.length == 0){wx.showToast({title: '请选择专长',icon: "error"});return} if(!textarea_jianjie){wx.showToast({title: '请输入简介',icon: "error"});return} if(!textarea_shanchang){wx.showToast({title: '请输入擅长',icon: "error"});return} - + if(avatar==old_avatar && textarea_jianjie==old_brief_introduction &&textarea_shanchang== old_be_good_at && JSON.stringify(doctor_expertise)==old_doctor_expertise){ + wx.showToast({title: '请修改数据后再提交',icon: "none"});return + } api.updateIntroduction({ avatar, brief_introduction:textarea_jianjie, diff --git a/user/pages/yishi/addServiceContent/index.js b/user/pages/yishi/addServiceContent/index.js index 4277f78..b02f33d 100644 --- a/user/pages/yishi/addServiceContent/index.js +++ b/user/pages/yishi/addServiceContent/index.js @@ -11,9 +11,23 @@ Page({ navbarData: { showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 title: '添加服务内容', //导航栏 中间的标题 + }, + cycle_columns:['1个月', '3个月', '6个月', '12个月'], + showCycle:false + }, + confirmCycle(event){ + const { picker, value, index } = event.detail; + console.log(value); + this.setData({ + showCycle:true + }) + }, + cancelCycle(){ + this.setData({ + showCycle:true + }) }, - /** * 生命周期函数--监听页面加载 */ diff --git a/user/pages/yishi/addServiceContent/index.json b/user/pages/yishi/addServiceContent/index.json index fe7e253..24d3fd7 100644 --- a/user/pages/yishi/addServiceContent/index.json +++ b/user/pages/yishi/addServiceContent/index.json @@ -3,6 +3,8 @@ "te-nav-bar": "../../../../commpents/te_navbar/index", "van-field": "@vant/weapp/field/index", "van-icon": "@vant/weapp/icon/index", + "van-picker": "@vant/weapp/picker/index", + "van-popup": "@vant/weapp/popup/index", "van-button": "@vant/weapp/button/index" } } \ No newline at end of file diff --git a/user/pages/yishi/addServiceContent/index.wxml b/user/pages/yishi/addServiceContent/index.wxml index 1007d81..af29105 100644 --- a/user/pages/yishi/addServiceContent/index.wxml +++ b/user/pages/yishi/addServiceContent/index.wxml @@ -29,14 +29,23 @@ 服务价格（元） - - 不限制 + 元 - 建议服务价格设置为：单次图文*10次*5~8折 + + 建议服务价格设置为：单次图文*10次*5~8折 + 继续添加服务内容 保存 + + + \ No newline at end of file diff --git a/user/pages/yishi/addServiceContent/index.wxss b/user/pages/yishi/addServiceContent/index.wxss index f2dc7f8..72fb535 100644 --- a/user/pages/yishi/addServiceContent/index.wxss +++ b/user/pages/yishi/addServiceContent/index.wxss @@ -54,8 +54,16 @@ page{ .price_steup_box_bottom_num{ flex: 1.5; display: flex; + justify-content: flex-end; text-align: right; - align-items: flex-end; + align-items:center; + } + .ipt{ + font-size: 28rpx; + color: #E34D59; + } + .unit{ + font-size: 28rpx; } .price_steup_box_top::after{ position: absolute; @@ -104,6 +112,8 @@ page{ margin:15rpx 30rpx; font-weight: 400; font-size: 24rpx; +display: flex; +justify-content: space-between; color: #E34D59; } .continueadd{ @@ -134,4 +144,18 @@ border-radius: 8rpx; margin:160rpx auto 0; background: #3CC7C0; border-radius: 8rpx; + } + .van-picker__cancel{ + font-size: 32rpx!important; +color: rgba(0,0,0,0.6)!important; + } + .van-picker__confirm{ + font-size: 32rpx!important; + color: #3CC7C0!important; + } + .van-picker__title{ + font-size: 32rpx!important; + } + .van-picker__toolbar{ + border-bottom:.5px solid #E7E7E7; } \ No newline at end of file diff --git a/user/pages/yishi/onlinesetup/index.js b/user/pages/yishi/onlinesetup/index.js index e1bd532..9c0e75a 100644 --- a/user/pages/yishi/onlinesetup/index.js +++ b/user/pages/yishi/onlinesetup/index.js @@ -39,15 +39,39 @@ Page({ }, sub_visible: false, showSetting:false, - difficultSetting:false + difficultSetting:false, + showOpenchuFang:false, + showOpenTuWen:false, }, onLoad(){ + }, + cancelOpenChuFang(){ + this.setData({ + showOpenchuFang:false + }) + }, + confirmOpenChuFang(){ + this.setData({ + showOpenchuFang:false + }) + app.go('/user/pages/yishi/zhiye_identity/index') + }, + cancelOpenTuWen(){ + this.setData({ + showOpenTuWen:false + }) + }, + confirmOpenTuWen(){ + this.setData({ + showOpenTuWen:false, + active:0 + }) }, onShow(){ let {active}=this.data; this.getDoctorconfig(); - if(active==2){ + if(active==4){ this.getConfig() } }, @@ -118,14 +142,14 @@ Page({ let check = this.checkPrice(inquiry_price); if(!check) return; } - if(this.data.active==1 && detail){ + if(this.data.active==3 && detail){ wx.showToast({ title: '即将开通', icon:'none', }) return false } - if(this.data.active==1 || this.data.active==2){ + if(this.data.active==3 || this.data.active==4){ if(!this.data.info.work_num_day || !this.data.info.inquiry_price){ this.setData({ showSetting:true @@ -133,7 +157,7 @@ Page({ return false; } } - if(this.data.active==2){ + if(this.data.active==4){ if(!this.data.difficultSetting){ wx.showToast({ title: '请先设置服务设置', @@ -209,9 +233,9 @@ Page({ }) if(active==0){ app.go("/user/pages/yishi/onlinesetupprice/index?inquiry_mode=1") - }else if(active==1){ + }else if(active==3){ app.go("/user/pages/yishi/onlinesetupprice/index?inquiry_mode=2") - }else if(active==2){ + }else if(active==4){ app.go("/user/pages/yishi/onlinesetupprice/index?inquiry_mode=6") } @@ -226,12 +250,12 @@ Page({ inquiry_type:1, inquiry_mode:1, }) - }else if(index==1){ + }else if(index==3){ this.setData({ inquiry_type:1, inquiry_mode:2, }) - }else{ + }else if(index==4){ this.setData({ inquiry_type:1, inquiry_mode:6, diff --git a/user/pages/yishi/onlinesetup/index.wxml b/user/pages/yishi/onlinesetup/index.wxml index 772a44a..e269f97 100644 --- a/user/pages/yishi/onlinesetup/index.wxml +++ b/user/pages/yishi/onlinesetup/index.wxml @@ -106,32 +106,22 @@ {{ (info.is_open==1 && active==0)?'已开启，患者可以向您发起图文问诊':'已关闭，暂不接诊' }} - + - 价格设置 - - + 服务价格 + + - {{info.work_num_day}} - - - - - {{info.inquiry_price}} - 元 + - - - 提示：服务开启后，患者按照所设置的价格向您购买图文问诊服务 - 1、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通\n2、若开启公益问诊，图文问诊价格以公益问诊价格为准\n3、每日接诊数量和问诊价格每日仅限调整1次，每月仅限调整5次\n4、价格修改后立即生效，不影响修改之前已生成的问诊订单\n - - + 提示：开通此服务需通过多点执业认证 + 去接诊 @@ -308,4 +298,26 @@ 去设置 + + + 取消 + + + 前往 + + + + + 取消 + + + 前往 + + \ No newline at end of file diff --git a/user/pages/yishi/onlinesetup/index.wxss b/user/pages/yishi/onlinesetup/index.wxss index a57dd61..bbf4df7 100644 --- a/user/pages/yishi/onlinesetup/index.wxss +++ b/user/pages/yishi/onlinesetup/index.wxss @@ -174,3 +174,12 @@ page{ .green{ color:#3CC7C0; } +.pricebox .van-cell:after{ + border-bottom: none!important; +} +.desc{ + width: 90vw; + font-size: 28rpx; + color: rgba(0,0,0,0.65); + margin: 20rpx auto 0 auto; +} \ No newline at end of file