diff --git a/manifest.json b/manifest.json index 8fa2378..76c1e80 100644 --- a/manifest.json +++ b/manifest.json @@ -26,7 +26,8 @@ "modules" : { "Maps" : {}, "Geolocation" : {}, - "FaceID" : {} + "FaceID" : {}, + "iBeacon" : {} }, /* 应用发布信息 */ "distribute" : { @@ -36,6 +37,8 @@ "", "", "", + "", + "", "", "", "", @@ -44,7 +47,9 @@ "", "", "", - "" + "", + "", + "" ], "abiFilters" : [ "armeabi-v7a", "x86" ] }, diff --git a/pages.json b/pages.json index d291b4a..fcc4884 100644 --- a/pages.json +++ b/pages.json @@ -45,7 +45,9 @@ { "path": "pages/mine/index", "style": { - "navigationBarTitleText": "我的" + "navigationBarTitleText": "我的", + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { @@ -56,6 +58,30 @@ "navigationStyle": "custom" } }, + { + "path": "pages/enterprise-info/index", + "style": { + "navigationBarTitleText": "完善企业信息", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/message/index", + "style": { + "navigationBarTitleText": "消息中心", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/setting/index", + "style": { + "navigationBarTitleText": "系统设置", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, { "path": "pages/agreement/index", "style": { diff --git a/pages/message/index.vue b/pages/message/index.vue new file mode 100644 index 0000000..28d5883 --- /dev/null +++ b/pages/message/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/pages/mine/index.vue b/pages/mine/index.vue index f2e48bf..838a57b 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -21,11 +21,25 @@ - {{ userInfo.supplierName }} + {{ userInfo.supplierName }} - + + + + + + {{ messageNum }} + + + + + + 切换账号 + + + @@ -49,6 +63,7 @@ @@ -141,6 +165,7 @@ export default { color: #fff; font-weight: 600; margin-right: 16rpx; + word-break: break-all; } .image { width: 100rpx; @@ -151,6 +176,50 @@ export default { } } .operation { + z-index: 5; + margin-top: 18rpx; + margin-left: 20rpx; + flex-grow: 0; + flex-shrink: 0; + .box { + display: flex; + flex-direction: row; + align-items: center; + justify-content: flex-end; + margin-bottom: 36rpx; + .container { + width: 40rpx; + height: 40rpx; + flex-grow: 0; + flex-shrink: 0; + margin-right: 26rpx; + position: relative; + .number { + position: absolute; + top: -12rpx; + right: -12rpx; + // width:32rpx; + // height: 32rpx; + padding: 6rpx 10rpx; + background-color: #f5222d; + border-radius: 16rpx; + display: flex; + align-items: center; + justify-content: center; + .text { + font-size: 20rpx; + color: #fff; + font-weight: 500; + } + } + } + .icon { + width: 40rpx; + height: 40rpx; + flex-grow: 0; + flex-shrink: 0; + } + } } } .vip-area { diff --git a/pages/setting/index.vue b/pages/setting/index.vue new file mode 100644 index 0000000..41a80ac --- /dev/null +++ b/pages/setting/index.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/static/imgs/mine/mine-top-bg.png b/static/imgs/mine/mine-top-bg.png index 47cf92d..ec34e1e 100644 Binary files a/static/imgs/mine/mine-top-bg.png and b/static/imgs/mine/mine-top-bg.png differ diff --git a/static/imgs/mine/msg-icon.png b/static/imgs/mine/msg-icon.png new file mode 100644 index 0000000..f06043c Binary files /dev/null and b/static/imgs/mine/msg-icon.png differ diff --git a/static/imgs/mine/setting-icon.png b/static/imgs/mine/setting-icon.png new file mode 100644 index 0000000..20d3b34 Binary files /dev/null and b/static/imgs/mine/setting-icon.png differ diff --git a/static/imgs/mine/toggle-icon.png b/static/imgs/mine/toggle-icon.png new file mode 100644 index 0000000..7b943e4 Binary files /dev/null and b/static/imgs/mine/toggle-icon.png differ