Skip to content

M
mallapp
Commit 6489f9c9 authored by Mac's avatar Mac
Browse files
Options

1

parent 3ff6ca24
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 16 deletions
pages/friendcircle/activeContent.vue
View file @ 6489f9c9
...@@ -51,11 +51,17 @@ ...@@ -51,11 +51,17 @@
} }
.active_good{ .active_good{
width: 100%; width: 100%;
padding-bottom:20px ; padding-bottom:10px ;
overflow-x: auto!important; overflow-x: auto!important;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.active_good-s{
width: 100%;
padding-bottom:10px ;
display: flex;
flex-direction: column;
}
.active_good_item{ .active_good_item{
width: 100px; width: 100px;
margin-right: 15px; margin-right: 15px;
...@@ -63,6 +69,16 @@ ...@@ -63,6 +69,16 @@
box-shadow:0 6px 10px 1px #F2F2F2; box-shadow:0 6px 10px 1px #F2F2F2;
} }
.active_good_item-s{
width: 100%;
height: 80px;
border-radius: 5px;
box-shadow:0 6px 10px 1px #F2F2F2;
background: #FFF;
display: flex;
flex-direction: row;
align-items: center;
}
.active_text{ .active_text{
width: 100%; width: 100%;
padding:0 10px; padding:0 10px;
...@@ -74,6 +90,19 @@ ...@@ -74,6 +90,19 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.active_text-s{
width: 1px;
flex: 1;
height: 80px;
padding: 10px;
font-size: 12px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
}
</style> </style>
<template> <template>
<view class="activeContent" :style="{ height: contentHeight }"> <view class="activeContent" :style="{ height: contentHeight }">
...@@ -94,21 +123,25 @@ ...@@ -94,21 +123,25 @@
<view class="active_Title">活动规则</view> <view class="active_Title">活动规则</view>
<view class="active_Inner"> <view class="active_Inner">
<view v-if="dataList.Type==1" > <view v-if="dataList.Type==1" >
订单数量需满足{{dataList.OrderNum}}个 活动期间累计,订单数量需满足{{dataList.OrderNum}}个
</view> </view>
<view v-if="dataList.Type==2"> <view v-if="dataList.Type==2">
订单金额需满足{{dataList.OrderMoney}}元 活动期间累计,订单金额需满足{{dataList.OrderMoney}}元
</view> </view>
<view v-if="dataList.Type==3"> <view v-if="dataList.Type==3">
商品数量需满足{{dataList.GoodsNum}}个 活动期间累计,商品数量需满足{{dataList.GoodsNum}}个
</view> </view>
</view> </view>
<view class="active_Title">活动对象</view> <view class="active_Title">活动对象</view>
<view> <view>
<text class="avtice_Sperate" v-if="dataList.Tier==0">全部分销商</text> <text class="avtice_Sperate" v-if="dataList.Tier==0 && dataList.ActiveObject==1">全部分销商</text>
<text class="avtice_Sperate" v-if="dataList.Tier==1">一级分销商</text> <text class="avtice_Sperate" v-if="dataList.Tier==1 && dataList.ActiveObject==1">一级分销商</text>
<text class="avtice_Sperate" v-if="dataList.Tier==2">二级分销商</text> <text class="avtice_Sperate" v-if="dataList.Tier==2 && dataList.ActiveObject==1">二级分销商</text>
<text class="avtice_Sperate" v-if="dataList.Tier==3">三级分销商</text> <text class="avtice_Sperate" v-if="dataList.Tier==3 && dataList.ActiveObject==1">三级分销商</text>
<text class="avtice_Sperate" v-if="dataList.Tier==0 && dataList.ActiveObject==2">所有用户</text>
<text class="avtice_Sperate" v-if="dataList.Tier==1 && dataList.ActiveObject==2">一级分销</text>
<text class="avtice_Sperate" v-if="dataList.Tier==2 && dataList.ActiveObject==2">二级分销</text>
<text class="avtice_Sperate" v-if="dataList.Tier==3 && dataList.ActiveObject==2">三级分销</text>
</view> </view>
<view> <view>
...@@ -122,14 +155,23 @@ ...@@ -122,14 +155,23 @@
<text v-for="item in dataList.RangeList" class="active_RangeName" @click="goitemize(item)">{{item.Name}}</text> <text v-for="item in dataList.RangeList" class="active_RangeName" @click="goitemize(item)">{{item.Name}}</text>
</view> </view>
<view style="margin-top:10px;" v-if="dataList.RangeType==2"> <view style="margin-top:10px;" v-if="dataList.RangeType==2">
<view class="active_good"> <view class="active_good" v-if="dataList.RangeList.length>3">
<view class="active_good_item" v-for="(item,index) in dataList.RangeList" @click="goGood(item.Id)"> <view class="active_good_item" v-for="(item,index) in dataList.RangeList" @click="goGood(item.Id)">
<image :src="item.Image" <image :src="item.Image"
style="width: 100px;height: 100px;border-top-left-radius:4px ;border-top-right-radius:4px "></image> style="width: 100px;height: 100px;border-top-left-radius:4px ;border-top-right-radius:4px "></image>
<view class="active_text"> <view class="active_text" >
{{item.Name}}
</view>
</view>
</view>
<view class="active_good-s" v-if="dataList.RangeList.length>0 && dataList.RangeList.length<4 ">
<view class="active_good_item-s" v-for="(item,index) in dataList.RangeList" @click="goGood(item.Id)">
<image :src="item.Image"
style="width: 120px;height: 80px;border-radius: 5px; "></image>
<view class="active_text-s" >
{{item.Name}} {{item.Name}}
</view> </view>
<view style="width: 100%;height: 10px;"></view>
</view> </view>
</view> </view>
</view> </view>
......
pages/friendcircle/activitylist.vue
View file @ 6489f9c9
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
<view class="inter-item" v-for="(x, i) in g" :key="i" @click="goActiveContent(x)"> <view class="inter-item" v-for="(x, i) in g" :key="i" @click="goActiveContent(x)">
<view style="width: 100%;height: 190px;border-top-left-radius: 6px;border-top-right-radius: 6px;position: relative;"> <view style="width: 100%;height: 190px;border-top-left-radius: 6px;border-top-right-radius: 6px;position: relative;">
<image :src="x.CoverImage" mode='aspectFill' style="width: 100%;height: 190px;;border-top-left-radius: 6px;border-top-right-radius: 6px;"></image> <image :src="x.CoverImage" mode='aspectFill' style="width: 100%;height: 190px;;border-top-left-radius: 6px;border-top-right-radius: 6px;"></image>
<!-- <view class="imgview imgview2" v-if="msg.QActivityState ==1 && x.IsFinish==1 && x.SurplusDay>0" >活动已完成</view> -->
<!-- <view class="imgview imgview2" v-if="msg.QActivityState ==1 && x.SurplusDay==0" >活动已结束</view> -->
<view class="imgview" v-if="msg.QActivityState ==1 " :style="{background:mainColor,color:'#FFF'}">距离活动结束还有{{x.SurplusDay}}天</view> <view class="imgview" v-if="msg.QActivityState ==1 " :style="{background:mainColor,color:'#FFF'}">距离活动结束还有{{x.SurplusDay}}天</view>
<view class="imgview imgview2" v-if=" msg.QActivityState ==2 && x.SurplusDay>0" >兑换截止期限:{{x.ReceiveTime}}</view> <view class="imgview imgview2" v-if=" msg.QActivityState ==2 && x.SurplusDay>0" >兑换截止期限:{{x.ReceiveTime}}</view>
...@@ -33,7 +31,7 @@ ...@@ -33,7 +31,7 @@
<text >当前进度{{calculation(x)}}%</text> <text >当前进度{{calculation(x)}}%</text>
<view class="speed"> <view class="speed">
<text v-if="calculation(x)==100 && x.IsFinish==2" :style="{'color':mainColor}">已完成活动，等待发放奖励</text> <text v-if="calculation(x)==100 && x.IsFinish==2" :style="{'color':mainColor}">已完成活动，等待发放奖励</text>
<text style="margin-left: 5px;" v-if="x.IsFinish==1" :style="{'color':mainColor}">已完成</text> <text style="margin-left: 5px;" v-if="x.IsFinish==1" :style="{'color':mainColor}">活动已完成</text>
<text v-if="msg.QActivityState ==2 && x.IsFinish==2 && calculation(x)!=100" style="color: #777777;">未完成</text> <text v-if="msg.QActivityState ==2 && x.IsFinish==2 && calculation(x)!=100" style="color: #777777;">未完成</text>
</view> </view>
......
pages/friendcircle/myreward.vue
View file @ 6489f9c9
...@@ -75,8 +75,12 @@ ...@@ -75,8 +75,12 @@
</view> </view>
<view style="padding-left:10px;flex: 1;width: 1px;"> <view style="padding-left:10px;flex: 1;width: 1px;">
<view class="rewardTop Chaochu">{{x.ActivityName}}</view> <view class="rewardTop Chaochu">{{x.ActivityName}}</view>
<view class="reDuihuan Chaochu">{{x.PrizeName}}</view> <!-- <view class="reDuihuan Chaochu">{{x.PrizeName}}</view> -->
<view class="reDuihuan Chaochu">剩余{{x.SurplusDay}}天兑换</view> <view class="reDuihuan Chaochu" v-if="x.SurplusDay>0">剩余{{x.SurplusDay}}天兑换</view>
<view class="reDuihuan Chaochu" v-if="x.SurplusDay<1">兑换截止期限:{{x.ReceiveTime}}</view>
<view class="reDuihuan Chaochu" style="display:flex;flex-direction: row;align-items: center;font-family: aa;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/tiaoxingma.png" style="width: 13px;height: 10px;margin-right: 5px;"></image>
{{x.Code}}</view>
</view> </view>
</view> </view>
<view> <view>
......
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