diff --git a/Pages/yaoshi/home/home.wxss b/Pages/yaoshi/home/home.wxss index 028c6bc..0628c84 100644 --- a/Pages/yaoshi/home/home.wxss +++ b/Pages/yaoshi/home/home.wxss @@ -1,7 +1,8 @@ -.container{ +page{ background-color: #F4F5F7; +} +.container{ width: 100vw; - height: 100vh; } .main{ width: 90vw; diff --git a/Pages/yishi/cash/index.json b/Pages/yishi/cash/index.json index c77fddd..7095cf3 100644 --- a/Pages/yishi/cash/index.json +++ b/Pages/yishi/cash/index.json @@ -3,6 +3,7 @@ "usingComponents": { "te-nav-bar": "/commpents/te_navbar", "t-image": "tdesign-miniprogram/image/image", + "van-icon": "@vant/weapp/icon/index", "van-button": "@vant/weapp/button/index" } } \ No newline at end of file diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml index 937eb7c..5e79139 100644 --- a/Pages/yishi/cash/index.wxml +++ b/Pages/yishi/cash/index.wxml @@ -3,7 +3,7 @@ 结算银行卡 - 提现规则 + 提现规则 diff --git a/Pages/yishi/cashrecord/index.js b/Pages/yishi/cashrecord/index.js index d02f6ca..0d9255c 100644 --- a/Pages/yishi/cashrecord/index.js +++ b/Pages/yishi/cashrecord/index.js @@ -13,11 +13,21 @@ Page({ current_page: 0, total: 0, per_page: 0, - last_page: 0 + last_page: 0, + dateVisible: false, + select_date: '2023', + years: [ + { label: '2022年', value: '2022' }, + { label: '2023年', value: '2023' }, + { label: '2024年', value: '2024' }, + ], }, onLoad(){ + this.getDoctorWithdrawalRecord(); + }, + getDoctorWithdrawalRecord(){ //获取提现数据 - api.getDoctorWithdrawalRecord({year:'2023'}).then(response => { + api.getDoctorWithdrawalRecord({year: this.data.select_date}).then(response => { console.log(response); if(response.data.total > 0){ this.setData({ @@ -28,8 +38,36 @@ Page({ last_page: response.data.last_page, }) } - }).catch(errors => { - console.error(errors); + }).catch(errors => { console.error(errors); }) + }, + onDatePicker() { + this.setData({ dateVisible: true }); + }, + onPickerChange(e) { + const { key } = e.currentTarget.dataset; + const { value } = e.detail; + + console.log('picker change:', e.detail); + + this.setData({ + select_date: value }) + + this.getDoctorWithdrawalRecord(); + + }, + onColumnChange(e) { + const { key } = e.currentTarget.dataset; + const { value } = e.detail; + + console.log('Column change:', e.detail); + + }, + onPickerCancel(e) { + const { key } = e.currentTarget.dataset; + const { value } = e.detail; + + console.log('picker Cancel:', e.detail); + } }) \ No newline at end of file diff --git a/Pages/yishi/cashrecord/index.json b/Pages/yishi/cashrecord/index.json index 0439bb9..acbbb5d 100644 --- a/Pages/yishi/cashrecord/index.json +++ b/Pages/yishi/cashrecord/index.json @@ -3,6 +3,9 @@ "usingComponents": { "te-nav-bar": "/commpents/te_navbar", "van-icon": "@vant/weapp/icon/index", - "t-image": "tdesign-miniprogram/image/image" + "van-empty": "@vant/weapp/empty/index", + "t-image": "tdesign-miniprogram/image/image", + "t-picker": "tdesign-miniprogram/picker/picker", + "t-picker-item": "tdesign-miniprogram/picker-item/picker-item" } } \ No newline at end of file diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml index 9e42712..a27962d 100644 --- a/Pages/yishi/cashrecord/index.wxml +++ b/Pages/yishi/cashrecord/index.wxml @@ -2,8 +2,8 @@ - - 2022年 + + {{select_date}}年 @@ -47,25 +47,23 @@ 个人所得税：￥12.00 - - - - - - - 张三三（尾号9900） - 12.09 13:23 - - - ￥123.00 - - 结算中 - - - - 个人所得税：￥12.00 - - + + + + + + + diff --git a/Pages/yishi/cashrecord/index.wxss b/Pages/yishi/cashrecord/index.wxss index 6147fb6..5f863aa 100644 --- a/Pages/yishi/cashrecord/index.wxss +++ b/Pages/yishi/cashrecord/index.wxss @@ -93,4 +93,7 @@ page{ justify-content: flex-end; margin-right: 20rpx; color: #666; +} +.t-picker__confirm{ + color: #3CC7C0 !important; } \ No newline at end of file diff --git a/Pages/yishi/chat/index.wxss b/Pages/yishi/chat/index.wxss index 7642336..c44f761 100644 --- a/Pages/yishi/chat/index.wxss +++ b/Pages/yishi/chat/index.wxss @@ -2,7 +2,4 @@ background-color: #F4F4F4; width: 100vw; height: 100vh; -} -.top{ - } \ No newline at end of file diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js index 18fe3d1..751b8c4 100644 --- a/Pages/yishi/identity/index.js +++ b/Pages/yishi/identity/index.js @@ -307,6 +307,7 @@ Page({ }, //新增实名认证信息 postDoctorAuthReal(){ + const realname = this.data.realname.trim(); const idcard = this.data.idcard.trim(); @@ -333,16 +334,23 @@ Page({ wx.showToast({title: '身份证输入有误', icon:'error'}) return false; } - - var params = { - card_name: realname, - card_num: idcard, - } - api.postDoctorAuthReal(params).then(response => { - console.log(response); - }).catch(errors => { - console.error(errors); + + wx.requestSubscribeMessage({ + tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'], + success (res) { + console.log(res) + var params = { + card_name: realname, + card_num: idcard, + } + api.postDoctorAuthReal(params).then(response => { + console.log(response); + }).catch(errors => { + console.error(errors); + }) + } }) + }, onTabsChange(event) { console.log(`Change tab, tab-panel value is ${event.detail.value}.`); diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js index f4b1b4d..4874348 100644 --- a/Pages/yishi/index/index.js +++ b/Pages/yishi/index/index.js @@ -22,6 +22,7 @@ Page({ }, iden_auth_status_txt: "未认证", multi_point_status_txt: "未认证", + shiming_status_url: "", iden_auth_status_url: "/Pages/yishi/identity/index", multi_point_status_url: "/Pages/yishi/zhiye_identity/index", current: 0, @@ -87,7 +88,8 @@ Page({ case_text: "已全部通过" }, ], - skeleton_loading: true + skeleton_loading: true, + contactKeFu: false }, // 获取状态栏信息 getMenuButtonBound() { @@ -249,7 +251,13 @@ Page({ return; } } - + let url = e.currentTarget.dataset.url; + console.log(url); + if(url.indexOf("wenzhen") > -1){ + wx.switchTab({ + url: url, + }) + } app.go(e.currentTarget.dataset.url) }, @@ -283,6 +291,7 @@ Page({ this.setData({ "info.info_shiming_status_txt": "认证失败", "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/identity/index", dialog_content: "实名认证失败", dialog_visible: true }); @@ -295,6 +304,7 @@ Page({ this.setData({ "info.info_shiming_status_txt": "前往医师身份认证", "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/identity/index", dialog_content: "请您前往医师身份认证", dialog_visible: true }); @@ -304,6 +314,7 @@ Page({ this.setData({ "info.info_shiming_status_txt": "审核中", "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/identity/index", dialog_content: "您的医师身份认证正在审核中", dialog_visible: true }); @@ -324,6 +335,7 @@ Page({ this.setData({ "info.info_shiming_status_txt": "前往多点执业认证", "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/zhiye_identity/index", dialog_content: "请您先进行多点执业认证", dialog_visible: true }); @@ -333,6 +345,7 @@ Page({ this.setData({ "info.info_shiming_status_txt": "审核中", "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/zhiye_identity/index", dialog_content: "您的多点执业认证正在审核中", dialog_visible: true }); @@ -342,6 +355,7 @@ Page({ this.setData({ "info.info_shiming_status_txt": "认证失败", "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/zhiye_identity/index", dialog_content: "您的多点执业认证失败", dialog_visible: true }); @@ -355,6 +369,7 @@ Page({ this.setData({ "info.info_shiming_status_txt": "绑定结算银行卡", "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/bankcard/index", dialog_content: "请您先绑定结算银行卡", dialog_visible: true }); @@ -366,14 +381,31 @@ Page({ this.setData({ "info.info_shiming_status_txt": "开启在线问诊", "info.info_shiming_status": "info_shiming_status_yes", - multi_point_status_url: "/Pages/yishi/onlinesetup/index", + shiming_status_url: "/Pages/yishi/onlinesetup/index", dialog_content: "请您先前往在线问诊管理中开通在线问诊", dialog_visible: true }); return false; } - this.setData({"info.info_shiming_status_txt": "去接诊"}); + this.setData({ + "info.info_shiming_status_txt": "去接诊", + shiming_status_url: "/Pages/yishi/wenzhen_v2/wenzhen", + }); this.setData({"info.info_shiming_status": "info_shiming_status_yes"}); return true; + }, + contactKeFu(){ + let _this = this; + console.log("concatKeFu"); + wx.requestSubscribeMessage({ + tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'], + success (res) { + console.log(res); + _this.setData({ + contactKeFu: true + }) + + } + }) } }) \ No newline at end of file diff --git a/Pages/yishi/index/index.json b/Pages/yishi/index/index.json index 1df70e4..4f6315d 100644 --- a/Pages/yishi/index/index.json +++ b/Pages/yishi/index/index.json @@ -4,6 +4,7 @@ "t-avatar": "tdesign-miniprogram/avatar/avatar", "van-image": "@vant/weapp/image/index", "van-button": "@vant/weapp/button/index", + "van-dialog": "@vant/weapp/dialog/index", "t-swiper": "tdesign-miniprogram/swiper/swiper", "t-swiper-nav": "tdesign-miniprogram/swiper-nav/swiper-nav", "t-badge": "tdesign-miniprogram/badge/badge", diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml index 9db1c61..a74188e 100644 --- a/Pages/yishi/index/index.wxml +++ b/Pages/yishi/index/index.wxml @@ -23,7 +23,7 @@ - + {{info.info_shiming_status_txt}} @@ -131,7 +131,7 @@ - + + + \ No newline at end of file diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss index 6f403f4..02e951b 100644 --- a/Pages/yishi/index/index.wxss +++ b/Pages/yishi/index/index.wxss @@ -201,4 +201,4 @@ .dialog_confirm_btn{ border-top: 1px solid #E9E9E9; color: #3CC7C0; -} \ No newline at end of file +} diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml index 8f3be2b..4621ea8 100644 --- a/Pages/yishi/kuaisusetup/index.wxml +++ b/Pages/yishi/kuaisusetup/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/Pages/yishi/kuaisusetup/index.wxss b/Pages/yishi/kuaisusetup/index.wxss index 0af51b2..8aa348a 100644 --- a/Pages/yishi/kuaisusetup/index.wxss +++ b/Pages/yishi/kuaisusetup/index.wxss @@ -1,7 +1,8 @@ +page{ + background-color: #F6F6F6; +} .container{ width: 100vw; - height: 100vh; - background-color: #F6F6F6; } .switch_box{ display: flex; diff --git a/Pages/yishi/myaccount/index.wxss b/Pages/yishi/myaccount/index.wxss index 569ce52..f84c243 100644 --- a/Pages/yishi/myaccount/index.wxss +++ b/Pages/yishi/myaccount/index.wxss @@ -62,6 +62,8 @@ page{ border-radius: 20rpx; padding: 20rpx 0; } - +.t-picker__confirm{ + color: #3CC7C0 !important; +} diff --git a/Pages/yishi/notice_deatil/index.wxss b/Pages/yishi/notice_deatil/index.wxss index 866e79d..c4c450c 100644 --- a/Pages/yishi/notice_deatil/index.wxss +++ b/Pages/yishi/notice_deatil/index.wxss @@ -1,6 +1,7 @@ -.container{ +page{ background-color: #F4F4F4; - height: 100vh; +} +.container{ width: 100vw; } .data{ diff --git a/Pages/yishi/onlinesetup/index.js b/Pages/yishi/onlinesetup/index.js index fe21f1a..a9bcbc5 100644 --- a/Pages/yishi/onlinesetup/index.js +++ b/Pages/yishi/onlinesetup/index.js @@ -91,9 +91,9 @@ Page({ }, onPriceChange(e){ console.log(e.detail); - let value = e.detail.value; - let min = this.data.config.min_inquiry_price; - let max = this.data.config.max_inquiry_price; + let value = Number(e.detail.value); + let min = Number(this.data.config.min_inquiry_price); + let max = Number(this.data.config.max_inquiry_price); if(value < min){ value = min; Toast.fail('价格不能低于' + min + '元'); diff --git a/Pages/yishi/wenzhenorder/index.js b/Pages/yishi/wenzhenorder/index.js index 5b76265..a945e82 100644 --- a/Pages/yishi/wenzhenorder/index.js +++ b/Pages/yishi/wenzhenorder/index.js @@ -24,8 +24,8 @@ Page({ onLoad(){ //可提现问诊订单列表 let params = {}; - params.page = page; - params.per_page = per_page; + params.page = this.data.page; + params.per_page = this.data.per_page; api.getDoctorWithdrawalOrder(params).then(response => { console.log(response); if(response.data.total > 0){ diff --git a/Pages/yishi/wenzhenorder/index.json b/Pages/yishi/wenzhenorder/index.json index 8d4e19e..70a874f 100644 --- a/Pages/yishi/wenzhenorder/index.json +++ b/Pages/yishi/wenzhenorder/index.json @@ -4,6 +4,7 @@ "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-button": "@vant/weapp/button/index", + "van-empty": "@vant/weapp/empty/index" } } \ No newline at end of file diff --git a/Pages/yishi/wenzhenorder/index.wxml b/Pages/yishi/wenzhenorder/index.wxml index a289885..d0372f4 100644 --- a/Pages/yishi/wenzhenorder/index.wxml +++ b/Pages/yishi/wenzhenorder/index.wxml @@ -37,7 +37,8 @@ - + + diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml index 1e3cd4e..673e6e4 100644 --- a/Pages/yishi/yizhensetup/index.wxml +++ b/Pages/yishi/yizhensetup/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss index 0cfbc64..44ef568 100644 --- a/Pages/yishi/yizhensetup/index.wxss +++ b/Pages/yishi/yizhensetup/index.wxss @@ -1,7 +1,8 @@ +page{ + background-color: #F6F6F6; +} .container{ width: 100vw; - height: 100vh; - background-color: #F6F6F6; } .switch_box{ display: flex; diff --git a/Pages/yishi/zhiye_identity/index.js b/Pages/yishi/zhiye_identity/index.js index 13ec417..66d1b05 100644 --- a/Pages/yishi/zhiye_identity/index.js +++ b/Pages/yishi/zhiye_identity/index.js @@ -63,46 +63,66 @@ Page({ } }, add(){ - let id_card_front = this.data.id_card_front[0].url; - console.log("id_card_front: ", id_card_front); - if(id_card_front == ""){ - wx.showToast({ - title: '请上传身份证', - icon: "error" - }) - return; - } - let id_card_back = this.data.id_card_back[0].url; - console.log("id_card_back: ", id_card_back); - if(id_card_back == ""){ - wx.showToast({ - title: '请上传身份证', - icon: "error" - }) - return; - } - let sign_image = this.data.sign_image; - console.log("sign_image: ", sign_image); - if(sign_image == ""){ - wx.showToast({ - title: '请上传签名', - icon: "error" - }) - return; - } - let params = {}; - params.id_card_front = id_card_front; - params.id_card_back = id_card_back; - params.sign_image = sign_image; - api.postDoctorAuthMulti(params).then(response => { - console.log("postDoctorAuthMulti: ",response); - wx.showToast({ - title: '提交成功', - icon: "success" - }) - }).catch(errors => { - console.error(errors); + let _this = this; + wx.requestSubscribeMessage({ + tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'], + success (res) { + console.log(res); + let id_card_front = _this.data.id_card_front[0].url; + console.log("id_card_front: ", id_card_front); + if(id_card_front == ""){ + wx.showToast({ + title: '请上传身份证', + icon: "error" + }) + return; + } + let id_card_back = _this.data.id_card_back[0].url; + console.log("id_card_back: ", id_card_back); + if(id_card_back == ""){ + wx.showToast({ + title: '请上传身份证', + icon: "error" + }) + return; + } + let sign_image = _this.data.sign_image; + console.log("sign_image: ", sign_image); + if(sign_image == ""){ + wx.showToast({ + title: '请上传签名', + icon: "error" + }) + return; + } + let params = {}; + params.id_card_front = id_card_front; + params.id_card_back = id_card_back; + params.sign_image = sign_image; + api.postDoctorAuthMulti(params).then(response => { + console.log("postDoctorAuthMulti: ",response); + wx.showToast({ + title: '提交成功', + icon: "success" + }) + + + // 订阅处方审核结果通知（长期） + wx.requestSubscribeMessage({ + tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'], + success (res) { console.log(res); } + }) + + + }).catch(errors => { + console.error(errors); + }) + }, + fail (res) { console.log(res) }, + complete (res) { console.log(res) }, }) + + }, doUploadFile(event) { console.log("index douploadFIle: ", event); diff --git a/Pages/yishi/zhiye_identity/index.wxml b/Pages/yishi/zhiye_identity/index.wxml index 3d986e1..a06e626 100644 --- a/Pages/yishi/zhiye_identity/index.wxml +++ b/Pages/yishi/zhiye_identity/index.wxml @@ -59,5 +59,8 @@ 提交 + + + \ No newline at end of file diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js index 53fac75..560f0fd 100644 --- a/commpents/myprofile/index.js +++ b/commpents/myprofile/index.js @@ -638,23 +638,26 @@ Component({ params.qualification_cert = this.data.zige_file_list.map(e => e.url);//医生资格证 if(this.data.zhicheng_file_list.length == 0){wx.showToast({title: '请上传职称证',icon: "error"});return} params.work_cert = this.data.zhicheng_file_list.map(e => e.url);//工作证，职称证 - - console.log(params); - api.postDoctorAuthIden(params).then(response => { - console.log(response); - wx.showToast({ - title: '提交成功', - icon: "success" - }) - - this.setData({ - iden_auth_status_txt: "审核中", - iden_auth_disabled: true - }) - - }).catch(errors => {console.error(errors);}) + let _this = this; + wx.requestSubscribeMessage({ + tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'], + success (res) { + console.log(res); + api.postDoctorAuthIden(params).then(response => { + console.log(response); + wx.showToast({ + title: '提交成功', + icon: "success" + }) + _this.setData({ + iden_auth_status_txt: "审核中", + iden_auth_disabled: true + }) + }).catch(errors => {console.error(errors);}) + } + }) }, doUploadFile(event) { console.log("index douploadFIle: ", event); diff --git a/commpents/wenzhen_data/index.js b/commpents/wenzhen_data/index.js index 2df19bd..fa8b97e 100644 --- a/commpents/wenzhen_data/index.js +++ b/commpents/wenzhen_data/index.js @@ -80,10 +80,16 @@ Component({ }) }, goChat(e){ - let from_account = e.currentTarget.dataset.from_account; - let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id; - wx.navigateTo({ - url: e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id + 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; + wx.navigateTo({ + url: e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id + }) + } }) }, tabShow(){ diff --git a/utils/network/request.js b/utils/network/request.js index 740b86a..e0c1d2d 100644 --- a/utils/network/request.js +++ b/utils/network/request.js @@ -47,9 +47,6 @@ class HTTP { } else { reject(res.data.message) this._show_error(res.data.message) - wx.navigateTo({ - url: "/Pages/index/index" - }) } } else { resolve(res.data)