Skip to content

M
mallapp
Commit 7981353c authored by 罗超's avatar 罗超
Browse files
Options

修改

parent 8ee51ba0
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 121 deletions
pages.json
View file @ 7981353c
......@@ -494,6 +494,8 @@
"path":"activitylist"//活动列表 不想多建一个分包就放在朋友圈里了
},{
"path":"myreward" //活动列表 我的奖励
},{
"path":"activeContent" //活动列表 活动内容
}]
},
//抖音商品短视频
......
pages/friendcircle/myreward.vue
View file @ 7981353c
<style>
.myRewardContent{
height:auto;
width:100%;
display: flex;
margin:10px;
align-items: center;
justify-content: space-between;
}
.reward_ImgDiv{
width:120px;
height:70px;
border-radius: 5px;
overflow: hidden;
box-shadow: 2px 2px 8px #d2d2d2;
}
.reward_ImgDiv img{
width:100%;
height:100%;
}
.rewardTop{
width:130px;
width:120px;
color:#111111;
font-size:13px;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
}
.reDuihuan{
color:#888888;
......@@ -28,11 +30,26 @@
padding:5px 10px;
border:1px solid #999999;
color:#999999;
border-radius: 20%;
border-radius: 20px;
font-size:13px;
}
.Chaochu{
width:100%;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
margin-top:5px;
}
.onlineWay{
color:#FF4048;
border:1px solid #FF4048;
padding:5px 10px;
border-radius: 20px;
font-size:13px;
}
</style>
<template>
<view class="myVipList" :style="{ height: contentHeight }">
<view class="myreward" :style="{ height: contentHeight }">
<!-- <u-empty v-if="dataList.length == 0" text="暂无奖励" mode="coupon"></u-empty> -->
<view
......@@ -50,21 +67,30 @@
@scrolltolower="lower"
:style="{ height: '100%' }"
>
<!-- <view class="details" v-for="(x, i) in dataList" :key="i"> -->
<view class="myRewardContent">
<view class="reward_ImgDiv">
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/studycardgq.png" alt="">
</view>
<view style="margin-left:15px;">
<view class="rewardTop">智慧改变生活阿萨德</view>
<view class="reDuihuan">剩余20天兑换</view>
</view>
<view>
<view class="rewardStatus">未兑换</view>
<view class="details" v-for="(x, i) in dataList" :key="i">
<view class="myRewardContent">
<view style="width:76%;display: flex;">
<view class="reward_ImgDiv">
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/studycardgq.png" alt="">
</view>
<view style="padding-left:10px;max-width:170px;">
<view class="rewardTop Chaochu">{{x.ActivityName}}</view>
<view class="reDuihuan Chaochu">{{x.PrizeName}}</view>
<view class="reDuihuan Chaochu">剩余{{x.SurplusDay}}天兑换</view>
</view>
</view>
<view>
<view class="rewardStatus" v-if="x.Way==2">
<text v-if="x.State==1">未兑换</text>
<text v-if="x.State==2">已兑换</text>
<text v-if="x.State==3">已过期</text>
</view>
<view v-if="x.Way==1" class="onlineWay">
<text v-if="x.State==1">立即兑换</text>
</view>
</view>
</view>
</view>
<!-- </view> -->
<u-loadmore
:status="status"
:load-text="loadText"
......@@ -81,19 +107,6 @@
<u-loading mode="flower" size="48">></u-loading>
<Text style="color: #fff; margin-top: 10rpx;">加载中...</Text>
</view>
<!-- <view v-if="show==true" class="pu" @click="show=false">
<view class="pu-box">
<image mode="widthFix" :src="selectobj.CardBagIco" style="width: 100%;height: 100%;"></image>
<view class="pu-btoom">
<view>{{selectobj.CardNo}}</view>
<view style="margin-top: 12px;font-size: 12px;display: flex;flex-direction: row;align-items: center;">
<view style="margin-right: 10px;max-width: 100px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{useName}}</view>
{{selectobj.EndDate.split('T')[0].split('-')[1]+'/'+selectobj.EndDate.split('T')[0].split('-')[0].toString().substr(2, 2)}}
</view>
</view>
</view>
</view> -->
<!-- 取消提示 -->
<u-toast ref="uToast" />
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
......@@ -176,7 +189,7 @@ export default {
if(res.resultCode==1){
console.log(res,'数据');
this.loading = false;
this.g = this.g.concat(res.data.pageData);
this.dataList = this.dataList.concat(res.data.pageData);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.status = "nomore";
......@@ -207,14 +220,14 @@ export default {
};
</script>
<style>
.myVipList {
.myreward {
width: 100%;
height: 100%;
background: #FFF;
position: relative;
}
.myVipList .loading {
.myreward .loading {
width: 180rpx;
height: 180rpx;
background: #000000;
......@@ -230,7 +243,7 @@ export default {
margin-left: -100rpx;
z-index: 999;
}
.myVipList .details{
.myreward .details{
width: 100%;
padding:0 15px;
margin-top: 15px;
......@@ -238,88 +251,4 @@ export default {
flex-direction: column;
align-items: center;
}
.d-t-box{
width: 100%;
height: 83px;
border-radius: 6px;
overflow: hidden;
background-repeat: no-repeat;
background-size: cover;
position: relative;
}
.bj {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
background: rgba(0, 0, 0, 0.2);
border-radius: 6px;
}
.btext{
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
font-size: 12px;
padding: 15px;
color: #FFF;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.bj2{
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
background: rgba(153, 153, 153, 0.6);
border-radius: 6px;
}
.btext-l{
width: 1;
flex:1;
margin-right: 20px;
font-size: 18px;
}
.btext-r{
width: 100px;
text-align: right;
overflow: hidden;white-space: nowrap;text-overflow: ellipsis;
}
.myVipList .pu{
width: 100%;
height: 100%;
background: rgba(255, 255, 255, 0.9);
position: fixed;
left: 0;
top: 0;
z-index: 999;
display: flex;
align-items: center;
justify-content: center;
}
.pu-box{
width: 100%;
/* height: 230px; */
position: relative;
}
.pu-btoom{
width: 100%;
height: 100%;
color: #FFF;font-size: 15px;
position: absolute;
padding: 15px;
left: 0;
top: 0;
display: flex;
flex-direction: column;
justify-content: flex-end;
}
</style>
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