diff --git a/Pages/index/index.js b/Pages/index/index.js index aa18410..0757550 100644 --- a/Pages/index/index.js +++ b/Pages/index/index.js @@ -18,14 +18,14 @@ Page({ goCheck(e){ console.log(e); let usertype = e.currentTarget.dataset.usertype; + let url = e.currentTarget.dataset.url; + wx.setStorageSync('usertype', usertype); + wx.setStorageSync('next_url', url); if(usertype == 2){ app.imInit(); }else{ app.imLogout(); } - let url = e.currentTarget.dataset.url; - wx.setStorageSync('usertype', usertype); - wx.setStorageSync('next_url', url); let token = wx.getStorageSync('AUTH_TOKEN_'+usertype); console.log(token); if(token){ diff --git a/Pages/yaoshi/home/home.wxml b/Pages/yaoshi/home/home.wxml index bbb1af0..619ca77 100644 --- a/Pages/yaoshi/home/home.wxml +++ b/Pages/yaoshi/home/home.wxml @@ -15,33 +15,36 @@ - - - 处方订单号：{{item.prescription_code}} - - + + + + 处方订单号：{{item.prescription_code}} + + + - - - 开方时间：{{item.created_at}} - - 查看病例 + + 开方时间：{{item.created_at}} + + 查看病例 + - - - {{item.patient_name}}/{{item.patient_sex==1?'男':'女'}}/{{item.patient_age}}岁 - - 去审方 + + {{item.patient_name}}/{{item.patient_sex==1?'男':'女'}}/{{item.patient_age}}岁 + + 去审方 + + 处方订单号：{{item.prescription_code}} @@ -62,9 +65,11 @@ + + 处方订单号：{{item.prescription_code}} @@ -85,10 +90,11 @@ - + + 处方订单号：{{item.prescription_code}} @@ -109,6 +115,7 @@ + diff --git a/Pages/yaoshi/home/home.wxss b/Pages/yaoshi/home/home.wxss index 7aa8dee..5203b44 100644 --- a/Pages/yaoshi/home/home.wxss +++ b/Pages/yaoshi/home/home.wxss @@ -69,10 +69,24 @@ page{ .avatar-example--medium:not(:last-child) { margin-right: 96rpx; } +.van-tabs__nav{ + border-radius: 20rpx !important; +} +.item_list{ + padding-bottom: 100rpx; + background-color: #F4F5F7; + border-radius: 20rpx; +} +.item:last-child{ + border-bottom-left-radius: 20rpx; + border-bottom-right-radius: 20rpx; +} .item{ border-top: solid rgb(187, 185, 185) 1rpx; - width: 95%; - margin: 10rpx auto; + width: 100%; + margin: 0 auto; + background-color: #fff; + padding: 20rpx 0; } .item_txt{ display: flex; diff --git a/Pages/yaoshi/prescription/prescription.wxss b/Pages/yaoshi/prescription/prescription.wxss index 4a325df..a4446ba 100644 --- a/Pages/yaoshi/prescription/prescription.wxss +++ b/Pages/yaoshi/prescription/prescription.wxss @@ -24,7 +24,7 @@ page{ display:inline-block; } .pop{ - width: 80vw; + width: 90vw; margin-bottom: 30rpx; } .pop_button{ @@ -55,3 +55,6 @@ page{ left:125rpx; bottom:126rpx; } +.van-cell__value{ + flex: 1.2 !important; +} \ No newline at end of file diff --git a/Pages/yishi/appraise/index.js b/Pages/yishi/appraise/index.js index a52f6c5..9a0b2de 100644 --- a/Pages/yishi/appraise/index.js +++ b/Pages/yishi/appraise/index.js @@ -44,6 +44,7 @@ Page({ this.setData({ doctor_id: option.doctor_id }) + }, onShow(){ console.log("onShow"); @@ -51,21 +52,15 @@ Page({ }, onTabsChange(e){ console.log(e); - let list_name = "appraise_list_" + e.detail.value; + let list_name = "appraise_list_" + e.detail.name; this.setData({ - evaluation_type: e.detail.value, + evaluation_type: e.detail.name, current_page: 0, last_page: 0, [list_name]: [] }) this.getDoctorEvaluationList() }, - onTabsClick(e){ - console.log(e); - }, - onStickyScroll(e){ - return 1; - }, getDoctorEvaluationList(){ //获取评价列表 let params = {}; diff --git a/Pages/yishi/appraise/index.json b/Pages/yishi/appraise/index.json index 32a4098..01214cc 100644 --- a/Pages/yishi/appraise/index.json +++ b/Pages/yishi/appraise/index.json @@ -3,9 +3,11 @@ "usingComponents": { "te-nav-bar": "/commpents/te_navbar", "appraise-data": "/commpents/appraise_data/index", - "t-tabs": "tdesign-miniprogram/tabs/tabs", - "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel", - "van-empty": "@vant/weapp/empty/index" + "van-empty": "@vant/weapp/empty/index", + "van-tab": "@vant/weapp/tab/index", + "van-tabs": "@vant/weapp/tabs/index", + "t-rate": "tdesign-miniprogram/rate/rate", + "van-divider": "@vant/weapp/divider/index" }, "enablePullDownRefresh": true, "onReachBottomDistance": 100 diff --git a/Pages/yishi/appraise/index.wxml b/Pages/yishi/appraise/index.wxml index 80226b2..4850809 100644 --- a/Pages/yishi/appraise/index.wxml +++ b/Pages/yishi/appraise/index.wxml @@ -1,6 +1,63 @@ - - + + + + + + + {{item.name_mask}} + + + + + {{item.content}} + {{item.created_at}} + + + + 到底了~ + + + + + + {{item.name_mask}} + + + + + {{item.content}} + {{item.created_at}} + + + + 到底了~ + + + + + + {{item.name_mask}} + + + + + {{item.content}} + {{item.created_at}} + + + + 到底了~ + + + + \ No newline at end of file diff --git a/Pages/yishi/appraise/index.wxss b/Pages/yishi/appraise/index.wxss index 87cec88..112832e 100644 --- a/Pages/yishi/appraise/index.wxss +++ b/Pages/yishi/appraise/index.wxss @@ -4,22 +4,47 @@ page{ .container{ width: 100vw; } -.t-tab-panel,.t-tabs__content { - background-color: #F6F6F6; -} -.t-tabs__item--active{ - color: #49B9AD !important; - font-size: 32rpx !important; -} -.t-tabs__item-inner--line{ - font-size: 28rpx !important; -} -.t-tabs__track{ - background-color: var(--td-tab-track-color, var(--td-primary-color, #49B9AD)) !important; -} .item_list{ width: 92vw; margin: 20rpx auto; background-color: #fff; border-radius: 20rpx; } + + + +.item{ + display: flex; + padding: 20rpx; + flex-direction: column; +} +.item:not(:last-child){ + border-bottom: 1px solid #E7E7E7; +} +.top{ + display: flex; + justify-content: space-between; + align-items: center; + flex: 1; +} +.name{ + flex: 1; + font-size: 30rpx; + color: #666666; +} +.start{ + flex: 1; + display: flex; + justify-content: flex-end; +} +.content{ + flex: 2; + font-size: 34rpx; + color: #333333; + margin: 20rpx 0; +} +.date{ + flex: 1; + font-size: 28rpx; + color: #666666; +} \ No newline at end of file diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js index bd1434a..5a1a320 100644 --- a/Pages/yishi/cash/index.js +++ b/Pages/yishi/cash/index.js @@ -17,26 +17,23 @@ Page({ withdrawal_amount: "xxxx", income_tax: "xx", contactKeFu: false, - skeleton_loading: true + skeleton_loading: true, + order_inquiry_ids: "" }, - onLoad(options){ - //获取提现数据 - api.getDoctorWithdrawal().then(response => { - console.log(response); - if(response.data.bank_card_id){ - this.setData({ - bank_card_id: response.data.bank_card_id, - bank_icon_path: response.data.bank_icon_path, - bank_name : response.data.bank_name, - bank_card_code_mask: response.data.bank_card_code_mask, - withdrawal_amount: response.data.withdrawal_amount, - income_tax: response.data.income_tax, - skeleton_loading: false - }) - } - }).catch(errors => { - console.error(errors); - }) + onLoad(option){ + let order_inquiry_ids = option.order_inquiry_ids; + let params = {}; + if(order_inquiry_ids){ + params.order_inquiry_ids = order_inquiry_ids; + this.setData({ + "navbarData.back_url": "/Pages/yishi/my/index", + "navbarData.back_url_type": 1, + }) + } + this.postDoctorWithdrawalInfo(params); + }, + onShow(){ + }, contactKeFu(e){ let _this = this; @@ -54,4 +51,23 @@ Page({ }) }, + postDoctorWithdrawalInfo(params){ + //获取提现数据 + api.postDoctorWithdrawalInfo(params).then(response => { + console.log(response); + if(response.data.bank.bank_card_id){ + this.setData({ + bank_card_id: response.data.bank.bank_card_id, + bank_icon_path: response.data.bank.bank_icon_path, + bank_name : response.data.bank.bank_name, + bank_card_code_mask: response.data.bank.bank_card_code_mask, + withdrawal_amount: response.data.withdrawal_amount, + income_tax: response.data.income_tax, + skeleton_loading: false + }) + } + }).catch(errors => { + console.error(errors); + }) + } }) \ No newline at end of file diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml index 68e9845..bd83843 100644 --- a/Pages/yishi/cash/index.wxml +++ b/Pages/yishi/cash/index.wxml @@ -32,7 +32,7 @@ - + 查看订单 diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml index 9aceb12..f9ce70f 100644 --- a/Pages/yishi/chufangsetup/index.wxml +++ b/Pages/yishi/chufangsetup/index.wxml @@ -3,8 +3,6 @@ - - + + diff --git a/Pages/yishi/chufangsetup/index.wxss b/Pages/yishi/chufangsetup/index.wxss index cb38bfb..467ac1d 100644 --- a/Pages/yishi/chufangsetup/index.wxss +++ b/Pages/yishi/chufangsetup/index.wxss @@ -15,7 +15,7 @@ page{ } .item_list{ width: 90vw; - margin: 20rpx auto; + margin: 0 auto; } .item{ width: 100%; diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml index d16420f..e75409e 100644 --- a/Pages/yishi/identity/index.wxml +++ b/Pages/yishi/identity/index.wxml @@ -53,7 +53,7 @@ - 说明：因互联网医院实行实名制要求，需要您的身份信息，包括姓名，身份证号码。如您不能提供上述信息，将无法完成医师身份认证。 + 说明：因互联网医院诊疗实名制法规要求，为顺利完成医师身份认证，请您如实提供姓名及身份证等身份信息 { + wx.stopPullDownRefresh() }).catch(errors => { console.error(errors); }) @@ -295,7 +317,7 @@ Page({ let iden_auth_status = this.data.info.iden_auth_status; if(idcard_status != 1){ this.setData({ - dialog_content: "请您先实名认证", + dialog_content: "请您先完成实名认证", shiming_status_url: "/Pages/yishi/identity/index", dialog_visible: true, }); @@ -345,7 +367,7 @@ Page({ }); } this.setData({ - dialog_content: "请您先实名认证", + dialog_content: "请您先完成实名认证", shiming_status_url: "/Pages/yishi/identity/index", default_dialog_show: true }); @@ -490,7 +512,7 @@ Page({ "info.info_shiming_status_txt": "开启在线问诊", "info.info_shiming_status": "info_shiming_status_yes", shiming_status_url: "/Pages/yishi/onlinesetup/index", - dialog_content: "请您先前往在线问诊管理中开通在线问诊", + dialog_content: "请您点击[在线问诊管理]，开通在线问诊", default_dialog_show: true }) return false; diff --git a/Pages/yishi/index/index.json b/Pages/yishi/index/index.json index 6ff3411..e4f6673 100644 --- a/Pages/yishi/index/index.json +++ b/Pages/yishi/index/index.json @@ -3,11 +3,12 @@ "usingComponents": { "t-avatar": "tdesign-miniprogram/avatar/avatar", "van-button": "@vant/weapp/button/index", - "van-dialog": "@vant/weapp/dialog/index", "t-swiper": "tdesign-miniprogram/swiper/swiper", "t-badge": "tdesign-miniprogram/badge/badge", "t-dialog": "tdesign-miniprogram/dialog/dialog", "van-image": "@vant/weapp/image/index", "t-skeleton": "tdesign-miniprogram/skeleton/skeleton" - } + }, + "enablePullDownRefresh": true, + "backgroundTextStyle":"dark" } \ No newline at end of file diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml index e89bb69..30c8bef 100644 --- a/Pages/yishi/index/index.wxml +++ b/Pages/yishi/index/index.wxml @@ -3,11 +3,10 @@ {{ title }} + style="top:0;padding-top: {{stateHeight}}px;height: {{navHeight + 10}}px;line-height: {{navHeight}}px;position: relative;">{{ title }} - - - + + @@ -30,7 +29,7 @@ - 新问诊：{{info.not_accepted_inquiry_num}} + 待接诊：{{info.not_accepted_inquiry_num}} 接诊中：{{info.accepting_inquiry_num}} @@ -115,7 +114,7 @@ height="70rpx" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/jianjie.png" /> - 简介管理 + 个人简介管理 - + + 取消 + + + + + diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss index a7da0f9..92efe8c 100644 --- a/Pages/yishi/index/index.wxss +++ b/Pages/yishi/index/index.wxss @@ -18,7 +18,7 @@ page{ .title{ position: fixed; letter-spacing: 3rpx; - margin-left: 5vw; + padding-left: 5vw; font-size: 35rpx; color: #fff; background-color: #3CC7C0; @@ -27,7 +27,7 @@ page{ } .info_box{ width: 90vw; - margin: 30rpx auto; + margin: 0 auto; display: flex; padding: 20rpx 0; flex-direction: column; @@ -229,3 +229,6 @@ page{ border-top: 1px solid #E9E9E9; color: #3CC7C0; } +.t-button__content{ + color: #3CC7C0 !important; +} \ No newline at end of file diff --git a/Pages/yishi/kuaisusetup/index.js b/Pages/yishi/kuaisusetup/index.js index 898de51..71d18fa 100644 --- a/Pages/yishi/kuaisusetup/index.js +++ b/Pages/yishi/kuaisusetup/index.js @@ -10,8 +10,8 @@ Page({ }, height: app.globalData.height, checked: true, - open_note: "已开启，可在问诊消息中选择订单接诊", - close_note: "已关闭，暂不接收快速图文订单", + open_note: "已开启，可在问诊消息中进行接诊", + close_note: "已关闭，暂不接收快速问诊", note: "", inquiry_type: 2, inquiry_mode: 1, diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml index 34aacee..1563a9f 100644 --- a/Pages/yishi/kuaisusetup/index.wxml +++ b/Pages/yishi/kuaisusetup/index.wxml @@ -35,9 +35,9 @@ - 提示：服务开通后，患者可以通过快速问诊找到您，增加您的曝光度。 - 1、快速问诊价格为平台统一定价； - 2、接诊后{{config.duration}}分钟内和患者{{config.times_number==0?'无限':config.times_number}}次沟通。 + 提示：服务开启后，您将有机会接收到平台自动分配的在线患者快速问诊订单 + 1、快速问诊价格为平台统一设定 + 2、快速问诊服务时间为{{config.duration}}分钟，期间不限制交流次数 diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js index 92f162e..f54969d 100644 --- a/Pages/yishi/my/index.js +++ b/Pages/yishi/my/index.js @@ -15,7 +15,10 @@ Page({ estimate_income: "0", doctor_id: "" }, - + onPullDownRefresh(){ + console.log("用户下拉动作") + this.onShow(); + }, // 获取状态栏信息 getMenuButtonBound() { let stateHeight = 0; // 接收状态栏高度 @@ -67,6 +70,8 @@ Page({ this.setData({ "avatar": avatar }) + }).then(res => { + wx.stopPullDownRefresh() }).catch(errors => { console.error(errors); }) diff --git a/Pages/yishi/my/index.json b/Pages/yishi/my/index.json index ddabca8..9f87f0f 100644 --- a/Pages/yishi/my/index.json +++ b/Pages/yishi/my/index.json @@ -6,5 +6,7 @@ "van-icon": "@vant/weapp/icon/index", "van-cell": "@vant/weapp/cell/index", "van-cell-group": "@vant/weapp/cell-group/index" - } + }, + "enablePullDownRefresh":true, + "backgroundTextStyle":"dark" } \ No newline at end of file diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml index c31887b..119ec21 100644 --- a/Pages/yishi/my/index.wxml +++ b/Pages/yishi/my/index.wxml @@ -50,7 +50,7 @@ - + diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss index 398d140..09dd19c 100644 --- a/Pages/yishi/my/index.wxss +++ b/Pages/yishi/my/index.wxss @@ -1,7 +1,8 @@ -.container{ - height: 100vh; - width: 100vw; +page{ background-color: #F5F5F5; +} +.container{ + width: 100vw; color: #fff; position: relative; } diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js index 4bfbfce..8367253 100644 --- a/Pages/yishi/myinfo/index.js +++ b/Pages/yishi/myinfo/index.js @@ -56,12 +56,14 @@ Page({ wx.setStorageSync('client_user_id_'+usertype, ""); if(wx.$TUIKit){ let promise = wx.$TUIKit.logout(); + wx.$TUIKit = undefined; promise.then(function(imResponse) { console.log(imResponse.data); // 登出成功 }).catch(function(imError) { console.warn('logout error:', imError); }); } + app.clearAllInterval() app.go("/Pages/index/index"); } else if (res.cancel) { console.log('用户点击取消') diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml index 603e3fc..571d812 100644 --- a/Pages/yishi/onlinechufang/index.wxml +++ b/Pages/yishi/onlinechufang/index.wxml @@ -14,7 +14,7 @@ 病情主诉： {{case_detail.disease_desc}} - + 用药意向： {{item}}; diff --git a/Pages/yishi/onlinechufang/index.wxss b/Pages/yishi/onlinechufang/index.wxss index beb4fba..bc7160b 100644 --- a/Pages/yishi/onlinechufang/index.wxss +++ b/Pages/yishi/onlinechufang/index.wxss @@ -12,10 +12,9 @@ page{ } .item_top{ position: relative; - height: 100rpx; display: flex; align-items: center; - padding: 0 32rpx; + padding: 20rpx 32rpx; } .item_top::after { position: absolute; @@ -30,12 +29,12 @@ page{ } .item_top_name{ - flex: 1; color: #3CC7C0; font-size: 34rpx; + margin-right: 20rpx; } .item_top_sex{ - flex: 3; + flex: 1; font-size: 34rpx; color: #666; } diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml index 77a4a55..a3582c3 100644 --- a/Pages/yishi/onlinesetup/index.wxml +++ b/Pages/yishi/onlinesetup/index.wxml @@ -38,11 +38,11 @@ - 提示：服务开通后，患者可以向您购买图文问诊进行问诊，接诊后需要与患者进行图文沟通 - 1、问诊价格每日仅限调整1次，每自然月仅限调整5次 - 2、单价修改后立即生效，不影响当日已生成的问诊订单 - 3、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}个回合沟通 - 4、如有参加公益问诊活动，患者问诊订单价格以参加的公益问诊单价为准 + 提示：服务开启后，患者按照所设置的价格向您购买图文问诊服务 + 1、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通 + 2、若开启公益问诊，图文问诊价格以公益问诊价格为准 + 3、问诊价格每日仅限调整1次，每月仅限调整5次 + 4、价格修改后立即生效，不影响修改之前已生成的问诊订单 diff --git a/Pages/yishi/onlinesetupprice/index.wxml b/Pages/yishi/onlinesetupprice/index.wxml index c3bc297..3d4a7c7 100644 --- a/Pages/yishi/onlinesetupprice/index.wxml +++ b/Pages/yishi/onlinesetupprice/index.wxml @@ -19,11 +19,11 @@ - 提示：服务开通后，患者可以向您购买图文问诊进行问诊，接诊后需要与患者进行图文沟通 - 1、问诊价格每日仅限调整1次，每自然月仅限调整5次 - 2、单价修改后立即生效，不影响当日已生成的问诊订单 - 3、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}个回合沟通 - 4、如有参加公益问诊活动，患者问诊订单价格以参加的公益问诊单价为准 + 提示：服务开启后，患者按照所设置的价格向您购买图文问诊服务 + 1、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通 + 2、若开启公益问诊，图文问诊价格以公益问诊价格为准 + 3、问诊价格每日仅限调整1次，每月仅限调整5次 + 4、价格修改后立即生效，不影响修改之前已生成的问诊订单 diff --git a/Pages/yishi/orderdetail/index.wxml b/Pages/yishi/orderdetail/index.wxml index a7bb161..371eafe 100644 --- a/Pages/yishi/orderdetail/index.wxml +++ b/Pages/yishi/orderdetail/index.wxml @@ -13,8 +13,8 @@ 就诊患者：张三三（女，25岁） 接诊时间：2022-12-30 11：23：23 结束时间：2022-12-12 11：23：23 - 订单金额：￥1212.00元 - 预计收入：￥112.00元 + 订单金额：￥1212.00 + 预计收入：￥112.00 @@ -28,7 +28,7 @@ 就诊患者：张三三/18/男 订单编号：2131231xxxx - 订单金额：￥1212.00元 + 订单金额：￥1212.00 完成时间：2022.12.30 diff --git a/Pages/yishi/service_notice/index.js b/Pages/yishi/service_notice/index.js index c37c0f1..81e8224 100644 --- a/Pages/yishi/service_notice/index.js +++ b/Pages/yishi/service_notice/index.js @@ -14,6 +14,11 @@ Page({ total: 0, per_page: 0, last_page: 0, + contactKeFu: false, + confirmBtn: { + "openType": "contact", + "content": "确认", + } }, onShow(){ this.getList(); @@ -46,6 +51,111 @@ Page({ putMessageReadNoticeAll(){ api.putMessageReadNoticeAll({notice_type: 1}).then(response => { console.log(response); + let new_list = []; + this.data.list.forEach(item => { + item.read_status = 1; + new_list.push(item) + }) + this.setData({ + list: new_list + }) + let usertype = wx.getStorageSync('usertype'); + let userID = wx.getStorageSync('user_id_'+usertype); + wx.setStorageSync( userID+"_service_notice_unreadnnum", ""); + wx.showToast({ + title: '操作成功', + icon: "success" + }) }).catch(errors => {console.error(errors);}) - } + }, + putMessageReadNotice(notice_id){ + api.putMessageReadNotice({notice_id: notice_id}).then(response => { + console.log(response); + + }).catch(errors => {console.error(errors);}) + }, + go(e){ + let item = e.currentTarget.dataset.item; + this.putMessageReadNotice(item.notice_id); + console.log(item); + let link_type = item.link_type; + link_type = Number(link_type); + // 跳转页面类型（1:聊天详情页 2:问诊结束列表页 3:问诊消息列表页 4:我的名片 5:我的简介 6:我的账户 7:我的福利 8:药品订单详情页 9:物流详情 10:问诊订单详情 11:联系客服 12:协议详情 13:处方详情） + switch (link_type) { + case 1: + let from_account = item.link_params.from_account; + let order_inquiry_id = item.link_params.order_inquiry_id; + let inquiry_type = item.link_params.inquiry_type; + let url = "/Pages/yishi/chat/index?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type; + app.go(url); + break; + case 2: + wx.showToast({ + title: '暂无页面', + icon: 'error' + }) + break; + case 3: + wx.switchTab({ + url: "/Pages/yishi/wenzhen_v2/wenzhen", + }) + break; + case 4: + app.go("/Pages/yishi/mycard/index") + break; + case 5: + app.go("/Pages/yishi/myprofile/index") + break; + case 6: + app.go("/Pages/yishi/myaccount/index") + break; + case 7: + wx.showToast({ + title: '暂无页面', + icon: 'error' + }) + break; + case 8: + wx.showToast({ + title: '暂无页面', + icon: 'error' + }) + break; + case 9: + wx.showToast({ + title: '暂无页面', + icon: 'error' + }) + break; + case 10: + wx.showToast({ + title: '暂无页面', + icon: 'error' + }) + break; + case 11: + this.setData({ + contactKeFu: true + }) + break; + case 12: + wx.showToast({ + title: '暂无页面', + icon: 'error' + }) + break; + case 13: + let url1 = "/Pages/yishi/onlinechufang/index?order_inquiry_id="+item.link_params.order_inquiry_id+"&order_prescription_id="+item.link_params.order_prescription_id+"&from=chat"; + app.go(url1); + break; + default: + break; + } + }, + cancelContactDialog(){ + console.log("cancelContactDialogcancelContactDialogcancelContactDialog"); + this.setData({ + contactKeFu: false + }) + }, }) \ No newline at end of file diff --git a/Pages/yishi/service_notice/index.json b/Pages/yishi/service_notice/index.json index c57d952..627b877 100644 --- a/Pages/yishi/service_notice/index.json +++ b/Pages/yishi/service_notice/index.json @@ -4,7 +4,8 @@ "te-nav-bar": "/commpents/te_navbar", "van-image": "@vant/weapp/image/index", "van-divider": "@vant/weapp/divider/index", - "van-empty": "@vant/weapp/empty/index" + "van-empty": "@vant/weapp/empty/index", + "t-dialog": "tdesign-miniprogram/dialog/dialog" }, "enablePullDownRefresh": false, "onReachBottomDistance": 50 diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml index dc9084a..f39a07e 100644 --- a/Pages/yishi/service_notice/index.wxml +++ b/Pages/yishi/service_notice/index.wxml @@ -1,80 +1,52 @@ - - + - + 快速问诊 - + 快速问诊 - + 公益问诊 - + 问诊购药 {{item.notice_send_time}} - {{item.notice_title}} + + {{item.notice_brief_title}} + + + + - - - - - - - - - - 到底了~ - - + + + + + 取消 + + \ No newline at end of file diff --git a/Pages/yishi/service_notice/index.wxss b/Pages/yishi/service_notice/index.wxss index 594dcad..23172e5 100644 --- a/Pages/yishi/service_notice/index.wxss +++ b/Pages/yishi/service_notice/index.wxss @@ -37,8 +37,35 @@ page{ margin-top: 20rpx; font-size: 30rpx; color: #666666; + display: flex; + align-items: center; } .van_img{ display: flex; justify-content: center; +} +.hongdian{ + height: 50rpx; + display: flex; + align-items: center; + flex: 1; + display: flex; + justify-content: flex-end; +} +.dialog{ + width: 50%; + text-align: center; + height: 100rpx; + line-height: 100rpx; +} +.dialog_cancel_btn{ + border-top: 1px solid #E9E9E9; + border-right: 1px solid #E9E9E9; +} +.dialog_confirm_btn{ + border-top: 1px solid #E9E9E9; + color: #3CC7C0; +} +.t-button__content{ + color: #3CC7C0 !important; } \ No newline at end of file diff --git a/Pages/yishi/system_notice/index.js b/Pages/yishi/system_notice/index.js index f341cad..d273427 100644 --- a/Pages/yishi/system_notice/index.js +++ b/Pages/yishi/system_notice/index.js @@ -80,6 +80,21 @@ Page({ putMessageReadNoticeAll(){ api.putMessageReadNoticeAll({notice_type: 2}).then(response => { console.log(response); + let new_list = []; + this.data.list.forEach(item => { + item.read_status = 1; + new_list.push(item) + }) + this.setData({ + list: new_list + }) + let usertype = wx.getStorageSync('usertype'); + let userID = wx.getStorageSync('user_id_'+usertype); + wx.setStorageSync( userID+"_system_notice_unreadnnum", ""); + wx.showToast({ + title: '操作成功', + icon: "success" + }) }).catch(errors => {console.error(errors);}) } }) \ No newline at end of file diff --git a/Pages/yishi/system_notice/index.wxml b/Pages/yishi/system_notice/index.wxml index 9189956..a954b2d 100644 --- a/Pages/yishi/system_notice/index.wxml +++ b/Pages/yishi/system_notice/index.wxml @@ -6,7 +6,7 @@ - {{item.notice_title}} + {{item.notice_brief_title}} diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index 1f94e02..dffc2a3 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -20,28 +20,40 @@ Page({ message_inquiry_type: 99999, system_notice_unreadnnum: "", service_notice_unreadnnum: "", - hasOnShow: false + hasOnShow: false, + show: false, + show_dialog_from_account: "", + show_dialog_order_inquiry_id: "", + show_dialog_inquiry_type: "", + unreadnnum_inter: 0 }, onLoad() { - console.log("wenzhen onload"); + console.log("wenzhen onloadddd"); + + // if(wx.$TUIKit){ + // wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this); + // }else{ + // app.imInit().then(res => { + // console.log("wenzhen onload imInit"); + // wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this); + // }); + // } + }, + initInterval(){ let usertype = wx.getStorageSync('usertype'); let userID = wx.getStorageSync('user_id_'+usertype); - if(wx.$TUIKit){ - wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this); - }else{ - app.imInit().then(res => { - console.log("wenzhen onload imInit"); - wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this); - }); - } - setInterval(() => { + let unreadnnum_inter = setInterval(() => { let system_notice_unreadnnum = wx.getStorageSync(userID+"_system_notice_unreadnnum"); let service_notice_unreadnnum = wx.getStorageSync(userID+"_service_notice_unreadnnum"); this.setData({ system_notice_unreadnnum: system_notice_unreadnnum, service_notice_unreadnnum: service_notice_unreadnnum, }) - }, 500); + }, 1000); + this.setData({ + unreadnnum_inter: unreadnnum_inter + }) + console.log("app.globalData.unreadnnum_inter: ", app.globalData.unreadnnum_inter); }, onShow: function () { console.log("onShow from wenzhen V2") @@ -54,37 +66,60 @@ Page({ }) } this.getConversationList(); + if(this.data.unreadnnum_inter == 0){ + this.initInterval(); + } //避免onshow加载多次 this.setData({ hasOnShow: true }) + + if(wx.$TUIKit){ + wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this); + }else{ + app.imInit().then(res => { + console.log("wenzhen onload imInit"); + wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this); + }); + } + }, onHide(){ console.log("onHideonHide from wenzhen") - this.setData({hasOnShow: false}) + clearInterval(this.data.unreadnnum_inter) + this.setData({ + hasOnShow: false, + data_list_1: [], + data_list_2: [], + data_list_3: [], + data_list_4: [], + data_list_5: [], + message_inquiry_type: 9999, + unreadnnum_inter: 0 + }) + wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived); }, onUnload(){ console.log("onUnload from wenzhen") - this.setData({hasOnShow: false}) - // wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived); + this.setData({ + hasOnShow: false, + message_inquiry_type: 9999 + }) }, getConversationList(){ - wx.$TUIKit.getConversationList().then((imResponse) => { - console.log("imResponse.data.conversationList from wenzhen_v2: ", imResponse.data.conversationList); - this.setData({ - conversationList: imResponse.data.conversationList, - }); - }).then(() => { - console.log("开始查询订单状态") - this.formatStatus(); - }).catch(error => { - console.log(error) - // 补偿登录操作 - app.imInit().then(res => { - this.getConversationList(); + console.log("getConversationListgetConversationListgetConversationList"); + app.imInit().then(res => { + console.log("wenzhen onload imInit: ", res); + wx.$TUIKit.getConversationList().then((imResponse) => { + console.log("imResponse.data.conversationList from wenzhen_v2: ", imResponse.data.conversationList); + this.setData({ + conversationList: imResponse.data.conversationList, + }); + }).then(() => { + console.log("开始查询订单状态") + this.formatStatus(); }).catch(error => { console.log(error) - this.getConversationList(); }); }); }, @@ -190,7 +225,7 @@ Page({ }, formatStatus(){ let order_inquiry_id_list = []; - order_inquiry_id_list.push("a");//初始化一个，防止失败 + order_inquiry_id_list.push("");//初始化一个，防止失败 this.data.conversationList.forEach(item => { let conversationID = item.conversationID; if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过 @@ -241,14 +276,12 @@ Page({ item.patient_age = order.patient_age; item.patient_name = order.patient_name; item.patient_sex = order.patient_sex; - new_conversationList.push(item); }) this.setData({ conversationList: new_conversationList }) - } }).then(() => { console.log("开始格式化formatConversationList") @@ -300,6 +333,16 @@ Page({ let session_item = {}; session_item.inquiry_status = item.inquiry_status;//订单状态暂无 let txt = {}; + if(lastMessage.messageForShow == "[自定义消息]"){ + let text = "自定义消息"; + let payload = lastMessage.payload; + if(payload) { + console.log("payload: ",payload.data); + let payloadJson = JSON.parse(payload.data); + text = payloadJson.title.replace(/-/g, ""); + } + lastMessage.messageForShow = text; + } txt.Text= lastMessage.messageForShow; session_item.last_message_content = txt; session_item.message_send_time = getTimeAgo(lastMessage.lastTime); @@ -315,7 +358,12 @@ Page({ totalUnreadCount = totalUnreadCount + unreadCount; session_item.message_dot = true; }else{ - session_item.message_dot = false; + if(item.inquiry_status == 3){ + totalUnreadCount = totalUnreadCount + 1; + session_item.message_dot = true; + }else{ + session_item.message_dot = false; + } } session_list[inquiry_type - 1].push(session_item); }) @@ -336,7 +384,9 @@ Page({ this.setData({has_data: false}) }else{ this.setData({has_data: true}) + this.selectComponent('#tabs').resize(); } + }, checkOrderInquiryId(list, order_inquiry_id){ let index = list.findIndex(item => { @@ -346,5 +396,59 @@ Page({ }, onTabsChange(e){ console.log(e); + }, + goChat(e){ + this.setData({ + show: false + }) + + console.log("开始订阅消息"); + wx.requestSubscribeMessage({ + tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'], + success (res) { + console.log(res); + let from_account = e.currentTarget.dataset.from_account; + let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id; + let inquiry_type = e.currentTarget.dataset.inquiry_type; + let url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type; + app.go(url); + } + }) + }, + postDoctorInquiry(e){ + this.setData({ + show: false + }) + console.log("order_inquiry_id: ", e.currentTarget.dataset.order_inquiry_id); + let params = {}; + params.order_inquiry_id = e.currentTarget.dataset.order_inquiry_id; + console.log("params: ",params) + api.postDoctorInquiry(params).then(response => { + console.log("开始接诊"); + console.log(response); + }).then(() => { + this.goChat(e); + }).catch(errors => { + console.error(errors); + }) + + }, + tabShow(e){ + let show_dialog_from_account = e.currentTarget.dataset.show_dialog_from_account; + let show_dialog_order_inquiry_id = e.currentTarget.dataset.show_dialog_order_inquiry_id; + let show_dialog_inquiry_type = e.currentTarget.dataset.show_dialog_inquiry_type; + console.log("tabShowtabShowtabShowtabShow"); + this.setData({ + show_dialog_from_account: show_dialog_from_account, + show_dialog_order_inquiry_id: show_dialog_order_inquiry_id, + show_dialog_inquiry_type: show_dialog_inquiry_type, + show: true + }) + }, + onClose(){ + console.log("onCloseonCloseonCloseonClose") + this.setData({ + show: false + }) } }) \ No newline at end of file diff --git a/Pages/yishi/wenzhen_v2/wenzhen.json b/Pages/yishi/wenzhen_v2/wenzhen.json index 38cbf54..d7cc87b 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.json +++ b/Pages/yishi/wenzhen_v2/wenzhen.json @@ -10,6 +10,7 @@ "van-empty": "@vant/weapp/empty/index", "van-image": "@vant/weapp/image/index", "van-tab": "@vant/weapp/tab/index", - "van-tabs": "@vant/weapp/tabs/index" + "van-tabs": "@vant/weapp/tabs/index", + "t-dialog": "tdesign-miniprogram/dialog/dialog" } } \ No newline at end of file diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index ed94341..30ce8eb 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -146,9 +146,10 @@ color="#3CC7C0" title-active-color="#3CC7C0" border="{{true}}" + id="tabs" > - + /> --> + + + + + + 就诊人： + {{item.patient_name}} {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}} + + {{item.message_send_time}} + + {{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?'已取消':'其他' }} + + 查看病历 + 去接诊 + + + 问诊详情 + + + + 不接诊24小时后自动取消 + + - + /> --> + + + + + 就诊人： + {{item.patient_name}} {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}} + + {{item.message_send_time}} + + {{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?'已取消':'其他' }} + + 查看病历 + 去接诊 + + + 问诊详情 + + + + 不接诊24小时后自动取消 + - + /> --> + + + + + 就诊人： + {{item.patient_name}} {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}} + + {{item.message_send_time}} + + {{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?'已取消':'其他' }} + + 查看病历 + 去接诊 + + + 问诊详情 + + + + 不接诊24小时后自动取消 + - + /> --> + + + + + 就诊人： + {{item.patient_name}} {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}} + + {{item.message_send_time}} + + {{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?'已取消':'其他' }} + + 查看病历 + 去接诊 + + + 问诊详情 + + + + 不接诊24小时后自动取消 + - + + 去查看 + 去接诊 + \ No newline at end of file diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxss b/Pages/yishi/wenzhen_v2/wenzhen.wxss index 7dcd8a7..fa341ca 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxss +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxss @@ -53,3 +53,88 @@ page{ vertical-align: baseline !important; } + + + + + +.content{ + background-color: #fff; + display: flex; + flex-direction: column; + margin-bottom: 20rpx; +} +.content_1,.content_3,.content_2{ + display: flex; + justify-content: space-between; + margin: 20rpx 30rpx; + align-items: center; +} +.content_1,.content_3{ + flex: 5; +} +.name{ + font-size: 30rpx; + color: #666666; + height: 50rpx; + line-height: 50rpx; +} +.date{ + font-size: 30rpx; + color: #999; +} +.content_2{ + background-color: #FAFAFA; + font-size: 26rpx; + color: #999999; + min-height: 70rpx; + padding: 10rpx 20rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: block; + line-height: 70rpx; +} +.status{ + font-size: 26rpx; + color: #FA541C; + flex: 1; +} +.status_end{ + color: #666666; +} +.btn{ + flex: 2; + display: flex; + justify-content: flex-end; +} +.content_4{ + flex: 5; + font-size: 24rpx; + color: #E34D59; + justify-self:flex-end; + text-align:right; + display: flex; + justify-content: flex-end; + border-top: 1px solid #E3E4E5; + align-items: center; + margin: 0 30rpx; + min-height: 70rpx; +} +.dialog{ + width: 50%; + text-align: center; + height: 100rpx; + line-height: 100rpx; +} +.dialog_cancel_btn{ + border-top: 1px solid #E9E9E9; + border-right: 1px solid #E9E9E9; +} +.dialog_confirm_btn{ + border-top: 1px solid #E9E9E9; + color: #3CC7C0; +} +.t-badge__content-text { + line-height: 70rpx !important; +} diff --git a/Pages/yishi/wenzhenorder/index.js b/Pages/yishi/wenzhenorder/index.js index d547724..9106a80 100644 --- a/Pages/yishi/wenzhenorder/index.js +++ b/Pages/yishi/wenzhenorder/index.js @@ -55,7 +55,7 @@ Page({ let select_order_amount = 0; let select_order_inquiry_id = []; result.forEach(item => { - select_order_amount = Number(select_order_amount) + Number(this.data.order_list[item].payment_amount_total); + select_order_amount = Number(select_order_amount) + Number(this.data.order_list[item].expected_amount_total); select_order_inquiry_id.push(this.data.order_list[item].order_inquiry_id); }) this.setData({ @@ -99,13 +99,7 @@ Page({ confirmOrder(){ const select_order_inquiry_id = this.data.select_order_inquiry_id; console.log(select_order_inquiry_id); - wx.showToast({ - title: '缺少接口', - icon: "error", - duration: 1500 - }) - setTimeout(() => { - wx.navigateBack(); - }, 2000); + let order_inquiry_ids = select_order_inquiry_id.join(","); + app.go("/Pages/yishi/cash/index?order_inquiry_ids="+order_inquiry_ids); } }) \ No newline at end of file diff --git a/Pages/yishi/wenzhenorder/index.wxml b/Pages/yishi/wenzhenorder/index.wxml index 3813818..0613fe0 100644 --- a/Pages/yishi/wenzhenorder/index.wxml +++ b/Pages/yishi/wenzhenorder/index.wxml @@ -15,8 +15,8 @@ 就诊患者：{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁） 接诊时间：{{item.reception_time}} 结束时间：{{item.finish_time}} - 订单金额：￥{{item.amount_total}}元 - 预计收入：￥{{item.payment_amount_total}}元 + 订单金额：￥{{item.amount_total}} + 预计收入：￥{{item.expected_amount_total}} @@ -28,7 +28,7 @@ 全{{allchecked?'不':''}}选 - 共{{select_order_length}}个订单，金额： ￥{{select_order_amount}}元 + 共{{select_order_length}}个订单，金额： ￥{{select_order_amount}} { + this.data.result.push(""+index); + }) + this.setData({ + result: this.data.result + }) + } + if(event.detail == false){ + this.setData({ + result: [] + }) + } + this.resetSelectOrder(); + }, + resetSelectOrder(e){ + let result = this.data.result; + let select_order_amount = 0; + let select_order_inquiry_id = []; + result.forEach(item => { + select_order_amount = Number(select_order_amount) + Number(this.data.order_list[item].expected_amount_total); + select_order_inquiry_id.push(this.data.order_list[item].order_inquiry_id); + }) + this.setData({ + select_order_length: result.length, + select_order_amount: select_order_amount, + select_order_inquiry_id: select_order_inquiry_id + }) + }, + selectOrder(e){ + const { index } = e.currentTarget.dataset; + const checkbox = this.selectComponent(`.checkboxes-${index}`); + checkbox.toggle(); + }, + getDoctorWithdrawalOrder(){ + //可提现问诊订单列表 + let params = {}; + params.page = this.data.current_page + 1; + params.per_page = this.data.per_page; + api.getDoctorWithdrawalOrder(params).then(response => { + console.log(response); + if(response.data.total > 0){ + this.setData({ + order_list: response.data.data, + current_page: response.data.current_page, + per_page: response.data.per_page, + last_page: response.data.last_page + }) + } + }).catch(errors => {console.error(errors);}) + }, + onShow(){ + this.getDoctorWithdrawalOrder(); + this.resetSelectOrder(); + }, + onReachBottom() { + console.log('===触底了！！==='); + if(this.data.current_page < this.data.last_page){//最后一页时停止分页 + this.getDoctorWithdrawalOrder() + } + }, + confirmOrder(){ + const select_order_inquiry_id = this.data.select_order_inquiry_id; + console.log(select_order_inquiry_id); + let order_inquiry_ids = select_order_inquiry_id.join(","); + app.go("/Pages/yishi/cash/index?order_inquiry_ids="+order_inquiry_ids); + } +}) \ No newline at end of file diff --git a/Pages/yishi/wenzhenorderV2/index.json b/Pages/yishi/wenzhenorderV2/index.json new file mode 100644 index 0000000..cca90c7 --- /dev/null +++ b/Pages/yishi/wenzhenorderV2/index.json @@ -0,0 +1,11 @@ +{ + "component": true, + "usingComponents": { + "te-nav-bar": "/commpents/te_navbar", + "van-checkbox": "@vant/weapp/checkbox/index", + "van-checkbox-group": "@vant/weapp/checkbox-group/index", + "van-button": "@vant/weapp/button/index", + "van-empty": "@vant/weapp/empty/index" + }, + "onReachBottomDistance": 100 +} \ No newline at end of file diff --git a/Pages/yishi/wenzhenorderV2/index.wxml b/Pages/yishi/wenzhenorderV2/index.wxml new file mode 100644 index 0000000..1dfb713 --- /dev/null +++ b/Pages/yishi/wenzhenorderV2/index.wxml @@ -0,0 +1,23 @@ + + + + + + + + {{item.inquiry_type==1?'专家问诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'未知'}} + + 订单编号：{{item.order_inquiry_id }} + 就诊患者：{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁） + 接诊时间：{{item.reception_time}} + 结束时间：{{item.finish_time}} + 订单金额：￥{{item.amount_total}} + 预计收入：￥{{item.expected_amount_total}} + + + + + + + + \ No newline at end of file diff --git a/Pages/yishi/wenzhenorderV2/index.wxss b/Pages/yishi/wenzhenorderV2/index.wxss new file mode 100644 index 0000000..8c2a298 --- /dev/null +++ b/Pages/yishi/wenzhenorderV2/index.wxss @@ -0,0 +1,80 @@ +page{ + background-color: #F4F4F4; +} +.container{ + width: 100vw; +} +.order_list{ + display: flex; + width: 92vw; + margin: 0 auto; + flex-direction: column; + padding-bottom: 180rpx; +} +.order_item{ + display: flex; + width: 100%; + margin-top: 30rpx; +} +.order_item_checkbox{ + flex: 1; + align-self: center; +} +.order_item_content{ + flex: 10; + background-color: #fff; + border-radius: 20rpx; + display: flex; + flex-direction: column; + padding: 20rpx; + height: 400rpx; +} +.order_item_content_top{ + flex: 1; + border-bottom: 1px solid #E5E5E5; + display: flex; + align-items: center; + font-size: 36rpx; +} +.order_item_content_data{ + flex: 3; + display: flex; + flex-direction: column; +} +.order_id{ + flex: 1; + display: flex; + align-items: center; + font-size: 30rpx; +} +.bottom{ + position: fixed; + bottom: 0; + width: 100vw; + display: flex; + background-color: rgb(255, 255, 255); + align-items: center; + z-index: 99; + padding-bottom: 50rpx; + height: 100rpx; +} +.bottom_checkbox{ + flex: 2.2; + font-size: 30rpx; + display: flex; + justify-content: left; + padding-left: 4vw; +} +.bottom_content{ + flex: 6; + text-align: center; + font-size: 28rpx; + color: #666666; +} +.bottom_btn{ + flex: 2; + justify-content: flex-end; + font-size: 34rpx; +} + + diff --git a/Pages/yishi/yizhensetup/index.js b/Pages/yishi/yizhensetup/index.js index 134c366..604a3f9 100644 --- a/Pages/yishi/yizhensetup/index.js +++ b/Pages/yishi/yizhensetup/index.js @@ -10,8 +10,8 @@ Page({ }, height: app.globalData.height, checked: true, - open_note: "已开启，患者可以向您发起图文问诊", - close_note: "已关闭，暂不接收义诊订单", + open_note: "已开启，可在问诊消息中进行接诊", + close_note: "已关闭，暂不接收公益问诊", note: "", amountText: "选择金额（元）", amountValue: "", diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml index f5668a6..2767d8f 100644 --- a/Pages/yishi/yizhensetup/index.wxml +++ b/Pages/yishi/yizhensetup/index.wxml @@ -48,9 +48,9 @@ - 提示：服务开通后，患者可以通过公益问诊找到您，增加您的接诊量。 - 1、公益问诊价格为平台统一设定的几个，需要您自己选择单价； - 2、接诊后{{config.duration/60}}小时内和患者{{config.times_number}}个回合沟通。 + 提示：服务开启后，您将参与到平台爱心公益问诊活动中 + 1、从平台统一设定的多种公益问诊价格中选择您的公益问诊价格 + 2、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通 diff --git a/Pages/yishi/yizhensetupprice/index.js b/Pages/yishi/yizhensetupprice/index.js index 73ff6f2..3854ab6 100644 --- a/Pages/yishi/yizhensetupprice/index.js +++ b/Pages/yishi/yizhensetupprice/index.js @@ -10,8 +10,8 @@ Page({ }, height: app.globalData.height, checked: true, - open_note: "已开启，患者可以向您发起图文问诊", - close_note: "已关闭，暂不接收义诊订单", + open_note: "已开启，可在问诊消息中进行接诊", + close_note: "已关闭，暂不接收公益问诊", note: "", amountText: "选择金额（元）", amountValue: "", diff --git a/Pages/yishi/yizhensetupprice/index.wxml b/Pages/yishi/yizhensetupprice/index.wxml index 6e335cc..5888e92 100644 --- a/Pages/yishi/yizhensetupprice/index.wxml +++ b/Pages/yishi/yizhensetupprice/index.wxml @@ -21,9 +21,9 @@ - 提示：服务开通后，患者可以通过公益问诊找到您，增加您的接诊量。 - 1、公益问诊价格为平台统一设定的几个，需要您自己选择单价； - 2、接诊后{{config.duration/60}}小时内和患者{{config.times_number}}个回合沟通。 + 提示：服务开启后，您将参与到平台爱心公益问诊活动中 + 1、从平台统一设定的多种公益问诊价格中选择您的公益问诊价格 + 2、接诊后，患者可与您在{{config.duration/60}}小时内进行{{config.times_number}}回合沟通 diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml index 2e0238a..17c2db5 100644 --- a/Pages/yishi/zhiye_identity/index.wxml +++ b/Pages/yishi/zhiye_identity/index.wxml @@ -38,7 +38,7 @@ value='查看操作手册' is-link /> - 注:请先了解多点执业认证流程，在提交审核 + 注:请先了解多点执业认证流程，再提交审核 @@ -47,7 +47,7 @@ 点击签名 - + @@ -68,7 +68,7 @@ bindDeleteFile="doDeleteFile" /> - 提示：平台会在1~3天内审核您提交的资料，审核结果会第一时间通知您。 + 提示：平台会在1~3个工作日内审核您提交的资料，审核结果会第一时间通知您。 {{btn_txt}} diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js index 87fdf49..39da407 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js +++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js @@ -78,6 +78,7 @@ Component({ } }, parseCustom(message) { + const { BUSINESS_ID_TEXT } = constant; const { GDXZ_CUSTOM_MSEEAGE } = constant; // 群消息解析 @@ -149,7 +150,6 @@ Component({ } // 6:处方开具成功 if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.PRESCRIBE) { - console.log("处方"); let data = customMessage.data; const renderDom = [{ type: 'prescribe', diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml index 97e9cf8..a579a30 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml @@ -50,7 +50,7 @@ {{renderDom[0].desc}} --> - + 请您对本次问诊服务进行评价 diff --git a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss index ff371b8..b22385d 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss +++ b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss @@ -66,6 +66,8 @@ letter-spacing: 0; line-height: 40rpx; font-size: 28rpx; + word-wrap: break-word; + word-break: break-all; } .message-body-span-image { display: inline-block; diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js index 224013c..7631ec4 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -305,12 +305,8 @@ Component({ // 发送图片消息 handleSendImageMessage(file) { - //获取最后一条消息 - let message_length = this.data.messageList.length; - let last_message = {}; - if(message_length > 0){ - last_message = this.data.messageList[message_length - 1]; - } + // 获取最后一条消息 + let last_message = this.data.conversation.lastMessage; console.log("last_message: ", last_message); let cloudCustomData = ""; let cloudCustomDataJson = ""; @@ -566,13 +562,9 @@ Component({ ext2: wx.$chat_reportType, ext3: wx.$chat_SDKAppID, }); - + //获取最后一条消息 - let message_length = this.data.messageList.length; - let last_message = {}; - if(message_length > 0){ - last_message = this.data.messageList[message_length - 1]; - } + let last_message = this.data.conversation.lastMessage; console.log("last_message: ", last_message); let cloudCustomData = ""; let cloudCustomDataJson = ""; diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml index f97004c..04b47e9 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml @@ -104,7 +104,7 @@ 取消 diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js index 5427cd5..3633bcf 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.js +++ b/TUIKit/components/TUIChat/components/MessageList/index.js @@ -495,6 +495,7 @@ Component({ }, // 消息跳转到最新 handleJumpNewMessage() { + console.log("handleJumpNewMessage") this.setData({ jumpAim: `ID-${this.filterSystemMessageID(this.data.messageList[this.data.messageList.length - 1].ID)}`, showDownJump: false, @@ -503,6 +504,7 @@ Component({ }, // 消息跳转到最近未读 handleJumpUnreadMessage() { + console.log("handleJumpUnreadMessage") if (this.data.unreadCount > 15) { this.getMessageList(this.data.conversation); this.setData({ diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml index 090e8c3..2a8be6e 100644 --- a/TUIKit/components/TUIChat/index.wxml +++ b/TUIKit/components/TUIChat/index.wxml @@ -43,7 +43,7 @@ 取消 diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss index facc82e..72ec143 100644 --- a/TUIKit/components/TUIChat/index.wxss +++ b/TUIKit/components/TUIChat/index.wxss @@ -142,7 +142,7 @@ display: flex; justify-content: space-around; align-items: center; - flex: 2; + flex: 3; } .right{ flex: 1; @@ -159,13 +159,11 @@ .name{ font-size: 34rpx; color: #3CC7C0; - flex: 1; text-align: center; } .age{ font-size: 34rpx; color: #666666; - flex: 1; } .status{ background: #FFF2E8; diff --git a/app.js b/app.js index a85b98d..b221d6d 100644 --- a/app.js +++ b/app.js @@ -78,56 +78,70 @@ App({ console.log("sign: ", sign); // const userSig = sign.userSig; - //获取im签名数据 - return api.getSignIM().then(response => { - return response.data; - }).then((userSig) => { - console.log("userSig: ", userSig); - wx.$TUIKit = TIM.create({ - SDKAppID: this.globalData.config.SDKAPPID - }); - - wx.$chat_userID = this.globalData.config.userID; - wx.$chat_SDKAppID = this.globalData.config.SDKAPPID; - wx.$chat_userSig = userSig; - wx.$TUIKitTIM = TIM; - wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin }); - let login_promise = wx.$TUIKit.login({ - userID: this.globalData.config.userID, - userSig - }); - - login_promise.then(function(imResponse) { - console.log(imResponse.data); // 登录成功 + if(!wx.$TUIKit){ + //获取im签名数据 + return api.getSignIM().then(response => { + return response.data; + }).then((userSig) => { + console.log("userSig: ", userSig); + wx.$TUIKit = TIM.create({ + SDKAppID: this.globalData.config.SDKAPPID + }); - }).catch(function(imError) { - console.warn('login error:', imError); // 登录失败的相关信息 + wx.$chat_userID = this.globalData.config.userID; + wx.$chat_SDKAppID = this.globalData.config.SDKAPPID; + wx.$chat_userSig = userSig; + wx.$TUIKitTIM = TIM; + wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin }); + let login_promise = wx.$TUIKit.login({ + userID: this.globalData.config.userID, + userSig + }); + login_promise.then(function(imResponse) { + console.log(imResponse.data); // 登录成功 + + }).catch(function(imError) { + console.warn('login error:', imError); // 登录失败的相关信息 + + }); + + wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady); + wx.$TUIKit.setLogLevel(3);//设置日志级别 + wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this); + wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.TOTAL_UNREAD_MESSAGE_COUNT_UPDATED, this.onTotalUnreadMessageCountUpdated); + }).catch(errors => {console.error(errors);}) + }else{ + let promise = new Promise((resolve, reject) => { + resolve("success"); + }).then(res => { + console.log("from app js:", res); + return "from app js"; }); - - wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady); - wx.$TUIKit.setLogLevel(3);//设置日志级别 - wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this); - }).then(()=>{ - //初始化tab-bar角标 - let index_info = wx.getStorageSync(userID+'_index_info'); - let wenzhen_info = wx.getStorageSync(userID+'_wenzhen_info'); - let my_info = wx.getStorageSync(userID+'_my_info'); - if(!index_info) wx.setStorageSync(userID+'_index_info',""); - if(!wenzhen_info) wx.setStorageSync(userID+'_wenzhen_info', ""); - if(!my_info) wx.setStorageSync(userID+'_my_info', ""); - }).catch(errors => {console.error(errors);}) + return promise; + } }, imLogout(){ if(wx.$TUIKit){ wx.$TUIKit.logout(); + wx.$TUIKit = undefined; } + this.clearAllInterval() + }, + clearAllInterval(){ + this.globalData.app_inter.forEach(item => { + clearInterval(item) + }) + }, + onTotalUnreadMessageCountUpdated(){ + console.log("onTotalUnreadMessageCountUpdated"); + let totalUnreadCount = wx.$TUIKit.getTotalUnreadMessageCount(); + console.log("未读消息数量：", totalUnreadCount) }, onSDKReady(){ console.log("onSDKReady from app.js"); this.globalData.chat_sdk_ready = true; - // let promise = wx.$TUIKit.deleteConversation('C2C500318318078251008'); // promise.then(function(imResponse) { // // 删除会话成功 @@ -136,8 +150,17 @@ App({ // console.warn('deleteConversation error:', imError); // 删除会话失败的相关信息 // }); + let usertype = wx.getStorageSync('usertype'); + let userID = wx.getStorageSync('user_id_'+usertype); + //初始化tab-bar角标 + let index_info = wx.getStorageSync(userID+'_index_info'); + let my_info = wx.getStorageSync(userID+'_my_info'); + if(!index_info) wx.setStorageSync(userID+'_index_info',""); + if(!my_info) wx.setStorageSync(userID+'_my_info', ""); + this.formatWenZhenInfo(); wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived, this); + //互踢 wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.KICKED_OUT, this.onKickedOut); }, onKickedOut(){ @@ -224,11 +247,104 @@ App({ SECRETKEY: "a5bcd8c583181cf004e9d91a47687d719d4b5d2a10ce33fbee95d587889447d8", // Your secretKey EXPIRETIME: 604800, }, + app_inter: [] }, go(url, ...params){ wx.navigateTo({ url: url }) + }, + formatWenZhenInfo(){ + this.getConversationList(); + }, + getConversationList(){ + wx.$TUIKit.getConversationList().then((imResponse) => { + console.log("getConversationList from app js: ", imResponse.data.conversationList); + return imResponse.data.conversationList; + }).then(conversationList => { + console.log("开始查询订单状态") + this.formatStatus(conversationList); + }).catch(error => { + console.log(error) + }); + }, + formatStatus(conversationList){ + let order_inquiry_id_list = []; + order_inquiry_id_list.push("");//初始化一个，防止失败 + conversationList.forEach(item => { + let conversationID = item.conversationID; + if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过 + let lastMessage = item.lastMessage; + if(!lastMessage) return; + let cloudCustomData = lastMessage.cloudCustomData; + if(!cloudCustomData) return; + let cloudCustomDataJson; + try { + cloudCustomDataJson = JSON.parse(cloudCustomData); + } catch (error) { + console.log(error); + return; + } + let order_inquiry_id = cloudCustomDataJson.order_inquiry_id; + order_inquiry_id_list.push(order_inquiry_id);//准备去请求后端那订单状态 + }) + //获取医生问诊消息用户属性 + api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_id_list.join(",")}).then(response => { + if(response.data.length > 0){ + let new_conversationList = []; + conversationList.forEach(item => { + let conversationID = item.conversationID; + if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过 + let lastMessage = item.lastMessage; + if(!lastMessage) return; + let cloudCustomData = lastMessage.cloudCustomData; + if(!cloudCustomData) return; + let cloudCustomDataJson; + try { + cloudCustomDataJson = JSON.parse(item.lastMessage.cloudCustomData); + } catch (error) { + return; + } + let order_inquiry_id = cloudCustomDataJson.order_inquiry_id; + let order = response.data.find(attr_item => { + return attr_item.order_inquiry_id == order_inquiry_id; + }) + if(!order) return; + + let inquiry_status = order.inquiry_status; + //inquiry_status 状态 + if(inquiry_status !=3 && inquiry_status != 4){ + return; + } + item.order_inquiry_id = order_inquiry_id; + item.inquiry_status = inquiry_status; + item.patient_age = order.patient_age; + item.patient_name = order.patient_name; + item.patient_sex = order.patient_sex; + new_conversationList.push(item); + }) + conversationList = []; + return new_conversationList; + } + }).then(new_conversationList => { + console.log("开始计算问诊角标"); + let wenzhen_info = 0; + new_conversationList.forEach(item => { + let unreadCount = item.unreadCount; + if(unreadCount > 0){ + wenzhen_info = wenzhen_info + unreadCount; + }else{//若为0，则继续判断订单状态 + let inquiry_status = item.inquiry_status; + if(inquiry_status == 3){//若为待接诊，则+1 + wenzhen_info = wenzhen_info + 1; + } + } + }) + console.log("角标的数量：", wenzhen_info); + let usertype = wx.getStorageSync('usertype'); + let userID = wx.getStorageSync('user_id_'+usertype); + this.formatUnReadNum(userID+'_wenzhen_info', wenzhen_info) + }).catch(errors => {console.error(errors);}) } }) \ No newline at end of file diff --git a/app.json b/app.json index 887ed38..c7d88a9 100644 --- a/app.json +++ b/app.json @@ -53,7 +53,8 @@ "Pages/webpage/index", "Pages/kickedout/index", "Pages/yishi/onlinesetupprice/index", - "Pages/yishi/yizhensetupprice/index" + "Pages/yishi/yizhensetupprice/index", + "Pages/yishi/wenzhenorderV2/index" ], "window": { "navigationBarBackgroundColor": "#ffffff", diff --git a/commpents/appraise_data/index.wxml b/commpents/appraise_data/index.wxml index 2352ca0..15c7d67 100644 --- a/commpents/appraise_data/index.wxml +++ b/commpents/appraise_data/index.wxml @@ -2,7 +2,7 @@ {{name}} - + {{content}} diff --git a/commpents/appraise_data/index.wxss b/commpents/appraise_data/index.wxss index 4fc902e..e44cd25 100644 --- a/commpents/appraise_data/index.wxss +++ b/commpents/appraise_data/index.wxss @@ -2,7 +2,11 @@ display: flex; padding: 20rpx; flex-direction: column; + background-color: aqua; +} +.item:not(:last-child){ border-bottom: 1px solid #E7E7E7; + background-color: brown; } .top{ display: flex; diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js index ad33e7e..8bf35c0 100644 --- a/commpents/myprofile/index.js +++ b/commpents/myprofile/index.js @@ -331,11 +331,18 @@ Component({ console.log("keshi_huixian: ", keshi_huixian) console.log("zhicheng_huixian: ", zhicheng_huixian) console.log("area_huixian: ", area_huixian) - if((keshi_huixian && zhicheng_huixian && area_huixian) || huixian_try_count > 50){ + if((keshi_huixian && zhicheng_huixian && area_huixian)){ + console.log("clearInterval1111", data_replay); + clearInterval(data_replay); + } + if(huixian_try_count > 50){ + console.log("clearInterva22222", data_replay); clearInterval(data_replay); } console.log("计时器"); }, 500); + + console.log("clearInterva3333", data_replay); }, }, diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml index 71f3914..d4c2d3a 100644 --- a/commpents/myprofile/index.wxml +++ b/commpents/myprofile/index.wxml @@ -70,7 +70,7 @@ + placeholder="请输入您所在科室实际名称" border="{{department_custom_name_reason == ''}}" /> @@ -272,7 +272,7 @@ textarea_cell_name="个人简介" t_icon_name="view-module" bind:showNote="onshowJianJieNote" - textarea_cell_content_placeholder="您的从业经历，职称，所获荣誉等信息（10~1000字）" + textarea_cell_content_placeholder="您目前就职医院与科室、社会兼职、所获荣誉、参与科研课题及发表论文等信息（10~1000字）" textarea_val="{{textarea_jianjie}}" disabled="{{(indentity && iden_auth_disabled)}}" has_error_content="{{ brief_introduction_reason }}" @@ -285,7 +285,7 @@ disabled="{{(indentity && iden_auth_disabled)}}" textarea_val="{{textarea_shanchang}}" has_error_content="{{ be_good_at_reason }}" - textarea_cell_content_placeholder="您的专业领域、擅长疾病、研究方法等信息（10~1000字）" + textarea_cell_content_placeholder="描述您所擅长治疗的疾病或者研究方向（10~1000字）" data-textarea_name="textarea_shanchang" bindTextAreaBlur="getTextAreaVal" /> 去查看 去接诊 diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index fffb97a..9672b94 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -60,7 +60,6 @@ Component({ }, attached() { const usertype = wx.getStorageSync('usertype') - console.log("usertype: " ,usertype); if (usertype == 2) { this.setData({ usertype: usertype, @@ -74,7 +73,7 @@ Component({ } let _this = this; let userID = wx.getStorageSync('user_id_'+usertype); - setInterval(() => { + let info_inter = setInterval(() => { let index_info = wx.getStorageSync(userID+'_index_info'); let wenzhen_info = wx.getStorageSync(userID+'_wenzhen_info'); let my_info = wx.getStorageSync(userID+'_my_info'); @@ -84,6 +83,8 @@ Component({ my_info: my_info, }) }, 500); + + app.globalData.app_inter.push(info_inter); }, methods: { // swichNav: function (e) { @@ -102,7 +103,6 @@ Component({ // } // }, onChange(e) { - console.log("custom tab bar onChange"); const usertype = wx.getStorageSync('usertype'); let userID = wx.getStorageSync('user_id_'+usertype); let idcard_status = wx.getStorageSync(userID+'_idcard_status'); @@ -110,15 +110,10 @@ Component({ let multi_point_status = wx.getStorageSync(userID+'_multi_point_status'); let is_bind_bank = wx.getStorageSync(userID+'_is_bind_bank'); - console.log("idcard_status: ", idcard_status); - console.log("iden_auth_status: ", iden_auth_status); - console.log("multi_point_status: ", iden_auth_status); - console.log("is_bind_bank: ", is_bind_bank); - if(idcard_status != 1 && usertype != 3){ this.setData({ dialog_visible: true, - dialog_content: "请您先实名认证", + dialog_content: "请您先完成实名认证", next_url: "/Pages/yishi/identity/index", }) return; @@ -140,7 +135,6 @@ Component({ return; } let url = this.data.items[e.detail].pagePath; - console.log(url); wx.switchTab({ url: url, }) @@ -149,7 +143,6 @@ Component({ this.setData({ dialog_visible: false }) - console.log("next_url: ", this.data.next_url); let next_url = this.data.next_url; app.go(next_url); }, diff --git a/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js b/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js index 8fe1721..b222517 100644 --- a/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js +++ b/miniprogram_npm/tdesign-miniprogram/navbar/navbar.js @@ -96,17 +96,11 @@ let Navbar = class Navbar extends SuperComponent { success: (res) => { const boxStyleList = []; const { statusBarHeight } = wx.getSystemInfoSync(); - console.log("statusBarHeight: ", statusBarHeight); - console.log("${rect.height}px: ", `${rect.height}`); boxStyleList.push(`--td-navbar-padding-top:${statusBarHeight}px`); if (rect && (res === null || res === void 0 ? void 0 : res.windowWidth)) { boxStyleList.push(`--td-navbar-right:${res.windowWidth - rect.left}px`); } boxStyleList.push(`--td-navbar-capsule-height: ${rect.height}px`); - - console.log("statusBarHeight: ", statusBarHeight); - console.log("${rect.height}: ", `${rect.height}`); - boxStyleList.push(`--td-navbar-capsule-width:${rect.width}px`); this.setData({ boxStyle: `${boxStyleList.join('; ')}`, diff --git a/utils/network/api.js b/utils/network/api.js index 274933f..e59e8c9 100644 --- a/utils/network/api.js +++ b/utils/network/api.js @@ -234,10 +234,10 @@ class API extends HTTP { }) } //获取提现数据 - getDoctorWithdrawal(params) { + postDoctorWithdrawalInfo(params) { return this.request({ - url: `${this.baseUrl}/doctor/withdrawal`, - method: 'GET', + url: `${this.baseUrl}/doctor/withdrawal/info`, + method: 'POST', data: { ...params }