diff --git a/config/app.js b/config/app.js index 359137d..30b078c 100644 --- a/config/app.js +++ b/config/app.js @@ -2,8 +2,8 @@ let httpApiThree; let httpApi; // 总域名 let httpApiTwo; // 物流系统域名 -// const env = 'dev'; // 开发 -const env = 'prod'; // 生产 +const env = 'dev'; // 开发 +// const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 // const env = 'local'; // 本地 diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index a3f0f87..cf014a8 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -7,14 +7,14 @@ - + 工作证:{{ myOaInfo.nickname }} - + 身份:{{ myOaInfo.user_role_name}} @@ -45,10 +45,58 @@ + + + + + + + + 邀请码 + + + {{myOaInfo.invite_code}} + + + - @@ -110,7 +158,6 @@ - @@ -475,7 +522,7 @@ width: 750rpx; background-image: url('/static/newWork/index/SYBG.png'); background-size: 100% 100%; - height: 309.78rpx; + height: 378.78rpx; font-size: 30rpx; font-weight: bold; color: #2B63E2; @@ -502,7 +549,14 @@ position: absolute; left: 50%; transform: translateX(-50%); - top: -50rpx; + top: -160rpx; + } + + .identity { + max-width: 250rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } } @@ -514,7 +568,7 @@ display: flex; width: 750rpx; justify-content: space-between; - + flex-wrap: wrap; box-sizing: border-box; padding: 0 30rpx; @@ -530,6 +584,7 @@ box-sizing: border-box; padding: 30rpx 29rpx; font-weight: 500; + margin-bottom: 20rpx; .deposit-value { color: #336AE7; diff --git a/static/newWork/index/GLHS.png b/static/newWork/index/GLHS.png index 6e0f6dc..f633a77 100644 Binary files a/static/newWork/index/GLHS.png and b/static/newWork/index/GLHS.png differ diff --git a/static/newWork/index/JYJE.png b/static/newWork/index/JYJE.png new file mode 100644 index 0000000..3197542 Binary files /dev/null and b/static/newWork/index/JYJE.png differ diff --git a/static/newWork/index/RZSHS.png b/static/newWork/index/RZSHS.png new file mode 100644 index 0000000..4a1430c Binary files /dev/null and b/static/newWork/index/RZSHS.png differ diff --git a/static/newWork/index/SYBG.png b/static/newWork/index/SYBG.png index 6364a5f..83f0a85 100644 Binary files a/static/newWork/index/SYBG.png and b/static/newWork/index/SYBG.png differ diff --git a/static/newWork/index/YQM.png b/static/newWork/index/YQM.png new file mode 100644 index 0000000..be6e519 Binary files /dev/null and b/static/newWork/index/YQM.png differ diff --git a/static/newWork/index/ZCYHS.png b/static/newWork/index/ZCYHS.png new file mode 100644 index 0000000..b137121 Binary files /dev/null and b/static/newWork/index/ZCYHS.png differ