From edff2d3c05519c81b9ab6aeda090d6d4def35783 Mon Sep 17 00:00:00 2001 From: haomingming Date: Thu, 30 Mar 2023 17:14:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/login/index.js | 9 +++++- Pages/mobile_login/index.js | 8 +++++ Pages/yishi/chat/index.js | 1 + Pages/yishi/chufangsetup/index.wxml | 2 +- Pages/yishi/onlinechufang/index.js | 9 +++++- Pages/yishi/onlinechufang/index.wxml | 32 +++++++++++++++++-- Pages/yishi/onlinechufang/index.wxss | 4 ++- Pages/yishi/wenzhen_v2/wenzhen.js | 2 +- Pages/yishi/wenzhen_v2/wenzhen.wxml | 4 +-- .../MessageElements/CustomMessage/index.wxss | 3 +- .../TUIChat/components/MessageInput/index.js | 2 +- .../TUIChat/components/MessageList/index.js | 12 +++++-- .../TUIChat/components/MessageList/index.wxml | 2 +- .../TUIChat/components/MessageList/index.wxss | 4 +-- TUIKit/components/TUIChat/index.js | 11 +++++++ app.js | 4 ++- utils/network/request.js | 2 +- 17 files changed, 92 insertions(+), 19 deletions(-) diff --git a/Pages/login/index.js b/Pages/login/index.js index f0c734b..5a9b7ab 100644 --- a/Pages/login/index.js +++ b/Pages/login/index.js @@ -3,7 +3,6 @@ import { API } from './../../utils/network/api' const api = new API() const app = getApp() Page({ - data: { navbarData: { showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 @@ -11,6 +10,14 @@ Page({ }, checked: false }, + onLoad(){ + let usertype = wx.getStorageSync('usertype'); + if(!usertype){ + wx.navigateTo({ + url: "/Pages/index/index" + }) + } + }, onChange(event) { this.setData({ checked: event.detail, diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js index 9641266..98f456d 100644 --- a/Pages/mobile_login/index.js +++ b/Pages/mobile_login/index.js @@ -15,6 +15,14 @@ Page({ login_disabled: false, btn_color: "#ccc" }, + onLoad(){ + let usertype = wx.getStorageSync('usertype'); + if(!usertype){ + wx.navigateTo({ + url: "/Pages/index/index" + }) + } + }, onChange(event) { this.setData({ checked: event.detail, diff --git a/Pages/yishi/chat/index.js b/Pages/yishi/chat/index.js index b240c87..8d619b9 100644 --- a/Pages/yishi/chat/index.js +++ b/Pages/yishi/chat/index.js @@ -21,6 +21,7 @@ Page({ onShow(){ console.log("chat onShow"); this.getInquiryMessageBasic(); + console.log("app.globalData.scene from chat: ", app.globalData.scene); }, $onMessageReceived(value) { const message = value.data[0]; diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml index 1a887c4..9aceb12 100644 --- a/Pages/yishi/chufangsetup/index.wxml +++ b/Pages/yishi/chufangsetup/index.wxml @@ -97,7 +97,7 @@ - 问诊记录 + 问诊记录 重开处方 diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js index 3725107..b20a3e1 100644 --- a/Pages/yishi/onlinechufang/index.js +++ b/Pages/yishi/onlinechufang/index.js @@ -35,7 +35,14 @@ Page({ doctors_advice_focus: false, case_detail: {}, sub_disabled: false, - from: "" + from: "", + now_filed_focus: 'save_durg_single_use' + }, + changeFocus(e){ + let next_filed_focus = e.currentTarget.dataset.next_filed_focus; + this.setData({ + now_filed_focus: next_filed_focus + }) }, onDoctorsAdviceFocus(){ this.setData({ diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml index a479048..5c0e90d 100644 --- a/Pages/yishi/onlinechufang/index.wxml +++ b/Pages/yishi/onlinechufang/index.wxml @@ -33,7 +33,8 @@ +添加诊断 - {{item.icd_name}} + + {{item.icd_name}} @@ -124,6 +125,11 @@ input-align="left" placeholder="请输入用法（口服）" custom-style="font-size: 30rpx;" + clearable + confirm-type="next" + bind:confirm="changeFocus" + data-next_filed_focus="save_durg_frequency_use" + focus="{{now_filed_focus == 'save_durg_single_use'}}" border="{{ true }}" /> diff --git a/Pages/yishi/onlinechufang/index.wxss b/Pages/yishi/onlinechufang/index.wxss index 7e9b85b..5c73745 100644 --- a/Pages/yishi/onlinechufang/index.wxss +++ b/Pages/yishi/onlinechufang/index.wxss @@ -79,9 +79,11 @@ page{ border-radius: 20rpx; } .drugs_box_item{ - border-bottom: 1px solid red; padding: 20rpx 20rpx 20rpx 20rpx; } +.drugs_box_item:not(:first-child){ + border-top: 1px solid #E7E7E7; +} .drugs_name{ color: #333333; font-size: 32rpx; diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index 6e422f2..ae7c21d 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -17,7 +17,7 @@ Page({ data_list_4: [], data_list_5: [], conversationList: [], - message_inquiry_type: 1, + message_inquiry_type: 99999, system_notice_unreadnnum: "", service_notice_unreadnnum: "", hasOnShow: false diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index 4083d25..85904ea 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -28,14 +28,14 @@ diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss index ad4da67..2ccc20b 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss +++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss @@ -127,7 +127,8 @@ line-height: 42rpx; display: flex; flex-direction: column; align-items: center; - width: 100vw; + width: calc(100vw - 40rpx); + text-align: center; } .gdxz_custom_message_title{ flex: 1; diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js index 34e63f4..a0743cd 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -833,7 +833,7 @@ Component({ displayServiceEvaluation: true, }); }, - + //常用语 showChangYongYu(){ app.go("/Pages/yishi/quickreply/index?from=chat") }, diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js index e1e1aca..26ad364 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.js +++ b/TUIKit/components/TUIChat/components/MessageList/index.js @@ -186,10 +186,11 @@ Component({ } }, checkShowAvatar(message){ - + console.log("checkShowAvatar "); let type = message.type; + console.log("message type: ", type); let show_avatar = true; - if(type == "TIMCustomElem"){ + if(type === "TIMCustomElem"){ const customMessage = JSON.parse(message.payload.data); if(customMessage.message_type != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE){ show_avatar = false; @@ -273,6 +274,8 @@ Component({ showNewMessageCount: this.data.showNewMessageCount, showDownJump: true, }); + + } } else { this.setData({ @@ -310,10 +313,13 @@ Component({ groupOptionsNumber: this.data.messageList.slice(-1)[0].payload.operationType, }); } + + //主动跳到 消息跳转到最新 + // this.handleJumpNewMessage() }, // 自己的消息上屏 updateMessageList(message) { - + console.log("自己的消息上屏 updateMessageList: ", message); //自己的消息有头像 message.show_avatar = this.checkShowAvatar(message); if (message.conversationID !== this.data.conversation.conversationID) return; diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml index 4786f9f..1e077a3 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml @@ -64,7 +64,7 @@ - + {{showNewMessageCount.length}}条新消息 diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss index 34e0b61..fb4e32a 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.wxss +++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss @@ -16,8 +16,8 @@ .t-message{ position: relative; z-index: -9; - width: calc(100vw - 20rpx); - padding: 0 10rpx; + width: calc(100vw - 40rpx); + padding: 10rpx 20rpx 20rpx 20rpx; } .t-recieve-message { display: flex; diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js index eb913dd..059ab26 100644 --- a/TUIKit/components/TUIChat/index.js +++ b/TUIKit/components/TUIChat/index.js @@ -103,6 +103,17 @@ Component({ ready() { //修改为组件传值 // this.getInquiryMessageBasic() + console.log("app.globalData.scene from TUIchat ready: ", app.globalData.scene); + let pages = getCurrentPages(); + console.log("pages:", pages) + console.log("pages.length:", pages.length) + console.log("pages:", pages[0]) + if(pages.length == 1){ + console.log("navbarData.showCapsule"); + this.setData({ + "navbarData.showCapsule": 3 + }) + } } }, /** diff --git a/app.js b/app.js index 22e19d6..856e613 100644 --- a/app.js +++ b/app.js @@ -7,11 +7,12 @@ const api = new API() App({ onLaunch: function (options) { // 判断是否由分享进入小程序 - if (options.scene == 1007 || options.scene == 1008) { + if (options.scene != 1001) { this.globalData.share = true } else { this.globalData.share = false }; + this.globalData.scene = options.scene //获取设备顶部窗口的高度（不同设备窗口高度不一样，根据这个来设置自定义导航栏的高度） //这个最初我是在组件中获取，但是出现了一个问题，当第一次进入小程序时导航栏会把 //页面内容盖住一部分,当打开调试重新进入时就没有问题，这个问题弄得我是莫名其妙 @@ -160,6 +161,7 @@ App({ globalData: { share: false, // 分享默认为false height: 0, + scene: "",//场景值 login_url: "/Pages/login/index", chat_sdk_ready: false, jiesuan_dialog_show: false, diff --git a/utils/network/request.js b/utils/network/request.js index 7918d56..4ffddc5 100644 --- a/utils/network/request.js +++ b/utils/network/request.js @@ -43,7 +43,7 @@ class HTTP { resolve(res.data) } else if(code == 401 || code == 403 || code == 405 || code == 406){ wx.navigateTo({ - url: app.globalData.login_url + url: "/Pages/login/index" }) } else { reject(res.data.message);//向后传递错误信息，catch会拿到