From ca01f809d8871b11ab70e92800963ac25c8c98c1 Mon Sep 17 00:00:00 2001 From: hurui Date: Wed, 31 Jul 2019 18:43:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B8=93=E9=A2=98][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bannerdetail/index.wxml | 2 +- pages/bannerdetail/index.wxss | 19 ++-- pages/cardorder/index/index.json | 3 +- pages/cardorder/index/index.wxss | 3 +- pages/couponorder/index/index.json | 3 +- pages/main/coupons/index.wxss | 2 +- pages/main/index.js | 5 ++ pages/main/index.wxml | 19 +++- pages/main/index.wxss | 52 +++++++++-- pages/radetail/index.js | 1 + pages/radetail/index.wxml | 36 ++++---- pages/radetail/index.wxss | 124 +++++++++++++++++++------- pages/radetail/joinActivity/edit.wxss | 2 +- pages/radetail/success/index.wxss | 8 +- pages/topicDetail/index.wxml | 2 +- pages/topicDetail/index.wxss | 8 +- pages/user/myactivity/index.js | 7 +- pages/user/myactivity/index.json | 3 +- pages/user/myactivity/index.wxml | 14 +-- pages/user/myactivity/index.wxss | 21 ++++- utils/imgurl.js | 8 ++ wxParse/wxParse.wxss | 1 + 22 files changed, 250 insertions(+), 93 deletions(-) diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml index ebec148..010516d 100644 --- a/pages/bannerdetail/index.wxml +++ b/pages/bannerdetail/index.wxml @@ -39,7 +39,7 @@ 满¥{{item.usePriceStr}}可用 - + 仅限本店使用 diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss index d641dfe..cc84bb1 100644 --- a/pages/bannerdetail/index.wxss +++ b/pages/bannerdetail/index.wxss @@ -19,6 +19,7 @@ page { width: 750rpx; height: 280rpx; overflow: hidden; + box-shadow:0px 14px 26px 0px rgba(199,203,211,1); } .banner image { @@ -31,9 +32,9 @@ page { z-index: 1000000000; background: #fff; border-radius: 12rpx; - width: 705rpx; + width: 100%; /* height: 212rpx; */ - margin: 24rpx auto 0; + margin:44rpx auto 0; padding-bottom: 20rpx; } @@ -70,7 +71,7 @@ page { .proct text:nth-of-type(1) { display: block; font-size: 30rpx; - color: #ff4949; + color: #FD782D; letter-spacing: 0; line-height: 32rpx; margin-bottom: 20rpx; @@ -318,7 +319,7 @@ navigator:nth-of-type(2n+1) { .buy { display: block; - background: #ff4949; + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); border-radius: 30rpx; height: 48rpx; width: 112rpx; @@ -349,7 +350,7 @@ navigator:nth-of-type(2n+1) { border-radius: 16rpx; padding-bottom: 21rpx; overflow: hidden; - height: 486rpx; + height: 405rpx; } /* .coupons1-border { @@ -363,7 +364,7 @@ navigator:nth-of-type(2n+1) { .coupons1-img { width: 344rpx; - height: 258rpx; + height: 233rpx; overflow: hidden; } @@ -391,9 +392,9 @@ navigator:nth-of-type(2n+1) { .coupons1-info-price-p { display: inline-block; font-size: 36rpx; - color: #f96563; + color: #FD782D; line-height: 50rpx; - margin-top: 21rpx; + /* margin-top: 21rpx; */ } .tit { @@ -406,7 +407,7 @@ navigator:nth-of-type(2n+1) { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - padding-top: 16rpx; + padding-top: 12rpx; } .coupons1-info-price-o { diff --git a/pages/cardorder/index/index.json b/pages/cardorder/index/index.json index 79ac7ed..5f9dfef 100644 --- a/pages/cardorder/index/index.json +++ b/pages/cardorder/index/index.json @@ -3,5 +3,6 @@ "i-tab": "../../../dist/tab/index", "i-tabs": "../../../dist/tabs/index" }, - "navigationBarTitleText": "我的卡包" + "navigationBarTitleText": "我的卡包", + "navigationBarBackgroundColor": "#F4F5F9" } \ No newline at end of file diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss index b389518..85d3ad9 100644 --- a/pages/cardorder/index/index.wxss +++ b/pages/cardorder/index/index.wxss @@ -1,7 +1,7 @@ .market { width: 100%; height: 100%; - /* background: #f5f5f5; */ + background: #F4F5F9; } .tabs { @@ -13,6 +13,7 @@ left: 0; right: 0; z-index: 100000; + background: #fff; } .i-tab { diff --git a/pages/couponorder/index/index.json b/pages/couponorder/index/index.json index b39b248..22e6017 100644 --- a/pages/couponorder/index/index.json +++ b/pages/couponorder/index/index.json @@ -3,6 +3,7 @@ "i-tab": "../../../dist/tab/index", "i-tabs": "../../../dist/tabs/index" }, - "navigationBarTitleText": "我的券包" + "navigationBarTitleText": "我的券包", + "navigationBarBackgroundColor": "#F4F5F9" } \ No newline at end of file diff --git a/pages/main/coupons/index.wxss b/pages/main/coupons/index.wxss index 69efb35..15bce1c 100644 --- a/pages/main/coupons/index.wxss +++ b/pages/main/coupons/index.wxss @@ -1,7 +1,7 @@ @import "../../../app.wxss"; .index-coupons { 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%); */ } i-tabs i-tabs-scroll { diff --git a/pages/main/index.js b/pages/main/index.js index c485842..8f979c6 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -18,6 +18,9 @@ Page({ xingyun: imgurl.xingyun.url, jfshangcheng: imgurl.jfshangcheng.url, toutiao: imgurl.toutiao.url, + giftHr: imgurl.giftHr.url, + giftHr: imgurl.giftHr.url, + next: imgurl.next.url, usergift: imgurl.usergift.url, guanbi1: imgurl.guanbi1.url, icon0001: imgurl.icon0001.url, @@ -475,7 +478,9 @@ Page({ }).then(res => { if (res && res.data) { that.setData({ + name: res.data.name, cover: res.data.cover, + title: res.data.title, id: res.data.id, showTopic: true }) diff --git a/pages/main/index.wxml b/pages/main/index.wxml index c395418..2769e81 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -65,14 +65,25 @@ 今日好货推荐,满1000减200元… 抢购 + + + + + + + + {{name}} + {{title}} + + + + + + - - - - diff --git a/pages/main/index.wxss b/pages/main/index.wxss index 67ed9fa..5a335fa 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -294,14 +294,52 @@ page { margin-top: 6rpx; } .product{ - height: 135rpx; - padding: 0 30rpx; + height: 124rpx; + /* padding: 0 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{ margin-top: 30rpx; @@ -379,7 +417,7 @@ progress{ height: 82rpx; line-height: 82rpx; margin:0 auto; - background: #FAFBFD; + background: #FFF; box-shadow:0px 6rpx 16rpx 0px rgba(236,238,243,1); border-radius:12rpx; margin-top: 18rpx; diff --git a/pages/radetail/index.js b/pages/radetail/index.js index 81390f5..81cc9fd 100644 --- a/pages/radetail/index.js +++ b/pages/radetail/index.js @@ -16,6 +16,7 @@ Page({ day: "", hour: "", activityId: "", + homeSelectedO: imgurl.homeSelectedO.url, wmhome: imgurl.wmhome.url, minute: "", nodes: '' diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml index acf23ee..9c16163 100644 --- a/pages/radetail/index.wxml +++ b/pages/radetail/index.wxml @@ -1,6 +1,7 @@ @@ -8,20 +9,23 @@ - - {{data.title}} - {{data.subTitle}} - - 活动说明 - {{data.detail}} + + + {{data.title}} + {{data.subTitle}} + + 活动说明 + {{data.detail}} + + 活动人数:{{data.personLimit}}人 + 消耗积分:{{data.credit}} 积分 + 报名开始时间:{{startTime}} + 报名结束时间:{{endTime}} + 活动开始时间:{{activityStartTime}} + 活动结束时间:{{activityEndTime}} - 活动人数:{{data.personLimit}}人 - 消耗积分:{{data.credit}}积分 - 报名开始时间:{{startTime}} - 报名结束时间:{{endTime}} - 活动开始时间:{{activityStartTime}} - 活动结束时间:{{activityEndTime}} + @@ -31,7 +35,7 @@ - + - - \ No newline at end of file + + \ No newline at end of file diff --git a/pages/radetail/index.wxss b/pages/radetail/index.wxss index 8f7cb06..ea01891 100644 --- a/pages/radetail/index.wxss +++ b/pages/radetail/index.wxss @@ -1,5 +1,8 @@ @import "../../app.wxss"; @import "../../wxParse/wxParse.wxss"; +page{ + background: #F4F5F9; +} .coupons { width: 100%; position: relative; @@ -31,11 +34,11 @@ padding-bottom: 20rpx; } -.act text { +/* .act text { display: block; padding-left: 4.8%; padding-right: 4.8%; -} +} */ .txt001 { display: block; @@ -532,29 +535,42 @@ scroll-view { button::after{ border: none; } .goback{ 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; background:rgba(255,255,255,1); line-height: 95rpx; border:1rpx solid rgba(227,227,227,1); - border-radius:50%; + border-radius:32rpx; } -.goback image{ +.goback image { position: absolute; - width: 60rpx; + width:52rpx; + height: 50rpx; left: 0; right: 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 { width: 100%; position: relative; + /* height: 100%; */ } .coupons-body { @@ -567,43 +583,66 @@ button::after{ border: none; } width: 750rpx; /* height: 280rpx; */ overflow: hidden; + box-shadow:0px 14px 26px 0px rgba(199,203,211,1); } .banner image { width: 750rpx; /* height: 280rpx; */ } - +.box{ + width: 100%; +} .act { position: relative; background: #fff; border-radius: 12rpx; - width: 705rpx; - margin: 24rpx auto 0; + width:94%; + margin: 44rpx auto 0; padding-bottom: 20rpx; + padding:0 3%; } .act text { display: block; - text-align: center; + /* text-align: center; padding-left: 4.8%; - padding-right: 4.8%; + padding-right: 4.8%; */ } .txt001 { display: block; - font-size: 34rpx; - color: #363636; + font-size: 32rpx; + color: #3C3C3C; letter-spacing: 0; text-align: left; line-height: 48rpx; padding-top: 3.2%; font-weight: bold; + margin-bottom: 20rpx; +} +.content{ + font-size: 24rpx; + color: #A6A6A6; + margin-top: 40rpx; } .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 { font-size: 24rpx; color: #999; @@ -620,8 +659,8 @@ button::after{ border: none; } .proct text:nth-of-type(1) { display: block; - font-size: 30rpx; - color: #ff4949; + font-size: 28rpx; + color: #FD782D; letter-spacing: 0; line-height: 32rpx; margin-bottom: 20rpx; @@ -1082,26 +1121,45 @@ scroll-view { } .signUp{ position: fixed; - bottom: 30rpx; - left: 0; - right: 0; + bottom: 22rpx; + /* left: 0; */ + right: 22rpx; 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; 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: .8; } .time{ - font-size: 30rpx; + font-size: 24rpx; line-height: 50rpx; + color: #A6A6A6; } .ques{ display: block; diff --git a/pages/radetail/joinActivity/edit.wxss b/pages/radetail/joinActivity/edit.wxss index b2af056..8bc68b1 100644 --- a/pages/radetail/joinActivity/edit.wxss +++ b/pages/radetail/joinActivity/edit.wxss @@ -75,7 +75,7 @@ radio { line-height: 86rpx; text-align: center; border-radius:60rpx; - background: orange; + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); font-size: 32rpx; z-index: 1000; } diff --git a/pages/radetail/success/index.wxss b/pages/radetail/success/index.wxss index 2b824ef..9c08661 100644 --- a/pages/radetail/success/index.wxss +++ b/pages/radetail/success/index.wxss @@ -48,8 +48,8 @@ .btns .fl { margin-left: 20rpx; 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 { @@ -67,6 +67,6 @@ color: #fff; margin-right: 20rpx; 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); */ } \ No newline at end of file diff --git a/pages/topicDetail/index.wxml b/pages/topicDetail/index.wxml index d6c17f1..2772f9a 100644 --- a/pages/topicDetail/index.wxml +++ b/pages/topicDetail/index.wxml @@ -24,7 +24,7 @@ {{item.title}} - {{item.subTitle}} + {{item.subTitle}}都是打打杀杀 {{item.salePriceStr}} diff --git a/pages/topicDetail/index.wxss b/pages/topicDetail/index.wxss index 3202f6a..85e3176 100644 --- a/pages/topicDetail/index.wxss +++ b/pages/topicDetail/index.wxss @@ -312,7 +312,7 @@ .buy { display: block; - background: #ff4949; + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); border-radius: 30rpx; height: 48rpx; width: 112rpx; @@ -343,7 +343,7 @@ border-radius: 16rpx; padding-bottom: 21rpx; overflow: hidden; - height: 491rpx; + height: 400rpx; } /* .coupons1-border { @@ -357,14 +357,14 @@ .coupons1-img { width: 344rpx; - height: 258rpx; + height: 233rpx; overflow: hidden; } .coupons1-img image { display: block; width: 100%; - height: 100%; + height: 233rpx; } .coupons1-info { diff --git a/pages/user/myactivity/index.js b/pages/user/myactivity/index.js index bd08c49..925a0c8 100644 --- a/pages/user/myactivity/index.js +++ b/pages/user/myactivity/index.js @@ -5,6 +5,9 @@ let app = getApp(); const imgurl = require("../../../utils/imgurl"); Page({ data: { + orangeImg: imgurl.orange.url, + blueImg: imgurl.blue.url, + grayImg: imgurl.gray.url, noCoupon: imgurl.noCoupon.url, dingdanUrl: imgurl.dingdan.url, loadingUrl: imgurl.loading.url, @@ -112,8 +115,8 @@ Page({ list: tmpArr }) 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 * 渲染到页面 diff --git a/pages/user/myactivity/index.json b/pages/user/myactivity/index.json index 25e291a..91d78ec 100644 --- a/pages/user/myactivity/index.json +++ b/pages/user/myactivity/index.json @@ -3,5 +3,6 @@ "i-tab": "../../../dist/tab/index", "i-tabs": "../../../dist/tabs/index" }, - "navigationBarTitleText": "我的活动" + "navigationBarTitleText": "我的活动", + "navigationBarBackgroundColor": "#F4F5F9" } \ No newline at end of file diff --git a/pages/user/myactivity/index.wxml b/pages/user/myactivity/index.wxml index afd9bef..3fae471 100644 --- a/pages/user/myactivity/index.wxml +++ b/pages/user/myactivity/index.wxml @@ -10,12 +10,16 @@ {{item.title}} - - 报名中 + 报名中 + 报名成功 + 报名失败 + + + + {{item.activityStartTime}}--{{item.activityEndTime}} + diff --git a/pages/user/myactivity/index.wxss b/pages/user/myactivity/index.wxss index c82880b..631ed10 100644 --- a/pages/user/myactivity/index.wxss +++ b/pages/user/myactivity/index.wxss @@ -1,6 +1,7 @@ .market { width: 100%; height: 100%; + background: #F4F5F9; } .tabs { @@ -12,6 +13,7 @@ right: 0; text-align: center; z-index: 10000000; + background: #FFF; } .i-tab { @@ -53,12 +55,14 @@ margin-top: 40rpx; justify-content: space-between; padding: 0 0 0 4%; + /* font-weight: 600; */ } .info text,view{ font-size: 26rpx; text-align: center; display: block; - color: #efefef; + color: #fff; + /* font-weight: 600; */ } .info { width: 100%; @@ -280,3 +284,18 @@ button::after{ border: none; } bottom: 0; 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; +} \ No newline at end of file diff --git a/utils/imgurl.js b/utils/imgurl.js index 3ecc13f..db75d17 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -673,5 +673,13 @@ module.exports = { 'url': baseUrl + "cancelH.png", 'name': '' }, + 'giftHr': { + 'url': baseUrl + "giftHr.png", + 'name': '' + }, + 'next': { + 'url': baseUrl + "next.png", + 'name': '' + }, } \ No newline at end of file diff --git a/wxParse/wxParse.wxss b/wxParse/wxParse.wxss index 6e1d604..43edc89 100644 --- a/wxParse/wxParse.wxss +++ b/wxParse/wxParse.wxss @@ -19,6 +19,7 @@ } view{ word-break:break-all; overflow:auto; + background: #FFF; } .wxParse-inline{ display: inline;