diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index cfdc506..06d5806 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -24,9 +24,11 @@
bindtap="getPhoneNumber"
color="#09BB07" custom-style="font-size: 36rpx;" type="primary" round block>微信授权手机号登录
-
+
我已阅读并同意协议
- 《肝胆相照用户服务协议》
+ 《肝胆相照用户注册及服务协议》
+ 《隐私协议》
+ 《劳务协议》
diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js
index 6842119..412cf1d 100644
--- a/Pages/mobile_login/index.js
+++ b/Pages/mobile_login/index.js
@@ -162,8 +162,10 @@ Page({
clearInterval(time_index);
}
},1000)
-
-
+ },
+ go(e){
+ let url = e.currentTarget.dataset.url;
+ app.go(url);
}
})
\ No newline at end of file
diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml
index 68cf62d..0e2b427 100644
--- a/Pages/mobile_login/index.wxml
+++ b/Pages/mobile_login/index.wxml
@@ -26,7 +26,13 @@
登录
- 我已阅读并同意协议《肝胆相照用户服务协议》
+
+
+ 我已阅读并同意协议
+ 《肝胆相照用户注册及服务协议》
+ 《隐私协议》
+ 《劳务协议》
+
\ No newline at end of file
diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml
index 3d17021..8963a27 100644
--- a/Pages/yishi/cash/index.wxml
+++ b/Pages/yishi/cash/index.wxml
@@ -21,7 +21,7 @@
- 提现金额(元)
+ 实际到账(元)
¥{{withdrawal_amount}}
diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml
index aade775..c20219e 100644
--- a/Pages/yishi/cashrecord/index.wxml
+++ b/Pages/yishi/cashrecord/index.wxml
@@ -18,7 +18,7 @@
{{item.created_at}}
- ¥{{item.applied_withdrawal_amount}}
+ ¥{{item.actual_withdrawal_amount}}
{{item.examine_status==1?'审核中':item.examine_status==2?'审核通过':item.examine_status==3?'审核未通过':'未知'}}
diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml
index 960c705..f616403 100644
--- a/Pages/yishi/kuaisusetup/index.wxml
+++ b/Pages/yishi/kuaisusetup/index.wxml
@@ -16,7 +16,7 @@
{{ note }}
-
+
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 658ad10..30858f6 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -32,7 +32,7 @@
+添加诊断
-
+
{{item.icd_name}}
diff --git a/Pages/yishi/onlinechufang/index.wxss b/Pages/yishi/onlinechufang/index.wxss
index bc7160b..7e4e112 100644
--- a/Pages/yishi/onlinechufang/index.wxss
+++ b/Pages/yishi/onlinechufang/index.wxss
@@ -61,6 +61,8 @@ page{
flex: 1;
color: #666666;
font-size: 28rpx;
+ word-wrap:break-word;
+ word-break:break-all;
}
.txt_title{
@@ -195,6 +197,10 @@ page{
height: 100rpx;
line-height: 100rpx;
border-bottom: 1px solid #E7E7E7;
+ width: 90%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.label_item{
display: flex;
diff --git a/Pages/yishi/onlinesetup/index.wxml b/Pages/yishi/onlinesetup/index.wxml
index 5d257f7..859b9b6 100644
--- a/Pages/yishi/onlinesetup/index.wxml
+++ b/Pages/yishi/onlinesetup/index.wxml
@@ -16,7 +16,7 @@
{{ note }}
-
+
diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml
index 00a86fd..b8acba0 100644
--- a/Pages/yishi/yizhensetup/index.wxml
+++ b/Pages/yishi/yizhensetup/index.wxml
@@ -16,7 +16,7 @@
{{ note }}
-
+
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js
index 9ecf644..7502196 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -173,7 +173,7 @@ Component({
wx.setStorageSync('words', "");
}
- console.log("pageLifetimes show")
+ // console.log("pageLifetimes show")
let _this = this
wx.getNetworkType({
success (res) {
@@ -361,7 +361,7 @@ Component({
handleSendImageMessage(file) {
let networkstatus = this.data.networkstatus
- console.log("networkstatus: ", networkstatus)
+ // console.log("networkstatus: ", networkstatus)
if(networkstatus === 'none'){
wx.showToast({
title: '请检查您的网络',
@@ -405,12 +405,15 @@ Component({
message_rounds = cloudCustomDataJson.message_rounds;
}
+ let cach_message_rounds = this.data.message_rounds
+ message_rounds = cach_message_rounds>message_rounds?cach_message_rounds:message_rounds
+
const mycloudCustomData = JSON.stringify({
order_inquiry_id: this.data.order_inquiry_id,
inquiry_type: this.data.inquiry_type,
message_type: 0,
is_system: 0,
- message_rounds: this.data.message_rounds,
+ message_rounds: message_rounds,
patient_family_data: patient_family_data
});
@@ -459,7 +462,7 @@ Component({
},
handleCommonFunctions(e) {
- console.log("handleCommonFunctions: ", e)
+ // console.log("handleCommonFunctions: ", e)
switch (e.target.dataset.key) {
case '0':
this.setData({
@@ -541,7 +544,7 @@ Component({
})
wx.openSetting({
success (res) {
- console.log(res.authSetting)
+ // console.log(res.authSetting)
}
})
},
@@ -679,7 +682,7 @@ Component({
sendTextMessage(msg, flag) {
let networkstatus = this.data.networkstatus
- console.log("networkstatus: ", networkstatus)
+ // console.log("networkstatus: ", networkstatus)
if(networkstatus === 'none'){
wx.showToast({
title: '请检查您的网络',
@@ -730,6 +733,9 @@ Component({
message_rounds = cloudCustomDataJson.message_rounds;
}
+ let cach_message_rounds = this.data.message_rounds
+ message_rounds = cach_message_rounds>message_rounds?cach_message_rounds:message_rounds
+
const to = this.getToAccount();
const text = flag ? msg : this.data.message;
@@ -739,7 +745,7 @@ Component({
inquiry_type: this.data.inquiry_type,
message_type: 0,
is_system: 0,
- message_rounds: this.data.message_rounds,
+ message_rounds: message_rounds,
patient_family_data: patient_family_data
});
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index 2f368f9..e13ab40 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -235,7 +235,7 @@ Component({
},
refreshMessageRounds(message){
try {
- console.log("messageList refreshMessageRounds message: ", message);
+ // console.log("messageList refreshMessageRounds message: ", message);
let cloudCustomData = "";
let cloudCustomDataJson = "";
if(message.cloudCustomData){