Skip to content

G
gxpt_wechat
Commit 75953729 by zhangzhen
Options

细节优化

parent 9c82c1fc
Showing with 68 additions and 31 deletions
pages.json
...@@ -253,8 +253,7 @@ ...@@ -253,8 +253,7 @@
{ {
"path": "equityFundLog/index", "path": "equityFundLog/index",
"style": { "style": {
"navigationBarTitleText": "权益金详情", "navigationBarTitleText": "我的权益金",
"navigationStyle": "custom",
"enablePullDownRefresh" : false "enablePullDownRefresh" : false
} }
}, },
......
pages/my/myInfo.vue
...@@ -248,14 +248,14 @@ ...@@ -248,14 +248,14 @@
</view> </view>
</view> </view>
<view v-if="userInfo.consumerMember && userInfo.consumerMember.isRights" class="item-box" @tap="onNavByPath('equityFundLog')"> <!-- <view v-if="userInfo.consumerMember && userInfo.consumerMember.isRights" class="item-box" @tap="onNavByPath('equityFundLog')">
<view class="icon-img"> <view class="icon-img">
<image :src="assetsPath+'/user/tool_4.png'" mode="scaleToFill"></image> <image :src="assetsPath+'/user/tool_4.png'" mode="scaleToFill"></image>
</view> </view>
<view class="text-box"> <view class="text-box">
<text class="text-gray">收益明细</text> <text class="text-gray">收益明细</text>
</view> </view>
</view> </view> -->
<view class="item-box" @tap="onNavByPath('payRecord')"> <view class="item-box" @tap="onNavByPath('payRecord')">
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
</view> </view>
</uni-popup> </uni-popup>
<LoginPop ref="loginPop" /> <LoginPop ref="loginPop" @success="onGetUserInfo" />
</view> </view>
</template> </template>
......
setting/equityFundLog/index.vue
<template> <template>
<view class="order-record"> <view class="order-record">
<f-navbar title="奖励金" :isShowTransparentTitle="false" :isShowLeft="true" fontColor="#ffffff" :fontSize="38" <!-- <f-navbar title="奖励金" :isShowTransparentTitle="false" :isShowLeft="true" fontColor="#ffffff" :fontSize="38"
bgColor="#E40583" :scrollTop="scrollTop" navbarType='5'></f-navbar> bgColor="#E40583" :scrollTop="scrollTop" navbarType='5'></f-navbar> -->
<scroll-view :enable-flex="true" class="scroll-view" scroll-y="true" @scroll="onScroll" @scrolltolower="onScrolltolower"> <!-- <scroll-view :enable-flex="true" class="scroll-view" scroll-y="true" @scroll="onScroll" @scrolltolower="onScrolltolower"> -->
<view class="content-box"> <view class="content-box">
<view class="header-content" :style="{paddingTop:statusBarHeight+'px' }"> <view class="header-content">
<!-- <image class="logo-bg" :src="assetsPath +'/logo_v1.png'" mode="widthFix"></image> --> <image class="logo-bg" :src="assetsPath +'/equity_bg.png'" mode="scaleToFill"></image>
<view class="flex-col part-content" >
<view class="flex-col avatar-box"> <view class="flex-col avatar-box">
<view class="avatar"> <view class="avatar">
<image :src="userInfo.avatar || assetsPath+'/logo_icon.png' " mode="scaleToFill"></image> <image :src="userInfo.avatar || assetsPath+'/logo_icon.png' " mode="scaleToFill"></image>
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
</view> </view>
<view class="amount"> <view class="amount">
<text class="text-bold text-white">{{ userInfo && userInfo.consumerWallet && userInfo.consumerWallet.equityFund? (userInfo.consumerWallet.equityFund).toFixed(2) : '0.00' }}</text> <text class="text-bold text-white">{{ userInfo && userInfo.consumerWallet && userInfo.consumerWallet.equityFund? (userInfo.consumerWallet.equityFund).toFixed(2) : '0.00' }}</text>
<text class="text-sm">可提现</text>
</view> </view>
</view> </view>
...@@ -34,6 +36,7 @@ ...@@ -34,6 +36,7 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<view class="btn-box"> <view class="btn-box">
<button class="cu-btn round bg-white" @tap="onConfirm">立即提现</button> <button class="cu-btn round bg-white" @tap="onConfirm">立即提现</button>
...@@ -42,7 +45,7 @@ ...@@ -42,7 +45,7 @@
</view> </view>
<view class="content-list"> <view class="content-list">
<view v-if="list && list.length" class="padding-sm"> <view class="padding-sm">
<text class="text-title text-lg text-black">权益金入账信息</text> <text class="text-title text-lg text-black">权益金入账信息</text>
</view> </view>
<view class="list-content"> <view class="list-content">
...@@ -65,9 +68,9 @@ ...@@ -65,9 +68,9 @@
<view class="flex-between"> <view class="flex-between">
<text class="">说明:</text> <text class="">说明:</text>
<text class="text-black"> 好友 <text <text class="text-black"><text
class="text-bold">{{item.newNickName||'凑角用户'}}_{{item.phone4Last}}</text>进行<text class="text-bold">{{item.newNickName || '凑角用户'}}_{{item.phone4Last}}</text>进行<text
class="text-bold">{{equityFundTypeEnum[item.equityFundType]}}</text>后返现</text> class="text-bold">{{equityFundTypeEnum[item.equityFundType]}}</text></text>
</view> </view>
...@@ -84,7 +87,7 @@ ...@@ -84,7 +87,7 @@
</view> </view>
</view> </view>
</view> </view>
</scroll-view> <!-- </scroll-view> -->
</view> </view>
</template> </template>
...@@ -121,7 +124,7 @@ ...@@ -121,7 +124,7 @@
scrollTop: 0, scrollTop: 0,
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 5 pageSize: 10
}, },
equityFundTypeEnum: { equityFundTypeEnum: {
0: "金额充值", 0: "金额充值",
...@@ -150,6 +153,12 @@ ...@@ -150,6 +153,12 @@
this.onGetDicts() this.onGetDicts()
this.onEquityBindUser() this.onEquityBindUser()
}, },
onReachBottom() {
if (this.status == 'loadmore') {
this.queryParams.pageNum += 1;
this.onLoading();
}
},
methods: { methods: {
onScrolltolower(){ onScrolltolower(){
if (this.status == 'loadmore') { if (this.status == 'loadmore') {
...@@ -188,13 +197,13 @@ ...@@ -188,13 +197,13 @@
let dicts = [] let dicts = []
if (uni.getStorageSync('dicts')) { if (uni.getStorageSync('dicts')) {
dicts = JSON.parse(uni.getStorageSync('dicts')) dicts = JSON.parse(uni.getStorageSync('dicts'))
this.orderStatusEnum = getDictItem(dicts, "store_order_status"); this.equityFundTypeEnum = getDictItem(dicts, "equity_fund_type");
this.onLoading() this.onLoading()
} else { } else {
dictList().then(res => { dictList().then(res => {
dicts = res.data.data; dicts = res.data.data;
uni.setStorageSync('dicts', JSON.stringify(res.data.data)) uni.setStorageSync('dicts', JSON.stringify(res.data.data))
this.orderStatusEnum = getDictItem(dicts, "store_order_status"); this.equityFundTypeEnum = getDictItem(dicts, "equity_fund_type");
this.onLoading() this.onLoading()
}) })
} }
...@@ -212,7 +221,7 @@ ...@@ -212,7 +221,7 @@
let list = res.data.rows.map(item => { let list = res.data.rows.map(item => {
return { return {
...item, ...item,
phone4Last: item.newAccount.slice(-4) phone4Last: item.newPhone.slice(-4)
} }
}) })
...@@ -298,25 +307,35 @@ ...@@ -298,25 +307,35 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 100%; width: 100%;
min-height: 400upx; // background: linear-gradient(to right, #FB406F, #E40583);
background: linear-gradient(to right, #FB406F, #E40583);
.logo-bg { .logo-bg {
width: 380upx; position: absolute;
max-height: 280upx; top: 0;
left: 0;
width: 100%;
height: 100%;
}
.part-content{
position: relative;
width: 100%;
height: 100%;
z-index: 4;
} }
.avatar-box{ .avatar-box{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 16upx;
.avatar{ .avatar{
border: 2px solid rgba(255, 255, 255, 0.8); border: 2px solid rgba(255, 255, 255, 1);
width: 52px; width: 54px;
height: 52px; height: 54px;
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
box-shadow: 0 0 6upx #f1f1f1; box-shadow: 0 0 6upx #f1f1f1;
background: #e4e4e4;
image{ image{
display: block; display: block;
width: 100%; width: 100%;
...@@ -324,15 +343,23 @@ ...@@ -324,15 +343,23 @@
} }
} }
.amount{ .amount{
margin-top: 16upx; display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin-top: 4upx;
text{ text{
font-size: 60upx; font-size: 52upx;
}
.text-sm{
font-size: 20upx;
color: #f1f1f1;
} }
} }
} }
.part-list{ .part-list{
width: 100%; width: 100%;
padding: 0 24upx 12upx; padding: 0 24upx 8upx;
.flex-col{ .flex-col{
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -341,12 +368,19 @@ ...@@ -341,12 +368,19 @@
.btn-box{ .btn-box{
position: absolute; position: absolute;
left: 0; left: 0;
bottom: -16px; bottom: -32upx;
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
.cu-btn{ .cu-btn{
box-shadow: 0 4upx 4upx #E40583; display: inline-block;
width: 230upx;
line-height: 64upx;
background: linear-gradient(0deg, #E03997 4%, #FF375D 92%);
border-radius: 32upx;
font-weight: 600;
font-size: 30upx;
color: #FFFFFF;
} }
} }
} }
...@@ -414,4 +448,7 @@ ...@@ -414,4 +448,7 @@
width: 0; width: 0;
border-left: 2upx solid #e5e5e5; border-left: 2upx solid #e5e5e5;
} }
.empty-box{
margin-top: 32upx;
}
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment