Commit d1d18f77 by 程智春

iconfont优化

parent 74aeaa4b
@font-face {font-family: "iconfont";
src: url('iconfont.eot?t=1551321207986'); /* IE9 */
src: url('iconfont.eot?t=1551321207986#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
url('iconfont.woff?t=1551321207986') format('woff'),
url('iconfont.ttf?t=1551321207986') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
url('iconfont.svg?t=1551321207986#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-wode:before {
content: "\e61d";
}
.icon-kefu:before {
content: "\e61e";
}
.icon-gouwuche:before {
content: "\e605";
}
.icon-jingdiananli_wujiaoxing_shoucanghou:before {
content: "\e64a";
}
.icon-kefu1:before {
content: "\e637";
}
.icon-shoucang:before {
content: "\e613";
}
.icon-fenlei:before {
content: "\e623";
}
.icon-home:before {
content: "\e616";
}
\ No newline at end of file
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
></i> ></i>
<i <i
wx:else wx:else
class="content-img iconfont {{datas.componentData.icon.src}}" class="content-img iconfont antt {{datas.componentData.icon.src}}"
style="font-size:1.6em;color:{{datas.componentData['contentColor']}}" style="font-size:1.6em;color:{{datas.componentData['contentColor']}}"
> >
</i> </i>
......
...@@ -40,6 +40,11 @@ Component({ ...@@ -40,6 +40,11 @@ Component({
if (app.globalData.footerVal) { if (app.globalData.footerVal) {
let mid = Math.ceil(app.globalData.footerVal.componentData.list.length / 2 - 1) let mid = Math.ceil(app.globalData.footerVal.componentData.list.length / 2 - 1)
app.globalData.footerVal.componentData.list.forEach(item => {
item.isAntt = item.icon.includes('ant-')
console.log('isAntt', item.isAntt)
})
console.log(app.globalData.footerVal.componentData.list,'app.globalData.footerVal.componentData.list')
that.setData({ that.setData({
componentData: app.globalData.footerVal.componentData, componentData: app.globalData.footerVal.componentData,
list: app.globalData.footerVal.componentData.list, list: app.globalData.footerVal.componentData.list,
...@@ -49,6 +54,16 @@ Component({ ...@@ -49,6 +54,16 @@ Component({
app.footerCallBack = function (params) { app.footerCallBack = function (params) {
params.componentData.selectIconColor = app.globalData.footerVal.componentData.selectIconBackground == 1 ? 'val(--main-color)' : params.componentData.selectIconColor params.componentData.selectIconColor = app.globalData.footerVal.componentData.selectIconBackground == 1 ? 'val(--main-color)' : params.componentData.selectIconColor
let mid = Math.ceil(params.componentData.list.length / 2 - 1) let mid = Math.ceil(params.componentData.list.length / 2 - 1)
params.componentData.list.forEach(item => {
item.isAntt = item.icon.includes('ant-')
console.log('isAntt', item.isAntt)
})
console.log(params.componentData.list,'app.globalData.footerVal.componentData.list')
that.setData({ that.setData({
componentData: params.componentData, componentData: params.componentData,
list: params.componentData.list, list: params.componentData.list,
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<view class="item {{index == selected ? 'current' : ''}}"> <view class="item {{index == selected ? 'current' : ''}}">
<view wx:if="{{componentData['contentFormNum']!=2}}" > <view wx:if="{{componentData['contentFormNum']!=2}}" >
<view wx:if="{{item.iconType==0||!item.iconType}}"> <view wx:if="{{item.iconType==0||!item.iconType}}">
<view class="antt {{item.icon}}" style="font-size:{{componentData.defaultIcon==1 ? '36rpx' : (componentData.defaultIconSize*2 + 'rpx')}};color:{{index==selected?componentData.selectIconColor:componentData.defaultIconColor}}"></view> <view class="{{item.isAntt ? 'antt' : 'iconfont'}} {{item.icon}}" style="font-size:{{componentData.defaultIcon==1 ? '36rpx' : (componentData.defaultIconSize*2 + 'rpx')}};color:{{index==selected?componentData.selectIconColor:componentData.defaultIconColor}}"></view>
</view> </view>
<view <view
wx:elif="{{item.iconType==1}}" wx:elif="{{item.iconType==1}}"
......
@import "/static/css/iconfont.wxss";
@font-face { @font-face {
font-family: "ant"; font-family: "ant";
src: url('//cdn.mayi888.com/static/font/ant-171b61a6fb.eot'); src: url('//cdn.mayi888.com/static/font/ant-171b61a6fb.eot');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment