diff --git a/Pages/index/index.js b/Pages/index/index.js index ade1a4f..aa18410 100644 --- a/Pages/index/index.js +++ b/Pages/index/index.js @@ -18,6 +18,11 @@ Page({ goCheck(e){ console.log(e); let usertype = e.currentTarget.dataset.usertype; + if(usertype == 2){ + app.imInit(); + }else{ + app.imLogout(); + } let url = e.currentTarget.dataset.url; wx.setStorageSync('usertype', usertype); wx.setStorageSync('next_url', url); diff --git a/Pages/yaoshi/prescription/prescription.wxml b/Pages/yaoshi/prescription/prescription.wxml index 8931b8b..3b5b79f 100644 --- a/Pages/yaoshi/prescription/prescription.wxml +++ b/Pages/yaoshi/prescription/prescription.wxml @@ -1,6 +1,6 @@ - + + + + + diff --git a/Pages/yaoshi/prescription/prescription.wxss b/Pages/yaoshi/prescription/prescription.wxss index 4ac2e02..4a325df 100644 --- a/Pages/yaoshi/prescription/prescription.wxss +++ b/Pages/yaoshi/prescription/prescription.wxss @@ -1,5 +1,4 @@ page{ - background-color: #F3F5F7; } @@ -12,7 +11,7 @@ page{ width: 100%; } .img_content{ - background-color: #F1F1F3; + background-color: #F3F5F7; padding: 20rpx; border-radius: 10rpx; } @@ -35,4 +34,24 @@ page{ } .pop_button_txt{ color: red; -} \ No newline at end of file +} +.imgbox{ + width:100%; + height:0; + position:relative; + padding-bottom:141%; +} +.prescription{ + position:absolute; + top:0px; + height:100%; + bottom:0px; + width:100%; +} +.doctorSign{ + position:absolute; + width:100rpx; + height:53rpx; + left:125rpx; + bottom:126rpx; +} diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js index 782805a..bd1434a 100644 --- a/Pages/yishi/cash/index.js +++ b/Pages/yishi/cash/index.js @@ -16,7 +16,8 @@ Page({ bank_card_code_mask: "888 xxxx xxxx 888", withdrawal_amount: "xxxx", income_tax: "xx", - contactKeFu: false + contactKeFu: false, + skeleton_loading: true }, onLoad(options){ //获取提现数据 @@ -30,6 +31,7 @@ Page({ 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 => { diff --git a/Pages/yishi/cash/index.json b/Pages/yishi/cash/index.json index c1f968d..ae3c221 100644 --- a/Pages/yishi/cash/index.json +++ b/Pages/yishi/cash/index.json @@ -5,6 +5,7 @@ "van-image": "@vant/weapp/image/index", "van-icon": "@vant/weapp/icon/index", "van-button": "@vant/weapp/button/index", - "van-dialog": "@vant/weapp/dialog/index" + "van-dialog": "@vant/weapp/dialog/index", + "t-skeleton": "tdesign-miniprogram/skeleton/skeleton" } } \ No newline at end of file diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml index ea973f1..68e9845 100644 --- a/Pages/yishi/cash/index.wxml +++ b/Pages/yishi/cash/index.wxml @@ -5,7 +5,7 @@ 结算银行卡 提现规则 - + @@ -14,8 +14,11 @@ {{bank_card_code_mask}} + + + - + 提现金额（元） @@ -24,7 +27,9 @@ ￥{{withdrawal_amount}} - 扣除个人所得税： {{income_tax}}元 + 扣除个人所得税： + {{income_tax}}元 + @@ -40,6 +45,9 @@ + + + - + + - - + --> + + + + + + + + + + + + + + + + diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxss b/Pages/yishi/wenzhen_v2/wenzhen.wxss index 8814706..7dcd8a7 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxss +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxss @@ -48,4 +48,8 @@ page{ font-size: 24rpx; color: #999999; margin-top: 30rpx; -} \ No newline at end of file +} +.badge--t-badge { + vertical-align: baseline !important; +} + diff --git a/Pages/yishi/wenzhenorder/index.js b/Pages/yishi/wenzhenorder/index.js index a945e82..d547724 100644 --- a/Pages/yishi/wenzhenorder/index.js +++ b/Pages/yishi/wenzhenorder/index.js @@ -9,22 +9,70 @@ Page({ title: '问诊订单', //导航栏 中间的标题 }, height: app.globalData.height, - result: ['a'], - page: 1, + result: [], + order_list:[], + current_page: 0, + total: 0, per_page: 10, - order_list: [], - total: 0 + last_page: 0, + allchecked: false, + select_order_length: 0, + select_order_amount: 0, + select_order_inquiry_id: [] }, - onChange(event) { + console.log("onChange: ",event) this.setData({ result: event.detail, }); + this.resetSelectOrder(); + this.setData({ + allchecked: this.data.result.length == this.data.order_list.length + }) }, - onLoad(){ + onAllChange(event) { + console.log("onAllChange: ",event) + this.setData({ + allchecked: event.detail + }) + if(event.detail == true){ + this.data.order_list.forEach((item,index) => { + 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].payment_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.page; + params.page = this.data.current_page + 1; params.per_page = this.data.per_page; api.getDoctorWithdrawalOrder(params).then(response => { console.log(response); @@ -37,6 +85,27 @@ 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); + wx.showToast({ + title: '缺少接口', + icon: "error", + duration: 1500 + }) + setTimeout(() => { + wx.navigateBack(); + }, 2000); } }) \ No newline at end of file diff --git a/Pages/yishi/wenzhenorder/index.json b/Pages/yishi/wenzhenorder/index.json index 70a874f..cca90c7 100644 --- a/Pages/yishi/wenzhenorder/index.json +++ b/Pages/yishi/wenzhenorder/index.json @@ -6,5 +6,6 @@ "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/wenzhenorder/index.wxml b/Pages/yishi/wenzhenorder/index.wxml index fd82797..3813818 100644 --- a/Pages/yishi/wenzhenorder/index.wxml +++ b/Pages/yishi/wenzhenorder/index.wxml @@ -1,35 +1,18 @@ - + - - - - - - - + - {{item.inquiry_type}} + {{item.inquiry_type==1?'专家问诊':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'未知'}} - 订单编号：{{item.inquiry_no }} - 就诊患者：{{item.patient_name}}（{{item.patient_sex}}，{{item.patient_age}}岁） + 订单编号：{{item.order_inquiry_id }} + 就诊患者：{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁） 接诊时间：{{item.reception_time}} 结束时间：{{item.finish_time}} 订单金额：￥{{item.amount_total}}元 @@ -37,19 +20,21 @@ - - - + - 全选 + 全{{allchecked?'不':''}}选 - 共10个订单，金额： ￥302元 + 共{{select_order_length}}个订单，金额： ￥{{select_order_amount}}元 - + 确定 diff --git a/Pages/yishi/wenzhenorder/index.wxss b/Pages/yishi/wenzhenorder/index.wxss index 4f81925..8c2a298 100644 --- a/Pages/yishi/wenzhenorder/index.wxss +++ b/Pages/yishi/wenzhenorder/index.wxss @@ -1,13 +1,15 @@ -.container{ +page{ background-color: #F4F4F4; +} +.container{ width: 100vw; - height: 100vh; } .order_list{ display: flex; width: 92vw; margin: 0 auto; flex-direction: column; + padding-bottom: 180rpx; } .order_item{ display: flex; @@ -50,16 +52,18 @@ bottom: 0; width: 100vw; display: flex; - background-color: #fff; + background-color: rgb(255, 255, 255); align-items: center; z-index: 99; padding-bottom: 50rpx; + height: 100rpx; } .bottom_checkbox{ - flex: 2; + flex: 2.2; font-size: 30rpx; display: flex; - justify-content: center; + justify-content: left; + padding-left: 4vw; } .bottom_content{ flex: 6; @@ -71,7 +75,6 @@ flex: 2; justify-content: flex-end; font-size: 34rpx; - background-color: limegreen; } diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml index 1b0091f..f5668a6 100644 --- a/Pages/yishi/yizhensetup/index.wxml +++ b/Pages/yishi/yizhensetup/index.wxml @@ -23,19 +23,25 @@ 价格设置 - - 每日接诊数量 - - + + + {{ info.work_num_day }} - + + url="/Pages/yishi/yizhensetupprice/index" + > + + {{ amountText }} + + diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss index 0e38bb0..592ac88 100644 --- a/Pages/yishi/yizhensetup/index.wxss +++ b/Pages/yishi/yizhensetup/index.wxss @@ -116,7 +116,9 @@ page{ .t-picker__confirm,.t-class-confirm{ color: #49B9AD !important; } -.van-cell__value{ - font-size: 32rpx !important; - color: red !important; +.num{ + color: #000; +} +.price{ + color: red; } \ No newline at end of file diff --git a/Pages/yishi/yizhensetupprice/index.js b/Pages/yishi/yizhensetupprice/index.js new file mode 100644 index 0000000..73ff6f2 --- /dev/null +++ b/Pages/yishi/yizhensetupprice/index.js @@ -0,0 +1,169 @@ +import { API } from './../../../utils/network/api' +import Toast from '@vant/weapp/toast/toast'; +let api = new API() +const app = getApp() +Page({ + data: { + navbarData: { + showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 + title: '设置价格', //导航栏 中间的标题 + }, + height: app.globalData.height, + checked: true, + open_note: "已开启，患者可以向您发起图文问诊", + close_note: "已关闭，暂不接收义诊订单", + note: "", + amountText: "选择金额（元）", + amountValue: "", + inquiry_type: 3, + inquiry_mode: 1, + amounts: [], + info:{ + is_open: false, + inquiry_price: 0, + work_num_day: 0 + }, + config:{ + "max_work_num_day": 30, + "min_inquiry_price": 0, + "max_inquiry_price": 0, + "default_inquiry_price": 0, + "times_number": 10, + "duration": 1440, + "system_inquiry_price": [ + "0", + "5", + "10" + ] + } + }, + + onShow(){ + let params = {}; + params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） + params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员） + //获取医生我的账户数据 + api.getDoctorInquiryConfig(params).then(response => { + console.log(response); + this.setData({ + info: response.data.info, + config: response.data.config, + }) + this.formatAmounts(); + this.formatAmountValue(); + }).then(re =>{ + let is_open = this.data.info.is_open; + let note = this.data.note; + if(is_open == 1) note = this.data.open_note; + if(is_open == 0) note = this.data.close_note; + this.setData({ + note: note + }) + }).catch(errors => {console.error(errors);}) + }, + formatAmounts(){ + let list = this.data.config.system_inquiry_price.map(item => { + let it = {}; + it.label = item+" 元"; + it.value = item; + return it; + }); + this.setData({ + amounts: list + }) + }, + formatAmountValue(){ + let val = Math.trunc(this.data.info.inquiry_price); + let valarr = [''+val+''] + this.setData({ + amountValue: valarr, + amountText: val+" 元" + }) + }, + onChange({ detail }) { + console.log("onChange: ", detail); + if(detail){ + this.setData({ note: this.data.open_note }); + }else{ + this.setData({ note: this.data.close_note }); + } + this.setData({ "info.is_open": detail }); + + //修改开关 + let params = {}; + params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） + params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员） + params.is_open = detail?1:0; + api.putDoctorInquiryOpen(params).then(response => { + console.log(response); + }).then(()=>{ + if(detail){ + wx.requestSubscribeMessage({ + tmplIds: ['G1RIs0RYqsTQ2CuPQWalIGVet9sd_d371YtDVhfBsFg'], + success (res) { + console.log(res);//同意授权 + } + }) + } + }).catch(errors => {console.error(errors);}) + }, + + putDoctorInquiryConfig(){ + //修改医生问诊配置 + let params = {}; + params.inquiry_type = this.data.inquiry_type;//接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） + params.inquiry_mode = this.data.inquiry_mode;//接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员） + params.inquiry_price = this.data.info.inquiry_price; + params.work_num_day = this.data.info.work_num_day; + api.putDoctorInquiryConfig(params).then(response => { + console.log(response); + Toast.success("修改成功"); + setTimeout(() => { + wx.navigateBack(); + }, 1000); + }).catch(errors => {console.error(errors);}) + }, + onStepperChange(event) { + console.log(event.detail); + this.setData({ + "info.work_num_day": event.detail + }); + }, + + onAmountPicker() { + this.setData({ amountVisible: true }); + }, + + onColumnChange(e) { + console.log('picker pick:', e); + }, + + onPickerChange(e) { + console.log(e); + const { key } = e.currentTarget.dataset; + const { value } = e.detail; + console.log('picker change:', e.detail); + this.setData({ + [`${key}Visible`]: false, + [`${key}Value`]: value, + [`${key}Text`]: value+' 元', + "info.inquiry_price": value[0] + }); + + }, + + onPickerCancel(e) { + const { key } = e.currentTarget.dataset; + console.log(e, '取消'); + console.log('picker1 cancel:'); + this.setData({ + [`${key}Visible`]: false, + }); + }, + go(e){ + let url = e.currentTarget.dataset.url; + wx.switchTab({ + url: url + }) + } +}) \ No newline at end of file diff --git a/Pages/yishi/yizhensetupprice/index.json b/Pages/yishi/yizhensetupprice/index.json new file mode 100644 index 0000000..7ebfd9b --- /dev/null +++ b/Pages/yishi/yizhensetupprice/index.json @@ -0,0 +1,13 @@ +{ + "component": true, + "usingComponents": { + "te-nav-bar": "/commpents/te_navbar", + "t-picker": "tdesign-miniprogram/picker/picker", + "t-picker-item": "tdesign-miniprogram/picker-item/picker-item", + "van-cell": "@vant/weapp/cell/index", + "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" + } +} \ No newline at end of file diff --git a/Pages/yishi/yizhensetupprice/index.wxml b/Pages/yishi/yizhensetupprice/index.wxml new file mode 100644 index 0000000..6e335cc --- /dev/null +++ b/Pages/yishi/yizhensetupprice/index.wxml @@ -0,0 +1,49 @@ + + + + + + 每日接诊数量 + + + + + + + + + + + + + 提示：服务开通后，患者可以通过公益问诊找到您，增加您的接诊量。 + 1、公益问诊价格为平台统一设定的几个，需要您自己选择单价； + 2、接诊后{{config.duration/60}}小时内和患者{{config.times_number}}个回合沟通。 + + + + + 确定 + + + + + + + + \ No newline at end of file diff --git a/Pages/yishi/yizhensetupprice/index.wxss b/Pages/yishi/yizhensetupprice/index.wxss new file mode 100644 index 0000000..8d256c4 --- /dev/null +++ b/Pages/yishi/yizhensetupprice/index.wxss @@ -0,0 +1,123 @@ +page{ + background-color: #F6F6F6; +} +.container{ + width: 100vw; + padding-top: 30rpx; +} +.switch_box{ + display: flex; + flex-direction: column; + width: 90vw; + /* height: 500rpx; */ + border-radius: 20rpx; + margin: 30rpx auto; + background-color: rgb(255, 255, 255); +} +.switch_box_top{ + position: relative; + display: flex; + /* height: 300rpx; */ + flex-direction: column; + padding: 30rpx 30rpx 20rpx 30rpx; +} +.switch_box_top::after{ + position: absolute; + box-sizing: border-box; + content: ' '; + pointer-events: none; + right: 0; + left: 32rpx; + bottom: 0; + border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7)); + transform: scaleY(0.5); +} +.switch_box_item{ + display: flex; + justify-content: space-between; + align-items: center; +} +.switch_box_item_name{ + flex: 1; + font-size: 32rpx; +} +.switch_box_item_btn{ + flex: 1; + text-align: right; +} +.switch_box_note{ + color: #999999; + font-size: 24rpx; +} +.help{ + margin-bottom: 20rpx; +} +.price_title{ + width: 90vw; + margin: 0 auto; + font-size: 32rpx; + margin-bottom: 20rpx; + /* font-family: "AlibabaPuHuiTi-2-55-Regular"; */ + color: #333333; +} +.price_steup_box{ + display: flex; + width: 90vw; + margin: 0 auto; + border-radius: 20rpx; + flex-direction: column; + background-color: rgb(255, 255, 255); +} +.price_steup_box_top{ + position: relative; + display: flex; + justify-content: space-between; + align-items: center; + padding: var(--cell-vertical-padding,20rpx) var(--cell-horizontal-padding,32rpx); +} + +.price_steup_box_top_title, .price_steup_box_bottom_title{ + flex: 1; + font-size: 32rpx; + color: #333; +} +.price_steup_box_top::after{ + position: absolute; + box-sizing: border-box; + content: ' '; + pointer-events: none; + right: 0; + left: 0; + bottom: 0; + border-bottom: 1px solid var(--td-cell-border-color, var(--td-gray-color-3, #e7e7e7)); + transform: scaleY(0.5); +} +.price_steup_box_top_stepper{ + flex: 1; + text-align: right; + align-items: center; +} +.bottom{ + width: 90vw; + margin: -20rpx auto; + color: #999; + letter-spacing: 2rpx; + font-size: 28rpx; + line-height: 40rpx; +} + +.go{ + position: fixed; + left: 50%; + transform: translateX(-50%); + bottom: 100rpx; + width: 90vw; +} + +.t-picker__confirm,.t-class-confirm{ + color: #49B9AD !important; +} +.van-cell__value{ + font-size: 32rpx !important; + color: red !important; +} \ No newline at end of file diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js index a0743cd..224013c 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -40,6 +40,10 @@ Component({ has_emoji:{ type: Boolean, value: false, + }, + baseInfo: { + type: Object, + value: {} } }, @@ -317,10 +321,12 @@ Component({ cloudCustomDataJson = JSON.parse(cloudCustomData); } let message_rounds = 0; - let patient_family_data = ""; + let patient_family_data = {}; + patient_family_data.patient_name = this.data.baseInfo.patient_family_name; + patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex; + patient_family_data.patient_age = this.data.baseInfo.patient_family_age; if(cloudCustomDataJson){ message_rounds = cloudCustomDataJson.message_rounds; - patient_family_data = cloudCustomDataJson.patient_family_data } const mycloudCustomData = JSON.stringify({ @@ -577,10 +583,12 @@ Component({ cloudCustomDataJson = JSON.parse(cloudCustomData); } let message_rounds = 0; - let patient_family_data = ""; + let patient_family_data = {}; + patient_family_data.patient_name = this.data.baseInfo.patient_family_name; + patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex; + patient_family_data.patient_age = this.data.baseInfo.patient_family_age; if(cloudCustomDataJson){ message_rounds = cloudCustomDataJson.message_rounds; - patient_family_data = cloudCustomDataJson.patient_family_data } const to = this.getToAccount(); diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss index ecb46f7..9e3baa6 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss +++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss @@ -82,7 +82,7 @@ display: flex; flex-wrap: wrap; width: 100vw; - /* height: 450rpx; */ + height: 100px; margin-left: 14rpx; margin-right: 14rpx; } diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js index b942ae1..5427cd5 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.js +++ b/TUIKit/components/TUIChat/components/MessageList/index.js @@ -149,7 +149,6 @@ Component({ }, // 获取消息列表 getMessageList(conversation) { - console.log("getMessageListgetMessageListgetMessageList") if (!this.data.isCompleted) { wx.$TUIKit.getMessageList({ @@ -166,8 +165,9 @@ Component({ // console.log(item) //去除自定义消息 // if(HMM_type == "TIMCustomElem") return; - let show_avatar = this.checkShowAvatar(item); - item.show_avatar = show_avatar; + if(!this.checkShowAvatar(item)){ + item.no_avatar = true; + } HMM_messageList_del.push(item); }) @@ -182,6 +182,7 @@ Component({ this.getMessageList(conversation); } this.$handleMessageRender(this.data.messageList, messageList); + }).then(res => { }); } }, @@ -247,7 +248,9 @@ Component({ // 收到的消息 $onMessageReceived(value) { const message = value.data[0]; - message.show_avatar = this.checkShowAvatar(message); + if(!this.checkShowAvatar(message)){ + message.no_avatar = true; + } wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => { logger.log('| MessageList | setMessageRead | ok'); }); @@ -271,7 +274,7 @@ Component({ }); } catch (error) { } - if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING)) { + if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING) || item.type !== MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM) { this.data.showNewMessageCount.push(message); this.setData({ showNewMessageCount: this.data.showNewMessageCount, @@ -325,9 +328,9 @@ Component({ console.log("自己的消息上屏 updateMessageList: ", message); console.log(message); //自己的消息有头像 - message.show_avatar = this.checkShowAvatar(message); - console.log(message.show_avatar) - console.log(message.flow) + if(!this.checkShowAvatar(message)){ + message.no_avatar = true; + } if (message.conversationID !== this.data.conversation.conversationID) return; wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => { logger.log('| MessageList | setMessageRead | ok'); diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml index 11b4eeb..5b271b1 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml @@ -34,7 +34,7 @@ - + @@ -53,7 +53,7 @@ - + diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js index 2658ad2..da0ed79 100644 --- a/TUIKit/components/TUIChat/index.js +++ b/TUIKit/components/TUIChat/index.js @@ -78,28 +78,9 @@ Component({ showTips: true, }); } - - let rect = null; - if (wx.getMenuButtonBoundingClientRect) { - rect = wx.getMenuButtonBoundingClientRect(); - } - console.log("rect: ", rect) - wx.getSystemInfo({ - success: (res) => { - 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; - this.setData({ - navbar_height: height - }) - }, - fail: (err) => { - console.error('navbar 获取系统信息失败', err); - }, - }); - + this.getNavbarHeight() }, + ready() { //修改为组件传值 // this.getInquiryMessageBasic() @@ -157,6 +138,30 @@ Component({ * 组件的方法列表 */ methods: { + getNavbarHeight(addHeight){ + let rect = null; + if (wx.getMenuButtonBoundingClientRect) { + rect = wx.getMenuButtonBoundingClientRect(); + } + console.log("rect: ", rect) + wx.getSystemInfo({ + success: (res) => { + 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){ + height = height + addHeight + } + this.setData({ + navbar_height: height + }) + }, + fail: (err) => { + console.error('navbar 获取系统信息失败', err); + }, + }); + }, //结束问诊 putDoctorInquiryFinish() { this.setData({ @@ -230,6 +235,7 @@ Component({ sendMessage(event) { // 将自己发送的消息写进消息列表里面 this.selectComponent('#MessageList').updateMessageList(event.detail.message); + this.getNavbarHeight(); }, showMessageErrorImage(event) { this.selectComponent('#MessageList').sendMessageError(event); @@ -273,10 +279,13 @@ Component({ this.setData({ input_area_style: "position: absolute; bottom: 30px;" }) + this.getNavbarHeight(100); + this.selectComponent('#MessageList').handleJumpNewMessage(); }else{ this.setData({ - input_area_style: "" + input_area_style: "", }) + this.getNavbarHeight(); } }, // 监听键盘，获取焦点时将输入框推到键盘上方 diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml index ab2caac..090e8c3 100644 --- a/TUIKit/components/TUIChat/index.wxml +++ b/TUIKit/components/TUIChat/index.wxml @@ -32,7 +32,7 @@ - diff --git a/app.js b/app.js index a40bc9c..a85b98d 100644 --- a/app.js +++ b/app.js @@ -105,6 +105,7 @@ App({ }); + 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(()=>{ @@ -116,8 +117,11 @@ App({ if(!wenzhen_info) wx.setStorageSync(userID+'_wenzhen_info', ""); if(!my_info) wx.setStorageSync(userID+'_my_info', ""); }).catch(errors => {console.error(errors);}) - - + }, + imLogout(){ + if(wx.$TUIKit){ + wx.$TUIKit.logout(); + } }, onSDKReady(){ console.log("onSDKReady from app.js"); diff --git a/app.json b/app.json index a1bbedb..887ed38 100644 --- a/app.json +++ b/app.json @@ -51,7 +51,9 @@ "Pages/yishi/addzhenduan/index", "Pages/yishi/wenzhen_v2/wenzhen", "Pages/webpage/index", - "Pages/kickedout/index" + "Pages/kickedout/index", + "Pages/yishi/onlinesetupprice/index", + "Pages/yishi/yizhensetupprice/index" ], "window": { "navigationBarBackgroundColor": "#ffffff", diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js index 2f4a19e..ad33e7e 100644 --- a/commpents/myprofile/index.js +++ b/commpents/myprofile/index.js @@ -605,9 +605,13 @@ Component({ this.triggerEvent('showPageMeta'); }, onZhuanChangVisibleChange(e) { + console.log("onZhuanChangVisibleChange:", e.detail.visible) this.setData({ zhuanchang_show: e.detail.visible, }); + if(e.detail.visible == false){ + this.triggerEvent('hidePageMeta'); + } }, onshowJianJieNote(e){ e.detail // 自定义组件触发事件时提供的 detail 对象 diff --git a/commpents/wenzhen_data/index.wxss b/commpents/wenzhen_data/index.wxss index dbcf891..3b54795 100644 --- a/commpents/wenzhen_data/index.wxss +++ b/commpents/wenzhen_data/index.wxss @@ -2,7 +2,7 @@ background-color: #fff; display: flex; flex-direction: column; - margin-top: 20rpx; + margin-bottom: 20rpx; } .content_1,.content_3,.content_2{ display: flex; @@ -16,6 +16,8 @@ .name{ font-size: 30rpx; color: #666666; + height: 50rpx; + line-height: 50rpx; } .date{ font-size: 30rpx; @@ -72,4 +74,14 @@ .dialog_confirm_btn{ border-top: 1px solid #E9E9E9; color: #3CC7C0; +} +.t-badge__content-text { + line-height: 70rpx !important; + background-color: #E34D59 !important; +} +.t-badge{ + background-color: burlywood !important; +} +.t-badge__content,.t-class-content{ + background-color: crimson !important; } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index b983689..922bbc7 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -10,7 +10,7 @@ "list": [ { "name": "", - "pathName": "Pages/kickedout/index", + "pathName": "Pages/index/index", "query": "", "launchMode": "default", "scene": null