diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml index b6baa97..f52c1dc 100644 --- a/Pages/yishi/case/index.wxml +++ b/Pages/yishi/case/index.wxml @@ -45,7 +45,7 @@ 用药意向: - {{item}}; + {{item}}; @@ -59,9 +59,13 @@ - 其他信息 - + 其他信息 + + + 是否服用过您想购买的药品且无相关禁忌: + {{case_detail.is_taboo==0?'否':'是'}} + 过敏史: {{case_detail.is_allergy_history==0?'否':case_detail.allergy_history}} diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss index c251ea6..44931d5 100644 --- a/Pages/yishi/case/index.wxss +++ b/Pages/yishi/case/index.wxss @@ -67,6 +67,8 @@ page{ flex: 1; font-size: 28rpx; color: #666666; + word-wrap:break-word; + word-break:break-all; } .disease_info{ background: #FAFAFA; diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml index ac67c59..0fc69b1 100644 --- a/Pages/yishi/index/index.wxml +++ b/Pages/yishi/index/index.wxml @@ -230,7 +230,7 @@ width="100vw" src="{{static_host}}/applet/doctor/static/images/collection.png" /> - 我知道了 + 我知道了 messageTime){ + return ["", false] + } + this.setData({ + cachRealTime: messageTime + }) let time = wechatTimeFormat(messageTime) // console.log("cachMessageTime: ", time) if(time){ diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml index 8881299..91284d8 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml @@ -28,12 +28,10 @@ - 复制| - - 删除 - - |撤回 + 复制 + diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss index 640c335..c336701 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.wxss +++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss @@ -147,7 +147,7 @@ border-width: 20px; position: absolute; bottom: -27px; - left: 55px; + left: 0px; border-style: solid dashed dashed; border-color: black transparent transparent; font-size: 0; diff --git a/commpents/image-cropper/image-cropper.js b/commpents/image-cropper/image-cropper.js index 50a2f62..d2728ce 100644 --- a/commpents/image-cropper/image-cropper.js +++ b/commpents/image-cropper/image-cropper.js @@ -247,7 +247,7 @@ Component({ that._canvasDetectionPosition(); }, imgSrc(value, that){ - that.pushImg(); + // that.pushImg(); }, cut_top(value, that) { that._cutDetectionPosition(); @@ -471,6 +471,7 @@ Component({ _img_top: wx.getSystemInfoSync().windowHeight / 2, _img_left: wx.getSystemInfoSync().windowWidth / 2, }) + this.pushImg() // console.log(wx.getSystemInfoSync().windowHeight / 2, "-", wx.getSystemInfoSync().windowWidth / 2,) }, /** diff --git a/utils/network/config.js b/utils/network/config.js index f9818ff..145061d 100644 --- a/utils/network/config.js +++ b/utils/network/config.js @@ -6,14 +6,14 @@ export const dev = { } // 测试环境url export const test = { - baseUrl: "http://www.xxx.com", + baseUrl: "https://dev.hospital.applets.igandanyiyuan.com", staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host appId: 'wxbdb4d63f81d98228' //此处为appId } // 线上环境url export const prod = { - baseUrl: 'https://www.xxx.com', - staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host + baseUrl: 'https://prod.hospital.applets.igandanyiyuan.com', + staticHost: "https://oss.prod.applets.igandanyiyuan.com",//静态资源host appId: 'wxbdb4d63f81d98228' //此处为appId }