diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxml b/TUIChatService/TUIKit/components/TUIChat/index.wxml
index fdfdd43..21fbcb7 100644
--- a/TUIChatService/TUIKit/components/TUIChat/index.wxml
+++ b/TUIChatService/TUIKit/components/TUIChat/index.wxml
@@ -26,7 +26,7 @@
0个沟通回合
- 问诊中 | 不限问诊次数，{{serviceInfo.finish_time}}后结束
+ 问诊中 | 不限问诊次数，{{serviceInfo.finish_time}}天后结束
当月剩余：{{serviceInfo.monthly_frequency-serviceInfo.month_inquiry_count}}次
diff --git a/user/pages/yishi/addServiceContent/index.js b/user/pages/yishi/addServiceContent/index.js
index c1b9fee..7ac29f8 100644
--- a/user/pages/yishi/addServiceContent/index.js
+++ b/user/pages/yishi/addServiceContent/index.js
@@ -13,6 +13,7 @@ Page({
title: '添加服务内容', //导航栏 中间的标题
},
+ tuwenPrice:'',
cycle_columns:['1个月', '3个月', '6个月', '12个月'],
service_columns:['10次','不限次'],
showCycle:false,
@@ -21,6 +22,10 @@ Page({
isAdd:false,
service_rounds:0,
cur_id:'',
+ onePrice:null,
+ threePrice:null,
+ sixPrice:null,
+ yearPrice:null,
items:[{
service_period:'',
service_price:''
@@ -238,7 +243,12 @@ getFollowDetail(){
this.setData({
iden_auth_status:options.iden_auth_status,
idcard_status:options.idcard_status,
- is_bind_bank:options.is_bind_bank
+ is_bind_bank:options.is_bind_bank,
+ tuwenPrice:options.tuwenPrice,
+ onePrice:options.tuwenPrice?(options.tuwenPrice*10*0.5).toFixed(2):0,
+ threePrice:options.tuwenPrice?(options.tuwenPrice*30*0.4).toFixed(2):0,
+ sixPrice:options.tuwenPrice?(options.tuwenPrice*60*0.3).toFixed(2):0,
+ yearPrice:options.tuwenPrice?(options.tuwenPrice*120*0.2).toFixed(2):0,
})
},
diff --git a/user/pages/yishi/addServiceContent/index.wxml b/user/pages/yishi/addServiceContent/index.wxml
index 88f5446..b4e1a35 100644
--- a/user/pages/yishi/addServiceContent/index.wxml
+++ b/user/pages/yishi/addServiceContent/index.wxml
@@ -33,19 +33,19 @@
- 服务价格（元）
+ 服务价格
元
-
- 建议服务价格设置为：{{(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'}}
+
+ 建议服务价格设置为：{{(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/cash/index.js b/user/pages/yishi/cash/index.js
index 68cb098..d5a483b 100644
--- a/user/pages/yishi/cash/index.js
+++ b/user/pages/yishi/cash/index.js
@@ -23,11 +23,13 @@ Page({
sub_visible: false,
skeleton_loading: true,
order_inquiry_ids: [],
+ order_nos:[],
sub_btn_disabled: false
},
onLoad(option){
let order_inquiry_ids = option.order_inquiry_ids;
let params = {};
+ console.log(order_inquiry_ids)
if(order_inquiry_ids){
params.order_inquiry_ids = order_inquiry_ids;
this.setData({
@@ -93,7 +95,7 @@ Page({
bank_card_code_mask: response.data.bank.bank_card_code_mask,
withdrawal_amount: response.data.withdrawal_amount,
amount_total:response.data.amount_total,
- order_inquiry_ids: response.data.order_inquiry_ids,
+ order_nos:response.data.order_nos,
bank_card_name: response.data.bank.bank_card_name_mask,
income_tax: response.data.income_tax,
skeleton_loading: false
@@ -109,7 +111,7 @@ Page({
sub_btn_disabled: true
})
let params = {};
- params.order_inquiry_id = this.data.order_inquiry_ids.join(",");
+ params.order_no = this.data.order_nos.join(",");
params.withdrawal_amount_total = this.data.withdrawal_amount;
params.bank_card_id = this.data.bank_card_id;
//获取提现数据
diff --git a/user/pages/yishi/myaccount/index.wxml b/user/pages/yishi/myaccount/index.wxml
index 5aa946d..c31e6f5 100644
--- a/user/pages/yishi/myaccount/index.wxml
+++ b/user/pages/yishi/myaccount/index.wxml
@@ -26,7 +26,7 @@
¥{{doctor_today_inquiry_total}}
- 已完成待入账
+ 待入账
¥{{doctor_day_completed_amount_total}}
@@ -69,7 +69,8 @@
1、账户余额表示未提现的所有已经结束的订单金额总和
2、今日接诊收入表示今日已经接诊的订单金额总和
- 3、已完成待入账表示近期已完成未结束的订单金额总和
+ 3、待入账表示单次问诊已完成未结束的订单金额总和+健康包/随访包服务开始后的订单金额总和
+
确定
diff --git a/user/pages/yishi/onlinesetup/index.js b/user/pages/yishi/onlinesetup/index.js
index 9f931fe..d5910d3 100644
--- a/user/pages/yishi/onlinesetup/index.js
+++ b/user/pages/yishi/onlinesetup/index.js
@@ -14,8 +14,10 @@ Page({
// open_note: "已开启，患者可以向您发起图文问诊",
// close_note: "已关闭，暂不接诊",
note: "",
+ tuwenPrice:'',
inquiry_type: 1,
inquiry_mode: 1,
+ monthly_frequency:'',
multi_point_status:'',
config_setting:{},
items:[],
@@ -79,13 +81,19 @@ Page({
})
},
onShow(){
- let {active}=this.data;
+ let {active,idcard_status,iden_auth_status,is_bind_bank}=this.data;
this.getDoctorconfig();
this.getDoctorOpen();
this.getSysconfig();
if(active==4){
this.getConfig()
}
+ if(active==1){
+ this.getFollow();
+ if(idcard_status==1 && iden_auth_status==1 && is_bind_bank==1){
+ this.getFollowDetail();
+ }
+ }
},
getDoctorOpen(){
@@ -117,6 +125,11 @@ Page({
// config: response.data.config,
// note: response.data.info.is_open
})
+ if(inquiry_mode==1){
+ this.setData({
+ tuwenPrice:response.data.inquiry_price
+ })
+ }
}).catch(errors => {console.error(errors);})
},
changeON(){
@@ -158,8 +171,8 @@ Page({
}).catch(errors => {console.error(errors);})
},
addServiceContent(){
- 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)
+ let {idcard_status,iden_auth_status,is_bind_bank,tuwenPrice}=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+"&tuwenPrice="+tuwenPrice)
},
async doChange(detail){
console.log("onChange: ", detail);
@@ -347,6 +360,7 @@ Page({
let res=response.data.map((item)=>{
return {service_period:item.service_period,service_price:item.service_price}
})
+ res.sort((a, b) =>a.service_period-b.service_period);
this.setData({
items:res
})
@@ -390,7 +404,7 @@ Page({
getHealthy(){
api.getHealthy().then(response => {
this.setData({
- healthPrice:(response.data.inquiry_price*response.data.service_rate/100).toFixed(2)
+ healthPrice:(response.data.inquiry_price*response.data.service_rate/100*response.data.service_count).toFixed(2)
})
}).catch(errors => {console.error(errors);})
},
diff --git a/user/pages/yishi/onlinesetup/index.wxml b/user/pages/yishi/onlinesetup/index.wxml
index 45fef4d..e666c56 100644
--- a/user/pages/yishi/onlinesetup/index.wxml
+++ b/user/pages/yishi/onlinesetup/index.wxml
@@ -11,7 +11,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){