From bce93b336058e02ab2493ca5e417232e0245b8f0 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 22 Apr 2019 11:38:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:[?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/czdetail/czdetail.wxml | 39 +++++++++++-------- pages/czdetail/czdetail.wxss | 6 +++ .../integralmall/integcoupondetail/index.wxss | 4 +- pages/integralmall/integraHistory/index.wxml | 21 ++++++---- pages/integralmall/integraHistory/index.wxss | 6 +++ .../payIntegcouponStatus/index.json | 2 +- .../payIntegcoupondetail/index.json | 1 + pages/main/index.js | 4 ++ pages/main/index.wxml | 7 ---- pages/user/index.wxml | 4 +- 10 files changed, 58 insertions(+), 36 deletions(-) diff --git a/pages/czdetail/czdetail.wxml b/pages/czdetail/czdetail.wxml index 23980f2..fb44006 100644 --- a/pages/czdetail/czdetail.wxml +++ b/pages/czdetail/czdetail.wxml @@ -6,23 +6,28 @@ 成长值明细 - - - 每日登录 - 消费 - 绑车牌 - 连接WIFI - 微信用户昵称授权 - 微信用户手机授权 - 完善个人信息 - 会员导入 - {{item.reason}} - {{item.createDate}} - - - 重置为{{item.scoreAmount}}分 - +{{item.scoreAmount}}分 - {{item.scoreAmount}}分 + + + + 每日登录 + 消费 + 绑车牌 + 连接WIFI + 微信用户昵称授权 + 微信用户手机授权 + 完善个人信息 + 会员导入 + {{item.reason}} + {{item.createDate}} + + + 重置为{{item.scoreAmount}}分 + +{{item.scoreAmount}}分 + {{item.scoreAmount}}分 + + + 暂无数据 + \ No newline at end of file diff --git a/pages/czdetail/czdetail.wxss b/pages/czdetail/czdetail.wxss index 6c9fd59..339bdb6 100644 --- a/pages/czdetail/czdetail.wxss +++ b/pages/czdetail/czdetail.wxss @@ -116,4 +116,10 @@ height: 60rpx; vertical-align: middle; margin-right: 10rpx; +} +.nonecontent{ + text-align: center; + font-size: 30rpx; + color: #999; + margin-top: 30rpx; } \ No newline at end of file diff --git a/pages/integralmall/integcoupondetail/index.wxss b/pages/integralmall/integcoupondetail/index.wxss index af1c5aa..363ae76 100644 --- a/pages/integralmall/integcoupondetail/index.wxss +++ b/pages/integralmall/integcoupondetail/index.wxss @@ -8,6 +8,7 @@ width: 100%; height: 533rpx; } +button::after{ border: none; } .goback { float:left; width:122rpx!important; @@ -17,7 +18,7 @@ border:1rpx solid rgba(227,227,227,1); /* box-shadow:0px 8px 8px 1px rgba(189,189,189,0.32); */ border-radius:48rpx; - margin-right:25rpx; + margin-right:20rpx; } .goback image{ position:absolute; @@ -331,6 +332,7 @@ font-size: 32rpx; color: #333; letter-spacing: 0; + line-height: 40rpx; } .posi_logo view:nth-child(2) text:nth-child(2) { diff --git a/pages/integralmall/integraHistory/index.wxml b/pages/integralmall/integraHistory/index.wxml index e759db9..5162083 100644 --- a/pages/integralmall/integraHistory/index.wxml +++ b/pages/integralmall/integraHistory/index.wxml @@ -6,14 +6,19 @@ 积分明细 - - - {{item.creditTypeName}} - {{item.createDate}} - - - +{{item.creditNum}}分 - {{item.creditNum}}分 + + + + {{item.creditTypeName}} + {{item.createDate}} + + + +{{item.creditNum}}分 + {{item.creditNum}}分 + + + 暂无数据 + \ No newline at end of file diff --git a/pages/integralmall/integraHistory/index.wxss b/pages/integralmall/integraHistory/index.wxss index 089c1e8..bcd3a11 100644 --- a/pages/integralmall/integraHistory/index.wxss +++ b/pages/integralmall/integraHistory/index.wxss @@ -117,4 +117,10 @@ height: 60rpx; vertical-align: middle; margin-right: 10rpx; +} +.nonecontent{ + text-align: center; + font-size: 30rpx; + color: #999; + margin-top: 30rpx; } \ No newline at end of file diff --git a/pages/integralmall/payIntegcouponStatus/index.json b/pages/integralmall/payIntegcouponStatus/index.json index 039b934..3f5a942 100644 --- a/pages/integralmall/payIntegcouponStatus/index.json +++ b/pages/integralmall/payIntegcouponStatus/index.json @@ -1,7 +1,7 @@ { "navigationBarTitleText": "积分兑换结果", "navigationBarTextStyle": "white", - "navigationBarBackgroundColor":"#52A0FD", + "navigationBarBackgroundColor": "#F13C42", "enablePullDownRefresh": true, "usingComponents": {} } \ No newline at end of file diff --git a/pages/integralmall/payIntegcoupondetail/index.json b/pages/integralmall/payIntegcoupondetail/index.json index 28668d9..c2fa498 100644 --- a/pages/integralmall/payIntegcoupondetail/index.json +++ b/pages/integralmall/payIntegcoupondetail/index.json @@ -1,5 +1,6 @@ { "navigationBarTitleText": "积分换礼", "navigationBarBackgroundColor": "#F13C42", + "navigationBarTextStyle": "white", "enablePullDownRefresh": true } \ No newline at end of file diff --git a/pages/main/index.js b/pages/main/index.js index dfb66a0..909fac0 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -490,6 +490,10 @@ Page({ id: res.data.id, showTopic: true }) + }else{ + that.setData({ + showTopic: false + }) } }) .catch(err => { diff --git a/pages/main/index.wxml b/pages/main/index.wxml index c1be6fc..e17a910 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -51,13 +51,6 @@ -