diff --git a/components/money-view/money-view.vue b/components/money-view/money-view.vue new file mode 100644 index 0000000..bdf9bae --- /dev/null +++ b/components/money-view/money-view.vue @@ -0,0 +1,99 @@ + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 99e9545..2829c6c 100644 --- a/pages.json +++ b/pages.json @@ -13,7 +13,8 @@ "path": "pages/profit/profit", "style": { "navigationBarTitleText": "收益", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "navigationStyle": "custom" } }, { @@ -222,7 +223,7 @@ //底部跳转tab "tabBar": { "color": "#FFFFFF", - "selectedColor": "#30a9c0", + "selectedColor": "#0b6375", "borderStyle": "black", "backgroundColor": "#141b29", "fontSize": "12px", diff --git a/pages/index/index.vue b/pages/index/index.vue index 947ce6b..daff841 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -62,7 +62,7 @@ backgroundColor: 'rgba(255, 255, 255, .5)', border: '1px rgba(0, 0, 0, .3) solid', color: '#fff', - selectedBackgroundColor: 'rgba(255, 255, 255, .9)', + selectedBackgroundColor: 'rgba(11, 99, 117, .9)', selectedBorder: '1px rgba(0, 0, 0, .9) solid', bottom: 50 }, @@ -122,7 +122,7 @@ created(){ const userInfo = uni.getStorageSync('userInfo') if (!userInfo) { - uni.showModal({ + /*uni.showModal({ content: '艺术家账户过期,请重新登录!', showCancel: false, success() { @@ -131,7 +131,7 @@ url: '/pages/login/login' }); } - }); + });*/ } else { this.userInfo = userInfo; this.queryCreatorTypeImgNum(); @@ -291,7 +291,7 @@ height: calc(20vh - 30rpx); margin: 0 auto; background: #1d2734; - border-radius: 40rpx; + border-radius: 20rpx; display: flex; flex-wrap: wrap; @@ -331,7 +331,7 @@ height: 100%; margin: 0 auto; background: #1d2734; - border-radius: 40rpx; + border-radius: 20rpx; display: flex; flex-wrap: wrap; justify-content: space-between; diff --git a/pages/login/login.vue b/pages/login/login.vue index 0aaa823..9ef3eb6 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -182,7 +182,7 @@ .logo-div { width: 86rpx; height: 86rpx; - background: linear-gradient(180.00deg, #30a9c0 0%, #30a9c0 100%); + background: linear-gradient(180.00deg, #0b6375 0%, #0b6375 100%); border-radius: 24rpx; margin-top: 154rpx; text-align: center; diff --git a/pages/profit/profit.vue b/pages/profit/profit.vue index 1ac6e06..47fce91 100644 --- a/pages/profit/profit.vue +++ b/pages/profit/profit.vue @@ -1,151 +1,146 @@ @@ -158,7 +153,11 @@ import { queryFrontInOrOutAmt, //查询指定艺术家已入账/转入钱包累计收益 } from "@/api/profit.js"; import { getNoticeList } from "@/api/userInfo.js"; +import MoneyView from "@/components/money-view/money-view.vue" export default { + components: { + MoneyView + }, data() { return { nvueWidth: 730, @@ -171,7 +170,7 @@ export default { }, downloadAndInviteCountInfo: {}, profitList: [], - items: ["即将入账", "", "已入账", "", "已转入钱包"], + items: ["即将入账", "已入账", "已转入钱包"], current: 0, activeColor: "#007aff", styleType: "text", @@ -182,6 +181,10 @@ export default { pageSize: 10, pageNum: 1, active: 0, + hidden: false, + incomeBackground: '/static/income-background.png', + advertIcon: "/static/material.png", + inviteIcon: "/static/material.png", }; }, // 下拉刷新 @@ -191,7 +194,7 @@ export default { created() { const userInfo = uni.getStorageSync('userInfo') if (!userInfo) { - uni.showModal({ + /*uni.showModal({ content: '艺术家账户过期,请重新登录!', showCancel: false, success() { @@ -200,7 +203,7 @@ export default { url: '/pages/login/login' }); } - }); + });*/ } else { this.userInfo = userInfo; } @@ -347,6 +350,9 @@ export default { segActive(index) { this.active = index; }, + clickHidden() { + this.hidden = !this.hidden; + } }, }; @@ -354,193 +360,209 @@ export default { diff --git a/pages/userInfo/userInfo.vue b/pages/userInfo/userInfo.vue index 6ea0f0c..8d8f9db 100644 --- a/pages/userInfo/userInfo.vue +++ b/pages/userInfo/userInfo.vue @@ -155,7 +155,7 @@ .top { width: 100vw; - height: 25vh; + height: 30vh; position: relative; .background-image-dim { @@ -266,7 +266,7 @@ border-radius: 20rpx; overflow: hidden; backdrop-filter: blur(25rpx); - background-image: linear-gradient(45deg, #243949 0%, #30a9c0 100%); + background-image: linear-gradient(45deg, #243949 0%, #0b6375 100%); .middle-btn-item {