From 5d03a051863bf87580daf02707825b1d7a0b9345 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Wed, 27 Mar 2024 17:35:55 +0800 Subject: [PATCH 01/38] =?UTF-8?q?=E7=AE=80=E4=BB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/commpents/myprofile/index.js | 2 + user/commpents/myprofile/index.wxml | 11 ++- user/commpents/myprofile/index.wxss | 3 + user/pages/yishi/onlinesetup/index.wxml | 91 +++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 3 deletions(-) diff --git a/user/commpents/myprofile/index.js b/user/commpents/myprofile/index.js index b725f47..969d18c 100644 --- a/user/commpents/myprofile/index.js +++ b/user/commpents/myprofile/index.js @@ -81,6 +81,7 @@ Component({ license_cert_reason: "", qualification_cert_reason: "", work_cert_reason: "", + expertise_reason:"", email_reason:'', department_custom_name_reason: '', zhuanchang_note: '请选择专长', @@ -184,6 +185,7 @@ Component({ this.setData({ avatar_reason: response.data.avatar, brief_introduction_reason: response.data.brief_introduction, + expertise_reason:response.data.expertise, be_good_at_reason: response.data.be_good_at, }) diff --git a/user/commpents/myprofile/index.wxml b/user/commpents/myprofile/index.wxml index 0137ef5..146f779 100644 --- a/user/commpents/myprofile/index.wxml +++ b/user/commpents/myprofile/index.wxml @@ -342,7 +342,7 @@ - + 专长 * @@ -359,7 +359,7 @@ - + 专长 * @@ -375,7 +375,12 @@ - + + + + {{ expertise_reason }} + + 去接诊 + + + + + + + + 接诊开关 + + + + + {{ (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 + + + + + 去接诊 + + + + + + + + + 接诊开关 + + + + + {{ (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 + + + + + 去接诊 + + From e76883f86e4f6be9a3c42be8c4efe4d98ea092bf Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Wed, 27 Mar 2024 18:46:30 +0800 Subject: [PATCH 02/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 152 +++++++++--------- user/pages/yishi/addServiceContent/index.js | 66 ++++++++ user/pages/yishi/addServiceContent/index.json | 6 + user/pages/yishi/addServiceContent/index.wxml | 2 + user/pages/yishi/addServiceContent/index.wxss | 1 + user/pages/yishi/onlinesetup/index.js | 3 + user/pages/yishi/onlinesetup/index.wxml | 12 +- 7 files changed, 160 insertions(+), 82 deletions(-) create mode 100644 user/pages/yishi/addServiceContent/index.js create mode 100644 user/pages/yishi/addServiceContent/index.json create mode 100644 user/pages/yishi/addServiceContent/index.wxml create mode 100644 user/pages/yishi/addServiceContent/index.wxss diff --git a/app.json b/app.json index ea43334..c61de92 100644 --- a/app.json +++ b/app.json @@ -10,88 +10,89 @@ ], "subPackages": [ { - "root": "user", - "name":"user", - "pages": [ - "pages/yaoshi/info/info", - "pages/yaoshi/authentication/authentication", - "pages/yaoshi/medicalrecord/medicalrecord", - "pages/yaoshi/prescription/prescription", - "pages/yishi/wenzhen/wenzhen", - "pages/yishi/identity/index", - "pages/yishi/onlinesetup/index", - "pages/yishi/chufangsetup/index", - "pages/yishi/onlinechufang/index", - "pages/yishi/zhiye_identity/index", - "pages/yishi/signcanvas/index", - "pages/yishi/myprofile/index", - "pages/yishi/myinfo/index", - "pages/yishi/mycard/index", - "pages/yishi/attestation/index", - "pages/yishi/practicing/index", - "pages/yishi/bankcard/index", - "pages/yishi/bindcard/index", - "pages/yishi/myaccount/index", - "pages/yishi/cash/index", - "pages/yishi/wenzhenorder/index", - "pages/yishi/orderdetail/index", - "pages/yishi/cashrecord/index", - "pages/yishi/service_notice/index", - "pages/yishi/system_notice/index", - "pages/yishi/notice_deatil/index", - "pages/yishi/kuaisusetup/index", - "pages/yishi/yizhensetup/index", - "pages/yishi/manual/index", - "pages/yishi/appraise/index", - "pages/yishi/quickreply/index", - "pages/yishi/quickreply_data/index", - "pages/yishi/case/index", - - - "pages/login/index", - "pages/mobile_login/index", - "pages/yishi/manual_detail/index", - "pages/yishi/agreement_detail/index", - "pages/yishi/addzhenduan/index", - "pages/webpage/index", - "pages/kickedout/index", - "pages/yishi/onlinesetupprice/index", - "pages/yishi/yizhensetupprice/index", - "pages/yishi/wenzhenorderV2/index", - "pages/yishi/wenzhen_v3/wenzhen", - "pages/agreement_page/index", - "pages/yishi/medince_list/index", - "pages/yishi/linkPage/linkPage", - "pages/yishi/notify/notify", - "pages/yishi/patient_sick/index", - "pages/yishi/write_sickform/index", - "pages/yishi/sickform/index", - "pages/yishi/service_setting/index", - "pages/yishi/expertDetail/expertDetail" - ] + "root": "user", + "name": "user", + "pages": [ + "pages/yaoshi/info/info", + "pages/yaoshi/authentication/authentication", + "pages/yaoshi/medicalrecord/medicalrecord", + "pages/yaoshi/prescription/prescription", + "pages/yishi/wenzhen/wenzhen", + "pages/yishi/identity/index", + "pages/yishi/onlinesetup/index", + "pages/yishi/chufangsetup/index", + "pages/yishi/onlinechufang/index", + "pages/yishi/zhiye_identity/index", + "pages/yishi/signcanvas/index", + "pages/yishi/myprofile/index", + "pages/yishi/myinfo/index", + "pages/yishi/mycard/index", + "pages/yishi/attestation/index", + "pages/yishi/practicing/index", + "pages/yishi/bankcard/index", + "pages/yishi/bindcard/index", + "pages/yishi/myaccount/index", + "pages/yishi/cash/index", + "pages/yishi/wenzhenorder/index", + "pages/yishi/orderdetail/index", + "pages/yishi/cashrecord/index", + "pages/yishi/service_notice/index", + "pages/yishi/system_notice/index", + "pages/yishi/notice_deatil/index", + "pages/yishi/kuaisusetup/index", + "pages/yishi/yizhensetup/index", + "pages/yishi/manual/index", + "pages/yishi/appraise/index", + "pages/yishi/quickreply/index", + "pages/yishi/quickreply_data/index", + "pages/yishi/case/index", + "pages/login/index", + "pages/mobile_login/index", + "pages/yishi/manual_detail/index", + "pages/yishi/agreement_detail/index", + "pages/yishi/addzhenduan/index", + "pages/webpage/index", + "pages/kickedout/index", + "pages/yishi/onlinesetupprice/index", + "pages/yishi/yizhensetupprice/index", + "pages/yishi/wenzhenorderV2/index", + "pages/yishi/wenzhen_v3/wenzhen", + "pages/agreement_page/index", + "pages/yishi/medince_list/index", + "pages/yishi/linkPage/linkPage", + "pages/yishi/notify/notify", + "pages/yishi/patient_sick/index", + "pages/yishi/write_sickform/index", + "pages/yishi/sickform/index", + "pages/yishi/service_setting/index", + "pages/yishi/expertDetail/expertDetail", + "pages/yishi/addServiceContent/index" + ] }, { - "root": "TUIChatService", - "name":"TUIChatService", - "pages": [ - "pages/index" - ], - "independent": false - }, + "root": "TUIChatService", + "name": "TUIChatService", + "pages": [ + "pages/index" + ], + "independent": false + }, { - "root": "TUICallKit", - "name": "TUICallKit", - "pages": [ - "pages/globalCall/globalCall" - ], - "independent": false + "root": "TUICallKit", + "name": "TUICallKit", + "pages": [ + "pages/globalCall/globalCall" + ], + "independent": false } ], "preloadRule": { "TUICallKit/pages/globalCall/globalCall": { - "network": "all", - "packages": ["TUICallKit"] - } + "network": "all", + "packages": [ + "TUICallKit" + ] + } }, "window": { "navigationBarBackgroundColor": "#ffffff", @@ -108,7 +109,6 @@ { "pagePath": "Pages/yaoshi/home/home", "text": "首页" - }, { "pagePath": "Pages/yaoshi/my/my", diff --git a/user/pages/yishi/addServiceContent/index.js b/user/pages/yishi/addServiceContent/index.js new file mode 100644 index 0000000..d78b6c7 --- /dev/null +++ b/user/pages/yishi/addServiceContent/index.js @@ -0,0 +1,66 @@ +// user/pages/yishi/addServiceContent/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/user/pages/yishi/addServiceContent/index.json b/user/pages/yishi/addServiceContent/index.json new file mode 100644 index 0000000..75ef835 --- /dev/null +++ b/user/pages/yishi/addServiceContent/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "te-nav-bar": "../../../../commpents/te_navbar/index", + "van-field": "@vant/weapp/field/index" + } +} \ No newline at end of file diff --git a/user/pages/yishi/addServiceContent/index.wxml b/user/pages/yishi/addServiceContent/index.wxml new file mode 100644 index 0000000..c525d8a --- /dev/null +++ b/user/pages/yishi/addServiceContent/index.wxml @@ -0,0 +1,2 @@ + +user/pages/yishi/addServiceContent/index.wxml \ No newline at end of file diff --git a/user/pages/yishi/addServiceContent/index.wxss b/user/pages/yishi/addServiceContent/index.wxss new file mode 100644 index 0000000..db2739f --- /dev/null +++ b/user/pages/yishi/addServiceContent/index.wxss @@ -0,0 +1 @@ +/* user/pages/yishi/addServiceContent/index.wxss */ \ No newline at end of file diff --git a/user/pages/yishi/onlinesetup/index.js b/user/pages/yishi/onlinesetup/index.js index 34c3cd2..4a096c9 100644 --- a/user/pages/yishi/onlinesetup/index.js +++ b/user/pages/yishi/onlinesetup/index.js @@ -104,6 +104,9 @@ Page({ }) } }).catch(errors => {console.error(errors);}) + }, + addServiceContent(){ + }, doChange(detail){ console.log("onChange: ", detail); diff --git a/user/pages/yishi/onlinesetup/index.wxml b/user/pages/yishi/onlinesetup/index.wxml index c84e9b5..772a44a 100644 --- a/user/pages/yishi/onlinesetup/index.wxml +++ b/user/pages/yishi/onlinesetup/index.wxml @@ -61,11 +61,11 @@ {{ (info.is_open==1 && active==0)?'已开启，患者可以向您发起图文问诊':'已关闭，暂不接诊' }} - + - + + - 去接诊 + 添加服务内容 From a479ddf92e133e0a15f19bd07f9cc04acb9422cd Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 28 Mar 2024 09:38:22 +0800 Subject: [PATCH 03/38] =?UTF-8?q?3.28=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 | 5 +- user/commpents/myprofile/index.wxss | 1 + user/pages/yishi/addServiceContent/index.js | 8 +- user/pages/yishi/addServiceContent/index.json | 4 +- user/pages/yishi/addServiceContent/index.wxml | 20 +++- user/pages/yishi/addServiceContent/index.wxss | 92 ++++++++++++++++++- user/pages/yishi/onlinesetup/index.js | 2 +- 7 files changed, 125 insertions(+), 7 deletions(-) diff --git a/user/commpents/myprofile/index.js b/user/commpents/myprofile/index.js index 969d18c..468f9d9 100644 --- a/user/commpents/myprofile/index.js +++ b/user/commpents/myprofile/index.js @@ -877,7 +877,10 @@ Component({ } }, zhuanchangConfirm(e){ - this.setData({ zhuanchang_show: false }); + this.setData({ + zhuanchang_show: false, + expertise_reason:'' + }); this.triggerEvent('hidePageMeta'); }, zhuanchangConcle(e){ diff --git a/user/commpents/myprofile/index.wxss b/user/commpents/myprofile/index.wxss index 7ea00f0..b4bbb1c 100644 --- a/user/commpents/myprofile/index.wxss +++ b/user/commpents/myprofile/index.wxss @@ -266,4 +266,5 @@ color: #FF0000; letter-spacing: 3rpx; font-weight: 600; + word-break: break-all; } \ No newline at end of file diff --git a/user/pages/yishi/addServiceContent/index.js b/user/pages/yishi/addServiceContent/index.js index d78b6c7..4277f78 100644 --- a/user/pages/yishi/addServiceContent/index.js +++ b/user/pages/yishi/addServiceContent/index.js @@ -1,11 +1,17 @@ // user/pages/yishi/addServiceContent/index.js +import { API } from '../../../../utils/network/api' +let api = new API() +const app = getApp() Page({ /** * 页面的初始数据 */ data: { - + navbarData: { + showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 + title: '添加服务内容', //导航栏 中间的标题 + }, }, /** diff --git a/user/pages/yishi/addServiceContent/index.json b/user/pages/yishi/addServiceContent/index.json index 75ef835..9bb8f20 100644 --- a/user/pages/yishi/addServiceContent/index.json +++ b/user/pages/yishi/addServiceContent/index.json @@ -1,6 +1,8 @@ { "usingComponents": { "te-nav-bar": "../../../../commpents/te_navbar/index", - "van-field": "@vant/weapp/field/index" + "van-field": "@vant/weapp/field/index", + "van-stepper": "@vant/weapp/stepper/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 c525d8a..c169534 100644 --- a/user/pages/yishi/addServiceContent/index.wxml +++ b/user/pages/yishi/addServiceContent/index.wxml @@ -1,2 +1,18 @@ - -user/pages/yishi/addServiceContent/index.wxml \ No newline at end of file + + + + + 每日接诊数量 + + + + + + 问诊单价 + + + 元 + + + + diff --git a/user/pages/yishi/addServiceContent/index.wxss b/user/pages/yishi/addServiceContent/index.wxss index db2739f..4f4dd66 100644 --- a/user/pages/yishi/addServiceContent/index.wxss +++ b/user/pages/yishi/addServiceContent/index.wxss @@ -1 +1,91 @@ -/* user/pages/yishi/addServiceContent/index.wxss */ \ No newline at end of file +page{ + background-color: #F6F6F6; + } + .checked_box{ + margin-top: 30rpx; + } + .price_title{ + width: 90vw; + margin: 20rpx auto 0 auto; + font-size: 32rpx; + margin-bottom: 20rpx; + /* font-family: "AlibabaPuHuiTi-2-55-Regular"; */ + color: #333333; + } + .price_steup_box{ + display: flex; + width: 90vw; + height: 180rpx; + margin: 0 auto; + border-radius: 20rpx; + flex-direction: column; + background-color: rgb(255, 255, 255); + } + .price_steup_box_top{ + position: relative; + display: flex; + justify-content: space-between; + margin: 20rpx 20rpx 20rpx 30rpx; + align-items: center; + padding-bottom: 20rpx; + } + .price_steup_box_bottom{ + position: relative; + display: flex; + justify-content: space-between; + margin: 0rpx 20rpx 0rpx 30rpx; + align-items: center; + } + .price_steup_box_top_title, .price_steup_box_bottom_title{ + flex: 1; + font-size: 32rpx; + color: #333; + } + .price_steup_box_bottom_num{ + flex: 1.5; + display: flex; + align-items: center; + } + .price_steup_box_top::after{ + position: absolute; + box-sizing: border-box; + content: ' '; + pointer-events: none; + right: 0; + left: 0; + bottom: 0; + border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7)); + transform: scaleY(0.5); + } + .price_steup_box_top_stepper{ + flex: 1; + text-align: right; + align-items: center; + } + .bottom{ + width: 90vw; + margin: -20rpx auto; + color: #999; + letter-spacing: 2rpx; + font-size: 28rpx; + line-height: 40rpx; + } + .go{ + position: fixed; + left: 50%; + transform: translateX(-50%); + bottom: 100rpx; + width: 90vw; + } + .weui-input{ + color: red; + display: inline-block; + text-align: right; + } + .price{ + text-align: center; + flex: 1; + } + .green{ + color:#3CC7C0; + } \ No newline at end of file diff --git a/user/pages/yishi/onlinesetup/index.js b/user/pages/yishi/onlinesetup/index.js index 4a096c9..e1bd532 100644 --- a/user/pages/yishi/onlinesetup/index.js +++ b/user/pages/yishi/onlinesetup/index.js @@ -106,7 +106,7 @@ Page({ }).catch(errors => {console.error(errors);}) }, addServiceContent(){ - + app.go('/user/pages/yishi/addServiceContent/index') }, doChange(detail){ console.log("onChange: ", detail); From 518b1ccb3dfee66f3f8ab94e8785e702a9b4ba86 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 28 Mar 2024 14:26:24 +0800 Subject: [PATCH 04/38] =?UTF-8?q?3.28=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/commpents/textarea-cell/index.wxss | 1 + user/pages/yishi/addServiceContent/index.json | 2 +- user/pages/yishi/addServiceContent/index.wxml | 36 ++++++++++--- user/pages/yishi/addServiceContent/index.wxss | 50 ++++++++++++++++++- 4 files changed, 80 insertions(+), 9 deletions(-) diff --git a/user/commpents/textarea-cell/index.wxss b/user/commpents/textarea-cell/index.wxss index e7c0253..d149498 100644 --- a/user/commpents/textarea-cell/index.wxss +++ b/user/commpents/textarea-cell/index.wxss @@ -74,4 +74,5 @@ color: #FF0000; letter-spacing: 3rpx; font-weight: 600; + word-break:break-all; } \ No newline at end of file diff --git a/user/pages/yishi/addServiceContent/index.json b/user/pages/yishi/addServiceContent/index.json index 9bb8f20..fe7e253 100644 --- a/user/pages/yishi/addServiceContent/index.json +++ b/user/pages/yishi/addServiceContent/index.json @@ -2,7 +2,7 @@ "usingComponents": { "te-nav-bar": "../../../../commpents/te_navbar/index", "van-field": "@vant/weapp/field/index", - "van-stepper": "@vant/weapp/stepper/index", + "van-icon": "@vant/weapp/icon/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 c169534..1007d81 100644 --- a/user/pages/yishi/addServiceContent/index.wxml +++ b/user/pages/yishi/addServiceContent/index.wxml @@ -1,18 +1,42 @@ - + + - 每日接诊数量 + 服务次数/月 - + - 问诊单价 + 服务回合数 - - 元 + + 不限制 + + 服务内容 + + + 服务周期 + + + + + + 服务价格（元） + + + 不限制 + + + + 建议服务价格设置为：单次图文*10次*5~8折 + + +继续添加服务内容 +保存 + diff --git a/user/pages/yishi/addServiceContent/index.wxss b/user/pages/yishi/addServiceContent/index.wxss index 4f4dd66..f2dc7f8 100644 --- a/user/pages/yishi/addServiceContent/index.wxss +++ b/user/pages/yishi/addServiceContent/index.wxss @@ -1,6 +1,13 @@ page{ background-color: #F6F6F6; } + .title{ + width:90vw; + margin: 0 auto 20rpx; + font-weight: 550; + font-size: 32rpx; + color: rgba(0,0,0,0.85); + } .checked_box{ margin-top: 30rpx; } @@ -27,7 +34,7 @@ page{ justify-content: space-between; margin: 20rpx 20rpx 20rpx 30rpx; align-items: center; - padding-bottom: 20rpx; + padding-bottom: 30rpx; } .price_steup_box_bottom{ position: relative; @@ -41,10 +48,14 @@ page{ font-size: 32rpx; color: #333; } + .price{ + text-align: right!important; + } .price_steup_box_bottom_num{ flex: 1.5; display: flex; - align-items: center; + text-align: right; + align-items: flex-end; } .price_steup_box_top::after{ position: absolute; @@ -88,4 +99,39 @@ page{ } .green{ color:#3CC7C0; + } + .tips{ + margin:15rpx 30rpx; + font-weight: 400; +font-size: 24rpx; +color: #E34D59; + } + .continueadd{ + + font-size: 30rpx; + color: #3CC7C0; + display: flex; + align-items: center; + justify-content: center; + width:90vw; + height: 80rpx; + margin:160rpx auto 0; +background: rgba(44,241,248,0.28); +border-radius: 8rpx; + } + .btn{ + bottom:60rpx; + position: fixed; + font-size: 32rpx; + color: #fff; + display: flex; + align-items: center; + justify-content: center; + width:90vw; + left:50%; + transform: translate(-50%); + height: 80rpx; + margin:160rpx auto 0; + background: #3CC7C0; +border-radius: 8rpx; } \ No newline at end of file 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 05/38] =?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 From 1115e4e0609cf1dd741a69ba15e3eeb96a14d162 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 29 Mar 2024 19:19:23 +0800 Subject: [PATCH 06/38] =?UTF-8?q?=E7=AE=80=E4=BB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/commpents/myprofile/index.wxml | 4 ++-- user/commpents/textarea-cell/index.wxml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/user/commpents/myprofile/index.wxml b/user/commpents/myprofile/index.wxml index 146f779..079530a 100644 --- a/user/commpents/myprofile/index.wxml +++ b/user/commpents/myprofile/index.wxml @@ -391,7 +391,7 @@ disabled="{{(indentity && iden_auth_disabled) || (!indentity && introduction_status==2)}}" has_error_content="{{ brief_introduction_reason }}" data-textarea_name="textarea_jianjie" - bindTextAreaBlur="getTextAreaVal" /> + bind:TextAreaBlur="getTextAreaVal" /> + data-textarea_name="textarea_shanchang" bind:TextAreaBlur="getTextAreaVal" /> - + From 1d4619efe72227acab067cdb1004f8fe85fd7a4e Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Sun, 7 Apr 2024 13:58:23 +0800 Subject: [PATCH 07/38] =?UTF-8?q?4.7=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/yishi/index/index.wxml | 2 +- Pages/yishi/wenzhen_v2/wenzhen.wxml | 2 +- Pages/yishi/wenzhen_v2/wenzhen.wxss | 6 + user/pages/yishi/addServiceContent/index.js | 216 +++++++++++++++++- user/pages/yishi/addServiceContent/index.wxml | 36 ++- user/pages/yishi/addServiceContent/index.wxss | 22 +- user/pages/yishi/onlinesetup/index.js | 86 ++++++- user/pages/yishi/onlinesetup/index.wxml | 10 +- user/pages/yishi/onlinesetup/index.wxss | 11 + user/pages/yishi/onlinesetupprice/index.js | 23 +- user/pages/yishi/orderdetail/index.wxml | 2 +- user/pages/yishi/wenzhenorderV2/index.wxml | 2 +- user/pages/yishi/yizhensetup/index.js | 58 ++++- user/pages/yishi/yizhensetup/index.wxml | 4 +- user/pages/yishi/yizhensetupprice/index.js | 41 +++- utils/network/api.js | 66 +++++- 16 files changed, 521 insertions(+), 66 deletions(-) diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml index 8a80fec..cc2081e 100644 --- a/Pages/yishi/index/index.wxml +++ b/Pages/yishi/index/index.wxml @@ -115,7 +115,7 @@ 个人简介管理 ! - + - {{item.inquiry_mode==1?'图文':item.inquiry_mode==2?'视频':item.inquiry_mode==6?'疑难问诊':item.inquiry_mode==7?'附赠回复':'其他'}} + {{item.inquiry_mode==1?'图文':item.inquiry_mode==2?'视频':item.inquiry_mode==6?'疑难问诊':item.inquiry_mode==7?'附赠回复':item.inquiry_mode==8?'健康包':item.inquiry_mode==9?'随访包':'其他'}} 就诊人： {{item.patient_name}} {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}} diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxss b/Pages/yishi/wenzhen_v2/wenzhen.wxss index bca92af..94fe624 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxss +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxss @@ -175,4 +175,10 @@ page{ } .parallelogram.yinan.parallelogram::before{ background:#ffb700; +} +.parallelogram.healthy.parallelogram::before{ + background:#ff5d6a; +} +.parallelogram.visit.parallelogram::before{ + background:#03b5e3; } \ No newline at end of file diff --git a/user/pages/yishi/addServiceContent/index.js b/user/pages/yishi/addServiceContent/index.js index b02f33d..e6203a1 100644 --- a/user/pages/yishi/addServiceContent/index.js +++ b/user/pages/yishi/addServiceContent/index.js @@ -14,18 +14,219 @@ Page({ }, cycle_columns:['1个月', '3个月', '6个月', '12个月'], - showCycle:false + service_columns:['10次','不限次'], + showCycle:false, + showServiceNumber:false, + monthly_frequency:'', + isAdd:false, + service_rounds:0, + cur_id:'', + items:[{ + service_period:'', + service_price:'' + }] }, - confirmCycle(event){ - const { picker, value, index } = event.detail; - console.log(value); + openCycle(event){ + let {id} =event.currentTarget.dataset; + console.log(id); this.setData({ - showCycle:true + showCycle:true, + cur_id:id, }) }, + + confirmCycle(event){ + const { picker, value, index} = event.detail; + let {items,cur_id}=this.data; + + let obj='items['+cur_id+'].service_period'; + let day=null; + if(index==0){ + day=30 + }else if(index==1){ + day=90 + }else if(index==2){ + day=180 + }else if(index==3){ + day=360 + } + for (let index = 0; index < items.length; index++) { + if(items[index].service_period==day){ + wx.showToast({ + title: '此服务周期不能重复设置', + icon:'none' + }) + return false + }; + + } + this.setData({ + showCycle:false, + [obj]:day + }) + + }, + changeIpt(event){ + let {value}=event.detail; + let {id}=event.currentTarget.dataset; + console.log(id); + let obj='items['+id+'].service_price'; + this.setData({ + [obj]:value + }) + + }, + delService(event){ + let {items}=this.data; + let {id} =event.currentTarget.dataset; + items.splice(1,id); + this.setData({ + items + }) + }, + handle(){ + this.data.isAdd?this.addService():this.editService(); + }, + addServiceArr(){ + let {items}=this.data; + this.setData({ + items:items.concat({ + service_period:'' , + service_price:'' + }) + }) + }, cancelCycle(){ this.setData({ - showCycle:true + showCycle:false + }) + }, + getService(){ + api.getFollow().then(response=>{ + if(response.code==200){ + if(response.data){ + let {monthly_frequency,service_rounds,items}=response.data + this.setData({ + monthly_frequency, + service_rounds, + items, + isAdd:false + }) + }else{ + this.setData({ + isAdd:true + }) + } + } + }) + }, + addService(){ + let {monthly_frequency,service_rounds,items}=this.data; + if(!monthly_frequency && monthly_frequency===''){ + wx.showToast({ + title: '请选择服务次数', + icon:'none' + }) + return false + }; + for (let i = 0; i < items.length; i++) { + if(!items[i].service_period){ + wx.showToast({ + title: '请选择第'+(i+1)+'个的服务周期', + icon:'none' + }) + return false + } + if(!items[i].service_price){ + wx.showToast({ + title: '请设置第'+(i+1)+'个的服务价格', + icon:'none' + }) + return false + } + } + api.postFollow({ + monthly_frequency, + service_rounds, + items + }).then(response=>{ + if(response.code==200){ + wx.showToast({ + title: '保存成功', + icon:'none' + }) + wx.navigateBack() + } + }) + }, + editService(){ + let {monthly_frequency,service_rounds,items}=this.data; + if(!monthly_frequency && monthly_frequency!=0){ + wx.showToast({ + title: '请选择服务次数', + icon:'none' + }) + return false + }; + for (let i = 0; i < items.length; i++) { + if(!items[i].service_period){ + wx.showToast({ + title: '请选择第'+(i+1)+'的服务周期', + icon:'none' + }) + return false + } + if(!items[i].service_price){ + wx.showToast({ + title: '请设置第'+(i+1)+'的服务价格', + icon:'none' + }) + return false + } + } + api.editFollow({ + monthly_frequency, + service_rounds, + items + }).then(response=>{ + if(response.code==200){ + wx.showToast({ + title: '修改成功', + }); + wx.navigateBack() + } + }) +}, +getFollowDetail(){ + api.getFollowDetail().then(response=>{ + if(response.code==200){ + if(response.data){ + let res=response.data.map((item)=>{ + return {service_period:item.service_period,service_price:item.service_price} + }) + this.setData({ + items:res + }) + } + } + }) +}, + openServiceNumber(){ + this.setData({ + showServiceNumber:true + }) + }, + confirmServiceNumber(event){ + const { picker, value, index } = event.detail; + + this.setData({ + showServiceNumber:false, + monthly_frequency:index==0?10:0 + }) + }, + cancelServiceNumber(){ + this.setData({ + showServiceNumber:false }) }, /** @@ -46,7 +247,8 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + this.getService(); + this.getFollowDetail(); }, /** diff --git a/user/pages/yishi/addServiceContent/index.wxml b/user/pages/yishi/addServiceContent/index.wxml index af29105..7e3db73 100644 --- a/user/pages/yishi/addServiceContent/index.wxml +++ b/user/pages/yishi/addServiceContent/index.wxml @@ -4,8 +4,11 @@ 服务次数/月 - - + + 请选择服务次数 + {{monthly_frequency===0?'不限次数':'10次'}} + + @@ -17,30 +20,35 @@ - + + 服务内容 - - + + 服务周期 - + {{item.service_period/30}}个月 + 请选择周期 + 服务价格（元） - 元 + 元 - 建议服务价格设置为：单次图文*10次*5~8折 + 建议服务价格设置为：{{(item.service_period/30)==1?'单次图文*10次*5~8折':(item.service_period/30)==3?'单次图文*30次*4~7折':(item.service_period/30)==6?'单次图文*60次*3~6折':(item.service_period/30)==12?'单次图文*120次*2~5折':'单次图文*10次*5'}} + 删除 -继续添加服务内容 -保存 +继续添加服务内容 + +保存 + + + \ No newline at end of file diff --git a/user/pages/yishi/addServiceContent/index.wxss b/user/pages/yishi/addServiceContent/index.wxss index 72fb535..27b994b 100644 --- a/user/pages/yishi/addServiceContent/index.wxss +++ b/user/pages/yishi/addServiceContent/index.wxss @@ -1,6 +1,11 @@ page{ background-color: #F6F6F6; } + .page{ + overflow: hidden; + display: flex; + flex-direction: column; + } .title{ width:90vw; margin: 0 auto 20rpx; @@ -23,7 +28,7 @@ page{ display: flex; width: 90vw; height: 180rpx; - margin: 0 auto; + margin: 0 auto 20rpx; border-radius: 20rpx; flex-direction: column; background-color: rgb(255, 255, 255); @@ -48,8 +53,10 @@ page{ font-size: 32rpx; color: #333; } + .price{ text-align: right!important; + font-size: 28rpx; } .price_steup_box_bottom_num{ flex: 1.5; @@ -77,7 +84,7 @@ page{ transform: scaleY(0.5); } .price_steup_box_top_stepper{ - flex: 1; + display: flex; text-align: right; align-items: center; } @@ -125,7 +132,7 @@ color: #E34D59; justify-content: center; width:90vw; height: 80rpx; - margin:160rpx auto 0; + margin:80rpx auto 0; background: rgba(44,241,248,0.28); border-radius: 8rpx; } @@ -158,4 +165,13 @@ color: rgba(0,0,0,0.6)!important; } .van-picker__toolbar{ border-bottom:.5px solid #E7E7E7; + } + .amount.nodata{ + font-size: 28rpx; +color: rgba(0,0,0,0.45); + } + .vontent{ + flex:1; + margin-bottom: 150rpx; + overflow-y: scroll; } \ No newline at end of file diff --git a/user/pages/yishi/onlinesetup/index.js b/user/pages/yishi/onlinesetup/index.js index 9c0e75a..11866ce 100644 --- a/user/pages/yishi/onlinesetup/index.js +++ b/user/pages/yishi/onlinesetup/index.js @@ -16,6 +16,7 @@ Page({ note: "", inquiry_type: 1, inquiry_mode: 1, + multi_point_status:'', config_setting:{}, info:{ is_open: false, @@ -24,6 +25,7 @@ Page({ }, active:0, myprice: "", + healthPrice:'图文价格*0.5*6', config:{ "max_work_num_day": 30, "min_inquiry_price": 0, @@ -43,8 +45,11 @@ Page({ showOpenchuFang:false, showOpenTuWen:false, }, - onLoad(){ - + onLoad(options){ + console.log(options.multi_point_status); + this.setData({ + multi_point_status:options.multi_point_status + }) }, cancelOpenChuFang(){ this.setData({ @@ -71,10 +76,25 @@ Page({ onShow(){ let {active}=this.data; this.getDoctorconfig(); + this.getDoctorOpen(); + this.getSysconfig(); if(active==4){ this.getConfig() } }, + + getDoctorOpen(){ + let {inquiry_type,inquiry_mode}=this.data; + api.getOpen({ + inquiry_type, + inquiry_mode + }).then(response => { + this.setData({ + note: response.data, + 'info.is_open': response.data + }) + }).catch(errors => {console.error(errors);}) + }, getDoctorconfig(){ let {inquiry_type,inquiry_mode}=this.data; //接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） @@ -86,9 +106,10 @@ Page({ }).then(response => { console.log(response); this.setData({ - info: response.data.info, - config: response.data.config, - note: response.data.info.is_open + 'info.inquiry_price': response.data.inquiry_price, + 'info.work_num_day': response.data.work_num_day, + // config: response.data.config, + // note: response.data.info.is_open }) }).catch(errors => {console.error(errors);}) }, @@ -106,6 +127,7 @@ Page({ onChange({ detail }) { this.doChange(detail) }, + getConfig(){ let {inquiry_type,inquiry_mode}=this.data; api.getServiceConfig({ @@ -132,7 +154,7 @@ Page({ addServiceContent(){ app.go('/user/pages/yishi/addServiceContent/index') }, - doChange(detail){ + async doChange(detail){ console.log("onChange: ", detail); let is_open = 0; if(detail){ @@ -141,7 +163,23 @@ Page({ if(this.data.active==0){ let check = this.checkPrice(inquiry_price); if(!check) return; - } + }; + if(this.data.active==2 && detail){ + let {data}=await api.getOpen({inquiry_type:1,inquiry_mode:1}); + if(data==0){ + this.setData({ + showOpenTuWen:true + }) + return false + } + if(this.data.multi_point_status!=1){ + this.setData({ + showOpenchuFang:true + }) + return false + } + }; + if(this.data.active==3 && detail){ wx.showToast({ title: '即将开通', @@ -250,6 +288,17 @@ Page({ inquiry_type:1, inquiry_mode:1, }) + }else if(index==1){ + this.setData({ + inquiry_type:1, + inquiry_mode:9, + }) + }else if(index==2){ + this.setData({ + inquiry_type:1, + inquiry_mode:8, + }) + this.getHealthy() }else if(index==3){ this.setData({ inquiry_type:1, @@ -263,6 +312,8 @@ Page({ this.getConfig(); } this.getDoctorconfig(); + this.getDoctorOpen(); + this.getSysconfig(); }, putDoctorInquiryConfig(){ //修改医生问诊配置 @@ -284,6 +335,27 @@ Page({ }) }, + getHealthy(){ + api.getHealthy().then(response => { + this.setData({ + healthPrice:(response.data.inquiry_price*response.data.service_rate/100).toFixed(2) + }) + }).catch(errors => {console.error(errors);}) + }, + getSysconfig(){ + let {inquiry_type,inquiry_mode}=this.data; + api.getSysconfig({ + inquiry_type, + inquiry_mode + }).then(response => { + this.setData({ + 'config': response.data + // config: response.data.config, + // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note + }) + }).catch(errors => {console.error(errors);}) + +}, myToast(message){ Toast({ context: this, diff --git a/user/pages/yishi/onlinesetup/index.wxml b/user/pages/yishi/onlinesetup/index.wxml index e269f97..62b7f40 100644 --- a/user/pages/yishi/onlinesetup/index.wxml +++ b/user/pages/yishi/onlinesetup/index.wxml @@ -89,7 +89,7 @@ --> - 添加服务内容 + 添加服务内容 @@ -114,8 +114,12 @@ 服务价格 - - + + 元 diff --git a/user/pages/yishi/onlinesetup/index.wxss b/user/pages/yishi/onlinesetup/index.wxss index bbf4df7..49333ec 100644 --- a/user/pages/yishi/onlinesetup/index.wxss +++ b/user/pages/yishi/onlinesetup/index.wxss @@ -182,4 +182,15 @@ page{ font-size: 28rpx; color: rgba(0,0,0,0.65); margin: 20rpx auto 0 auto; +} +.healthPrice{ + font-size: 28rpx; + color: #E34D59; +} +.unit{ + color: #333; +} +.cell_value_heal{ + display: flex; + align-items: center; } \ No newline at end of file diff --git a/user/pages/yishi/onlinesetupprice/index.js b/user/pages/yishi/onlinesetupprice/index.js index d6ae576..22fdcfe 100644 --- a/user/pages/yishi/onlinesetupprice/index.js +++ b/user/pages/yishi/onlinesetupprice/index.js @@ -46,11 +46,28 @@ Page({ api.getDoctorInquiryConfig(params).then(response => { console.log(response); this.setData({ - info: response.data.info, - config: response.data.config, - note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note + 'info.inquiry_price': response.data.inquiry_price, + 'info.work_num_day': response.data.work_num_day, + // config: response.data.config, + // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note }) }).catch(errors => {console.error(errors);}) + this.getSysconfig(); + }, + getSysconfig(){ + let {inquiry_type,inquiry_mode}=this.data; + api.getSysconfig({ + inquiry_type, + inquiry_mode + }).then(response => { + console.log(response); + this.setData({ + 'config': response.data + // config: response.data.config, + // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note + }) + }).catch(errors => {console.error(errors);}) + }, onStepperChange(event) { console.log(event.detail); diff --git a/user/pages/yishi/orderdetail/index.wxml b/user/pages/yishi/orderdetail/index.wxml index da7e5b5..a3fa18e 100644 --- a/user/pages/yishi/orderdetail/index.wxml +++ b/user/pages/yishi/orderdetail/index.wxml @@ -5,7 +5,7 @@ - {{ item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'其他' }} + {{ item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==1 && item.inquiry_mode==8?'在线问诊-健康包':item.inquiry_type==1 && item.inquiry_mode==9?'在线问诊-随访包':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'其他' }} {{ item.entry_status==1?'入账中':item.entry_status==2?'入账成功':item.entry_status==3?'入账失败':'未知' }} diff --git a/user/pages/yishi/wenzhenorderV2/index.wxml b/user/pages/yishi/wenzhenorderV2/index.wxml index 27ba2ba..aeff9fe 100644 --- a/user/pages/yishi/wenzhenorderV2/index.wxml +++ b/user/pages/yishi/wenzhenorderV2/index.wxml @@ -5,7 +5,7 @@ - {{item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':item.inquiry_type==5?'糖组检测':'未知'}} + {{item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==1 && item.inquiry_mode==8?'在线问诊-健康包':item.inquiry_type==1 && item.inquiry_mode==9?'在线问诊-随访包':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':item.inquiry_type==5?'糖组检测':'未知'}} 订单编号：{{item.inquiry_no }} 就诊患者：{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁） diff --git a/user/pages/yishi/yizhensetup/index.js b/user/pages/yishi/yizhensetup/index.js index 33a664d..358d98d 100644 --- a/user/pages/yishi/yizhensetup/index.js +++ b/user/pages/yishi/yizhensetup/index.js @@ -11,7 +11,6 @@ Page({ }, height: app.globalData.height, checked: true, - canFree:false, showSetting:false, open_note: "已开启，可在问诊消息中进行接诊", close_note: "已关闭，暂不接收公益问诊", @@ -46,11 +45,12 @@ Page({ }, onShow(){ - let doctor_id=wx.getStorageSync('client_user_id_2'); - console.log(doctor_id); - if(doctor_id){ - this.getService(doctor_id) - } + this.getDoctorOpen() + // let doctor_id=wx.getStorageSync('client_user_id_2'); + // console.log(doctor_id); + // if(doctor_id){ + // this.getService(doctor_id) + // } 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:会员） @@ -58,12 +58,33 @@ Page({ api.getDoctorInquiryConfig(params).then(response => { console.log(response); this.setData({ - info: response.data.info, - config: response.data.config, + 'info.inquiry_price': response.data.inquiry_price, + 'info.work_num_day': response.data.work_num_day + // config: response.data.config, }) - this.formatAmounts(); - this.formatAmountValue(); + // 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);}) + this.getSysconfig(); + }, + getDoctorOpen(){ + let {inquiry_type,inquiry_mode}=this.data; + api.getOpen({ + inquiry_type, + inquiry_mode + }).then(response => { + this.setData({ + note: response.data, + 'info.is_open': response.data + }) let is_open = this.data.info.is_open; let note = this.data.note; if(is_open == 1) note = this.data.open_note; @@ -108,6 +129,23 @@ Page({ amountText: val }) }, + getSysconfig(){ + let {inquiry_type,inquiry_mode}=this.data; + api.getSysconfig({ + inquiry_type, + inquiry_mode + }).then(response => { + console.log(response); + this.setData({ + 'config': response.data + // config: response.data.config, + // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note + }) + this.formatAmounts(); + this.formatAmountValue(); + }).catch(errors => {console.error(errors);}) + +}, changeON(){ let is_open = this.data.info.is_open console.log("changeON:", is_open) diff --git a/user/pages/yishi/yizhensetup/index.wxml b/user/pages/yishi/yizhensetup/index.wxml index eaf02c5..e3fd98d 100644 --- a/user/pages/yishi/yizhensetup/index.wxml +++ b/user/pages/yishi/yizhensetup/index.wxml @@ -28,7 +28,7 @@ border="{{true}}" url="/user/pages/yishi/yizhensetupprice/index" > - + {{ info.work_num_day }} 去设置 @@ -39,7 +39,7 @@ border="{{false}}" url="/user/pages/yishi/yizhensetupprice/index" > - + {{ amountText }} 元 diff --git a/user/pages/yishi/yizhensetupprice/index.js b/user/pages/yishi/yizhensetupprice/index.js index fe8b253..9e6ad32 100644 --- a/user/pages/yishi/yizhensetupprice/index.js +++ b/user/pages/yishi/yizhensetupprice/index.js @@ -48,21 +48,40 @@ Page({ api.getDoctorInquiryConfig(params).then(response => { console.log(response); this.setData({ - info: response.data.info, - config: response.data.config, + 'info.inquiry_price': response.data.inquiry_price, + 'info.work_num_day': response.data.work_num_day + // config: response.data.config, }) - this.formatAmounts(); - this.formatAmountValue(); + // 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 - }) + // 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);}) + this.getSysconfig() }, + getSysconfig(){ + let {inquiry_type,inquiry_mode}=this.data; + api.getSysconfig({ + inquiry_type, + inquiry_mode + }).then(response => { + console.log(response); + this.setData({ + 'config': response.data + // config: response.data.config, + // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note + }) + this.formatAmounts(); + this.formatAmountValue(); + }).catch(errors => {console.error(errors);}) + +}, formatAmounts(){ let list = this.data.config.system_inquiry_price.map(item => { let it = {}; diff --git a/utils/network/api.js b/utils/network/api.js index 7962c98..9c1ce66 100644 --- a/utils/network/api.js +++ b/utils/network/api.js @@ -912,7 +912,7 @@ getJob() {//获取职业 } getServiceConfig(params) {//获取医生问诊配置-服务设置 return this.request({ - url: `${this.baseUrl}/doctor/inquiry/config/service`, + url: `${this.baseUrl}/doctor/inquiry/config/difficult`, method: 'GET', data: { ...params @@ -922,7 +922,7 @@ getServiceConfig(params) {//获取医生问诊配置-服务设置 postServiceConfig(params) {//新增医生问诊配置-服务设置 return this.request({ - url: `${this.baseUrl}/doctor/inquiry/config/service`, + url: `${this.baseUrl}/doctor/inquiry/config/difficult`, method: 'POST', data: { ...params @@ -931,7 +931,7 @@ postServiceConfig(params) {//新增医生问诊配置-服务设置 } putServiceConfig(params,id) {//修改医生问诊配置-服务设置 return this.request({ - url: `${this.baseUrl}/doctor/inquiry/config/service/${id}`, + url: `${this.baseUrl}/doctor/inquiry/config/difficult/${id}`, method: 'PUT', data: { ...params @@ -1005,13 +1005,67 @@ postServiceConfig(params) {//新增医生问诊配置-服务设置 method: 'GET' }) } - getDoctorService(params){ + getOpen(params){//获取医生问诊服务开启状态 return this.request({ - url: `${this.baseUrl}/doctor/inquiry/service/${params}`, - method: 'GET' + url: `${this.baseUrl}/doctor/inquiry/config/open`, + method: 'GET', + data: { + ...params + } + }) + } + + getSysconfig(params){ + return this.request({//获取系统问诊配置 + url: `${this.baseUrl}/system/inquiry/config`, + method: 'GET', + data: { + ...params + } }) } + getFollow(params){ + return this.request({//获取医生问诊配置-随访包 + url: `${this.baseUrl}/doctor/inquiry/config/follow`, + method: 'GET', + data: { + ...params + } + }) + } + + postFollow(params){ + return this.request({//新增医生问诊配置-随访包 + url: `${this.baseUrl}/doctor/inquiry/config/follow`, + method: 'POST', + data: { + ...params + } + }) + } + getFollowDetail(){ + return this.request({//获取医生问诊配置-随访包-明细 + url: `${this.baseUrl}/doctor/inquiry/config/follow/item`, + method: 'GET' + }) + } + editFollow(params){ + return this.request({//修改医生问诊配置-随访包 + url: `${this.baseUrl}/doctor/inquiry/config/follow`, + method: 'PUT', + data: { + ...params + } + }) + } + getHealthy(){ + return this.request({//获取医生问诊配置-健康包 + url: `${this.baseUrl}/doctor/inquiry/config/health`, + method: 'GET' + }) + } + } export { API } From 41edd2f55eeb618cd0fb3f2def1c1e20a56bce86 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Mon, 8 Apr 2024 14:53:41 +0800 Subject: [PATCH 08/38] 4.8 --- user/pages/yishi/addServiceContent/index.wxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/pages/yishi/addServiceContent/index.wxml b/user/pages/yishi/addServiceContent/index.wxml index 7e3db73..1feb887 100644 --- a/user/pages/yishi/addServiceContent/index.wxml +++ b/user/pages/yishi/addServiceContent/index.wxml @@ -45,7 +45,7 @@ -继续添加服务内容 +继续添加服务内容 保存 From 249e3a26c45ef540f0e8cfde43e0a3f68e26c385 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 12 Apr 2024 10:14:45 +0800 Subject: [PATCH 09/38] 4.12 --- Pages/yishi/index/index.wxml | 2 +- user/pages/yishi/addServiceContent/index.js | 28 +++++++---- user/pages/yishi/addServiceContent/index.wxml | 2 +- user/pages/yishi/onlinesetup/index.js | 50 +++++++++++++++++-- user/pages/yishi/onlinesetup/index.json | 1 + user/pages/yishi/onlinesetup/index.wxml | 47 ++++++++++++++++- user/pages/yishi/onlinesetup/index.wxss | 25 +++++++++- utils/network/api.js | 4 +- 8 files changed, 140 insertions(+), 19 deletions(-) diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml index cc2081e..febfbe1 100644 --- a/Pages/yishi/index/index.wxml +++ b/Pages/yishi/index/index.wxml @@ -115,7 +115,7 @@ 个人简介管理 ! - + { + let type=wx.getStorageSync('usertype'); + let id=wx.getStorageSync('client_user_id_'+type); + api.getFollowDetail(id).then(response=>{ if(response.code==200){ if(response.data){ let res=response.data.map((item)=>{ return {service_period:item.service_period,service_price:item.service_price} }) this.setData({ - items:res + items:res?res:[] }) + console.log(this.data.items) } } }) @@ -233,7 +235,12 @@ getFollowDetail(){ * 生命周期函数--监听页面加载 */ onLoad(options) { + this.setData({ + iden_auth_status:options.iden_auth_status, + idcard_status:options.idcard_status, + is_bind_bank:options.is_bind_bank + }) }, /** @@ -248,7 +255,10 @@ getFollowDetail(){ */ onShow() { this.getService(); - this.getFollowDetail(); + let {idcard_status,iden_auth_status,is_bind_bank}=this.data; + if(idcard_status==1 && iden_auth_status==1 && is_bind_bank==1){ + this.getFollowDetail(); + } }, /** diff --git a/user/pages/yishi/addServiceContent/index.wxml b/user/pages/yishi/addServiceContent/index.wxml index 1feb887..88f5446 100644 --- a/user/pages/yishi/addServiceContent/index.wxml +++ b/user/pages/yishi/addServiceContent/index.wxml @@ -1,6 +1,6 @@ - + 服务次数/月 diff --git a/user/pages/yishi/onlinesetup/index.js b/user/pages/yishi/onlinesetup/index.js index 11866ce..206cec9 100644 --- a/user/pages/yishi/onlinesetup/index.js +++ b/user/pages/yishi/onlinesetup/index.js @@ -48,7 +48,11 @@ Page({ onLoad(options){ console.log(options.multi_point_status); this.setData({ - multi_point_status:options.multi_point_status + multi_point_status:options.multi_point_status, + iden_auth_status:options.iden_auth_status, + idcard_status:options.idcard_status, + is_bind_bank:options.is_bind_bank + }) }, cancelOpenChuFang(){ @@ -95,6 +99,7 @@ Page({ }) }).catch(errors => {console.error(errors);}) }, + getDoctorconfig(){ let {inquiry_type,inquiry_mode}=this.data; //接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） @@ -152,7 +157,8 @@ Page({ }).catch(errors => {console.error(errors);}) }, addServiceContent(){ - app.go('/user/pages/yishi/addServiceContent/index') + let {idcard_status,iden_auth_status,is_bind_bank}=this.data; + app.go('/user/pages/yishi/addServiceContent/index?idcard_status='+idcard_status+'&iden_auth_status='+iden_auth_status+'&is_bind_bank='+is_bind_bank) }, async doChange(detail){ console.log("onChange: ", detail); @@ -165,8 +171,8 @@ Page({ if(!check) return; }; if(this.data.active==2 && detail){ - let {data}=await api.getOpen({inquiry_type:1,inquiry_mode:1}); - if(data==0){ + let {data}=await api.getDoctorInquiryConfig({inquiry_type:1,inquiry_mode:1}); + if(data.inquiry_price!=''){ this.setData({ showOpenTuWen:true }) @@ -278,8 +284,10 @@ Page({ } }, + onChangeInquiry(event) { let index=event.detail.name; + let {idcard_status,iden_auth_status,is_bind_bank}=this.data; this.setData({ active:index }) @@ -293,6 +301,11 @@ Page({ inquiry_type:1, inquiry_mode:9, }) + this.getFollow(); + if(idcard_status==1 && iden_auth_status==1 && is_bind_bank==1){ + this.getFollowDetail(); + } + }else if(index==2){ this.setData({ inquiry_type:1, @@ -315,6 +328,35 @@ Page({ this.getDoctorOpen(); this.getSysconfig(); }, + getFollowDetail(){ + let type=wx.getStorageSync('usertype'); + let id=wx.getStorageSync('client_user_id_'+type); + api.getFollowDetail(id).then(response=>{ + if(response.code==200){ + if(response.data){ + let res=response.data.map((item)=>{ + return {service_period:item.service_period,service_price:item.service_price} + }) + this.setData({ + items:res + }) + } + } + }) +}, + getFollow(){ + api.getFollow().then(response=>{ + if(response.code==200){ + if(response.data){ + let {monthly_frequency,service_rounds,items}=response.data + this.setData({ + monthly_frequency, + service_rounds + }) + } + } + }) + }, putDoctorInquiryConfig(){ //修改医生问诊配置 // let params = {}; diff --git a/user/pages/yishi/onlinesetup/index.json b/user/pages/yishi/onlinesetup/index.json index 6267a60..a145196 100644 --- a/user/pages/yishi/onlinesetup/index.json +++ b/user/pages/yishi/onlinesetup/index.json @@ -9,6 +9,7 @@ "van-button": "@vant/weapp/button/index", "t-toast": "tdesign-miniprogram/toast/toast", "van-tab": "@vant/weapp/tab/index", + "van-icon": "@vant/weapp/icon/index", "van-tabs": "@vant/weapp/tabs/index", "t-dialog": "tdesign-miniprogram/dialog/dialog" } diff --git a/user/pages/yishi/onlinesetup/index.wxml b/user/pages/yishi/onlinesetup/index.wxml index 62b7f40..45fef4d 100644 --- a/user/pages/yishi/onlinesetup/index.wxml +++ b/user/pages/yishi/onlinesetup/index.wxml @@ -2,7 +2,6 @@ - @@ -64,7 +63,53 @@ + + + + 服务次数/月 + + 请选择服务次数 + {{monthly_frequency===0?'不限次数':'10次'}} + + + + + 服务回合数 + + + 不限制 + + + + + + + 服务内容 + + + 服务周期 + + {{item.service_period/30}}个月 + 请选择周期 + + + + + 服务价格（元） + + 元 + + + + + + + + - diff --git a/TUIChatService/pages/index.js b/TUIChatService/pages/index.js index 62f1467..93214b4 100644 --- a/TUIChatService/pages/index.js +++ b/TUIChatService/pages/index.js @@ -9,7 +9,8 @@ Page({ from:'', inquiry_type:'', currentConversationID:'', - baseInfo: {} + baseInfo: {}, + serviceInfo:{} }, onLoad(option) { // console.log("chat onload", option); @@ -35,13 +36,13 @@ Page({ initChat(){ let _this = this; let count = 0; - let {currentConversationID,order_inquiry_id,inquiry_type,baseInfo,from}=this.data; + let {currentConversationID,order_inquiry_id,inquiry_type,baseInfo,from,serviceInfo}=this.data; let interval = setInterval(() => { // console.log("chat init count: ", count); // console.log("app.globalData.chat_sdk_ready: ", app.globalData.chat_sdk_ready); if(app.globalData.chat_sdk_ready){ const TUIChat = _this.selectComponent('#TUIKit'); - TUIChat.init(currentConversationID,order_inquiry_id,inquiry_type,baseInfo,from); + TUIChat.init(currentConversationID,order_inquiry_id,inquiry_type,baseInfo,from,serviceInfo); // wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, _this.$onMessageReceived, _this); clearInterval(interval); } @@ -52,8 +53,18 @@ Page({ } }, 1000); }, + handleServiceChatMsg(id){ + api.serviceChatMsg(id).then(response=>{ + console.log(response); + this.setData({ + serviceInfo:response.data + }) + this.initChat(); + }) + }, //获取问诊订单消息内页基础数据 getInquiryMessageBasic() { + // console.log("order_inquiry_id: ", this.data.order_inquiry_id); api.getInquiryMessageBasic({order_inquiry_id: this.data.order_inquiry_id}).then(response => { // console.log(response); @@ -70,7 +81,8 @@ Page({ console.warn('getUserProfile error:', imError); // 获取其他用户资料失败的相关信息 }); }).then(res => { - this.initChat(); + this.handleServiceChatMsg(this.data.order_inquiry_id); + }).catch(errors => {console.error(errors);}) }, }) diff --git a/TUIChatService/pages/index.wxml b/TUIChatService/pages/index.wxml index d3941fe..818b69e 100644 --- a/TUIChatService/pages/index.wxml +++ b/TUIChatService/pages/index.wxml @@ -1,4 +1,4 @@ - diff --git a/utils/network/api.js b/utils/network/api.js index b2928d9..26a38c8 100644 --- a/utils/network/api.js +++ b/utils/network/api.js @@ -1065,6 +1065,12 @@ postServiceConfig(params) {//新增医生问诊配置-服务设置 method: 'GET' }) } + serviceChatMsg(id){ + return this.request({//获取服务包关联问诊订单消息内页基础数据 + url: `${this.baseUrl}/im/inquiry/basic/service/${id}`, + method: 'GET' + }) + } } From 129db4f0811e2b3abf28aeb848d30dd3db4aac3c Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 18 Apr 2024 13:56:54 +0800 Subject: [PATCH 12/38] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=8D=AF=E5=93=81tip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TUIKit/components/TUIChat/index.wxml | 2 +- user/pages/login/index.js | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxml b/TUIChatService/TUIKit/components/TUIChat/index.wxml index e0d325e..fdfdd43 100644 --- a/TUIChatService/TUIKit/components/TUIChat/index.wxml +++ b/TUIChatService/TUIKit/components/TUIChat/index.wxml @@ -38,7 +38,7 @@ 如需要修改视频时间，请点击这里 - - {{ (info.is_open==1 && active==0)?'已开启，患者可以向您发起图文问诊':'已关闭，暂不接诊' }} + {{ (info.is_open==1 && active==1)?'已开启，患者可以向您发起图文问诊':'已关闭，暂不接诊' }} @@ -22,15 +22,17 @@ 价格设置 - + {{info.work_num_day}} + 请选择每日接诊数量 - - + + {{info.inquiry_price}} 元 + 请选择单价 @@ -57,7 +59,7 @@ - {{ (info.is_open==1 && active==0)?'已开启，患者可以向您发起图文问诊':'已关闭，暂不接诊' }} + {{ (info.is_open==1 && active==1)?'已开启，患者可以向您发起随访包服务':'已关闭，暂不接诊' }} @@ -69,7 +71,7 @@ 服务次数/月 请选择服务次数 - {{monthly_frequency===0?'不限次数':'10次'}} + {{monthly_frequency==="0"?'不限次数':'10次'}} @@ -95,8 +97,8 @@ - - 服务价格（元） + + 服务价格 元 @@ -148,7 +150,7 @@ - {{ (info.is_open==1 && active==0)?'已开启，患者可以向您发起图文问诊':'已关闭，暂不接诊' }} + {{ (info.is_open==1 && active==2)?'已开启，患者可以向您发起健康包服务':'已关闭，暂不接诊' }} @@ -158,7 +160,7 @@ 服务价格 - + - {{ (info.is_open==1&& active==1)?'已开启，患者可以向您发起视频问诊':'已关闭，暂不接诊'}} + {{ (info.is_open==1&& active==3)?'已开启，患者可以向您发起视频问诊':'已关闭，暂不接诊'}} @@ -197,15 +199,17 @@ 价格设置 - + {{info.work_num_day}} + 请选择每日接诊数量 - + {{info.inquiry_price}} 元 + 请选择问诊单价 @@ -241,7 +245,7 @@ - {{ (info.is_open==1 && active==2)?'已开启，患者可以向您发起疑难会诊':'已关闭，暂不接诊'}} + {{ (info.is_open==1 && active==4)?'已开启，患者可以向您发起疑难会诊':'已关闭，暂不接诊'}} diff --git a/user/pages/yishi/onlinesetup/index.wxss b/user/pages/yishi/onlinesetup/index.wxss index 6d9b8c2..f14ce81 100644 --- a/user/pages/yishi/onlinesetup/index.wxss +++ b/user/pages/yishi/onlinesetup/index.wxss @@ -65,11 +65,12 @@ page{ padding-top: 10rpx; display: flex; width: 90vw; - margin: 0 auto; + margin: 0 auto 20rpx; border-radius: 20rpx; flex-direction: column; background-color: rgb(255, 255, 255); } + .price_steup_box_top{ position: relative; display: flex; @@ -139,6 +140,8 @@ page{ color: #000; } .cell_value_seting{ + + white-space: nowrap; color: rgba(0,0,0,0.45); } .dialog{ @@ -216,4 +219,7 @@ color: #E34D59; } .unit{ font-size: 28rpx; + } + .nodata{ + color: #999999; } \ No newline at end of file diff --git a/user/pages/yishi/wenzhenorderV2/index.js b/user/pages/yishi/wenzhenorderV2/index.js index a944c28..0211c01 100644 --- a/user/pages/yishi/wenzhenorderV2/index.js +++ b/user/pages/yishi/wenzhenorderV2/index.js @@ -106,6 +106,7 @@ Page({ app.go("/user/pages/yishi/cash/index?order_inquiry_ids="+order_inquiry_ids); }, goback(){ + wx.navigateBack() }, onLoad(options){ From e5678bf2e539a809429c7abf6c84d6f3eec857a7 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Wed, 24 Apr 2024 14:48:00 +0800 Subject: [PATCH 17/38] 4.24 --- TUIChatService/TUIKit/components/TUIChat/index.wxml | 10 ++++++---- TUIChatService/TUIKit/components/TUIChat/index.wxss | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxml b/TUIChatService/TUIKit/components/TUIChat/index.wxml index 21fbcb7..95b2e7e 100644 --- a/TUIChatService/TUIKit/components/TUIChat/index.wxml +++ b/TUIChatService/TUIKit/components/TUIChat/index.wxml @@ -2,6 +2,10 @@ + {{baseInfo.patient_family_name}} @@ -38,10 +42,8 @@ 如需要修改视频时间，请点击这里 - + + diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxss b/TUIChatService/TUIKit/components/TUIChat/index.wxss index 5281c47..f015d3d 100644 --- a/TUIChatService/TUIKit/components/TUIChat/index.wxss +++ b/TUIChatService/TUIKit/components/TUIChat/index.wxss @@ -129,7 +129,7 @@ position: absolute; } .info{ - /* position: relative; */ + position: relative; z-index: 9; height: 100rpx; background-color: rgb(255, 255, 255); @@ -322,9 +322,11 @@ color: #FF9C00; color:#E34D59; } .yaotip{ - position: fixed; + position: absolute; + left:0; + width:100%; z-index:999; - top:230rpx; + top:100rpx; justify-content: space-between; padding: 0 10rpx; display: flex; From 71c614dba416f55920816b8984c9e5269356d771 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Wed, 24 Apr 2024 18:42:59 +0800 Subject: [PATCH 18/38] =?UTF-8?q?=E6=8F=90=E4=BA=A44.34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/yishi/wenzhen_v2/wenzhen.wxml | 11 +++++-- Pages/yishi/wenzhen_v2/wenzhen.wxss | 10 ++++-- .../TUIChat/components/MessageInput/index.js | 31 +++++++++++++++++-- .../TUIKit/components/TUIChat/index.js | 1 - .../TUIKit/components/TUIChat/index.wxml | 6 ++-- 5 files changed, 49 insertions(+), 10 deletions(-) diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index 71c4d4a..5ec78f6 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -47,12 +47,19 @@ 就诊人： {{item.patient_name}} {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}} - {{item.message_send_time}} + {{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }} + + 服务期限：2023.12.31 10:0 + 服务进度：2023.12.31 10:0 + + 服务内容：2023.12.31 10:0 {{item.custommessagetype==13?'[附赠回复]':item.last_message_content.Text}} - {{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }} + + {{item.message_send_time}} + 查看病历 message_rounds?cach_message_rounds:message_rounds - + let {serviceInfo}=this.data; const mycloudCustomData = JSON.stringify({ order_inquiry_id: this.data.order_inquiry_id, inquiry_type: this.data.inquiry_type, @@ -245,6 +255,11 @@ Component({ message_type: 0, is_system: 0, message_rounds: message_rounds, + remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + service_package_start_time:serviceInfo.start_time, + service_package_finish_time:serviceInfo.finish_timestart_time, + service_period:serviceInfo.service_period, + remaining_quantity:serviceInfo.remaining_quantity, patient_family_data: patient_family_data }); @@ -796,7 +811,7 @@ this.setData({ let cach_message_rounds = this.data.message_rounds message_rounds = cach_message_rounds>message_rounds?cach_message_rounds:message_rounds - + let {serviceInfo}=this.data; const mycloudCustomData = JSON.stringify({ order_inquiry_id: this.data.order_inquiry_id, inquiry_type: this.data.inquiry_type, @@ -804,6 +819,11 @@ this.setData({ message_type: 0, is_system: 0, message_rounds: message_rounds, + remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + service_package_start_time:serviceInfo.start_time, + service_package_finish_time:serviceInfo.finish_timestart_time, + service_period:serviceInfo.service_period, + remaining_quantity:serviceInfo.remaining_quantity, patient_family_data: patient_family_data }); @@ -1215,7 +1235,7 @@ this.setData({ const to = this.getToAccount(); const text = flag ? msg : this.data.message; - + let {serviceInfo}=this.data; const { FEAT_NATIVE_CODE } = constant; const mycloudCustomData = JSON.stringify({ order_inquiry_id: this.data.order_inquiry_id, @@ -1224,6 +1244,11 @@ this.setData({ message_type: 0, is_system: 0, message_rounds: message_rounds, + remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + service_package_start_time:serviceInfo.start_time, + service_package_finish_time:serviceInfo.finish_timestart_time, + service_period:serviceInfo.service_period, + remaining_quantity:serviceInfo.remaining_quantity, patient_family_data: patient_family_data }); diff --git a/TUIChatService/TUIKit/components/TUIChat/index.js b/TUIChatService/TUIKit/components/TUIChat/index.js index 9bb7488..f64b0ad 100644 --- a/TUIChatService/TUIKit/components/TUIChat/index.js +++ b/TUIChatService/TUIKit/components/TUIChat/index.js @@ -79,7 +79,6 @@ Component({ type: Object, value: {}, observer(serviceInfo) { - console.log(serviceInfo) this.setData({ serviceInfo: serviceInfo }); diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxml b/TUIChatService/TUIKit/components/TUIChat/index.wxml index 95b2e7e..cb04830 100644 --- a/TUIChatService/TUIKit/components/TUIChat/index.wxml +++ b/TUIChatService/TUIKit/components/TUIChat/index.wxml @@ -30,7 +30,7 @@ 0个沟通回合 - 问诊中 |  不限问诊次数，{{serviceInfo.finish_time}}天后结束 + 问诊中 |  不限问诊次数，{{serviceInfo.remaining_finish_day}}天后结束  当月剩余：{{serviceInfo.monthly_frequency-serviceInfo.month_inquiry_count}}次 @@ -74,7 +74,9 @@ - Date: Thu, 25 Apr 2024 09:47:38 +0800 Subject: [PATCH 19/38] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA4.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/yishi/wenzhen_v2/wenzhen.js | 18 ++++++++++++++++++ Pages/yishi/wenzhen_v2/wenzhen.wxml | 18 ++++++++++++++---- .../TUIChat/components/MessageInput/index.js | 9 ++++++--- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index 2f6a6ee..b48f5fb 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -307,6 +307,17 @@ Page({ let cloudCustomData = lastMessage.cloudCustomData; if(!cloudCustomData) return; let cloudCustomDataJson = JSON.parse(cloudCustomData); + // remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + // service_package_start_time:serviceInfo.start_time, + // service_package_finish_time:serviceInfo.finish_timestart_time, + // service_period:serviceInfo.service_period, + // remaining_quantity:serviceInfo.remaining_quantity, + let remaining_month_inquiry_count=cloudCustomDataJson.remaining_month_inquiry_count; + let service_package_start_time=cloudCustomDataJson.service_package_start_time; + let service_package_finish_time=cloudCustomDataJson.service_package_finish_time; + let remaining_quantity=cloudCustomDataJson.remaining_quantity; + let service_period=cloudCustomDataJson.service_period; + let monthly_frequency=cloudCustomDataJson.monthly_frequency; let order_inquiry_id = cloudCustomDataJson.order_inquiry_id; if(!order_inquiry_id) return; let inquiry_type = cloudCustomDataJson.inquiry_type; @@ -354,6 +365,13 @@ Page({ txt.Text= lastMessage.messageForShow; session_item.last_message_content = txt; session_item.message_send_time = getTimeAgo(lastMessage.lastTime); + + session_item.remaining_month_inquiry_count=remaining_month_inquiry_count; + session_item.service_package_start_time=service_package_start_time; + session_item.service_package_finish_time=service_package_finish_time; + session_item.service_period=service_period; + session_item.remaining_quantity=remaining_quantity; + session_item.monthly_frequency= monthly_frequency; session_item.message_type = type; session_item.order_inquiry_id = order_inquiry_id; session_item.inquiry_type = inquiry_type; diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index 5ec78f6..28d6f96 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -49,11 +49,21 @@ {{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }} - - 服务期限：2023.12.31 10:0 - 服务进度：2023.12.31 10:0 + + 服务期限：{{item.service_package_start_time}}-{{item.service_package_finish_time}} + 服务进度：不限次数问诊 + 服务进度：当月剩余{{item.remaining_month_inquiry_count}}次问诊 - 服务内容：2023.12.31 10:0 + 服务内容：服务周期{{item.service_period/30}}个月 + + 服务期限：{{item.service_package_start_time}}-{{item.service_package_finish_time}} + 服务进度：当月不限次问诊 + 当月剩余{{item.remaining_month_inquiry_count}}次问诊,剩余{{item.remaining_quantity}}盒干爽颗粒（步长） + + + + + 服务内容：{{item.monthly_frequency==='0'?'不限':item.monthly_frequency}}次问诊/月,30盒肝爽颗粒（步长） {{item.custommessagetype==13?'[附赠回复]':item.last_message_content.Text}} diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js index f0ae9a9..27e4a43 100644 --- a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -257,9 +257,10 @@ Component({ message_rounds: message_rounds, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, service_package_start_time:serviceInfo.start_time, - service_package_finish_time:serviceInfo.finish_timestart_time, + service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, remaining_quantity:serviceInfo.remaining_quantity, + monthly_frequency:serviceInfo.monthly_frequency, patient_family_data: patient_family_data }); @@ -821,9 +822,10 @@ this.setData({ message_rounds: message_rounds, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, service_package_start_time:serviceInfo.start_time, - service_package_finish_time:serviceInfo.finish_timestart_time, + service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, remaining_quantity:serviceInfo.remaining_quantity, + monthly_frequency:serviceInfo.monthly_frequency, patient_family_data: patient_family_data }); @@ -1246,9 +1248,10 @@ this.setData({ message_rounds: message_rounds, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, service_package_start_time:serviceInfo.start_time, - service_package_finish_time:serviceInfo.finish_timestart_time, + service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, remaining_quantity:serviceInfo.remaining_quantity, + monthly_frequency:serviceInfo.monthly_frequency, patient_family_data: patient_family_data }); From 821ead92056411f76d51c4184c1b902ac8e13a82 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 25 Apr 2024 10:08:23 +0800 Subject: [PATCH 20/38] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=AD=A3=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/pages/yishi/identity/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/pages/yishi/identity/index.js b/user/pages/yishi/identity/index.js index fa78eae..3667b1a 100644 --- a/user/pages/yishi/identity/index.js +++ b/user/pages/yishi/identity/index.js @@ -354,7 +354,7 @@ Page({ console.log("idcard: ", idcard); realname = realname.replace(/•/g,"·"); var realname_reg= /^(([a-zA-Z+\.?\·?a-zA-Z+]{2,30}$)|([\u4e00-\u9fa5+\·?\u4e00-\u9fa5+]{2,30}$))/; - var idcard_reg=/^(^[1-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])$)$/; + 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]$/; //判断用户输入的真实姓名是否为空 if(realname.length == 0){ From 176d383cff2df255bb9d54d6d1ce81270dfae603 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 25 Apr 2024 13:55:50 +0800 Subject: [PATCH 21/38] =?UTF-8?q?=E9=A6=96=E9=A1=B5service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/yishi/index/index.js | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js index 8bf4f85..5b12cac 100644 --- a/Pages/yishi/index/index.js +++ b/Pages/yishi/index/index.js @@ -268,6 +268,42 @@ 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=>{ + if(res.code==200){ + let result=res.data; + for (let i = 0; i < result.length; i++) { + if(result[i].inquiry_type=1 && result[i].inquiry_mode==1 && result[i].is_enable==1){ + this.setData({ + 'info.is_img_expert_reception':1 + }) + }else{ + this.setData({ + 'info.is_img_expert_reception':0 + }) + }; + if(result[i].inquiry_type=2 && result[i].is_enable==1){ + this.setData({ + 'info.is_img_quick_reception':1 + }) + }else{ + this.setData({ + 'info.is_img_quick_reception':0 + }) + }; + if(result[i].inquiry_type=3 && result[i].is_enable==1){ + this.setData({ + 'info.is_img_welfare_reception':1 + }) + }else{ + this.setData({ + 'info.is_img_welfare_reception':0 + }) + }; + + } + + } + }) // //是否参加专家图文接诊（0:否 1:是） // let is_img_expert_reception = response.data.info.is_img_expert_reception; // //是否参加专家快速接诊（0:否 1:是） From b1bfb01a395cee9b418cf6a5b65c61bf10848eef Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 25 Apr 2024 16:11:48 +0800 Subject: [PATCH 22/38] =?UTF-8?q?git=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/yishi/wenzhen_v2/wenzhen.js | 6 ++++-- user/pages/yishi/onlinesetup/index.js | 9 +++------ user/pages/yishi/yizhensetup/index.js | 10 +++++----- utils/network/api.js | 6 ++++++ 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index b48f5fb..e5f3c0c 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -267,7 +267,8 @@ Page({ new_conversationList.push(item); }) }; - //console.log(new_conversationList); + console.log(2222); + console.log(new_conversationList); this.setData({ conversationList: new_conversationList }) @@ -296,7 +297,8 @@ Page({ let userID = wx.getStorageSync('user_id_'+usertype); let totalUnreadCount = 0; let message_inquiry_type = this.data.message_inquiry_type; - //console.log(this.data.conversationList); + console.log(11111); + console.log(this.data.conversationList); this.data.conversationList.forEach(item => { let conversationID = item.conversationID; if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过 diff --git a/user/pages/yishi/onlinesetup/index.js b/user/pages/yishi/onlinesetup/index.js index d5910d3..93778b2 100644 --- a/user/pages/yishi/onlinesetup/index.js +++ b/user/pages/yishi/onlinesetup/index.js @@ -148,11 +148,8 @@ Page({ }, getConfig(){ - let {inquiry_type,inquiry_mode}=this.data; - api.getServiceConfig({ - inquiry_type, - inquiry_mode - }).then(response => { + // let {inquiry_type,inquiry_mode}=this.data; + api.getServiceConfig().then(response => { let result=response.data; if(result){ this.setData({ @@ -160,7 +157,7 @@ Page({ 'config_setting.service_process':result.service_process, 'config_setting.service_period':result.service_period, 'config_setting.service_rounds':result.service_rounds, - 'config_setting.config_service_id':result.config_service_id, + 'config_setting.config_service_id':result.difficult_consultation_id, difficultSetting:true }) }else{ diff --git a/user/pages/yishi/yizhensetup/index.js b/user/pages/yishi/yizhensetup/index.js index 358d98d..02dd0eb 100644 --- a/user/pages/yishi/yizhensetup/index.js +++ b/user/pages/yishi/yizhensetup/index.js @@ -46,11 +46,11 @@ Page({ }, onShow(){ this.getDoctorOpen() - // let doctor_id=wx.getStorageSync('client_user_id_2'); - // console.log(doctor_id); - // if(doctor_id){ - // this.getService(doctor_id) - // } + let doctor_id=wx.getStorageSync('client_user_id_2'); + + if(doctor_id){ + this.getService(doctor_id) + } 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:会员） diff --git a/utils/network/api.js b/utils/network/api.js index 26a38c8..544fe77 100644 --- a/utils/network/api.js +++ b/utils/network/api.js @@ -1005,6 +1005,12 @@ postServiceConfig(params) {//新增医生问诊配置-服务设置 method: 'GET' }) } + getDoctorService(params){//获取开通服务 + return this.request({ + url: `${this.baseUrl}/doctor/inquiry/service/${params}`, + method: 'GET' + }) + } getOpen(params){//获取医生问诊服务开启状态 return this.request({ url: `${this.baseUrl}/doctor/inquiry/config/open`, From a1104447925317074f55529816a95b7398400cde Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 26 Apr 2024 09:59:48 +0800 Subject: [PATCH 23/38] 4.26 --- Pages/yishi/wenzhen_v2/wenzhen.js | 2 ++ Pages/yishi/wenzhen_v2/wenzhen.wxml | 13 +++++++------ .../TUIChat/components/MessageInput/index.js | 3 +++ TUIChatService/TUIKit/components/TUIChat/index.wxml | 2 +- TUIChatService/TUIKit/components/TUIChat/index.wxss | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index e5f3c0c..5b85726 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -320,6 +320,7 @@ Page({ let remaining_quantity=cloudCustomDataJson.remaining_quantity; let service_period=cloudCustomDataJson.service_period; let monthly_frequency=cloudCustomDataJson.monthly_frequency; + let month_inquiry_count=cloudCustomDataJson.month_inquiry_count; let order_inquiry_id = cloudCustomDataJson.order_inquiry_id; if(!order_inquiry_id) return; let inquiry_type = cloudCustomDataJson.inquiry_type; @@ -374,6 +375,7 @@ Page({ session_item.service_period=service_period; session_item.remaining_quantity=remaining_quantity; session_item.monthly_frequency= monthly_frequency; + session_item.month_inquiry_count= month_inquiry_count; session_item.message_type = type; session_item.order_inquiry_id = order_inquiry_id; session_item.inquiry_type = inquiry_type; diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index 28d6f96..96d25ed 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -49,21 +49,22 @@ {{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }} - - 服务期限：{{item.service_package_start_time}}-{{item.service_package_finish_time}} + 服务内容：服务周期{{item.service_period/30}}个月 + + 服务期限：{{item.service_package_start_time}}-{{item.service_package_finish_time}} 服务进度：不限次数问诊 服务进度：当月剩余{{item.remaining_month_inquiry_count}}次问诊 - 服务内容：服务周期{{item.service_period/30}}个月 - - 服务期限：{{item.service_package_start_time}}-{{item.service_package_finish_time}} + 服务内容：{{item.monthly_frequency==='0'?'不限':item.monthly_frequency}}次问诊/月,30盒肝爽颗粒（步长） + + 服务期限：{{item.service_package_start_time}}-{{item.service_package_finish_time}} 服务进度：当月不限次问诊 当月剩余{{item.remaining_month_inquiry_count}}次问诊,剩余{{item.remaining_quantity}}盒干爽颗粒（步长） - 服务内容：{{item.monthly_frequency==='0'?'不限':item.monthly_frequency}}次问诊/月,30盒肝爽颗粒（步长） + {{item.custommessagetype==13?'[附赠回复]':item.last_message_content.Text}} diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js index 27e4a43..5d5dace 100644 --- a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -256,6 +256,7 @@ Component({ is_system: 0, message_rounds: message_rounds, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + month_inquiry_count:serviceInfo.month_inquiry_count, service_package_start_time:serviceInfo.start_time, service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, @@ -821,6 +822,7 @@ this.setData({ is_system: 0, message_rounds: message_rounds, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + month_inquiry_count:serviceInfo.month_inquiry_count, service_package_start_time:serviceInfo.start_time, service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, @@ -1247,6 +1249,7 @@ this.setData({ is_system: 0, message_rounds: message_rounds, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + month_inquiry_count:serviceInfo.month_inquiry_count, service_package_start_time:serviceInfo.start_time, service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxml b/TUIChatService/TUIKit/components/TUIChat/index.wxml index cb04830..4c73457 100644 --- a/TUIChatService/TUIKit/components/TUIChat/index.wxml +++ b/TUIChatService/TUIKit/components/TUIChat/index.wxml @@ -3,7 +3,7 @@ diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxss b/TUIChatService/TUIKit/components/TUIChat/index.wxss index f015d3d..9cc3438 100644 --- a/TUIChatService/TUIKit/components/TUIChat/index.wxss +++ b/TUIChatService/TUIKit/components/TUIChat/index.wxss @@ -334,8 +334,8 @@ color: #FF9C00; box-sizing: border-box; width:100%; height: 72rpx; - background: #facd91; + background: #FFFCF2; font-size: 28rpx; font-weight: 400; -color: #db0f22; +color: #FF9C00; } \ No newline at end of file From 7ba9510ee78f321fefc829bb6e73bc95d13f0591 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 26 Apr 2024 11:30:35 +0800 Subject: [PATCH 24/38] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/yishi/wenzhen_v2/wenzhen.wxml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index 96d25ed..bf2f2b2 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -49,14 +49,14 @@ {{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }} - 服务内容：服务周期{{item.service_period/30}}个月 - + 服务内容：服务周期{{item.service_period/30}}个月 + 服务期限：{{item.service_package_start_time}}-{{item.service_package_finish_time}} 服务进度：不限次数问诊 服务进度：当月剩余{{item.remaining_month_inquiry_count}}次问诊 - 服务内容：{{item.monthly_frequency==='0'?'不限':item.monthly_frequency}}次问诊/月,30盒肝爽颗粒（步长） - + 服务内容：{{item.monthly_frequency==='0'?'不限':item.monthly_frequency}}次问诊/月,30盒肝爽颗粒（步长） + 服务期限：{{item.service_package_start_time}}-{{item.service_package_finish_time}} 服务进度：当月不限次问诊 当月剩余{{item.remaining_month_inquiry_count}}次问诊,剩余{{item.remaining_quantity}}盒干爽颗粒（步长） From fb681b8a93e707968dbde10865e6c89eb3a276f7 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Sun, 28 Apr 2024 09:12:52 +0800 Subject: [PATCH 25/38] =?UTF-8?q?4.28=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/pages/yishi/addServiceContent/index.js | 1 + user/pages/yishi/addServiceContent/index.wxml | 10 +- user/pages/yishi/addServiceContent/index.wxss | 254 ++++++++++-------- 3 files changed, 154 insertions(+), 111 deletions(-) diff --git a/user/pages/yishi/addServiceContent/index.js b/user/pages/yishi/addServiceContent/index.js index 7ac29f8..f578e0d 100644 --- a/user/pages/yishi/addServiceContent/index.js +++ b/user/pages/yishi/addServiceContent/index.js @@ -26,6 +26,7 @@ Page({ threePrice:null, sixPrice:null, yearPrice:null, + static_host: api.getStaticHost(), items:[{ service_period:'', service_price:'' diff --git a/user/pages/yishi/addServiceContent/index.wxml b/user/pages/yishi/addServiceContent/index.wxml index b4e1a35..9ed50ef 100644 --- a/user/pages/yishi/addServiceContent/index.wxml +++ b/user/pages/yishi/addServiceContent/index.wxml @@ -23,7 +23,7 @@ 服务内容 - + 服务周期 @@ -40,8 +40,12 @@ - 建议服务价格设置为：{{(item.service_period/30)==1?'¥'+onePrice:(item.service_period/30)==3?'¥'+threePrice:(item.service_period/30)==6?'¥'+sixPrice:(item.service_period/30)==12?'¥'+yearPrice:'单次图文*10次*0.5'}} - 删除 + 建议服务价格设置为：{{(item.service_period/30)==1?'¥'+onePrice:(item.service_period/30)==3?'¥'+threePrice:(item.service_period/30)==6?'¥'+sixPrice:(item.service_period/30)==12?'¥'+yearPrice:'单次图文*10次*0.5'}} + + + diff --git a/user/pages/yishi/addServiceContent/index.wxss b/user/pages/yishi/addServiceContent/index.wxss index 27b994b..0834702 100644 --- a/user/pages/yishi/addServiceContent/index.wxss +++ b/user/pages/yishi/addServiceContent/index.wxss @@ -1,30 +1,35 @@ -page{ +page { background-color: #F6F6F6; - } - .page{ - overflow: hidden; - display: flex; - flex-direction: column; - } - .title{ - width:90vw; - margin: 0 auto 20rpx; - font-weight: 550; - font-size: 32rpx; - color: rgba(0,0,0,0.85); - } - .checked_box{ +} + +.page { + overflow: hidden; + display: flex; + flex-direction: column; +} + +.title { + width: 90vw; + margin: 0 auto 20rpx; + font-weight: 550; + font-size: 32rpx; + color: rgba(0, 0, 0, 0.85); +} + +.checked_box { margin-top: 30rpx; - } - .price_title{ +} + +.price_title { width: 90vw; margin: 20rpx auto 0 auto; font-size: 32rpx; margin-bottom: 20rpx; /* font-family: "AlibabaPuHuiTi-2-55-Regular"; */ color: #333333; - } - .price_steup_box{ +} + +.price_steup_box { display: flex; width: 90vw; height: 180rpx; @@ -32,47 +37,55 @@ page{ border-radius: 20rpx; flex-direction: column; background-color: rgb(255, 255, 255); - } - .price_steup_box_top{ +} + +.price_steup_box_top { position: relative; display: flex; justify-content: space-between; margin: 20rpx 20rpx 20rpx 30rpx; align-items: center; padding-bottom: 30rpx; - } - .price_steup_box_bottom{ +} + +.price_steup_box_bottom { position: relative; display: flex; justify-content: space-between; margin: 0rpx 20rpx 0rpx 30rpx; align-items: center; - } - .price_steup_box_top_title, .price_steup_box_bottom_title{ +} + +.price_steup_box_top_title, +.price_steup_box_bottom_title { flex: 1; font-size: 32rpx; color: #333; - } +} - .price{ - text-align: right!important; - font-size: 28rpx; - } - .price_steup_box_bottom_num{ +.price { + text-align: right !important; + font-size: 28rpx; +} + +.price_steup_box_bottom_num { flex: 1.5; display: flex; justify-content: flex-end; text-align: right; - align-items:center; - } - .ipt{ + align-items: center; +} + +.ipt { font-size: 28rpx; color: #E34D59; - } - .unit{ - font-size: 28rpx; - } - .price_steup_box_top::after{ +} + +.unit { + font-size: 28rpx; +} + +.price_steup_box_top::after { position: absolute; box-sizing: border-box; content: ' '; @@ -82,96 +95,121 @@ page{ bottom: 0; border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7)); transform: scaleY(0.5); - } - .price_steup_box_top_stepper{ - display: flex; +} + +.price_steup_box_top_stepper { + display: flex; text-align: right; align-items: center; - } - .bottom{ +} + +.bottom { width: 90vw; margin: -20rpx auto; color: #999; letter-spacing: 2rpx; font-size: 28rpx; line-height: 40rpx; - } - .go{ +} + +.go { position: fixed; left: 50%; transform: translateX(-50%); bottom: 100rpx; width: 90vw; - } - .weui-input{ +} + +.weui-input { color: red; display: inline-block; text-align: right; - } - .price{ +} + +.price { text-align: center; flex: 1; - } - .green{ - color:#3CC7C0; - } - .tips{ - margin:15rpx 30rpx; +} + +.green { + color: #3CC7C0; +} + +.tips { + margin: 15rpx 30rpx; + margin-right: 0; font-weight: 400; -font-size: 24rpx; -display: flex; -justify-content: space-between; -color: #E34D59; - } - .continueadd{ - + font-size: 24rpx; + display: flex; + justify-content: space-between; + color: #E34D59; +} + +.continueadd { + font-size: 30rpx; color: #3CC7C0; - display: flex; - align-items: center; - justify-content: center; - width:90vw; - height: 80rpx; - margin:80rpx auto 0; -background: rgba(44,241,248,0.28); -border-radius: 8rpx; - } - .btn{ - bottom:60rpx; - position: fixed; + display: flex; + align-items: center; + justify-content: center; + width: 90vw; + height: 80rpx; + margin: 80rpx auto 0; + background: rgba(44, 241, 248, 0.28); + border-radius: 8rpx; +} + +.btn { + bottom: 60rpx; + position: fixed; font-size: 32rpx; color: #fff; - display: flex; - align-items: center; - justify-content: center; - width:90vw; - left:50%; - transform: translate(-50%); - height: 80rpx; - 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; - } - .amount.nodata{ + display: flex; + align-items: center; + justify-content: center; + width: 90vw; + left: 50%; + transform: translate(-50%); + height: 80rpx; + 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; +} + +.amount.nodata { font-size: 28rpx; -color: rgba(0,0,0,0.45); - } - .vontent{ - flex:1; - margin-bottom: 150rpx; - overflow-y: scroll; - } \ No newline at end of file + color: rgba(0, 0, 0, 0.45); +} + +.vontent { + flex: 1; + margin-bottom: 150rpx; + overflow-y: scroll; +} + +.del_img { + width: 160rpx; + height: 64rpx; +} + +.advice_price { + margin-top: 10rpx; +} \ No newline at end of file From 2d8066cbed9631de83d48f411279bca627389597 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Sun, 28 Apr 2024 13:24:15 +0800 Subject: [PATCH 26/38] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E9=97=AE=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/pages/yishi/kuaisusetup/index.js | 35 ++++++++++++++++++------- user/pages/yishi/kuaisusetup/index.wxml | 2 +- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/user/pages/yishi/kuaisusetup/index.js b/user/pages/yishi/kuaisusetup/index.js index 4763933..834f3bb 100644 --- a/user/pages/yishi/kuaisusetup/index.js +++ b/user/pages/yishi/kuaisusetup/index.js @@ -48,20 +48,37 @@ Page({ api.getDoctorInquiryConfig(params).then(response => { console.log(response); this.setData({ - info: response.data.info, - config: response.data.config, + 'info.inquiry_price': response.data.inquiry_price, + 'info.work_num_day': response.data.work_num_day }) }).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 - }) + // 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);}) + this.getSysconfig() }, + getSysconfig(){ + let {inquiry_type,inquiry_mode}=this.data; + api.getSysconfig({ + inquiry_type, + inquiry_mode + }).then(response => { + console.log(response); + this.setData({ + 'config': response.data + // config: response.data.config, + // note: response.data.info.is_open == 1? this.data.open_note : this.data.close_note + }) + + }).catch(errors => {console.error(errors);}) + +}, changeON(){ let is_open = this.data.info.is_open console.log("changeON:", is_open) diff --git a/user/pages/yishi/kuaisusetup/index.wxml b/user/pages/yishi/kuaisusetup/index.wxml index 2a73959..2ddb585 100644 --- a/user/pages/yishi/kuaisusetup/index.wxml +++ b/user/pages/yishi/kuaisusetup/index.wxml @@ -26,7 +26,7 @@ 问诊单价 - +  元 From c7cfee82fad0ea964258e5925df7fec2ffc0f8c3 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Sun, 28 Apr 2024 13:33:11 +0800 Subject: [PATCH 27/38] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E9=97=AE=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/pages/yishi/kuaisusetup/index.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/user/pages/yishi/kuaisusetup/index.js b/user/pages/yishi/kuaisusetup/index.js index 834f3bb..eb30b4f 100644 --- a/user/pages/yishi/kuaisusetup/index.js +++ b/user/pages/yishi/kuaisusetup/index.js @@ -62,6 +62,7 @@ Page({ }).catch(errors => {console.error(errors);}) this.getSysconfig() + this.getDoctorOpen(); }, getSysconfig(){ let {inquiry_type,inquiry_mode}=this.data; @@ -79,6 +80,25 @@ Page({ }).catch(errors => {console.error(errors);}) }, +getDoctorOpen(){ + let {inquiry_type,inquiry_mode}=this.data; + api.getOpen({ + inquiry_type, + inquiry_mode + }).then(response => { + this.setData({ + note: response.data, + 'info.is_open': response.data + }) + 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);}) + }, changeON(){ let is_open = this.data.info.is_open console.log("changeON:", is_open) From c5020df72184b3bbb916a87973935f73662ce5c0 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Mon, 29 Apr 2024 16:03:54 +0800 Subject: [PATCH 28/38] =?UTF-8?q?=E9=97=AE=E8=AF=8A=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/yishi/wenzhen_v2/wenzhen.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index 5b85726..a910072 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -41,6 +41,9 @@ Page({ dot_5: false, }, onLoad() { + }, + onUnload(){ + }, initInterval(){ let _this = this; @@ -523,6 +526,7 @@ Page({ }) //点击请求数据为0，则重新渲染页面 this.getDoctorInquiryFinishMessage('end'); + } }, vanTabsChange(e){ @@ -560,7 +564,11 @@ Page({ last_page: response.data.last_page }) if(from && response.data.data.length==0){ - this.formatStatus(); + //this.formatStatus(); + + this.onHide(); + this.onShow(); + } // this.selectComponent('#tabs').resize(); }).then(res =>{ From 5130ea5c7a28c70a2904e77829f77653dcf14eb8 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Tue, 30 Apr 2024 17:29:43 +0800 Subject: [PATCH 29/38] =?UTF-8?q?=E9=94=AE=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TUIChat/components/MessageInput/index.js | 26 ++++++++++++++++--- .../components/MessageInput/index.wxml | 4 +-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js index 5d5dace..8e2800a 100644 --- a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -110,6 +110,7 @@ Component({ * 组件的初始数据 */ data: { + textFocus:false, conversation: {}, message: '', showRound:false, @@ -334,7 +335,20 @@ this.setData({ }) wx.setStorageSync('words', ""); } - + //let THIS=this; + // wx.getSystemInfo({ + // success: function(res) { + // let platform = res.platform; + // if (platform === 'ios') { + // setTimeout(()=>{ + // THIS.setData({ + // textFocus: true, + // }); + // }) + // } + // } + // }); + // console.log("pageLifetimes show") let _this = this wx.getNetworkType({ @@ -1349,9 +1363,13 @@ this.setData({ }, // 监听是否获取焦点，有焦点则向父级传值，动态改变input组件的高度。 inputBindFocus(event) { - this.setData({ - focus: true, - }); + let {height}= event.detail; + console.log(height); + // if(height==0){ + // this.setData({ + // textFocus: true, + // }); + // } // this.getMessageList(this.data.conversation); this.triggerEvent('pullKeysBoards', { event, diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml index da7bb5e..d206d3a 100644 --- a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml +++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml @@ -11,8 +11,8 @@ src="{{isAudio ? '../../../../static/assets/keyboard.svg' : '../../../../static/assets/audio.svg'}}" /> -