diff --git a/components/inputBox.vue b/components/inputBox.vue index 2dec23d..9ab5c28 100644 --- a/components/inputBox.vue +++ b/components/inputBox.vue @@ -2,7 +2,7 @@ - + {{label}}: @@ -129,10 +129,12 @@ export default { padding: 27.5rpx 14rpx; box-sizing: border-box; margin: 0 auto; - font-size: 32rpx; - letter-spacing: 1rpx; + font-size: 32rpx; + line-height: 32rpx; + letter-spacing: 1rpx; + align-items: center; &.error{ - border: 1rpx solid #FAB0B0; + border: 2rpx solid #FAB0B0; } .left{ display: flex; diff --git a/manifest.json b/manifest.json index e27b0f0..787983c 100644 --- a/manifest.json +++ b/manifest.json @@ -69,7 +69,9 @@ "uniStatistics" : { "enable" : false }, - "vueVersion" : "2", + "vueVersion" : "2", + /* "target" : "http://jasonyizherenxin.checkcopy.com",*/ + /* "target" : "http://api.yizherenxin.cn",*/ "h5" : { "router" : { "mode" : "history", diff --git a/pages/index/index.vue b/pages/index/index.vue index f9f1c56..b4f46b6 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -33,26 +33,40 @@ - {{item.hospital_name}} {{item.depart_name}} + {{item.hospital_name}} + - + - - 出诊:{{ item.workdate_desc }} + + + {{item.address}} + + - - + + + + + + 复制地址 + + + 出诊:{{ item.workdate_desc }} + + 预约看诊 @@ -197,6 +211,14 @@ } }); }, + copyAddress(address){ + uni.setClipboardData({ + data: address, + success: () => { + uni.showToast({ title: "地址已复制", icon: "none" }); + } + }); + }, setLoginUserInfo(info) { var uinfo = new Object(); this.$setuinfo.setUinfo(JSON.stringify(info)) @@ -409,7 +431,7 @@ width: 100%; margin-bottom: 36rpx; .top{ - min-height: 102rpx; + // min-height: 102rpx; .left{ flex-grow: 1; .title{ @@ -422,33 +444,51 @@ .date{ line-height: 40rpx; font-size: 28rpx; - color: #666666; + color: #949699; margin-top: 14rpx; } } .right{ - width: 200rpx; + // width: 200rpx; + width: 172rpx; + flex-shrink: 0; height: 100%; - color: #666666; + color: #666666; + display: flex; + justify-content: flex-end; img{ width: 52rpx; height: 52rpx; - background: #F4F4F4; - border-radius: 6rpx; - margin-right: 7rpx; + // background: #F4F4F4; + // border-radius: 6rpx; + // margin-right: 7rpx; } - text{ - width: 60rpx; - height: 54rpx; + .copy_btn{ display: block; - font-size: 26rpx; - color: #666666; - line-height: 37rpx; + line-height: normal; text-align: center; - margin-top: 5rpx; + margin-top: 4rpx; + font-size: 24rpx; + color: #30C563; } } } + .center{ + justify-content: flex-start; + align-items: center; + width: 100%; + box-sizing: border-box; + min-height: 59rpx; + padding: 10rpx; + display: flex; + z-index: 1; + background: #F8F6F9; + font-size: 28rpx; + line-height: 39rpx; + color: #666666; + margin-top: 22rpx; + word-break: break-all; + } .bot{ margin-top: 16rpx; } diff --git a/pages/modify_visitor/modify_visitor.vue b/pages/modify_visitor/modify_visitor.vue index 6c4b5c3..cbf4a07 100644 --- a/pages/modify_visitor/modify_visitor.vue +++ b/pages/modify_visitor/modify_visitor.vue @@ -8,8 +8,11 @@ - - 确认就诊人 + + 确认添加 + + + 确认修改 @@ -45,7 +48,16 @@ }, onLoad(option) { if(option.type) this.type = option.type - if(option.vid) this.vid = option.vid + if(option.vid) { + this.vid = option.vid + uni.setNavigationBarTitle({ + title: '修改就诊人' + }); + }else{ + uni.setNavigationBarTitle({ + title: '添加就诊人' + }); + } }, onShow() { if(this.vid) this.getVisitorInfo() diff --git a/static/images/frontend/copy_green.svg b/static/images/frontend/copy_green.svg new file mode 100644 index 0000000..c81d8e8 --- /dev/null +++ b/static/images/frontend/copy_green.svg @@ -0,0 +1 @@ + \ No newline at end of file