Commit 0d1ba72570e7ee8bfd32c0e88b2e8a1a7ee2edcf

Authored by taiyuan
1 parent 9b2ce373

分销功能图标修改

app.wxss
... ... @@ -53,8 +53,12 @@
53 53 padding-right: 20rpx;
54 54 }
55 55 .pdv20 {
56   - padding-top: 20rpx;
57   - padding-bottom: 20rpx;
  56 + padding-top: 30rpx;
  57 + padding-bottom: 30rpx;
  58 +}
  59 +.pdv30 {
  60 + padding-top: 30rpx;
  61 + padding-bottom: 30rpx;
58 62 }
59 63 .pdv40 {
60 64 padding-top: 40rpx;
... ... @@ -110,6 +114,10 @@
110 114 color: #555;
111 115 }
112 116  
  117 +.c7b {
  118 + color: #7b7b7b;
  119 +}
  120 +
113 121 .bg-white {
114 122 background-color: white;
115 123 }
... ... @@ -618,12 +626,12 @@ background: #ffe3e2;
618 626 /* 图标字体(ty) */
619 627 @font-face {
620 628 font-family: 'iconfont'; /* project id 2054717 */
621   - src: url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.eot');
622   - src: url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.eot?#iefix') format('embedded-opentype'),
623   - url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.woff2') format('woff2'),
624   - url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.woff') format('woff'),
625   - url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.ttf') format('truetype'),
626   - url('//at.alicdn.com/t/font_2054717_s9aix2fyd2.svg#iconfont') format('svg');
  629 + src: url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.eot');
  630 + src: url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.eot?#iefix') format('embedded-opentype'),
  631 + url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.woff2') format('woff2'),
  632 + url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.woff') format('woff'),
  633 + url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.ttf') format('truetype'),
  634 + url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.svg#iconfont') format('svg');
627 635 }
628 636  
629 637 .iconfont {
... ... @@ -634,6 +642,10 @@ background: #ffe3e2;
634 642 -moz-osx-font-smoothing: grayscale;
635 643 }
636 644  
  645 +.icon-yuanquan:before {
  646 + content: "\e60d";
  647 +}
  648 +
637 649 .icon-yes:before {
638 650 content: "\e630";
639 651 }
... ...
packageA/pages/checkin/checkin.js
... ... @@ -70,7 +70,6 @@ Page({
70 70 // 没有登录则跳转到登录页,
71 71 // 已登录则设置已登录状态,请求加载签到数据
72 72 this.isLogin().then(function() {
73   - console.log('loginnnn',app.globalData.userInfo);
74 73 self.setData({
75 74 isLogin: true
76 75 });
... ...
packageA/pages/distribution/main/main.wxml
... ... @@ -81,7 +81,7 @@
81 81 <view class="icon-container"><text class="iconfont icon-huiyuan1"></text></view>
82 82 <view>仅限PLUS卡({{item.conditonRemark}})的会员, <text class="c-red" bindtap="goto" data-url="/pages/user/cardinfo/cardinfo">立即升级</text></view>
83 83 </view>
84   - <text class="iconfont {{item.pass ? 'icon-yes c-green':'icon-guanbi c-red2'}}"></text>
  84 + <text class="iconfont {{item.pass ? 'icon-yes c-green':'icon-yuanquan c-c7'}}"></text>
85 85 </view>
86 86 <view class="item" wx:if="{{item.type == 2}}">
87 87 <view class="left f1">
... ... @@ -91,14 +91,14 @@
91 91 <view class="verify" wx:if="{{!item.pass}}" bindtap="verify" data-pass="{{item.pass}}">验证</view>
92 92 </view>
93 93 </view>
94   - <text class="iconfont {{item.pass ? 'icon-yes c-green':'icon-guanbi c-red2'}}"></text>
  94 + <text class="iconfont {{item.pass ? 'icon-yes c-green':'icon-yuanquan c-c7'}}"></text>
95 95 </view>
96 96 <view class="item" wx:if="{{item.type == 3}}">
97 97 <view class="left f1">
98 98 <view class="icon-container"><text class="iconfont icon-gouwu"></text></view>
99 99 <text>{{item.conditonRemark}}</text>
100 100 </view>
101   - <text class="iconfont {{item.pass ? 'icon-yes c-green':'icon-guanbi c-red2'}}"></text>
  101 + <text class="iconfont {{item.pass ? 'icon-yes c-green':'icon-yuanquan c-c7'}}"></text>
102 102 </view>
103 103 </block>
104 104 <view class="item" data-url="1">
... ... @@ -109,7 +109,7 @@
109 109 </view>
110 110  
111 111 </view>
112   - <view class="t-c pd20 fs30 bdt co-red bold" bindtap="goto" data-url="/pages/index/index/index">立即去购买</view>
  112 + <view class="t-c pd20 fs30 bdt co-red bold" bindtap="goto" data-url="/pages/index/index/index">去购买</view>
113 113 <!-- <view class="t-c pd20 fs30 bdt co-red bold">确定</view> -->
114 114 </view>
115 115 <!-- 遮罩 -->
... ...