gdxz/miniprogram-doctor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
haomingming 2023-05-09 15:04:05 +08:00
parent 7b9b80be8d
commit 807698b89f
53 changed files with 896 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Pages/agreement_page/index.js Normal file
View File

@ -0,0 +1,18 @@
// Pages/webpage/index.js
Page({
/**
* 页面的初始数据
*/
data: {
src: ""
},
onLoad(options) {
console.log(options.agreement_id)
this.setData({
src: "https://img.applets.igandanyiyuan.com/basic/file/agreement.htm?id="+options.agreement_id
})
},
})

3
Pages/agreement_page/index.json Normal file
View File

@ -0,0 +1,3 @@
{
"usingComponents": {}
}

2
Pages/agreement_page/index.wxml Normal file
View File

@ -0,0 +1,2 @@
<!--Pages/webpage/index.wxml-->
<web-view src="{{src}}"/>

1
Pages/agreement_page/index.wxss Normal file
View File

@ -0,0 +1 @@
/* Pages/webpage/index.wxss */

2
Pages/login/index.wxml
View File

@ -26,7 +26,7 @@
<view style="display: flex;">
<van-checkbox value="{{ checked }}" bind:change="onChange">我已阅读并同意协议</van-checkbox>
<view style="color: #4384FE;flex: 1;" bindtap="go" data-url="/Pages/yishi/agreement_detail/index?agreement_id=10">《肝胆相照用户服务协议》</view>
<view style="color: #4384FE;flex: 1;" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=10">《肝胆相照用户服务协议》</view>
</view>
</view>

55
Pages/yishi/cash/index.js
View File

