diff --git a/weapp/images/avatar.png b/weapp/images/avatar.png new file mode 100644 index 0000000..1222fbc Binary files /dev/null and b/weapp/images/avatar.png differ diff --git a/weapp/images/avatar.svg b/weapp/images/avatar.svg deleted file mode 100644 index dd95046..0000000 --- a/weapp/images/avatar.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/weapp/images/card_bg.png b/weapp/images/card_bg.png new file mode 100644 index 0000000..23abbc2 Binary files /dev/null and b/weapp/images/card_bg.png differ diff --git a/weapp/images/email.svg b/weapp/images/email.svg new file mode 100644 index 0000000..5f6fcc7 --- /dev/null +++ b/weapp/images/email.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/weapp/images/phone.svg b/weapp/images/phone.svg new file mode 100644 index 0000000..7ba2c9b --- /dev/null +++ b/weapp/images/phone.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/weapp/package/basic/basic.wxml b/weapp/package/basic/basic.wxml index 720786e..49e9186 100644 --- a/weapp/package/basic/basic.wxml +++ b/weapp/package/basic/basic.wxml @@ -1,7 +1,7 @@ - + {{userInfo.name || '--'}} diff --git a/weapp/pages/index/index.js b/weapp/pages/index/index.js index 21ac7d5..8c1eb75 100644 --- a/weapp/pages/index/index.js +++ b/weapp/pages/index/index.js @@ -32,7 +32,7 @@ Page({ callout: { content: `${p.name}\n今日巡检:${todayCount}次`, padding: 10, - display: this.data.isShowCallout ? 'ALWAYS' : 'ALWAYS', + display: this.data.isShowCallout ? 'ALWAYS' : 'BYCLICK', borderColor: '#1684FF', borderWidth: 1, }, diff --git a/weapp/pages/myInfo/myInfo.wxml b/weapp/pages/myInfo/myInfo.wxml index d52f06e..5f6d81c 100644 --- a/weapp/pages/myInfo/myInfo.wxml +++ b/weapp/pages/myInfo/myInfo.wxml @@ -1,25 +1,51 @@ - + + - - - - {{userInfo.name}} + + + + + + {{userInfo.name}} + + + + + {{userInfo.phone}} + + + + + + {{userInfo.email || '--'}} + + + + + {{userInfo.post || '--'}} + + + + + {{userInfo.deptName}} + - - 基本信息 + + 基本信息 + - - - 退出登录 + + 退出登录 + \ No newline at end of file diff --git a/weapp/pages/myInfo/myInfo.wxss b/weapp/pages/myInfo/myInfo.wxss index ae92f53..832eb6a 100644 --- a/weapp/pages/myInfo/myInfo.wxss +++ b/weapp/pages/myInfo/myInfo.wxss @@ -4,6 +4,24 @@ page { background-color: #F7F7FA; } +.over-ellipsis { + text-overflow: ellipsis; + overflow: hidden; + word-break: break-all; + white-space: nowrap; +} + +.bg { + width: 100%; + height: 160px; + position: fixed; + display: flex; + justify-content: center; + background-image: linear-gradient(180deg, #1979ff 0%, #4E87FF 100%); + border-radius: 0 0 50% 50%; + z-index: -1; +} + /* 容器 */ .box { padding: 30rpx; @@ -12,19 +30,33 @@ page { .header-item-container { width: 100%; - height: 180rpx; - background: rgb(255, 255, 255); + height: 165px; border-radius: 10rpx; - flex-direction: row; + background-size: 100% 165px; +} + +.info-box { + width: 100%; + height: 127px; display: flex; - justify-content: start; - align-items: center; + justify-content: space-between; } -.logo { - width: 120rpx; - height: 120rpx; - padding: 30rpx; +.avatar { + width: 54px; + min-width: 54px; + height: 54px; + padding: 16px; + margin-bottom: 30px; +} + +.info { + height: 100%; + min-width: 55%; + max-width: 60%; + display: flex; + flex-direction: column; + justify-content: space-evenly; } .userName { @@ -32,6 +64,51 @@ page { font-weight: 600; } +.contact { + display: flex; + align-items: center; + min-width: 190px; +} + +.contact .icon { + width: 20px; + min-width: 20px; + height: 20px; +} + +.contact .text { + min-width: 170px; + margin-left: 8px; + font-size: 14px; + color: #00000080; +} + +.post { + border: 1px solid #006BE3; + border-radius: 100px 0 0 100px; + min-width: 30px; + max-width: 60px; + height: 25px; + line-height: 25px; + color: #006BE3; + font-size: 14px; + padding: 0 7px; + margin-top: 20px; +} + +.dept-box { + height: 36px; + display: flex; + align-items: center; + justify-content: flex-end; +} + +.dept-box .dept { + font-size: 14px; + color: #FFFFFF; + margin-right: 10px; +} + .company { font-size: 28rpx; font-family: "PingFang SC"; @@ -72,23 +149,20 @@ page { } .foot-container { - width: 100%; - background: rgb(255, 255, 255); - border-radius: 10rpx; - flex-direction: column; - display: flex; - border: 1px #FFFFFF; + position: absolute; + bottom: 50px; + width: 343px; + height: 42px; + border: 1px solid #006BE3; + border-radius: 24px; } .foot-item { - color: rgb(0, 0, 0); - display: flex; - justify-content: center; - align-items: center; - padding: 30rpx; - font-size: 32rpx; - font-family: "PingFang SC"; font-weight: 600; + font-size: 16px; + color: #006BE3; + text-align: center; + line-height: 42px; } .right {