@@ -39,7 +39,7 @@ | |||||
<view class="coupons-info-manjian" style="margin-top:10rpx;font-size:28rpx;" wx:if="{{item.type == 1}}"> | <view class="coupons-info-manjian" style="margin-top:10rpx;font-size:28rpx;" wx:if="{{item.type == 1}}"> | ||||
满¥{{item.usePriceStr}}可用 | 满¥{{item.usePriceStr}}可用 | ||||
</view> | </view> | ||||
<view class="coupons-info-manjian" style="margin-top:10rpx;font-size:28rpx;" wx:if="{{item.type == 2||item.type == 3||item.type==4||item.type==5||item.type==6||item.type==7}}"> | |||||
<view class="coupons-info-manjian" style="font-size:28rpx;" wx:if="{{item.type == 2||item.type == 3||item.type==4||item.type==5||item.type==6||item.type==7}}"> | |||||
仅限本店使用 | 仅限本店使用 | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -19,6 +19,7 @@ page { | |||||
width: 750rpx; | width: 750rpx; | ||||
height: 280rpx; | height: 280rpx; | ||||
overflow: hidden; | overflow: hidden; | ||||
box-shadow:0px 14px 26px 0px rgba(199,203,211,1); | |||||
} | } | ||||
.banner image { | .banner image { | ||||
@@ -31,9 +32,9 @@ page { | |||||
z-index: 1000000000; | z-index: 1000000000; | ||||
background: #fff; | background: #fff; | ||||
border-radius: 12rpx; | border-radius: 12rpx; | ||||
width: 705rpx; | |||||
width: 100%; | |||||
/* height: 212rpx; */ | /* height: 212rpx; */ | ||||
margin: 24rpx auto 0; | |||||
margin:44rpx auto 0; | |||||
padding-bottom: 20rpx; | padding-bottom: 20rpx; | ||||
} | } | ||||
@@ -70,7 +71,7 @@ page { | |||||
.proct text:nth-of-type(1) { | .proct text:nth-of-type(1) { | ||||
display: block; | display: block; | ||||
font-size: 30rpx; | font-size: 30rpx; | ||||
color: #ff4949; | |||||
color: #FD782D; | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
line-height: 32rpx; | line-height: 32rpx; | ||||
margin-bottom: 20rpx; | margin-bottom: 20rpx; | ||||
@@ -318,7 +319,7 @@ navigator:nth-of-type(2n+1) { | |||||
.buy { | .buy { | ||||
display: block; | display: block; | ||||
background: #ff4949; | |||||
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
border-radius: 30rpx; | border-radius: 30rpx; | ||||
height: 48rpx; | height: 48rpx; | ||||
width: 112rpx; | width: 112rpx; | ||||
@@ -349,7 +350,7 @@ navigator:nth-of-type(2n+1) { | |||||
border-radius: 16rpx; | border-radius: 16rpx; | ||||
padding-bottom: 21rpx; | padding-bottom: 21rpx; | ||||
overflow: hidden; | overflow: hidden; | ||||
height: 486rpx; | |||||
height: 405rpx; | |||||
} | } | ||||
/* .coupons1-border { | /* .coupons1-border { | ||||
@@ -363,7 +364,7 @@ navigator:nth-of-type(2n+1) { | |||||
.coupons1-img { | .coupons1-img { | ||||
width: 344rpx; | width: 344rpx; | ||||
height: 258rpx; | |||||
height: 233rpx; | |||||
overflow: hidden; | overflow: hidden; | ||||
} | } | ||||
@@ -391,9 +392,9 @@ navigator:nth-of-type(2n+1) { | |||||
.coupons1-info-price-p { | .coupons1-info-price-p { | ||||
display: inline-block; | display: inline-block; | ||||
font-size: 36rpx; | font-size: 36rpx; | ||||
color: #f96563; | |||||
color: #FD782D; | |||||
line-height: 50rpx; | line-height: 50rpx; | ||||
margin-top: 21rpx; | |||||
/* margin-top: 21rpx; */ | |||||
} | } | ||||
.tit { | .tit { | ||||
@@ -406,7 +407,7 @@ navigator:nth-of-type(2n+1) { | |||||
overflow: hidden; | overflow: hidden; | ||||
white-space: nowrap; | white-space: nowrap; | ||||
text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
padding-top: 16rpx; | |||||
padding-top: 12rpx; | |||||
} | } | ||||
.coupons1-info-price-o { | .coupons1-info-price-o { | ||||
@@ -3,5 +3,6 @@ | |||||
"i-tab": "../../../dist/tab/index", | "i-tab": "../../../dist/tab/index", | ||||
"i-tabs": "../../../dist/tabs/index" | "i-tabs": "../../../dist/tabs/index" | ||||
}, | }, | ||||
"navigationBarTitleText": "我的卡包" | |||||
"navigationBarTitleText": "我的卡包", | |||||
"navigationBarBackgroundColor": "#F4F5F9" | |||||
} | } |
@@ -1,7 +1,7 @@ | |||||
.market { | .market { | ||||
width: 100%; | width: 100%; | ||||
height: 100%; | height: 100%; | ||||
/* background: #f5f5f5; */ | |||||
background: #F4F5F9; | |||||
} | } | ||||
.tabs { | .tabs { | ||||
@@ -13,6 +13,7 @@ | |||||
left: 0; | left: 0; | ||||
right: 0; | right: 0; | ||||
z-index: 100000; | z-index: 100000; | ||||
background: #fff; | |||||
} | } | ||||
.i-tab { | .i-tab { | ||||
@@ -3,6 +3,7 @@ | |||||
"i-tab": "../../../dist/tab/index", | "i-tab": "../../../dist/tab/index", | ||||
"i-tabs": "../../../dist/tabs/index" | "i-tabs": "../../../dist/tabs/index" | ||||
}, | }, | ||||
"navigationBarTitleText": "我的券包" | |||||
"navigationBarTitleText": "我的券包", | |||||
"navigationBarBackgroundColor": "#F4F5F9" | |||||
} | } |
@@ -1,7 +1,7 @@ | |||||
@import "../../../app.wxss"; | @import "../../../app.wxss"; | ||||
.index-coupons { | .index-coupons { | ||||
padding: 0 30rpx; | padding: 0 30rpx; | ||||
margin-top: 40rpx; | |||||
/* margin-top: 40rpx; */ | |||||
/* background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); */ | /* background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); */ | ||||
} | } | ||||
i-tabs i-tabs-scroll { | i-tabs i-tabs-scroll { | ||||
@@ -18,6 +18,9 @@ Page({ | |||||
xingyun: imgurl.xingyun.url, | xingyun: imgurl.xingyun.url, | ||||
jfshangcheng: imgurl.jfshangcheng.url, | jfshangcheng: imgurl.jfshangcheng.url, | ||||
toutiao: imgurl.toutiao.url, | toutiao: imgurl.toutiao.url, | ||||
giftHr: imgurl.giftHr.url, | |||||
giftHr: imgurl.giftHr.url, | |||||
next: imgurl.next.url, | |||||
usergift: imgurl.usergift.url, | usergift: imgurl.usergift.url, | ||||
guanbi1: imgurl.guanbi1.url, | guanbi1: imgurl.guanbi1.url, | ||||
icon0001: imgurl.icon0001.url, | icon0001: imgurl.icon0001.url, | ||||
@@ -475,7 +478,9 @@ Page({ | |||||
}).then(res => { | }).then(res => { | ||||
if (res && res.data) { | if (res && res.data) { | ||||
that.setData({ | that.setData({ | ||||
name: res.data.name, | |||||
cover: res.data.cover, | cover: res.data.cover, | ||||
title: res.data.title, | |||||
id: res.data.id, | id: res.data.id, | ||||
showTopic: true | showTopic: true | ||||
}) | }) | ||||
@@ -65,14 +65,25 @@ | |||||
<text>今日好货推荐,满1000减200元…</text> | <text>今日好货推荐,满1000减200元…</text> | ||||
<view class='qg' style='border-color:{{qg}}'><text>抢购</text></view> | <view class='qg' style='border-color:{{qg}}'><text>抢购</text></view> | ||||
</view> | </view> | ||||
<!-- 专题 --> | |||||
<view class='product' wx:if="{{showTopic}}"> | |||||
<!-- <view class='ztTitle'>点击进入{{title}}</view> --> | |||||
<view class='gift'> | |||||
<image src='{{giftHr}}' bindtap='gotoTopic' mode='aspectFill' ></image> | |||||
</view> | |||||
<view class='textBox'> | |||||
<text class='name'>{{name}}</text> | |||||
<text class='title'>{{title}}</text> | |||||
</view> | |||||
<view class='next'> | |||||
<image src='{{next}}' bindtap='gotoTopic' mode='aspectFill' ></image> | |||||
</view> | |||||
<!-- <image src='{{cover}}' bindtap='gotoTopic' mode='aspectFill'></image> --> | |||||
</view> | |||||
<!-- 爆款专区 --> | <!-- 爆款专区 --> | ||||
<c-hot id="hot"/> | <c-hot id="hot"/> | ||||
<!-- 砍价专场 --> | <!-- 砍价专场 --> | ||||
<!-- <c-bargain id="bargain"/> --> | <!-- <c-bargain id="bargain"/> --> | ||||
<!-- 专题 --> | |||||
<view class='product' wx:if="{{showTopic}}"> | |||||
<image src='{{cover}}' bindtap='gotoTopic' mode='aspectFill'></image> | |||||
</view> | |||||
<!-- 拼团专场 --> | <!-- 拼团专场 --> | ||||
<!-- <c-spellGroup id="spellGroup"/> --> | <!-- <c-spellGroup id="spellGroup"/> --> | ||||
<!-- 小游戏暂时注释 --> | <!-- 小游戏暂时注释 --> | ||||
@@ -294,14 +294,52 @@ page { | |||||
margin-top: 6rpx; | margin-top: 6rpx; | ||||
} | } | ||||
.product{ | .product{ | ||||
height: 135rpx; | |||||
padding: 0 30rpx; | |||||
height: 124rpx; | |||||
/* padding: 0 30rpx; */ | |||||
margin-top: 30rpx; | margin-top: 30rpx; | ||||
margin-bottom: 10rpx; | |||||
background: #FFF; | |||||
width: 710rpx; | |||||
margin: 0 auto; | |||||
} | } | ||||
.product image{ | |||||
width:690rpx; | |||||
height:135rpx; | |||||
border-radius:16rpx; | |||||
.textBox{ | |||||
/* display: block; */ | |||||
width: 400rpx; | |||||
height: 100%; | |||||
float: left; | |||||
} | |||||
.textBox .name{ | |||||
width: 400rpx; | |||||
font-size: 28rpx; | |||||
color: #3C3C3C; | |||||
} | |||||
.textBox .title{ | |||||
width: 400rpx; | |||||
font-size: 20rpx; | |||||
color: #A6A6A6; | |||||
} | |||||
.product .gift{ | |||||
width:88rpx; | |||||
height:88rpx; | |||||
float: left; | |||||
margin-top: 30rpx; | |||||
margin-left: 15rpx; | |||||
} | |||||
.next image{ | |||||
width: 26rpx; | |||||
height: 40rpx; | |||||
} | |||||
.gift image{ | |||||
width:88rpx; | |||||
height:76rpx; | |||||
} | |||||
.product .next{ | |||||
width:32rpx; | |||||
height:60rpx; | |||||
float: right; | |||||
margin-top: 40rpx; | |||||
margin-right: 26rpx; | |||||
} | } | ||||
#rushtobyCard{ | #rushtobyCard{ | ||||
margin-top: 30rpx; | margin-top: 30rpx; | ||||
@@ -379,7 +417,7 @@ progress{ | |||||
height: 82rpx; | height: 82rpx; | ||||
line-height: 82rpx; | line-height: 82rpx; | ||||
margin:0 auto; | margin:0 auto; | ||||
background: #FAFBFD; | |||||
background: #FFF; | |||||
box-shadow:0px 6rpx 16rpx 0px rgba(236,238,243,1); | box-shadow:0px 6rpx 16rpx 0px rgba(236,238,243,1); | ||||
border-radius:12rpx; | border-radius:12rpx; | ||||
margin-top: 18rpx; | margin-top: 18rpx; | ||||
@@ -16,6 +16,7 @@ Page({ | |||||
day: "", | day: "", | ||||
hour: "", | hour: "", | ||||
activityId: "", | activityId: "", | ||||
homeSelectedO: imgurl.homeSelectedO.url, | |||||
wmhome: imgurl.wmhome.url, | wmhome: imgurl.wmhome.url, | ||||
minute: "", | minute: "", | ||||
nodes: '' | nodes: '' | ||||
@@ -1,6 +1,7 @@ | |||||
<import src="../../wxParse/wxParse.wxml" /> | <import src="../../wxParse/wxParse.wxml" /> | ||||
<button class='goback' bindtap='goback'> | <button class='goback' bindtap='goback'> | ||||
<image src='{{wmhome}}' mode="widthFix"></image> | |||||
<image src='{{homeSelectedO}}' mode="widthFix"></image> | |||||
<text class='btnTxt'>首页</text> | |||||
</button> | </button> | ||||
<!-- 活动正常排版格式 --> | <!-- 活动正常排版格式 --> | ||||
<view class='coupons' style='{{data.type!=2?"padding-bottom: 160rpx":0}}'> | <view class='coupons' style='{{data.type!=2?"padding-bottom: 160rpx":0}}'> | ||||
@@ -8,20 +9,23 @@ | |||||
<view class='banner'> | <view class='banner'> | ||||
<image src='{{data.coverImg}}' mode='widthFix'></image> | <image src='{{data.coverImg}}' mode='widthFix'></image> | ||||
</view> | </view> | ||||
<view class='act'> | |||||
<text class='txt001'>{{data.title}}</text> | |||||
<text class='txt002'>{{data.subTitle}}</text> | |||||
<view class="proct" wx:if="{{data.type == 1}}"> | |||||
<text>活动说明</text> | |||||
<view class='detail'>{{data.detail}}</view> | |||||
<view class='box'> | |||||
<view class='act'> | |||||
<text class='txt001'>{{data.title}}</text> | |||||
<text class='txt002'>{{data.subTitle}}</text> | |||||
<view class="proct" wx:if="{{data.type == 1}}"> | |||||
<text>活动说明</text> | |||||
<view class='detail'>{{data.detail}}</view> | |||||
</view> | |||||
<view class='member'>活动人数:{{data.personLimit}}人</view> | |||||
<view class='integral' wx:if="{{data.useCredit}}"><text>消耗积分:</text><text class='integralNum'>{{data.credit}}</text> 积分</view> | |||||
<view class='time'>报名开始时间:{{startTime}}</view> | |||||
<view class='time'>报名结束时间:{{endTime}}</view> | |||||
<view class='time' style="margin-top:40rpx;">活动开始时间:{{activityStartTime}}</view> | |||||
<view class='time'>活动结束时间:{{activityEndTime}}</view> | |||||
</view> | </view> | ||||
<view class='member'>活动人数:{{data.personLimit}}人</view> | |||||
<view class='member' wx:if="{{data.useCredit}}">消耗积分:{{data.credit}}积分</view> | |||||
<view class='time'>报名开始时间:{{startTime}}</view> | |||||
<view class='time'>报名结束时间:{{endTime}}</view> | |||||
<view class='time' style="margin-top:40rpx;">活动开始时间:{{activityStartTime}}</view> | |||||
<view class='time'>活动结束时间:{{activityEndTime}}</view> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 自由图文格式 --> | <!-- 自由图文格式 --> | ||||
@@ -31,7 +35,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<button wx:if="{{status == 0}}" disabled class='signUp' hover-class='opacity'>报名未开始</button> | |||||
<button wx:if="{{status == 0}}" disabled class='signUpHr' hover-class='opacity'>报名未开始</button> | |||||
<button wx:if="{{status == 1}}" class='signUp' data-activityId="{{activityId}}" bindtap='goSignUp' hover-class='opacity'>我要报名</button> | <button wx:if="{{status == 1}}" class='signUp' data-activityId="{{activityId}}" bindtap='goSignUp' hover-class='opacity'>我要报名</button> | ||||
<button wx:if="{{status == 2}}" disabled class='signUp' hover-class='opacity'>活动已结束</button> | |||||
<button wx:if="{{status == 3}}" disabled class='signUp' hover-class='opacity'>已报名</button> | |||||
<button wx:if="{{status == 2}}" disabled class='signUpHr' hover-class='opacity'>活动已结束</button> | |||||
<button wx:if="{{status == 3}}" disabled class='signUpHr' hover-class='opacity'>已报名</button> |
@@ -1,5 +1,8 @@ | |||||
@import "../../app.wxss"; | @import "../../app.wxss"; | ||||
@import "../../wxParse/wxParse.wxss"; | @import "../../wxParse/wxParse.wxss"; | ||||
page{ | |||||
background: #F4F5F9; | |||||
} | |||||
.coupons { | .coupons { | ||||
width: 100%; | width: 100%; | ||||
position: relative; | position: relative; | ||||
@@ -31,11 +34,11 @@ | |||||
padding-bottom: 20rpx; | padding-bottom: 20rpx; | ||||
} | } | ||||
.act text { | |||||
/* .act text { | |||||
display: block; | display: block; | ||||
padding-left: 4.8%; | padding-left: 4.8%; | ||||
padding-right: 4.8%; | padding-right: 4.8%; | ||||
} | |||||
} */ | |||||
.txt001 { | .txt001 { | ||||
display: block; | display: block; | ||||
@@ -532,29 +535,42 @@ scroll-view { | |||||
button::after{ border: none; } | button::after{ border: none; } | ||||
.goback{ | .goback{ | ||||
position: fixed; | position: fixed; | ||||
right: 50rpx; | |||||
bottom: 60rpx; | |||||
width:100rpx!important; | |||||
height:100rpx; | |||||
/* right: 50rpx; */ | |||||
left: 22rpx; | |||||
bottom: 22rpx; | |||||
width:132rpx!important; | |||||
height:96rpx; | |||||
z-index: 100; | z-index: 100; | ||||
background:rgba(255,255,255,1); | background:rgba(255,255,255,1); | ||||
line-height: 95rpx; | line-height: 95rpx; | ||||
border:1rpx solid rgba(227,227,227,1); | border:1rpx solid rgba(227,227,227,1); | ||||
border-radius:50%; | |||||
border-radius:32rpx; | |||||
} | } | ||||
.goback image{ | |||||
.goback image { | |||||
position: absolute; | position: absolute; | ||||
width: 60rpx; | |||||
width:52rpx; | |||||
height: 50rpx; | |||||
left: 0; | left: 0; | ||||
right: 0; | right: 0; | ||||
top: 0; | top: 0; | ||||
bottom: 0; | |||||
margin: auto; | |||||
bottom:0; | |||||
margin:10rpx auto; | |||||
} | } | ||||
.btnTxt{ | |||||
width: 50rpx; | |||||
height: 30rpx; | |||||
line-height: 50rpx; | |||||
color: #FD782D; | |||||
font-size: 20rpx; | |||||
position: absolute; | |||||
right:42rpx ; | |||||
bottom: 15rpx; | |||||
} | |||||
.coupons { | .coupons { | ||||
width: 100%; | width: 100%; | ||||
position: relative; | position: relative; | ||||
/* height: 100%; */ | |||||
} | } | ||||
.coupons-body { | .coupons-body { | ||||
@@ -567,43 +583,66 @@ button::after{ border: none; } | |||||
width: 750rpx; | width: 750rpx; | ||||
/* height: 280rpx; */ | /* height: 280rpx; */ | ||||
overflow: hidden; | overflow: hidden; | ||||
box-shadow:0px 14px 26px 0px rgba(199,203,211,1); | |||||
} | } | ||||
.banner image { | .banner image { | ||||
width: 750rpx; | width: 750rpx; | ||||
/* height: 280rpx; */ | /* height: 280rpx; */ | ||||
} | } | ||||
.box{ | |||||
width: 100%; | |||||
} | |||||
.act { | .act { | ||||
position: relative; | position: relative; | ||||
background: #fff; | background: #fff; | ||||
border-radius: 12rpx; | border-radius: 12rpx; | ||||
width: 705rpx; | |||||
margin: 24rpx auto 0; | |||||
width:94%; | |||||
margin: 44rpx auto 0; | |||||
padding-bottom: 20rpx; | padding-bottom: 20rpx; | ||||
padding:0 3%; | |||||
} | } | ||||
.act text { | .act text { | ||||
display: block; | display: block; | ||||
text-align: center; | |||||
/* text-align: center; | |||||
padding-left: 4.8%; | padding-left: 4.8%; | ||||
padding-right: 4.8%; | |||||
padding-right: 4.8%; */ | |||||
} | } | ||||
.txt001 { | .txt001 { | ||||
display: block; | display: block; | ||||
font-size: 34rpx; | |||||
color: #363636; | |||||
font-size: 32rpx; | |||||
color: #3C3C3C; | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
text-align: left; | text-align: left; | ||||
line-height: 48rpx; | line-height: 48rpx; | ||||
padding-top: 3.2%; | padding-top: 3.2%; | ||||
font-weight: bold; | font-weight: bold; | ||||
margin-bottom: 20rpx; | |||||
} | |||||
.content{ | |||||
font-size: 24rpx; | |||||
color: #A6A6A6; | |||||
margin-top: 40rpx; | |||||
} | } | ||||
.member{ | .member{ | ||||
font-size: 32rpx; | |||||
font-size: 24rpx; | |||||
color: #A6A6A6; | |||||
} | |||||
.integral{ | |||||
display: block; | |||||
margin-top: 20rpx; | |||||
font-size: 24rpx; | |||||
color: #A6A6A6; | |||||
} | |||||
.integral text{ | |||||
float: left; | |||||
} | |||||
.integralNum{ | |||||
color: #FD782D; | |||||
margin-left: 10rpx; | |||||
} | } | ||||
.txt002 { | .txt002 { | ||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #999; | color: #999; | ||||
@@ -620,8 +659,8 @@ button::after{ border: none; } | |||||
.proct text:nth-of-type(1) { | .proct text:nth-of-type(1) { | ||||
display: block; | display: block; | ||||
font-size: 30rpx; | |||||
color: #ff4949; | |||||
font-size: 28rpx; | |||||
color: #FD782D; | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
line-height: 32rpx; | line-height: 32rpx; | ||||
margin-bottom: 20rpx; | margin-bottom: 20rpx; | ||||
@@ -1082,26 +1121,45 @@ scroll-view { | |||||
} | } | ||||
.signUp{ | .signUp{ | ||||
position: fixed; | position: fixed; | ||||
bottom: 30rpx; | |||||
left: 0; | |||||
right: 0; | |||||
bottom: 22rpx; | |||||
/* left: 0; */ | |||||
right: 22rpx; | |||||
margin: auto; | margin: auto; | ||||
width: 430rpx; | |||||
height: 90rpx; | |||||
line-height: 90rpx; | |||||
border-radius: 60rpx; | |||||
background: orange; | |||||
color: #fff; | |||||
width:556rpx; | |||||
height: 92rpx; | |||||
line-height: 92rpx; | |||||
border-radius: 32rpx; | |||||
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
color: #FFF; | |||||
font-size: 30rpx; | font-size: 30rpx; | ||||
text-align: center; | text-align: center; | ||||
box-shadow: 0 0 10px 0 rgba(211,211,211,0.50); | |||||
border:1rpx solid rgba(227,227,227,1); | |||||
/* box-shadow: 0 0 10px 0 rgba(211,211,211,0.50); */ | |||||
} | |||||
.signUpHr{ | |||||
position: fixed; | |||||
bottom: 22rpx; | |||||
/* left: 0; */ | |||||
right: 22rpx; | |||||
margin: auto; | |||||
width:556rpx; | |||||
height: 92rpx; | |||||
line-height: 92rpx; | |||||
border-radius: 32rpx; | |||||
background: #CECECE; | |||||
color: #FFF; | |||||
font-size: 30rpx; | |||||
text-align: center; | |||||
border:1rpx solid rgba(227,227,227,1); | |||||
/* box-shadow: 0 0 10px 0 rgba(211,211,211,0.50); */ | |||||
} | } | ||||
.opacity{ | .opacity{ | ||||
opacity: .8; | opacity: .8; | ||||
} | } | ||||
.time{ | .time{ | ||||
font-size: 30rpx; | |||||
font-size: 24rpx; | |||||
line-height: 50rpx; | line-height: 50rpx; | ||||
color: #A6A6A6; | |||||
} | } | ||||
.ques{ | .ques{ | ||||
display: block; | display: block; | ||||
@@ -75,7 +75,7 @@ radio { | |||||
line-height: 86rpx; | line-height: 86rpx; | ||||
text-align: center; | text-align: center; | ||||
border-radius:60rpx; | border-radius:60rpx; | ||||
background: orange; | |||||
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
font-size: 32rpx; | font-size: 32rpx; | ||||
z-index: 1000; | z-index: 1000; | ||||
} | } | ||||
@@ -48,8 +48,8 @@ | |||||
.btns .fl { | .btns .fl { | ||||
margin-left: 20rpx; | margin-left: 20rpx; | ||||
color: #fff; | color: #fff; | ||||
background: rgba(255, 169, 2, 1); | |||||
box-shadow: 0px 8px 8px 1px rgba(255, 169, 2, 0.32); | |||||
background: linear-gradient(90deg,rgba(40,179,255,1) 0%,rgba(48,103,255,1) 100%); | |||||
/* box-shadow: 0px 8px 8px 1px rgba(255, 169, 2, 0.32); */ | |||||
} | } | ||||
.btns .fl text { | .btns .fl text { | ||||
@@ -67,6 +67,6 @@ | |||||
color: #fff; | color: #fff; | ||||
margin-right: 20rpx; | margin-right: 20rpx; | ||||
line-height: 95rpx; | line-height: 95rpx; | ||||
background: rgba(236, 59, 45, 1); | |||||
box-shadow: 0px 8px 8px 1px rgba(246, 93, 51, 0.32); | |||||
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
/* box-shadow: 0px 8px 8px 1px rgba(246, 93, 51, 0.32); */ | |||||
} | } |
@@ -24,7 +24,7 @@ | |||||
</view> | </view> | ||||
<view class="coupons1-info"> | <view class="coupons1-info"> | ||||
<view class="coupons1-info-name tit">{{item.title}}</view> | <view class="coupons1-info-name tit">{{item.title}}</view> | ||||
<view class="coupons1-info-name subtitle">{{item.subTitle}}</view> | |||||
<view class="coupons1-info-name subtitle">{{item.subTitle}}都是打打杀杀</view> | |||||
<view class="coupons1-info-price-p"> | <view class="coupons1-info-price-p"> | ||||
<text class="i">¥</text>{{item.salePriceStr}} | <text class="i">¥</text>{{item.salePriceStr}} | ||||
<view class="coupons-info-manjian" style="margin-top:10rpx;font-size:28rpx;" wx:if="{{item.type == 1}}"> | <view class="coupons-info-manjian" style="margin-top:10rpx;font-size:28rpx;" wx:if="{{item.type == 1}}"> | ||||
@@ -312,7 +312,7 @@ | |||||
.buy { | .buy { | ||||
display: block; | display: block; | ||||
background: #ff4949; | |||||
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
border-radius: 30rpx; | border-radius: 30rpx; | ||||
height: 48rpx; | height: 48rpx; | ||||
width: 112rpx; | width: 112rpx; | ||||
@@ -343,7 +343,7 @@ | |||||
border-radius: 16rpx; | border-radius: 16rpx; | ||||
padding-bottom: 21rpx; | padding-bottom: 21rpx; | ||||
overflow: hidden; | overflow: hidden; | ||||
height: 491rpx; | |||||
height: 400rpx; | |||||
} | } | ||||
/* .coupons1-border { | /* .coupons1-border { | ||||
@@ -357,14 +357,14 @@ | |||||
.coupons1-img { | .coupons1-img { | ||||
width: 344rpx; | width: 344rpx; | ||||
height: 258rpx; | |||||
height: 233rpx; | |||||
overflow: hidden; | overflow: hidden; | ||||
} | } | ||||
.coupons1-img image { | .coupons1-img image { | ||||
display: block; | display: block; | ||||
width: 100%; | width: 100%; | ||||
height: 100%; | |||||
height: 233rpx; | |||||
} | } | ||||
.coupons1-info { | .coupons1-info { | ||||
@@ -5,6 +5,9 @@ let app = getApp(); | |||||
const imgurl = require("../../../utils/imgurl"); | const imgurl = require("../../../utils/imgurl"); | ||||
Page({ | Page({ | ||||
data: { | data: { | ||||
orangeImg: imgurl.orange.url, | |||||
blueImg: imgurl.blue.url, | |||||
grayImg: imgurl.gray.url, | |||||
noCoupon: imgurl.noCoupon.url, | noCoupon: imgurl.noCoupon.url, | ||||
dingdanUrl: imgurl.dingdan.url, | dingdanUrl: imgurl.dingdan.url, | ||||
loadingUrl: imgurl.loading.url, | loadingUrl: imgurl.loading.url, | ||||
@@ -112,8 +115,8 @@ Page({ | |||||
list: tmpArr | list: tmpArr | ||||
}) | }) | ||||
for (let i = 0; i < that.data.list.length; i++) { | for (let i = 0; i < that.data.list.length; i++) { | ||||
var activityStartTime1 = util.formatTime(that.data.list[i].activityStartTime, "yyyy-MM-dd hh:mm:ss"); | |||||
var activityEndTime1 = util.formatTime(that.data.list[i].activityEndTime, "yyyy-MM-dd hh:mm:ss"); | |||||
var activityStartTime1 = util.formatTime(that.data.list[i].activityStartTime, "yyyy.MM.dd" );//"yyyy-MM-dd hh:mm:ss" | |||||
var activityEndTime1 = util.formatTime(that.data.list[i].activityEndTime, "yyyy.MM.dd");//"yyyy-MM-dd hh:mm:ss" | |||||
/** | /** | ||||
* 修改list的endtime | * 修改list的endtime | ||||
* 渲染到页面 | * 渲染到页面 | ||||
@@ -3,5 +3,6 @@ | |||||
"i-tab": "../../../dist/tab/index", | "i-tab": "../../../dist/tab/index", | ||||
"i-tabs": "../../../dist/tabs/index" | "i-tabs": "../../../dist/tabs/index" | ||||
}, | }, | ||||
"navigationBarTitleText": "我的活动" | |||||
"navigationBarTitleText": "我的活动", | |||||
"navigationBarBackgroundColor": "#F4F5F9" | |||||
} | } |
@@ -10,12 +10,16 @@ | |||||
</view> | </view> | ||||
<view class='info'> | <view class='info'> | ||||
<view>{{item.title}}</view> | <view>{{item.title}}</view> | ||||
<view> | |||||
<text wx:if="{{item.status == 0&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名中</text> | |||||
<image class="frImg" wx:if="{{item.status == 0&&key==0}}" src="{{orangeImg}}" mode="aspectFill" lazy-load="true"><text>报名中</text></image> | |||||
<image class="frImg" wx:if="{{item.status == 1&&key==0}}" src="{{blueImg}}" mode="aspectFill" lazy-load="true"><text>报名成功</text></image> | |||||
<image class="frImg" wx:if="{{item.status == 2&&key==0}}" src="{{grayImg}}" mode="aspectFill" lazy-load="true"><text>报名失败</text></image> | |||||
<!-- <image class="frImg" wx:if="{{item.status == 3&&key==0}}" src="{{grayImg}}" mode="aspectFill" lazy-load="true"><text>活动结束</text></image> --> | |||||
<view> | |||||
<!-- <text wx:if="{{item.status == 0&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名中</text> | |||||
<text wx:if="{{item.status == 1&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名成功</text> | <text wx:if="{{item.status == 1&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名成功</text> | ||||
<text wx:if="{{item.status == 2&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名失败</text> | |||||
<text>活动开始日期:{{item.activityStartTime}}</text> | |||||
<text>活动结束日期:{{item.activityEndTime}}</text> | |||||
<text wx:if="{{item.status == 2&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名失败</text> --> | |||||
<text>{{item.activityStartTime}}--{{item.activityEndTime}}</text> | |||||
<!-- <text>活动结束日期:{{item.activityEndTime}}</text> --> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -1,6 +1,7 @@ | |||||
.market { | .market { | ||||
width: 100%; | width: 100%; | ||||
height: 100%; | height: 100%; | ||||
background: #F4F5F9; | |||||
} | } | ||||
.tabs { | .tabs { | ||||
@@ -12,6 +13,7 @@ | |||||
right: 0; | right: 0; | ||||
text-align: center; | text-align: center; | ||||
z-index: 10000000; | z-index: 10000000; | ||||
background: #FFF; | |||||
} | } | ||||
.i-tab { | .i-tab { | ||||
@@ -53,12 +55,14 @@ | |||||
margin-top: 40rpx; | margin-top: 40rpx; | ||||
justify-content: space-between; | justify-content: space-between; | ||||
padding: 0 0 0 4%; | padding: 0 0 0 4%; | ||||
/* font-weight: 600; */ | |||||
} | } | ||||
.info text,view{ | .info text,view{ | ||||
font-size: 26rpx; | font-size: 26rpx; | ||||
text-align: center; | text-align: center; | ||||
display: block; | display: block; | ||||
color: #efefef; | |||||
color: #fff; | |||||
/* font-weight: 600; */ | |||||
} | } | ||||
.info { | .info { | ||||
width: 100%; | width: 100%; | ||||
@@ -280,3 +284,18 @@ button::after{ border: none; } | |||||
bottom: 0; | bottom: 0; | ||||
margin: auto; | margin: auto; | ||||
} | } | ||||
.frImg{ | |||||
height: 78rpx; | |||||
width: 78rpx; | |||||
position: absolute; | |||||
right: 0; | |||||
top: 0; | |||||
} | |||||
.frImg text{ | |||||
transform: rotate(45deg); | |||||
color: #FFFFFF; | |||||
font-size: 18rpx; | |||||
position: absolute; | |||||
right: 0; | |||||
top: 17rpx; | |||||
} |
@@ -673,5 +673,13 @@ module.exports = { | |||||
'url': baseUrl + "cancelH.png", | 'url': baseUrl + "cancelH.png", | ||||
'name': '' | 'name': '' | ||||
}, | }, | ||||
'giftHr': { | |||||
'url': baseUrl + "giftHr.png", | |||||
'name': '' | |||||
}, | |||||
'next': { | |||||
'url': baseUrl + "next.png", | |||||
'name': '' | |||||
}, | |||||
} | } |
@@ -19,6 +19,7 @@ | |||||
} | } | ||||
view{ | view{ | ||||
word-break:break-all; overflow:auto; | word-break:break-all; overflow:auto; | ||||
background: #FFF; | |||||
} | } | ||||
.wxParse-inline{ | .wxParse-inline{ | ||||
display: inline; | display: inline; | ||||