@ -1,4 +1,5 @@
import { API } from './../../../utils/network/api'
import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
const api = new API()
const app = getApp()
@ -17,8 +18,10 @@ Page({
withdrawal_amount: "xxxx",
income_tax: "xx",
contactKeFu: false,
sub_visible: false,
skeleton_loading: true,
order_inquiry_ids: []
order_inquiry_ids: [],
sub_btn_disabled: false
},
onLoad(option){
let order_inquiry_ids = option.order_inquiry_ids;
@ -33,29 +36,50 @@ Page({
this.postDoctorWithdrawalInfo(params);
},
onShow(){
this.setData({
sub_btn_disabled: false
})
},
go(e){
let url = e.currentTarget.dataset.url;
app.go(url);
},
contactKeFu(e){
let _this = this;
console.log("concatKeFu");
wx.requestSubscribeMessage({
tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'],
success (res) {
console.log(res);
_this.setData({
contactKeFu: true
let tmplIds = ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc']
let sub_promise = requestSubscribeMessage(tmplIds)
sub_promise.then(res => {
console.log("订阅成功")
this.setData({
contactKeFu: true
})
}).catch(err => {
console.log(err)
let errCode = err.errCode
if(errCode == 20004){
this.setData({
sub_visible: true,
})
}
})
},
subcancelDialog(){
this.setData({
sub_visible: false
})
},
subconfirmDialog(){
this.setData({
sub_visible: false
})
wx.openSetting({
success (res) {
console.log(res.authSetting)
}
})
},
postDoctorWithdrawalInfo(params){
//获取提现数据
api.postDoctorWithdrawalInfo(params).then(response => {
console.log(response);
@ -74,9 +98,13 @@ Page({
}
}).catch(errors => {
console.error(errors);
})
},
postDoctorWithdrawal(){
this.setData({
sub_btn_disabled: true
})
let params = {};
params.order_inquiry_id = this.data.order_inquiry_ids.join(",");
params.withdrawal_amount_total = this.data.withdrawal_amount;
@ -94,6 +122,9 @@ Page({
})
}).catch(errors => {
console.error(errors);
this.setData({
sub_btn_disabled: false
})
})
}
})

3
Pages/yishi/cash/index.json
View File

@ -6,6 +6,7 @@
"van-icon": "@vant/weapp/icon/index",
"van-button": "@vant/weapp/button/index",
"van-dialog": "@vant/weapp/dialog/index",
"t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
"t-skeleton": "tdesign-miniprogram/skeleton/skeleton",
"t-dialog": "tdesign-miniprogram/dialog/dialog"
}
}

18
Pages/yishi/cash/index.wxml
View File

@ -3,7 +3,7 @@
<view class="container">
<view class="top">
<view class="txt_title">结算银行卡</view>
<view class="rule" bindtap="go" data-url="/Pages/yishi/agreement_detail/index?agreement_id=12">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
<view class="rule" bindtap="go" data-url="/Pages/agreement_page/index?agreement_id=12">提现规则<van-icon name="warning-o" color="#FF9800" /></view>
</view>
<view class="bankcard" wx:if="{{!skeleton_loading}}">
<view class="bankcard_icon">
@ -58,7 +58,7 @@
</view> -->
<view class="bottom">
<van-button bind:click="postDoctorWithdrawal" disabled="{{order_inquiry_ids.length == 0}}" custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
<van-button bind:click="postDoctorWithdrawal" disabled="{{order_inquiry_ids.length == 0 || sub_btn_disabled}}" custom-style="border-radius: 10rpx;font-size: 30rpx;" block color="#3CC7C0">提取</van-button>
<view class="kefu" bindtap="contactKeFu">
<text>联系客服</text>
</view>
@ -71,4 +71,18 @@
confirm-button-color="#3CC7C0"
confirm-button-open-type="contact"
/>
<t-dialog
visible="{{ sub_visible }}"
title="温馨提示"
content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
>
<view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
取消
</view>
<view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
确定
</view>
</t-dialog>
</view>

15
Pages/yishi/cash/index.wxss
View File

@ -139,5 +139,18 @@ page{
color: #3CC7C0;
margin: 30rpx;
}
.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;
}

48
Pages/yishi/index/index.js
View File

@ -1,6 +1,8 @@
// Pages/yishi/index/index.js
import { API } from './../../../utils/network/api'
import { rpxTopx } from './../../../utils/util'
import { pxTorpx } from './../../../utils/util'
import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
const api = new API()
const app = getApp()
Page({
@ -92,6 +94,7 @@ Page({
},
],
contactKeFu: false,
sub_visible: false,
jiesuan_dialog_show: false,
jiesuan_dialog_visible: false,
funbox_height: 100,
@ -125,7 +128,7 @@ Page({
const { statusBarHeight } = wx.getSystemInfoSync();
// console.log("statusBarHeight: ", rpxTopx(statusBarHeight));
let funbox_height = wx.getSystemInfoSync().windowHeight - (this.data.stateHeight + this.data.navHeight + 10) - 55;//减去底部空白
funbox_height = rpxTopx(funbox_height);
funbox_height = pxTorpx(funbox_height);
// 147 userinfo的高度
// 80 info_note
// 155 认证部分的高度
@ -424,6 +427,8 @@ Page({
});
}
this.setData({
"info.info_shiming_status_txt": "未认证",
"info.info_shiming_status": "info_shiming_status_no",
dialog_content: "请您先完成实名认证",
shiming_status_url: "/Pages/yishi/identity/index",
dialog_url: "/Pages/yishi/identity/index",
@ -637,20 +642,41 @@ Page({
let checkDialog = this.checkDialog(e);
if(checkDialog){
// console.log("concatKeFu");
wx.requestSubscribeMessage({
tmplIds: ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc'],
success (res) {
// console.log(res);
_this.setData({
contactKeFu: true
})
let tmplIds = ['JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc']
let sub_promise = requestSubscribeMessage(tmplIds)
sub_promise.then(res => {
console.log("订阅成功")
this.setData({
contactKeFu: true
})
}).catch(err => {
console.log(err)
let errCode = err.errCode
if(errCode == 20004){
this.setData({
sub_visible: true,
})
}
})
}
},
subcancelDialog(){
this.setData({
sub_visible: false,
contactKeFu: true
})
},
subconfirmDialog(){
this.setData({
sub_visible: false
})
wx.openSetting({
success (res) {
console.log(res.authSetting)
}
})
},
checkDialog(e){
//实名认证
let idcard_status = this.data.info.idcard_status;

13
Pages/yishi/index/index.wxml
View File

@ -233,6 +233,19 @@
<van-button color="rgba(0, 0, 0, .1)" style="position: fixed;bottom: 50rpx;left: 50%;transform: translateX(-50%);width: 90vw;border: 1px solid #fff;border-radius: 50px;" block round bind:click="onClickHideOverlay">我知道了</van-button>
</van-overlay>
<t-dialog
visible="{{ sub_visible }}"
title="温馨提示"
content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
>
<view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
取消
</view>
<view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
确定
</view>
</t-dialog>
</view>

1
Pages/yishi/index/index.wxss
View File

@ -167,6 +167,7 @@ page{
margin: 0 auto;
background-color: #fff;
padding: 20rpx 20rpx 0 20rpx;
box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1);
}
.swiper{
height:168rpx;

39
Pages/yishi/kuaisusetup/index.js
View File

@ -1,5 +1,6 @@
import { API } from './../../../utils/network/api'
import Toast from '@vant/weapp/toast/toast';
import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
let api = new API()
const app = getApp()
Page({
@ -32,7 +33,8 @@ Page({
"5",
"10"
]
}
},
sub_visible: false,
},
onLoad(){
@ -78,16 +80,41 @@ Page({
console.log(response);
}).then(()=>{
if(detail){
wx.requestSubscribeMessage({
tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
success (res) {
console.log(res);//同意授权
let tmplIds = ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc']
let sub_promise = requestSubscribeMessage(tmplIds)
sub_promise.then(res => {
console.log("订阅成功")
}).catch(err => {
console.log(err)
let errCode = err.errCode
if(errCode == 20004){
this.setData({
sub_visible: true,
})
}
})
}
}).catch(errors => {console.error(errors);})
},
subcancelDialog(){
this.setData({
sub_visible: false
})
},
subconfirmDialog(){
this.setData({
sub_visible: false
})
wx.openSetting({
success (res) {
console.log(res.authSetting)
}
})
},
putDoctorInquiryConfig(){
wx.switchTab({
url: "/Pages/yishi/wenzhen_v2/wenzhen"

3
Pages/yishi/kuaisusetup/index.json
View File

@ -7,6 +7,7 @@
"van-stepper": "@vant/weapp/stepper/index",
"van-switch": "@vant/weapp/switch/index",
"van-button": "@vant/weapp/button/index",
"van-toast": "@vant/weapp/toast/index"
"van-toast": "@vant/weapp/toast/index",
"t-dialog": "tdesign-miniprogram/dialog/dialog"
}
}

13
Pages/yishi/kuaisusetup/index.wxml
View File

@ -46,4 +46,17 @@
</view>
<van-toast id="van-toast" />
<t-dialog
visible="{{ sub_visible }}"
title="温馨提示"
content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
>
<view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
取消
</view>
<view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
确定
</view>
</t-dialog>
</view>

14
Pages/yishi/kuaisusetup/index.wxss
View File

@ -124,3 +124,17 @@ page{
text-align: center;
flex: 1;
}
.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;
}

2
Pages/yishi/myaccount/index.wxml
View File

@ -23,7 +23,7 @@
<van-empty description="暂无账单" wx:if="{{ bill.length == 0 }}" />
</view>
<van-image bind:click="go" data-url="/Pages/yishi/agreement_detail/index?agreement_id=13" style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" fit="heightFix" height="84rpx" aria-label="role" />
<van-image bind:click="go" data-url="/Pages/agreement_page/index?agreement_id=13" style="position: fixed; right: 0;bottom: 262rpx;" src="https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/account_rule.png" fit="heightFix" height="84rpx" aria-label="role" />
<t-picker
visible="{{dateVisible}}"

46
Pages/yishi/onlinechufang/index.js
View File

@ -1,5 +1,7 @@
import Toast from '@vant/weapp/toast/toast';
import { API } from './../../../utils/network/api'
import Dialog from '@vant/weapp/dialog/dialog';
const api = new API()
const app = getApp()
Page({
@ -138,11 +140,24 @@ Page({
let product_id = this.data.save_durg_product_id;
this.delDrugBox(product_id);
let save_durg_prescription_product_num = this.data.save_durg_prescription_product_num;
if(!save_durg_prescription_product_num || save_durg_prescription_product_num <0){
Dialog.alert({
message: '请输入药品数量',
}).then(() => {
this.setData({
save_durg_prescription_product_num: ""
})
});
return
}
let save_durg = {};
save_durg.product_name = this.data.product_name;
save_durg.product_id = this.data.save_durg_product_id;
save_durg.prescription_product_num = this.data.save_durg_prescription_product_num;
save_durg.single_unit = this.data.save_durg_single_unit;
save_durg.single_use = this.data.save_durg_single_use;
save_durg.packaging_unit = this.data.save_durg_packaging_unit;
@ -394,6 +409,37 @@ Page({
})
})
},
get_save_durg_prescription_product_num(e){
console.log("get_save_durg_prescription_product_num")
let save_durg_prescription_product_num = e.detail
console.log(typeof save_durg_prescription_product_num)
save_durg_prescription_product_num = Number.parseInt(save_durg_prescription_product_num)
console.log(save_durg_prescription_product_num)
if(isNaN(save_durg_prescription_product_num)){
Dialog.alert({
message: '请输入正确数字',
}).then(() => {
this.setData({
save_durg_prescription_product_num: ""
})
});
return
}
if(save_durg_prescription_product_num > 5){
Dialog.alert({
message: '每个药品数量不允许添加超过5个',
}).then(() => {
this.setData({
save_durg_prescription_product_num: ""
})
});
return
}
this.setData({
save_durg_prescription_product_num: save_durg_prescription_product_num
})
},
putDoctorPrescription(){//修改处方
let sub_disabled = this.data.sub_disabled;
if(sub_disabled) return

3
Pages/yishi/onlinechufang/index.json
View File

@ -11,6 +11,7 @@
"van-search": "@vant/weapp/search/index",
"van-image": "@vant/weapp/image/index",
"van-toast": "@vant/weapp/toast/index",
"van-icon": "@vant/weapp/icon/index"
"van-icon": "@vant/weapp/icon/index",
"van-dialog": "@vant/weapp/dialog/index"
}
}

4
Pages/yishi/onlinechufang/index.wxml
View File

@ -187,7 +187,8 @@
<van-field
label="药品数量"
type="number"
model:value="{{save_durg_prescription_product_num}}"
bind:input="get_save_durg_prescription_product_num"
value="{{save_durg_prescription_product_num}}"
input-align="left"
placeholder="请输入数量"
custom-style="font-size: 30rpx;"
@ -257,3 +258,4 @@
<view style="height: 50rpx;">
</view>
<van-dialog id="van-dialog" confirm-button-color="#3CC7C0"/>

38
Pages/yishi/onlinesetup/index.js
View File

@ -1,5 +1,7 @@
import { API } from './../../../utils/network/api'
import Toast from 'tdesign-miniprogram/toast/index';
import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
let api = new API()
const app = getApp()
Page({
@ -32,7 +34,8 @@ Page({
"5",
"10"
]
}
},
sub_visible: false,
},
onLoad(){
@ -72,16 +75,41 @@ Page({
console.log(response);
}).then(()=>{
if(detail){
wx.requestSubscribeMessage({
tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
success (res) {
console.log(res);//同意授权
let tmplIds = ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc']
let sub_promise = requestSubscribeMessage(tmplIds)
sub_promise.then(res => {
console.log("订阅成功")
}).catch(err => {
console.log(err)
let errCode = err.errCode
if(errCode == 20004){
this.setData({
sub_visible: true,
})
}
})
}
}).catch(errors => {console.error(errors);})
},
subcancelDialog(){
this.setData({
sub_visible: false
})
},
subconfirmDialog(){
this.setData({
sub_visible: false
})
wx.openSetting({
success (res) {
console.log(res.authSetting)
}
})
},
putDoctorInquiryConfig(){
//修改医生问诊配置
// let params = {};

3
Pages/yishi/onlinesetup/index.json
View File

@ -7,6 +7,7 @@
"van-stepper": "@vant/weapp/stepper/index",
"van-switch": "@vant/weapp/switch/index",
"van-button": "@vant/weapp/button/index",
"t-toast": "tdesign-miniprogram/toast/toast"
"t-toast": "tdesign-miniprogram/toast/toast",
"t-dialog": "tdesign-miniprogram/dialog/dialog"
}
}

13
Pages/yishi/onlinesetup/index.wxml
View File

@ -51,4 +51,17 @@
</view>
<t-toast id="t-toast" />
<t-dialog
visible="{{ sub_visible }}"
title="温馨提示"
content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
>
<view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
取消
</view>
<view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
确定
</view>
</t-dialog>
</view>

14
Pages/yishi/onlinesetup/index.wxss
View File

@ -138,3 +138,17 @@ page{
.cell_value{
color: #000;
}
.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;
}

14
Pages/yishi/wenzhen_v2/wenzhen.js
View File

@ -118,6 +118,8 @@ Page({
if(wx.$TUIKit){
wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady, this);
}else{
app.imInit().then(res => {
// console.log("wenzhen onload imInit");
@ -152,6 +154,7 @@ Page({
dot_4: false,
})
wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
},
onUnload(){
// console.log("onUnload from wenzhen")
@ -161,6 +164,9 @@ Page({
now_message_inquiry_type: 5,
})
},
onSDKReady(){
console.log("onSDKReady from wenzhen")
},
getConversationList(){
// console.log("getConversationListgetConversationListgetConversationList");
app.imInit().then(res => {
@ -294,6 +300,9 @@ Page({
if(!cloudCustomData) return;
let cloudCustomDataJson;
try {
if(!cloudCustomData){
return
}
cloudCustomDataJson = JSON.parse(cloudCustomData);
} catch (error) {
// console.log(error);
@ -316,6 +325,9 @@ Page({
if(!cloudCustomData) return;
let cloudCustomDataJson;
try {
if(!item.lastMessage.cloudCustomData){
return
}
cloudCustomDataJson = JSON.parse(item.lastMessage.cloudCustomData);
} catch (error) {
return;
@ -394,7 +406,7 @@ Page({
if(lastMessage.messageForShow == "[自定义消息]"){
let text = "自定义消息";
let payload = lastMessage.payload;
if(payload) {
if(payload && payload.data) {
// console.log("payload: ",payload.data);
let payloadJson = JSON.parse(payload.data);
text = payloadJson.title.replaceAll(/—/g, "");

3
Pages/yishi/wenzhen_v2/wenzhen.json
View File

@ -13,7 +13,8 @@
"van-tabs": "@vant/weapp/tabs/index",
"t-dialog": "tdesign-miniprogram/dialog/dialog",
"van-divider": "@vant/weapp/divider/index",
"van-loading": "@vant/weapp/loading/index"
"van-loading": "@vant/weapp/loading/index",
"van-dialog": "@vant/weapp/dialog/index"
},
"enablePullDownRefresh": true,
"onReachBottomDistance": 100

24
Pages/yishi/wenzhen_v3/wenzhen.js
View File

@ -469,18 +469,18 @@ Page({
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);
}
})
// 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({

37
Pages/yishi/yizhensetup/index.js
View File

@ -1,5 +1,6 @@
import { API } from './../../../utils/network/api'
import Toast from '@vant/weapp/toast/toast';
import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
let api = new API()
const app = getApp()
Page({
@ -35,7 +36,8 @@ Page({
"5",
"10"
]
}
},
sub_visible: false,
},
onLoad(){
@ -96,10 +98,19 @@ Page({
console.log(response);
}).then(()=>{
if(detail){
wx.requestSubscribeMessage({
tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
success (res) {
console.log(res);//同意授权
let tmplIds = ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc']
let sub_promise = requestSubscribeMessage(tmplIds)
sub_promise.then(res => {
console.log("订阅成功")
}).catch(err => {
console.log(err)
let errCode = err.errCode
if(errCode == 20004){
this.setData({
sub_visible: true,
})
}
})
}
@ -112,7 +123,21 @@ Page({
this.setData({ "info.is_open": detail });
}).catch(errors => {console.error(errors);})
},
subcancelDialog(){
this.setData({
sub_visible: false
})
},
subconfirmDialog(){
this.setData({
sub_visible: false
})
wx.openSetting({
success (res) {
console.log(res.authSetting)
}
})
},
putDoctorInquiryConfig(){
//修改医生问诊配置
let params = {};

3
Pages/yishi/yizhensetup/index.json
View File

@ -9,6 +9,7 @@
"van-stepper": "@vant/weapp/stepper/index",
"van-switch": "@vant/weapp/switch/index",
"van-button": "@vant/weapp/button/index",
"van-toast": "@vant/weapp/toast/index"
"van-toast": "@vant/weapp/toast/index",
"t-dialog": "tdesign-miniprogram/dialog/dialog"
}
}

13
Pages/yishi/yizhensetup/index.wxml
View File

@ -73,4 +73,17 @@
</t-picker>
<van-toast id="van-toast" />
<t-dialog
visible="{{ sub_visible }}"
title="温馨提示"
content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
>
<view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
取消
</view>
<view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
确定
</view>
</t-dialog>
</view>

14
Pages/yishi/yizhensetup/index.wxss
View File

@ -122,3 +122,17 @@ page{
.price{
color: red;
}
.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;
}

37
Pages/yishi/yizhensetupprice/index.js
View File

@ -1,5 +1,6 @@
import { API } from './../../../utils/network/api'
import Toast from '@vant/weapp/toast/toast';
import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
let api = new API()
const app = getApp()
Page({
@ -35,7 +36,8 @@ Page({
"5",
"10"
]
}
},
sub_visible: false,
},
onShow(){
@ -98,16 +100,39 @@ Page({
console.log(response);
}).then(()=>{
if(detail){
wx.requestSubscribeMessage({
tmplIds: ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc'],
success (res) {
console.log(res);//同意授权
let tmplIds = ['G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc']
let sub_promise = requestSubscribeMessage(tmplIds)
sub_promise.then(res => {
console.log("订阅成功")
}).catch(err => {
console.log(err)
let errCode = err.errCode
if(errCode == 20004){
this.setData({
sub_visible: true,
})
}
})
}
}).catch(errors => {console.error(errors);})
},
subcancelDialog(){
this.setData({
sub_visible: false
})
},
subconfirmDialog(){
this.setData({
sub_visible: false
})
wx.openSetting({
success (res) {
console.log(res.authSetting)
}
})
},
putDoctorInquiryConfig(){
//修改医生问诊配置
let params = {};

3
Pages/yishi/yizhensetupprice/index.json
View File

@ -8,6 +8,7 @@
"van-cell-group": "@vant/weapp/cell-group/index",
"van-stepper": "@vant/weapp/stepper/index",
"van-button": "@vant/weapp/button/index",
"van-toast": "@vant/weapp/toast/index"
"van-toast": "@vant/weapp/toast/index",
"t-dialog": "tdesign-miniprogram/dialog/dialog"
}
}

13
Pages/yishi/yizhensetupprice/index.wxml
View File

@ -46,4 +46,17 @@
</t-picker>
<van-toast id="van-toast" />
<t-dialog
visible="{{ sub_visible }}"
title="温馨提示"
content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
>
<view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
取消
</view>
<view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
确定
</view>
</t-dialog>
</view>

14
Pages/yishi/yizhensetupprice/index.wxss
View File

@ -121,3 +121,17 @@ page{
font-size: 32rpx !important;
color: red !important;
}
.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;
}

140
Pages/yishi/zhiye_identity/index.js
View File

@ -1,5 +1,6 @@
import { API } from './../../../utils/network/api'
import { FileUtil } from './../../../utils/fileutil'
import { requestSubscribeMessage } from './../../../utils/requestSubscribeUtil';
const api = new API()
const app = getApp()
Page({
@ -15,7 +16,8 @@ Page({
btn_txt: "提交",
multi_point_status: "",
btn_disabled: true,
sfz_show: false
sfz_show: false,
sub_visible: false,
},
onLoad(){
@ -99,66 +101,88 @@ Page({
})
}
},
add(){
let _this = this;
wx.requestSubscribeMessage({
tmplIds: ['XWfEQYtb8_ubz8pCs3GoCG6TFxpDz9jn52895yvDm3s','bGGoKtDZC23GZtrrxuy6i5V7OhHgRgwXWx4yoDO1tlA'],
success (res) {
console.log(res);
console.log(_this.data.id_card_front);
console.log(_this.data.id_card_back);
if(_this.data.id_card_front.length == 0){
wx.showToast({
title: '身份证正面为空',
icon: "error"
})
return;
}
if(_this.data.id_card_back.length == 0){
wx.showToast({
title: '身份证反面为空',
icon: "error"
})
return;
}
let id_card_front = _this.data.id_card_front[0].url;
let id_card_back = _this.data.id_card_back[0].url;
let sign_image = _this.data.sign_image[0].url;
console.log("id_card_front: ", id_card_front);
console.log("id_card_back: ", id_card_back);
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"
})
_this.setData({
btn_txt: "审核中",
btn_disabled: true
})
}).catch(errors => {
console.error(errors);
})
},
fail (res) { console.log(res) },
complete (res) { console.log(res) },
subcancelDialog(){
this.setData({
sub_visible: false
})
this.goadd()
},
subconfirmDialog(){
this.setData({
sub_visible: false
})
wx.openSetting({
success (res) {
console.log(res.authSetting)
}
})
},
add(){
let tmplIds = ['XWfEQYtb8_ubz8pCs3GoCG6TFxpDz9jn52895yvDm3s','bGGoKtDZC23GZtrrxuy6i5V7OhHgRgwXWx4yoDO1tlA']
let sub_promise = requestSubscribeMessage(tmplIds)
sub_promise.then(res => {
console.log("订阅成功")
this.goadd()
}).catch(err => {
console.log(err)
let errCode = err.errCode
if(errCode == 20004){
this.setData({
sub_visible: true,
})
}
})
},
goadd(){
let _this = this;
console.log(_this.data.id_card_front);
console.log(_this.data.id_card_back);
if(_this.data.id_card_front.length == 0){
wx.showToast({
title: '身份证正面为空',
icon: "error"
})
return;
}
if(_this.data.id_card_back.length == 0){
wx.showToast({
title: '身份证反面为空',
icon: "error"
})
return;
}
let id_card_front = _this.data.id_card_front[0].url;
let id_card_back = _this.data.id_card_back[0].url;
let sign_image = _this.data.sign_image[0].url;
console.log("id_card_front: ", id_card_front);
console.log("id_card_back: ", id_card_back);
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"
})
_this.setData({
btn_txt: "审核中",
btn_disabled: true
})
}).catch(errors => {
console.error(errors);
})
},
doUploadFile(event) {
console.log("index douploadFIle: ", event);

3
Pages/yishi/zhiye_identity/index.json
View File

@ -9,6 +9,7 @@
"van-divider": "@vant/weapp/divider/index",
"van-button": "@vant/weapp/button/index",
"van-popup": "@vant/weapp/popup/index",
"van-image": "@vant/weapp/image/index"
"van-image": "@vant/weapp/image/index",
"t-dialog": "tdesign-miniprogram/dialog/dialog"
}
}

13
Pages/yishi/zhiye_identity/index.wxml
View File

@ -97,4 +97,17 @@
</view>
</van-popup>
<t-dialog
visible="{{ sub_visible }}"
title="温馨提示"
content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
>
<view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
取消
</view>
<view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
确定
</view>
</t-dialog>
</view>

14
Pages/yishi/zhiye_identity/index.wxss
View File

@ -55,3 +55,17 @@
.zhiye_popup_img{
margin-top: 30rpx;
}
.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;
}

76
TUIKit/components/TUIChat/components/MessageInput/index.js
View File

@ -1,6 +1,7 @@
import logger from '../../../../utils/logger';
import constant from '../../../../utils/constant';
import { API } from '../../../../../utils/network/api';
import { requestSubscribeMessage } from '../../../../../utils/requestSubscribeUtil';
const api = new API()
let app = getApp()
@ -79,7 +80,7 @@ Component({
notShow: false,
isShow: true,
commonFunction: [
{ name: '查看完整病例', key: '10' },
{ name: '查看完整病历', key: '10' },
{ name: '在线开处方', key: '11' },
],
displayServiceEvaluation: false,
@ -95,6 +96,7 @@ Component({
showChangYongYu: false,
ChangYongYu: [],
dialog_visible: false,
sub_visible: false,
dialog_message: "在线开处方需先进行多点执业认证",
message_rounds: 0,
networkstatus: "wifi"
@ -456,7 +458,7 @@ Component({
},
handleCommonFunctions(e) {
// console.log("handleCommonFunctions: ", e)
console.log("handleCommonFunctions: ", e)
switch (e.target.dataset.key) {
case '0':
this.setData({
@ -478,26 +480,19 @@ Component({
break;
case '11'://在线开方
let _this = this;
// console.log("开始订阅消息");
wx.requestSubscribeMessage({
tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'],
success (res) {
// console.log(res);
let order_inquiry_id = _this.data.order_inquiry_id
api.getDoctorPrescriptionCheck({order_inquiry_id: order_inquiry_id}).then(response => {
let status = response.data.status
if(status == 1){
app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+order_inquiry_id)
}else{
_this.setData({
dialog_visible: true,
dialog_message: response.data.message
})
}
}).catch(errors => {
console.error(errors);
console.log("开始订阅消息");
let tmplIds = ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40']
let sub_promise = requestSubscribeMessage(tmplIds)
sub_promise.then(res => {
console.log("订阅成功")
this.goCase()
}).catch(err => {
console.log(err)
let errCode = err.errCode
if(errCode == 20004){
_this.setData({
sub_visible: true,
})
}
})
break;
@ -505,6 +500,23 @@ Component({
break;
}
},
goCase(){
let order_inquiry_id = this.data.order_inquiry_id
api.getDoctorPrescriptionCheck({order_inquiry_id: order_inquiry_id}).then(response => {
let status = response.data.status
if(status == 1){
app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+order_inquiry_id)
}else{
this.setData({
dialog_visible: true,
dialog_message: response.data.message
})
}
}).catch(errors => {
console.error(errors);
})
},
cancelDialog(){
this.setData({
dialog_visible: false
@ -516,6 +528,22 @@ Component({
dialog_visible: false
})
},
subcancelDialog(){
this.setData({
sub_visible: false
})
this.goCase()
},
subconfirmDialog(){
this.setData({
sub_visible: false
})
wx.openSetting({
success (res) {
console.log(res.authSetting)
}
})
},
handleSendOrder() {
this.setData({
displayOrderList: true,
@ -849,7 +877,11 @@ Component({
event,
});
},
inputBindLinechange(event){
this.triggerEvent('inputBindLinechange', {
event,
});
},
$handleSendTextMessage(event) {
this.sendTextMessage(event.detail.message, true);
this.setData({

21
TUIKit/components/TUIChat/components/MessageInput/index.wxml
View File

@ -1,18 +1,20 @@
<view class="TUI-message-input-container">
<view class="TUI-commom-function">
<view class="TUI-commom-function-item" data-key="10" bindtap="handleCommonFunctions">查看完整病例</view>
<view class="TUI-commom-function-item" data-key="10" bindtap="handleCommonFunctions">查看完整病历</view>
<view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1}}">在线开处方</view>
</view>
<view class="TUI-message-input">
<image class="TUI-icon" bindtap="switchAudio" wx:if="{{has_audio}}"
src="{{isAudio ? '../../../../static/assets/keyboard.svg' : '../../../../static/assets/audio.svg'}}" />
<view wx:if="{{!isAudio || isEmoji}}" class="TUI-message-input-main {{ focus && 'TUI-message-input-main-focus'}}" >
<textarea hold-keyboard id="mytextarea" class="TUI-message-input-area" adjust-position="{{false}}" cursor-spacing="0"
<textarea focus="{{false}}" hold-keyboard id="mytextarea" class="TUI-message-input-area" adjust-position="{{false}}" cursor-spacing="0"
value="{{message}}" bindinput="onInputValueChange" maxlength="-1" type="text" auto-height="{{true}}"
placeholder="请输入文字" placeholder-class="input-placeholder" confirm-type="return" show-confirm-bar="{{false}}"
bindfocus="inputBindFocus"
bindblur="inputBindBlur"
bindconfirm="sendTextMessage"/>
bindconfirm="sendTextMessage"
bindlinechange="inputBindLinechange"
/>
</view>
<view wx:if="{{isAudio}}" class="TUI-message-input-main"
bind:longpress="handleLongPress"
@ -114,3 +116,16 @@
确定
</view>
</t-dialog>
<t-dialog
visible="{{ sub_visible }}"
title="温馨提示"
content="您已关闭订阅消息通知，请点击“确认”按钮在设置中打开订阅通知。"
>
<view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="subcancelDialog">
取消
</view>
<view slot="confirm-btn" class="dialog dialog_confirm_btn" bindtap="subconfirmDialog">
确定
</view>
</t-dialog>

2
TUIKit/components/TUIChat/components/MessageInput/index.wxss
View File

@ -67,7 +67,7 @@
}
.TUI-message-input-area {
width: 100%;
max-height: 300rpx;
max-height: 100px;
/* 最多显示10行 */
line-height: 30rpx;
overflow: scroll;

7
TUIKit/components/TUIChat/components/MessageList/index.js
View File

@ -162,6 +162,7 @@ Component({
this.setData({
isCompleted: true,
triggered: false,
list_first_loading: false
});
return;
}
@ -293,8 +294,10 @@ Component({
if(Number(customMessage.message_type) == GDXZ_CUSTOM_MSEEAGE.TRABECULA && refreshBaseInfo){
const title = customMessage.title
if(title.indexOf("问诊已结束") > -1){
//收到横条消息去触发父组件getbase方法
this.triggerEvent('getInquiryMessageBasic');
setTimeout(() => {
//收到横条消息去触发父组件getbase方法,演示1秒
this.triggerEvent('getInquiryMessageBasic');
}, 1000);
}
}
}

151
TUIKit/components/TUIChat/index.js
View File

@ -2,6 +2,7 @@
import logger from '../../utils/logger';
import constant from '../../utils/constant';
import { API } from './../../../utils/network/api'
import { rpxTopx } from './../../../utils/util'
const api = new API()
// eslint-disable-next-line no-undef
const app = getApp();
@ -79,14 +80,19 @@ Component({
message_rounds: 0
});
}
//console.log("000")
this.getNavbarHeight()
wx.onKeyboardHeightChange(res => {
// console.log("键盘高度：", res.height)
this.setData({
keysboards_height: res.height
})
this.getNavbarHeight();
})
// let _this = this
// wx.onKeyboardHeightChange(res => {
// let kb_height = res.height
// console.log("键盘高度：", kb_height)
// _this.setData({
// kb_height: kb_height
// })
// console.log("111")
// _this.getNavbarHeight();
// })
},
ready() {
@ -103,6 +109,12 @@ Component({
"navbarData.showCapsule": 3
})
}
this.setData({
finsh_btn: false
})
}
},
/**
@ -137,11 +149,14 @@ Component({
showCapsule: 2, //是否显示左上角图标 1表示显示 0表示不显示
title: '', //导航栏 中间的标题
},
navbar_height: 0,
navbar_height: 120,
dialog_visible: false,
finsh_btn: false,
KeysBoardsStatus: "down",
message_rounds: 0,
keysboards_height: 0
keysboards_height: 0,
kb_height: 0,
change_kb: false
},
/**
@ -157,6 +172,9 @@ Component({
})
},
getNavbarHeight(addHeight){
try {
//console.log("getNavbarHeight: ", new Date().getTime())
let rect = null;
if (wx.getMenuButtonBoundingClientRect) {
rect = wx.getMenuButtonBoundingClientRect();
@ -164,32 +182,55 @@ Component({
// console.log("rect: ", rect)
wx.getSystemInfo({
success: (res) => {
const { statusBarHeight } = wx.getSystemInfoSync();
// const { statusBarHeight } = wx.getSystemInfoSync();
// console.log("statusBarHeight: ", statusBarHeight);
// console.log("${rect.height}px: ", `${rect.height}`);
let height = Number.parseInt(statusBarHeight) + Number.parseInt(`${rect.height}`) + 50;
if(addHeight){
let height = Number.parseInt(res.statusBarHeight) + Number.parseInt(`${rect.height}`);
let KeysBoardsStatus = this.data.KeysBoardsStatus
if(KeysBoardsStatus == 'pull'){
height = height + rpxTopx(35)
}else{
height = height + rpxTopx(70)
}
if(addHeight > 0){
height = height + addHeight
}
let keysboards_height = this.data.keysboards_height
// console.log("getNavbarHeight 键盘高度：", keysboards_height)
if(keysboards_height){
height = height + keysboards_height
let kb_height = Number.parseInt(this.data.kb_height)
let textarea_height = Number.parseInt(this.data.textarea_height)
//console.log("getNavbarHeight 键盘高度：", kb_height)
if(kb_height > 0){
//console.log("height 1: ", height)
height = height + kb_height
//console.log("height 2: ", height)
}
if(textarea_height > 0){
//console.log("height 1: ", height)
height = height + textarea_height
//console.log("height 2: ", height)
}
this.setData({
navbar_height: height
})
//console.log(444)
},
fail: (err) => {
console.error('navbar 获取系统信息失败', err);
},
});
} catch (error) {
console.error(error)
}
},
//结束问诊
putDoctorInquiryFinish() {
this.setData({
dialog_visible: true
})
wx.hideKeyboard()
},
cancelDialog(){
this.setData({
@ -197,12 +238,25 @@ Component({
})
},
confirmDialog(){
let finsh_btn = this.data.finsh_btn
if(finsh_btn){
return
}
this.setData({
finsh_btn: true
})
api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
// console.log(response);
this.getInquiryMessageBasic();
// this.getInquiryMessageBasic();
//调用子组件中的跳到最新消息
this.getNavbarHeight()
this.selectComponent('#MessageList').handleJumpNewMessage();
}).catch(errors => {console.error(errors);})
}).catch(errors => {
console.error(errors);
this.setData({
finsh_btn: false
})
})
this.setData({
dialog_visible: false
})
@ -215,6 +269,10 @@ Component({
this.setData({
baseInfo: response.data,
})
if(response.data.inquiry_status > 4){
wx.hideKeyboard()
this.getNavbarHeight()
}
}).catch(errors => {console.error(errors);})
},
init() {
@ -261,14 +319,14 @@ Component({
this.getNavbarHeight();
},
refreshMessageStatus(message) {
console.log("TUIchat refreshMessageStatus", message)
//console.log("TUIchat refreshMessageStatus", message)
this.selectComponent('#MessageList').refreshMessageStatus(message);
},
showMessageErrorImage(event) {
this.selectComponent('#MessageList').sendMessageError(event);
},
triggerClose() {
// console.log("message-list triggerClose")
//console.log("message-list triggerClose")
if(this.data.baseInfo.inquiry_status == 4){
this.selectComponent('#MessageInput').handleClose();
}
@ -305,13 +363,13 @@ Component({
this.selectComponent('#MessageInput').onInputValueChange(event);
},
myhandleExtensions(e){
// console.log("myhandleExtensionsmyhandleExtensions: ", e);
//console.log("myhandleExtensionsmyhandleExtensions: ", e);
wx.hideKeyboard()
let displayFlag = e.detail.displayFlag;
setTimeout(() => {
// setTimeout(() => {
if(displayFlag){
this.setData({
input_area_style: "position: absolute; bottom: 30px;"
input_area_style: "position: absolute; bottom: 20px;"
})
this.getNavbarHeight(100);
this.selectComponent('#MessageList').handleJumpNewMessage();
@ -321,39 +379,66 @@ Component({
})
this.getNavbarHeight();
}
}, 100);
// }, 100);
},
// 监听键盘，获取焦点时将输入框推到键盘上方
pullKeysBoards(event) {
// console.log("pullKeysBoardspullKeysBoards")
setNewInputStyle(event.detail.event.detail.height);
//console.log("pullKeysBoardspullKeysBoards")
let value = event.detail.event.detail.value;
let height = event.detail.event.detail.height;
this.getNavbarHeight();
//console.log("pullKeysBoards value: ", height)
setNewInputStyle(height);
if(height){
this.setData({
kb_height: height
})
}
//console.log("333")
this.setData({
'viewData.style': newInputStyle,
input_area_style: "position: absolute; bottom: 52rpx;",
// input_area_style: "position: absolute; bottom: 52rpx;",
KeysBoardsStatus: "pull"
});
this.getNavbarHeight();
this.selectComponent('#MessageList').handleJumpNewMessage();
},
// 监听键盘，失去焦点时收起键盘
downKeysBoards(event) {
// console.log("downKeysBoardsdownKeysBoards")
// console.log(event)
//console.log("downKeysBoardsdownKeysBoards")
// //console.log(event)
let value = event.detail.event.detail.value;
this.getNavbarHeight();
//console.log("downKeysBoards value: ", value)
if(value){
this.setData({
'viewData.style': inputStyle,
KeysBoardsStatus: "down"
KeysBoardsStatus: "down",
kb_height: 0
});
}else{
this.setData({
'viewData.style': inputStyle,
input_area_style: "",
KeysBoardsStatus: "down"
KeysBoardsStatus: "down",
kb_height: 0
});
}
//console.log("444")
this.getNavbarHeight();
},
inputBindLinechange(event){
console.log(event)
let lineCount = event.detail.event.detail.lineCount;
let height = event.detail.event.detail.height;
if(height > 100){
return
}
let lineHeight = height / lineCount;
this.setData({
textarea_height: lineHeight * (lineCount - 1)
})
this.getNavbarHeight();
},
typing(event) {
const { STRING_TEXT, FEAT_NATIVE_CODE } = constant;

19
TUIKit/components/TUIChat/index.wxml
View File

@ -1,16 +1,16 @@
<!--TUIKit-WChat/Chat/index.wxml-->
<te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
<view class="container">
<view class="info" wx:if="{{ true }}">
<view class="left">
<view class="name">{{baseInfo.patient_family_name}}</view>
<view class="age">{{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁</view>
<view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'问诊完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
<view class="info" wx:if="{{ baseInfo.inquiry_status > 0 }}">
<view class="left" >
<view class="name">{{baseInfo.patient_family_name}}</view>
<view class="age">{{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁</view>
<view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'问诊完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
</view>
<view class="right">
<text class="right_txt" bindtap="putDoctorInquiryFinish" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
</view>
</view>
<view class="right">
<text class="right_txt" bindtap="putDoctorInquiryFinish" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
</view>
</view>
<!-- <view class="tui-navigatorbar">
<image class="tui-navigatorbar-back" bindtap="goBack" src="../../static/assets/ic_back_black.svg" />
@ -37,6 +37,7 @@
<view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
<MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" baseInfo="{{baseInfo}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" hasCallKit="{{hasCallKit}}" bind:sendMessage="sendMessage" bind:downKeysBoards="downKeysBoards" bind:pullKeysBoards="pullKeysBoards" bind:showMessageErrorImage="showMessageErrorImage"
bind:refreshMessageStatus="refreshMessageStatus"
bind:inputBindLinechange="inputBindLinechange"
bind:handleCall="handleCall" message_rounds="{{message_rounds}}"></MessageInput>
</view>
</view>

10
app.js
View File

@ -1,6 +1,5 @@
import Aegis from './TUIKit/lib/aegis';
import TIM from './TUIKit/lib/tim-wx-sdk';
import { genTestUserSig } from './TUIKit/debug/GenerateTestUserSig';
import TIMUploadPlugin from './TUIKit/lib/tim-upload-plugin';
import { API } from './utils/network/api'
import constant from './TUIKit/utils/constant';
@ -69,7 +68,7 @@ App({
// this.imInit();
},
imInit(){
console.log("imInit")
let usertype = wx.getStorageSync('usertype');
let userID = wx.getStorageSync('user_id_'+usertype);
if(usertype != 2){//只登录医师端
@ -80,7 +79,7 @@ App({
return;
}
this.globalData.config.userID = userID;
let sign = genTestUserSig(this.globalData.config);
// let sign = genTestUserSig(this.globalData.config);
// console.log("sign: ", sign);
// const userSig = sign.userSig;
@ -194,6 +193,11 @@ App({
wx.setStorageSync('AUTH_TOKEN_'+usertype, "");
wx.setStorageSync('user_id_'+usertype, "");
wx.setStorageSync('client_user_id_'+usertype, "");
if(wx.$TUIKit){
wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onSystemPushReceived);
wx.$TUIKit = undefined
}
this.globalData.chat_sdk_ready = false
this.go("/Pages/kickedout/index");
},
$onSystemPushReceived(e){

3
app.json
View File

@ -56,7 +56,8 @@
"Pages/yishi/onlinesetupprice/index",
"Pages/yishi/yizhensetupprice/index",
"Pages/yishi/wenzhenorderV2/index",
"Pages/yishi/wenzhen_v3/wenzhen"
"Pages/yishi/wenzhen_v3/wenzhen",
"Pages/agreement_page/index"
],
"window": {
"navigationBarBackgroundColor": "#ffffff",

16
commpents/myprofile/index.js
View File

@ -238,12 +238,14 @@ Component({
return item.value == _this.data.select_keshi_id
})
console.log("科室：", index)
let keshi_note = _this.data.keshi_columns[index].text;
console.log("科室 keshi_note：", keshi_note);
if(index != undefined){
if(index == -1){
clearInterval(data_replay);
return
}
if(index > -1){
_this.setData({
select_keshi_index: index,
keshi_note: keshi_note
keshi_note: _this.data.keshi_columns[index].text
})
}
keshi_huixian = true;
@ -254,6 +256,10 @@ Component({
let index = _this.data.zhicheng_columns.findIndex(item => {
return item.value == _this.data.select_zhicheng_id
})
if(index == -1){
clearInterval(data_replay);
return
}
if(index > -1){
_this.setData({
select_zhicheng_index: index,
@ -299,6 +305,7 @@ Component({
}
api.getBasicHospital(params).then(response => {// 请求医院列表
_this.setData({
hospital_search_val: "",
yiyuan_columns: _this.formatYiYuan(response),
city_note: _this.data.hospital.province + "/" + _this.data.hospital.city + "/" + _this.data.hospital.county
})
@ -423,6 +430,7 @@ Component({
}
api.getBasicHospital(params).then(response => {// 请求医院列表】
this.setData({
hospital_search_val: "",
yiyuan_columns: this.formatYiYuan(response),
city_show: false,
city_note: this.getCityNote(selectedOptions),

9
custom-tab-bar/index.js
View File

@ -1,5 +1,3 @@
import _console from "../TUIKit/utils/console"
// custom-tab-bar/index.js
const app = getApp()
Component({
@ -62,17 +60,16 @@ Component({
info_inter: 0
},
ready() {
console.log("readyreadyreadyreadyreadyready")
const usertype = wx.getStorageSync('usertype')
if (usertype == 2) {
if (usertype == 3) {
this.setData({
usertype: usertype,
items: this.data.listAll.list2
items: this.data.listAll.list1
})
}else{
this.setData({
usertype: usertype,
items: this.data.listAll.list1
items: this.data.listAll.list2
})
}

2
project.private.config.json
View File

@ -18,5 +18,5 @@
]
}
},
"libVersion": "2.30.2"
"libVersion": "2.31.0"
}

4
utils/network/request.js
View File

@ -31,7 +31,7 @@ class HTTP {
'Authorization': "Bearer " + wx.getStorageSync('AUTH_TOKEN_'+usertype)
},
success: (res) => {
console.log("header Authorization: ", res.header.Authorization);
// console.log("header Authorization: ", res.header.Authorization);
var Authorization_token = res.header.Authorization;
if(Authorization_token){
wx.setStorageSync('AUTH_TOKEN_'+usertype, Authorization_token);//当token快过期时，服务器会返回新token，本地刷新
@ -58,7 +58,7 @@ class HTTP {
this._show_error(showLoading, err.data.message)
},
complete: (res) => {
console.log("res from cmplete： ",res)
// console.log("res from cmplete： ",res)
const code = res.data.code;
if (code == 200) {
if(showLoading) wx.hideLoading();

68
utils/requestSubscribeUtil.js Normal file
View File

@ -0,0 +1,68 @@
function requestSubscribeMessage(tmplIds){
return new Promise((resolve, reject) => {
wx.requestSubscribeMessage({
tmplIds: tmplIds,
success (res) {
console.log("succ:", res)
resolve(res)
},
fail(err){
console.log("error:", err)
let code = err.errCode
let title = "未知错误";
switch (code) {
case 10001:
title = "参数传空了"
break;
case 10002:
title = "请检查您的网络"
break;
case 10003:
title = "请检查您的网络"
break;
case 10004:
title = "参数类型错误"
break;
case 10005:
title = "无法展示 UI"
break;
case 20001:
title = "没有模板数据"
break;
case 20002:
title = "模板消息类型错误"
break;
case 20003:
title = "模板消息数量超过上限"
break;
case 20004:
title = "用户关闭了主开关，无法进行订阅"
break;
case 20005:
title = "小程序被禁封"
break;
case 20013:
title = "不允许通过该接口订阅设备消息"
break;
default:
break;
}
// wx.showToast({
// title: title,
// icon: 'error'
// })
reject(err)
}
})
})
}
module.exports = {
requestSubscribeMessage
}

8
utils/util.js
View File

@ -148,11 +148,16 @@ const likeWeChatTimeAgoChat = stringTime =>{
}
// px 转换为 rpx ，传参类型是数字（Number）
const rpxTopx = px => {
const pxTorpx = px => {
let deviceWidth = wx.getSystemInfoSync().windowWidth; //获取设备屏幕宽度
let rpx = (750 / deviceWidth) * Number(px)
return Math.floor(rpx);
}
// px 转换为 rpx ，传参类型是数字（Number）
const rpxTopx = rpx => {
let px = rpx / 750 * wx.getSystemInfoSync().windowWidth;
return Math.floor(px);
}
module.exports = {
formatTime,
@ -160,6 +165,7 @@ module.exports = {
formatNumber,
getTimeAgo,
rpxTopx,
pxTorpx,
getTimeAgoChat,
likeWeChatTimeAgoChat
}