|
@@ -5,16 +5,16 @@
|
|
<view class="content">
|
|
<view class="content">
|
|
<view class="news">
|
|
<view class="news">
|
|
<view class="info flex">
|
|
<view class="info flex">
|
|
- <re-image imgSrc="/" width="104" height="104"></re-image>
|
|
|
|
|
|
+ <image :src="avatar || defaultAvatar" class="img" width="104" height="104"></image>
|
|
<view class="info-text flex-column jcsa">
|
|
<view class="info-text flex-column jcsa">
|
|
<view class="info-top flex">
|
|
<view class="info-top flex">
|
|
- <view class="name">王安安</view>
|
|
|
|
|
|
+ <view class="name">{{name}}</view>
|
|
<view class="level flex aic">
|
|
<view class="level flex aic">
|
|
<re-image imgSrc="/retail/main/ic_chuji.png" width="40" height="44"></re-image>
|
|
<re-image imgSrc="/retail/main/ic_chuji.png" width="40" height="44"></re-image>
|
|
- <view class="level-text">初级</view>
|
|
|
|
|
|
+ <view class="level-text">{{lvName}}</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
- <view class="phone">13630639549</view>
|
|
|
|
|
|
+ <view class="phone">{{username}}</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<view class="news-total flex jcsa">
|
|
<view class="news-total flex jcsa">
|
|
@@ -37,7 +37,7 @@
|
|
<span class="title-line"></span>
|
|
<span class="title-line"></span>
|
|
套餐充值
|
|
套餐充值
|
|
</view>
|
|
</view>
|
|
- <view class="timer">
|
|
|
|
|
|
+ <!-- <view class="timer">
|
|
赠送游戏币倒计时
|
|
赠送游戏币倒计时
|
|
<span>
|
|
<span>
|
|
<span class="lb" id="day">2</span>
|
|
<span class="lb" id="day">2</span>
|
|
@@ -47,44 +47,44 @@
|
|
<span class="lb" id="mins">56</span>
|
|
<span class="lb" id="mins">56</span>
|
|
分
|
|
分
|
|
</span>
|
|
</span>
|
|
- </view>
|
|
|
|
|
|
+ </view> -->
|
|
</view>
|
|
</view>
|
|
<view class="list-wrapper">
|
|
<view class="list-wrapper">
|
|
- <view class="list-item">
|
|
|
|
|
|
+ <view class="list-item" v-for="(item,index) in list" :key="index">
|
|
<view class="item-wrapper">
|
|
<view class="item-wrapper">
|
|
- <view class="sub-title ${item.subTitle ? 'show' : ''}">2</view>
|
|
|
|
|
|
+ <view class="sub-title" v-if="item.name">{{item.name}}</view>
|
|
<view class="big">
|
|
<view class="big">
|
|
<view class="">
|
|
<view class="">
|
|
<view class="flex jcsb aic">
|
|
<view class="flex jcsb aic">
|
|
<view>
|
|
<view>
|
|
- <span class="strong">122</span><span class="strong-text">游戏币</span>
|
|
|
|
|
|
+ <span class="strong">{{item.gameCurrency}}</span><span class="strong-text">游戏币</span>
|
|
</view>
|
|
</view>
|
|
<view>
|
|
<view>
|
|
<span class="symbol">¥</span>
|
|
<span class="symbol">¥</span>
|
|
- <span class="list-price">23</span>
|
|
|
|
|
|
+ <span class="list-price">{{item.discountPrice}}</span>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
- <view class="original">¥344</view>
|
|
|
|
|
|
+ <view class="original">¥{{item.price}}</view>
|
|
</view>
|
|
</view>
|
|
<view class="msg flex jcsb aic">
|
|
<view class="msg flex jcsb aic">
|
|
<view class="msg-left">
|
|
<view class="msg-left">
|
|
- <span class="zeng ">赠</span>
|
|
|
|
- <span class="og"><span class="num">233</span>游戏币</span>
|
|
|
|
|
|
+ <span class="zeng" v-if="item.additionalGameCurrency || item.grabTimes">赠</span>
|
|
|
|
+ <span class="og" v-if="item.additionalGameCurrency"><span class="num">{{item.additionalGameCurrency}}</span>游戏币</span>
|
|
<!-- <span class="og">
|
|
<!-- <span class="og">
|
|
<span class="">+</span>
|
|
<span class="">+</span>
|
|
<span class="">2M</span>
|
|
<span class="">2M</span>
|
|
</span> -->
|
|
</span> -->
|
|
- <span class="og red">
|
|
|
|
|
|
+ <span class="og red" v-if="item.additionalGameCurrency && item.grabTimes">
|
|
<span class=""
|
|
<span class=""
|
|
style="margin-left:2px">+</span>
|
|
style="margin-left:2px">+</span>
|
|
<view class="red-box">
|
|
<view class="red-box">
|
|
<re-image width="30" imgSrc="/retail/main/ic_putonghb.png"></re-image>
|
|
<re-image width="30" imgSrc="/retail/main/ic_putonghb.png"></re-image>
|
|
- <span>红包机会x2</span>
|
|
|
|
|
|
+ <span>红包机会x{{item.grabTimes}}</span>
|
|
</view>
|
|
</view>
|
|
</span>
|
|
</span>
|
|
</view>
|
|
</view>
|
|
- <span class="time-text">23天有效</span>
|
|
|
|
- <view class="pay-btn" @click="toMall">去充值</view>
|
|
|
|
|
|
+ <span class="time-text">{{item.expireDays}}天有效</span>
|
|
|
|
+ <view class="pay-btn" @click="toMall(item.id)">去充值</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -95,11 +95,9 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
- import {
|
|
|
|
- toRpx
|
|
|
|
- } from '@/utils/calculate.js'
|
|
|
|
import defaultConfig from '@/config/default.js'
|
|
import defaultConfig from '@/config/default.js'
|
|
- import { statistics,packagePage } from '@/apis/main'
|
|
|
|
|
|
+ import { packagePage } from '@/apis/main'
|
|
|
|
+ import { getUserInfo } from '@/apis/user'
|
|
export default {
|
|
export default {
|
|
components: {},
|
|
components: {},
|
|
computed: {
|
|
computed: {
|
|
@@ -112,10 +110,15 @@
|
|
bannerImage: defaultConfig.ossImgUrl + '/retail/main/img_bgtop.png',
|
|
bannerImage: defaultConfig.ossImgUrl + '/retail/main/img_bgtop.png',
|
|
title: 'Hello',
|
|
title: 'Hello',
|
|
navBarHeight: uni.getStorageSync('navBarHeight'),
|
|
navBarHeight: uni.getStorageSync('navBarHeight'),
|
|
- sumPayNum: uni.getStorageSync('sumPayNum'),// 总销订单
|
|
|
|
- sumGameCurrency: uni.getStorageSync('sumGameCurrency'),// 总销游戏币
|
|
|
|
- sumIncome: uni.getStorageSync('sumIncome'),//预估总收益,
|
|
|
|
|
|
+ sumPayNum: uni.getStorageSync('userInfo').sumPayNum,// 总销订单
|
|
|
|
+ sumGameCurrency: uni.getStorageSync('userInfo').sumGameCurrency,// 总销游戏币
|
|
|
|
+ sumIncome: uni.getStorageSync('userInfo').sumIncome,//预估总收益,
|
|
|
|
+ avatar:uni.getStorageSync('avatar'),
|
|
|
|
+ defaultAvatar:'../../static/image/img_touxiang.png',
|
|
|
|
+ name:uni.getStorageSync('userInfo').name,
|
|
|
|
+ lvName:uni.getStorageSync('userInfo').lvName,
|
|
list:[],
|
|
list:[],
|
|
|
|
+ username:uni.getStorageSync('username'),
|
|
}
|
|
}
|
|
},
|
|
},
|
|
onLoad() {
|
|
onLoad() {
|
|
@@ -123,22 +126,43 @@
|
|
},
|
|
},
|
|
|
|
|
|
methods: {
|
|
methods: {
|
|
- toMall(){
|
|
|
|
|
|
+ updateAvatarFromStorage() {
|
|
|
|
+ // 从本地存储同步获取 avatar 并更新组件状态
|
|
|
|
+ this.avatar = uni.getStorageSync('avatar');
|
|
|
|
+ },
|
|
|
|
+ // async getInfo(){
|
|
|
|
+ // const res = await getUserInfo()
|
|
|
|
+ // if(res){
|
|
|
|
+ // const { avatar,sumPayNum,sumPay,sumIncome,sumGameCurrency,name } = res
|
|
|
|
+ // this.avatar = avatar || '../../static/image/img_touxiang.png'
|
|
|
|
+ // this.sumPayNum = sumPayNum
|
|
|
|
+ // this.sumGameCurrency = sumGameCurrency
|
|
|
|
+ // this.sumIncome = sumIncome
|
|
|
|
+ // this.name = name
|
|
|
|
+ // uni.setStorageSync('avatar',avatar)
|
|
|
|
+ // uni.setStorageSync('sumPayNum',sumPayNum)
|
|
|
|
+ // uni.setStorageSync('sumGameCurrency',sumGameCurrency)
|
|
|
|
+ // uni.setStorageSync('sumIncome',sumIncome)
|
|
|
|
+ // uni.setStorageSync('name',name)
|
|
|
|
+ // }
|
|
|
|
+ // },
|
|
|
|
+ toMall(id){
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: '/pages/mall/mallRecharge/index'
|
|
|
|
|
|
+ url: '/pages/mall/mallRecharge/index?id='+ id
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
|
|
async getData(){
|
|
async getData(){
|
|
const res = await packagePage()
|
|
const res = await packagePage()
|
|
if(res){
|
|
if(res){
|
|
- this.list = res.data.records
|
|
|
|
|
|
+ this.list = res.records
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
},
|
|
},
|
|
onShow() {
|
|
onShow() {
|
|
this.getData()
|
|
this.getData()
|
|
|
|
+ this.updateAvatarFromStorage()
|
|
},
|
|
},
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|
|
@@ -152,15 +176,13 @@
|
|
position: absolute;
|
|
position: absolute;
|
|
top: 0;
|
|
top: 0;
|
|
bottom: 0;
|
|
bottom: 0;
|
|
-
|
|
|
|
.logo {
|
|
.logo {
|
|
margin-top: 16rpx;
|
|
margin-top: 16rpx;
|
|
margin-left: 24rpx;
|
|
margin-left: 24rpx;
|
|
}
|
|
}
|
|
|
|
|
|
.content {
|
|
.content {
|
|
- padding: 0 32rpx;
|
|
|
|
-
|
|
|
|
|
|
+ padding: 0 32rpx 120rpx;
|
|
.news {
|
|
.news {
|
|
background: #FFFFFF;
|
|
background: #FFFFFF;
|
|
box-shadow: 0rpx 6rpx 16rpx 0rpx #E3E6F2;
|
|
box-shadow: 0rpx 6rpx 16rpx 0rpx #E3E6F2;
|
|
@@ -169,6 +191,13 @@
|
|
padding: 40rpx;
|
|
padding: 40rpx;
|
|
|
|
|
|
.info {
|
|
.info {
|
|
|
|
+ .img{
|
|
|
|
+ flex-shrink: 0;
|
|
|
|
+ width: 104rpx;
|
|
|
|
+ height: 104rpx;
|
|
|
|
+ border-radius: 8rpx;
|
|
|
|
+ margin-right: 20rpx;
|
|
|
|
+ }
|
|
.info-text {
|
|
.info-text {
|
|
.info-top {
|
|
.info-top {
|
|
.name {
|
|
.name {
|
|
@@ -265,7 +294,7 @@
|
|
|
|
|
|
.list-wrapper {
|
|
.list-wrapper {
|
|
margin-top: 40rpx;
|
|
margin-top: 40rpx;
|
|
-
|
|
|
|
|
|
+
|
|
.list-item {
|
|
.list-item {
|
|
margin-bottom: 20rpx;
|
|
margin-bottom: 20rpx;
|
|
position: relative;
|
|
position: relative;
|
|
@@ -299,7 +328,7 @@
|
|
padding: 6rpx 16rpx;
|
|
padding: 6rpx 16rpx;
|
|
font-size: 24rpx;
|
|
font-size: 24rpx;
|
|
color: #fff;
|
|
color: #fff;
|
|
- line-height: 11rpx;
|
|
|
|
|
|
+ line-height: 22rpx;
|
|
background: #FF6400;
|
|
background: #FF6400;
|
|
border-radius: 24rpx 0rpx 24rpx 0rpx;
|
|
border-radius: 24rpx 0rpx 24rpx 0rpx;
|
|
}
|
|
}
|
|
@@ -339,17 +368,20 @@
|
|
}
|
|
}
|
|
|
|
|
|
.strong-text {
|
|
.strong-text {
|
|
- font-size: 24rpx;
|
|
|
|
|
|
+ font-size: 28rpx;
|
|
color: #564C47;
|
|
color: #564C47;
|
|
line-height: 28rpx;
|
|
line-height: 28rpx;
|
|
font-weight: normal;
|
|
font-weight: normal;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ .hide{
|
|
|
|
+ display: none;
|
|
|
|
+ }
|
|
.msg {
|
|
.msg {
|
|
margin-top: 4rpx;
|
|
margin-top: 4rpx;
|
|
font-size: 32rpx;
|
|
font-size: 32rpx;
|
|
color: #2C2B28;
|
|
color: #2C2B28;
|
|
|
|
|
|
|
|
+
|
|
.msg-left {
|
|
.msg-left {
|
|
width: calc(100% - 150rpx);
|
|
width: calc(100% - 150rpx);
|
|
display: flex;
|
|
display: flex;
|
|
@@ -357,7 +389,7 @@
|
|
white-space: nowrap;
|
|
white-space: nowrap;
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
font-weight: normal;
|
|
font-weight: normal;
|
|
- font-size: 24rpx;
|
|
|
|
|
|
+ font-size: 28rpx;
|
|
.num{
|
|
.num{
|
|
|
|
|
|
}
|
|
}
|
|
@@ -377,6 +409,7 @@
|
|
align-items: center;
|
|
align-items: center;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
|
|
.time-text {
|
|
.time-text {
|
|
position: absolute;
|
|
position: absolute;
|