From 1a0ff19b7536bb9020ae957d1f3bbac8b4d9ee24 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 20 Apr 2019 15:48:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5][=E4=BF=AE=E6=94=B9]:[?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=A7=AF=E5=88=86=E6=A0=B7=E5=BC=8F=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coupon/detail/index.wxss | 6 +-- pages/czdetail/czdetail.wxss | 8 ++-- pages/integralmall/index.js | 6 +++ pages/integralmall/index.json | 2 - pages/integralmall/index.wxml | 19 +++++---- pages/integralmall/index.wxss | 41 ++++++++++++++++++-- pages/integralmall/integraHistory/index.wxml | 2 +- pages/integralmall/integraHistory/index.wxss | 5 ++- pages/main/index.wxss | 1 + pages/specialcourtesy/specialcourtesy.json | 2 +- pages/specialcourtesy/specialcourtesy.wxss | 2 +- pages/spellGroup/mySpellGroup/index.wxss | 1 + pages/user/index.wxss | 2 +- utils/imgurl.js | 5 ++- 14 files changed, 74 insertions(+), 28 deletions(-) diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index ac72a2e..d1d44d4 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -293,7 +293,7 @@ button::after{ border: none; } .buy { position: relative; - background: #00c0ff; + background: #AF6E34 ; height: 94rpx; width: 560rpx; margin: 0 auto 30rpx; @@ -490,8 +490,8 @@ button::after{ border: none; } .elecard { display: inline-block; margin-left: 6rpx; - color: #00c0ff; - border: 1px solid #00c0ff; + color: #AF6E34 ; + border: 1px solid #AF6E34 ; border-radius: 8rpx; font-style: normal; font-size: 30rpx; diff --git a/pages/czdetail/czdetail.wxss b/pages/czdetail/czdetail.wxss index eb0acb4..3fe7fc7 100644 --- a/pages/czdetail/czdetail.wxss +++ b/pages/czdetail/czdetail.wxss @@ -1,8 +1,8 @@ -/* pages/czdetail/czdetail.wxss */ - +@import "../../app.wxss"; .head { - height: 252rpx; - background: #02c0ff; + height: 232rpx; + padding-top: 20rpx; + background: #fc5b24; position: relative; } diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js index 336727e..7fc15f4 100644 --- a/pages/integralmall/index.js +++ b/pages/integralmall/index.js @@ -10,6 +10,7 @@ Page({ bannerUrl: imgurl.banner.url, loadingUrl: imgurl.loading.url, nodata: imgurl.nodata.url, + wangmeimeicredit: imgurl.wangmeimeicredit.url, list: [], lists: [], myLists: [], @@ -53,6 +54,11 @@ Page({ }) } }, + gotojifen(){ + wx.navigateTo({ + url: '/pages/integralmall/integraHistory/index', + }) + }, /** * banner */ diff --git a/pages/integralmall/index.json b/pages/integralmall/index.json index d0b8867..86878ed 100644 --- a/pages/integralmall/index.json +++ b/pages/integralmall/index.json @@ -1,8 +1,6 @@ { "navigationBarTitleText": "积分商城", "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#F13C42", - "navigationBarTextStyle": "white", "usingComponents": { "c-banner": "../../components/spellbanner/index", "i-tab": "../../../dist/tab/index", diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml index eb9636f..97c4f53 100644 --- a/pages/integralmall/index.wxml +++ b/pages/integralmall/index.wxml @@ -1,14 +1,17 @@ - - - + + + + 我的积分 + 200 - + 暂无数据 - + + + 热门好礼 + @@ -22,7 +25,7 @@ 积分 - {{'原价:'+item.priceStr+'元'}} + {{'原价 '+item.priceStr+'元'}} 立即换购 diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss index a6bf37c..48dcbaf 100644 --- a/pages/integralmall/index.wxss +++ b/pages/integralmall/index.wxss @@ -1,9 +1,32 @@ /* pages/spellGroup/spellGroup.wxss */ +.topbg image{ + display: block; + width: 100%; +} +.topbg { + position: relative; +} +.topbg text{ + position: absolute; + left: 0; + right: 0; + text-align: center; + font-size: 32rpx; + color: #fff; +} +.topbg .my{ + top:25rpx; +} +.topbg .score{ + top:60rpx; + font-size: 56rpx; + font-weight: bold; +} page { height: auto; overflow: auto; - background: #f89132; - background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spell-bg.png'); + background: #f7f7f7; + /* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spell-bg.png'); */ background-size: cover; background-repeat: no-repeat; } @@ -68,7 +91,7 @@ image{ height: 230rpx; background: #fff; border-radius: 30rpx; - margin: 30rpx auto 0; + margin: 0 auto 30rpx; } .content .spell-left{ width: 230rpx; @@ -154,7 +177,7 @@ image{ height:48rpx; font-size:26rpx; background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%); - border-radius:24rpx; + border-radius:8rpx; font-family:PingFang-SC-Medium; font-weight:500; text-align: center; @@ -288,4 +311,14 @@ image{ font-family:PingFang-SC-Medium; font-weight:500; color:rgba(0,0,0,1); +} +.hottitle{ + height: 100rpx; + line-height: 100rpx; +} +.hottitle text{ + color: #333; + font-weight: bold; + font-size: 36rpx; + padding-left: 30rpx; } \ No newline at end of file diff --git a/pages/integralmall/integraHistory/index.wxml b/pages/integralmall/integraHistory/index.wxml index c9d5017..e759db9 100644 --- a/pages/integralmall/integraHistory/index.wxml +++ b/pages/integralmall/integraHistory/index.wxml @@ -12,7 +12,7 @@ {{item.createDate}} - +{{item.creditNum}}分 + +{{item.creditNum}}分 {{item.creditNum}}分 diff --git a/pages/integralmall/integraHistory/index.wxss b/pages/integralmall/integraHistory/index.wxss index eb0acb4..089c1e8 100644 --- a/pages/integralmall/integraHistory/index.wxss +++ b/pages/integralmall/integraHistory/index.wxss @@ -1,8 +1,9 @@ /* pages/czdetail/czdetail.wxss */ .head { - height: 252rpx; - background: #02c0ff; + height: 232rpx; + padding-top: 20rpx; + background: #fc5b24; position: relative; } diff --git a/pages/main/index.wxss b/pages/main/index.wxss index 3cb2c9f..333cba3 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -1,3 +1,4 @@ +@import "../../app.wxss"; .index-position { background: rgba(0, 0, 0, 0.5); height: 88rpx; diff --git a/pages/specialcourtesy/specialcourtesy.json b/pages/specialcourtesy/specialcourtesy.json index 28b8826..6339287 100644 --- a/pages/specialcourtesy/specialcourtesy.json +++ b/pages/specialcourtesy/specialcourtesy.json @@ -1,5 +1,5 @@ { "navigationBarTitleText": "我的特权", - "navigationBarBackgroundColor": "#CD223C", + "navigationBarBackgroundColor": "#fc5b24", "navigationBarTextStyle": "white" } diff --git a/pages/specialcourtesy/specialcourtesy.wxss b/pages/specialcourtesy/specialcourtesy.wxss index cfa890d..fb920db 100644 --- a/pages/specialcourtesy/specialcourtesy.wxss +++ b/pages/specialcourtesy/specialcourtesy.wxss @@ -1,5 +1,5 @@ Page{ - background: #C8223C; + background: #fc5b24; } .none{ font-size: 28rpx; diff --git a/pages/spellGroup/mySpellGroup/index.wxss b/pages/spellGroup/mySpellGroup/index.wxss index e258707..29cba4e 100644 --- a/pages/spellGroup/mySpellGroup/index.wxss +++ b/pages/spellGroup/mySpellGroup/index.wxss @@ -19,6 +19,7 @@ border-radius:48rpx; margin-right:25rpx; } +button::after{ border: none; } .goback image{ position:absolute; width:60rpx; diff --git a/pages/user/index.wxss b/pages/user/index.wxss index f7821ae..26f20b6 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -106,7 +106,7 @@ page{ .view { font-size: 24rpx; - color: #01bffe; + color: #AF6E34; } .view image { diff --git a/utils/imgurl.js b/utils/imgurl.js index 0009a03..caeab86 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -560,6 +560,9 @@ module.exports = { 'wangmeimeiarrow01': { 'url': baseUrl + 'wangmeimeiarrow01.png', 'name': '专场的更多图标' + }, + 'wangmeimeicredit':{ + 'url': baseUrl + "wangmeimeicredit.png", + 'name': '积分背景' } - } \ No newline at end of file