diff --git a/app.wxss b/app.wxss index 952c66d..20b67fd 100644 --- a/app.wxss +++ b/app.wxss @@ -53,8 +53,12 @@ padding-right: 20rpx; } .pdv20 { - padding-top: 20rpx; - padding-bottom: 20rpx; + padding-top: 30rpx; + padding-bottom: 30rpx; +} +.pdv30 { + padding-top: 30rpx; + padding-bottom: 30rpx; } .pdv40 { padding-top: 40rpx; @@ -110,6 +114,10 @@ color: #555; } +.c7b { + color: #7b7b7b; +} + .bg-white { background-color: white; } @@ -618,12 +626,12 @@ background: #ffe3e2; /* 图标字体(ty) */ @font-face { font-family: 'iconfont'; /* project id 2054717 */ - src: url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.eot'); - src: url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.eot?#iefix') format('embedded-opentype'), - url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.woff2') format('woff2'), - url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.woff') format('woff'), - url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.ttf') format('truetype'), - url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.svg#iconfont') format('svg'); + src: url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.eot'); + src: url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.eot?#iefix') format('embedded-opentype'), + url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.woff2') format('woff2'), + url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.woff') format('woff'), + url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.ttf') format('truetype'), + url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.svg#iconfont') format('svg'); } .iconfont { @@ -634,6 +642,10 @@ background: #ffe3e2; -moz-osx-font-smoothing: grayscale; } +.icon-yuanquan:before { + content: "\e60d"; +} + .icon-yes:before { content: "\e630"; } diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js index 587ac97..8ed61f6 100644 --- a/packageA/pages/checkin/checkin.js +++ b/packageA/pages/checkin/checkin.js @@ -70,7 +70,6 @@ Page({ // 没有登录则跳转到登录页, // 已登录则设置已登录状态,请求加载签到数据 this.isLogin().then(function() { - console.log('loginnnn',app.globalData.userInfo); self.setData({ isLogin: true }); diff --git a/packageA/pages/distribution/main/main.wxml b/packageA/pages/distribution/main/main.wxml index fb2c5cd..4fc42ca 100644 --- a/packageA/pages/distribution/main/main.wxml +++ b/packageA/pages/distribution/main/main.wxml @@ -81,7 +81,7 @@ 仅限PLUS卡({{item.conditonRemark}})的会员, 立即升级 - + @@ -91,14 +91,14 @@ 验证 - + {{item.conditonRemark}} - + @@ -109,7 +109,7 @@ - 立即去购买 + 去购买