diff --git a/beike/Admin/View/DesignBuilders/Brand.php b/beike/Admin/View/DesignBuilders/Brand.php index 033a7272..1c5f1460 100644 --- a/beike/Admin/View/DesignBuilders/Brand.php +++ b/beike/Admin/View/DesignBuilders/Brand.php @@ -36,7 +36,7 @@ class Brand extends Component 'code' => 'brand', 'sort' => 0, 'name' => '品牌模块', - 'icon' => '', + 'icon' => '', ]; return view('admin::pages.design.module.brand', $data); diff --git a/beike/Admin/View/DesignBuilders/Image100.php b/beike/Admin/View/DesignBuilders/Image100.php index 7f3c8a87..606d955a 100644 --- a/beike/Admin/View/DesignBuilders/Image100.php +++ b/beike/Admin/View/DesignBuilders/Image100.php @@ -36,7 +36,7 @@ class Image100 extends Component 'code' => 'image100', 'sort' => 0, 'name' => '单图模块', - 'icon' => '', + 'icon' => '', ]; return view('admin::pages.design.module.image100', $data); diff --git a/beike/Admin/View/DesignBuilders/Image401.php b/beike/Admin/View/DesignBuilders/Image401.php index 1c6e5d8e..973a863b 100644 --- a/beike/Admin/View/DesignBuilders/Image401.php +++ b/beike/Admin/View/DesignBuilders/Image401.php @@ -36,7 +36,7 @@ class Image401 extends Component 'code' => 'image401', 'sort' => 0, 'name' => '一行四图-pro', - 'icon' => '', + 'icon' => '', ]; return view('admin::pages.design.module.image401', $data); diff --git a/beike/Admin/View/DesignBuilders/SlideShow.php b/beike/Admin/View/DesignBuilders/SlideShow.php index e3623ada..f87e5e98 100644 --- a/beike/Admin/View/DesignBuilders/SlideShow.php +++ b/beike/Admin/View/DesignBuilders/SlideShow.php @@ -36,7 +36,8 @@ class SlideShow extends Component 'code' => 'slideshow', 'sort' => 0, 'name' => '幻灯片模块', - 'icon' => '', + 'icon' => '', + 'style' => 'font-size: 40px;', ]; return view('admin::pages.design.module.slideshow', $data); diff --git a/beike/Admin/View/DesignBuilders/TabProduct.php b/beike/Admin/View/DesignBuilders/TabProduct.php index 91ff0123..c93ecb5f 100644 --- a/beike/Admin/View/DesignBuilders/TabProduct.php +++ b/beike/Admin/View/DesignBuilders/TabProduct.php @@ -36,7 +36,7 @@ class TabProduct extends Component 'code' => 'tab_product', 'sort' => 0, 'name' => '选项卡商品', - 'icon' => '', + 'icon' => '', ]; return view('admin::pages.design.module.tab_product', $data); diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css index 48648343..cd04e4b5 100644 --- a/public/build/beike/admin/css/app.css +++ b/public/build/beike/admin/css/app.css @@ -694,7 +694,7 @@ table.table.table-striped > tbody > tr:nth-of-type(2n) { @font-face { font-family: "iconfont"; - src: url("/vendor/iconfont/iconfont.woff") format("woff"), url("/vendor/iconfont/iconfont.ttf") format("truetype"); + src: url("/fonts/iconfont/iconfont.woff") format("woff"), url("/fonts/iconfont/iconfont.ttf") format("truetype"); /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ } .iconfont { diff --git a/public/build/beike/admin/css/design.css b/public/build/beike/admin/css/design.css index f3504579..0b3ac0b3 100644 --- a/public/build/beike/admin/css/design.css +++ b/public/build/beike/admin/css/design.css @@ -1,18 +1,9 @@ @charset "UTF-8"; @font-face { font-family: "iconfont"; - src: url("/vendor/iconfont/iconfont.woff") format("woff"), url("/vendor/iconfont/iconfont.ttf") format("truetype"); + src: url("/fonts/design/iconfont.woff") format("woff"), url("/fonts/design/iconfont.ttf") format("truetype"); /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ } -.iconfont { - font-family: "iconfont" !important; - font-size: 16px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -webkit-text-stroke-width: 0; - -moz-osx-font-smoothing: grayscale; -} - body.page-design { background-color: #fff; padding: 0; @@ -21,6 +12,14 @@ body.page-design { height: 100vh; overflow: hidden; } +body.page-design .iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0; + -moz-osx-font-smoothing: grayscale; +} body.page-design [class*=" el-icon-"], body.page-design [class^=el-icon-] { font-weight: 600; } @@ -130,9 +129,10 @@ body.page-design .design-box .sidebar-edit-wrap .module-list .module-info:hover } body.page-design .design-box .sidebar-edit-wrap .module-list .icon { padding: 12px 0 7px; - width: 36px; height: 36px; - display: inline-block; + display: flex; + justify-content: center; + align-items: center; } body.page-design .design-box .sidebar-edit-wrap .module-list .icon img { max-width: 100%; diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index 1d361a27..be0eca1b 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -1,7 +1,7 @@ @charset "UTF-8"; @font-face { font-family: "iconfont"; - src: url("/vendor/iconfont/iconfont.woff") format("woff"), url("/vendor/iconfont/iconfont.ttf") format("truetype"); + src: url("/fonts/iconfont/iconfont.woff") format("woff"), url("/fonts/iconfont/iconfont.ttf") format("truetype"); /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ } .iconfont { diff --git a/public/fonts/design/iconfont.json b/public/fonts/design/iconfont.json new file mode 100644 index 00000000..978a4c1f --- /dev/null +++ b/public/fonts/design/iconfont.json @@ -0,0 +1,429 @@ +{ + "id": "1828406", + "name": "oc-design", + "font_family": "iconfont", + "css_prefix_text": "icon", + "description": "", + "glyphs": [ + { + "icon_id": "20804653", + "name": "评 论", + "font_class": "pinglun", + "unicode": "e608", + "unicode_decimal": 58888 + }, + { + "icon_id": "16838458", + "name": "多图列表", + "font_class": "duotuliebiao", + "unicode": "e6f3", + "unicode_decimal": 59123 + }, + { + "icon_id": "20288261", + "name": "视频", + "font_class": "shipin", + "unicode": "e646", + "unicode_decimal": 58950 + }, + { + "icon_id": "22121657", + "name": "背景", + "font_class": "beijing", + "unicode": "e6eb", + "unicode_decimal": 59115 + }, + { + "icon_id": "1132464", + "name": "浏览记录", + "font_class": "liulanjilu1", + "unicode": "e62f", + "unicode_decimal": 58927 + }, + { + "icon_id": "15954666", + "name": "产品", + "font_class": "chanpin", + "unicode": "e606", + "unicode_decimal": 58886 + }, + { + "icon_id": "17907876", + "name": "产品 (1)", + "font_class": "chanpin1", + "unicode": "e607", + "unicode_decimal": 58887 + }, + { + "icon_id": "903795", + "name": "图片", + "font_class": "tupian2", + "unicode": "e663", + "unicode_decimal": 58979 + }, + { + "icon_id": "13988575", + "name": "选项卡", + "font_class": "xuanxiangka1", + "unicode": "e688", + "unicode_decimal": 59016 + }, + { + "icon_id": "744662", + "name": "文章管理02", + "font_class": "wenzhangguanli", + "unicode": "e67c", + "unicode_decimal": 59004 + }, + { + "icon_id": "20657761", + "name": "文章", + "font_class": "houtaiguanli-fabuwenzhang", + "unicode": "e645", + "unicode_decimal": 58949 + }, + { + "icon_id": "2495953", + "name": "文章", + "font_class": "wenzhang", + "unicode": "e604", + "unicode_decimal": 58884 + }, + { + "icon_id": "2836399", + "name": "文章", + "font_class": "wenzhang1", + "unicode": "e734", + "unicode_decimal": 59188 + }, + { + "icon_id": "22099270", + "name": "轮播", + "font_class": "lunbo", + "unicode": "e634", + "unicode_decimal": 58932 + }, + { + "icon_id": "960332", + "name": "商品对比", + "font_class": "shangpinduibi", + "unicode": "e8a5", + "unicode_decimal": 59557 + }, + { + "icon_id": "7551218", + "name": "爆款商品", + "font_class": "RectangleCopy", + "unicode": "e6b3", + "unicode_decimal": 59059 + }, + { + "icon_id": "10021408", + "name": "上传商品", + "font_class": "shangchuanshangpin", + "unicode": "e61a", + "unicode_decimal": 58906 + }, + { + "icon_id": "838044", + "name": "秒杀", + "font_class": "miaosha", + "unicode": "e60d", + "unicode_decimal": 58893 + }, + { + "icon_id": "903756", + "name": "40_砍价", + "font_class": "40kanjia", + "unicode": "e651", + "unicode_decimal": 58961 + }, + { + "icon_id": "1221715", + "name": "拼团购", + "font_class": "pintuangou", + "unicode": "e635", + "unicode_decimal": 58933 + }, + { + "icon_id": "1350178", + "name": "热卖", + "font_class": "remai", + "unicode": "e633", + "unicode_decimal": 58931 + }, + { + "icon_id": "2325937", + "name": "图片", + "font_class": "tupian1", + "unicode": "e644", + "unicode_decimal": 58948 + }, + { + "icon_id": "2681723", + "name": "优惠券", + "font_class": "coupon", + "unicode": "e617", + "unicode_decimal": 58903 + }, + { + "icon_id": "2821019", + "name": "幻灯片", + "font_class": "huaban", + "unicode": "e600", + "unicode_decimal": 58880 + }, + { + "icon_id": "3188471", + "name": "商品", + "font_class": "goods", + "unicode": "e60a", + "unicode_decimal": 58890 + }, + { + "icon_id": "3315084", + "name": "博客园", + "font_class": "bokeyuan", + "unicode": "e603", + "unicode_decimal": 58883 + }, + { + "icon_id": "4315710", + "name": "砍价", + "font_class": "kanjia", + "unicode": "e61d", + "unicode_decimal": 58909 + }, + { + "icon_id": "4539896", + "name": "分类", + "font_class": "fenlei", + "unicode": "e618", + "unicode_decimal": 58904 + }, + { + "icon_id": "5397240", + "name": "秒杀", + "font_class": "miaosha1", + "unicode": "e725", + "unicode_decimal": 59173 + }, + { + "icon_id": "7173057", + "name": "幻灯片", + "font_class": "emwhuandengpian", + "unicode": "e61b", + "unicode_decimal": 58907 + }, + { + "icon_id": "11520926", + "name": "砍价", + "font_class": "kanjia1", + "unicode": "e76b", + "unicode_decimal": 59243 + }, + { + "icon_id": "11987681", + "name": "选项卡", + "font_class": "xuanxiangka", + "unicode": "e630", + "unicode_decimal": 58928 + }, + { + "icon_id": "12842489", + "name": "图标 1795 (1)", + "font_class": "tubiao", + "unicode": "e60e", + "unicode_decimal": 58894 + }, + { + "icon_id": "13547745", + "name": "轮播图", + "font_class": "lunbotu", + "unicode": "e64a", + "unicode_decimal": 58954 + }, + { + "icon_id": "15984055", + "name": "富文本框", + "font_class": "fuwenbenkuang", + "unicode": "e601", + "unicode_decimal": 58881 + }, + { + "icon_id": "16853946", + "name": "轮播图", + "font_class": "lunbotu1", + "unicode": "e67a", + "unicode_decimal": 59002 + }, + { + "icon_id": "20323339", + "name": "品牌", + "font_class": "pinpai", + "unicode": "e602", + "unicode_decimal": 58882 + }, + { + "icon_id": "8777509", + "name": "arrow_up", + "font_class": "icon-test", + "unicode": "e658", + "unicode_decimal": 58968 + }, + { + "icon_id": "8777510", + "name": "arrow_left", + "font_class": "icon-test1", + "unicode": "e659", + "unicode_decimal": 58969 + }, + { + "icon_id": "8777511", + "name": "arrow_down", + "font_class": "icon-test2", + "unicode": "e65a", + "unicode_decimal": 58970 + }, + { + "icon_id": "8777512", + "name": "arrow_right", + "font_class": "icon-test3", + "unicode": "e65b", + "unicode_decimal": 58971 + }, + { + "icon_id": "15872071", + "name": "没有数据", + "font_class": "meiyoushuju", + "unicode": "e60c", + "unicode_decimal": 58892 + }, + { + "icon_id": "11843869", + "name": "拖动", + "font_class": "tuodong1", + "unicode": "e6f9", + "unicode_decimal": 59129 + }, + { + "icon_id": "538489", + "name": "加", + "font_class": "jia", + "unicode": "e643", + "unicode_decimal": 58947 + }, + { + "icon_id": "15272275", + "name": "拖动", + "font_class": "tuodong", + "unicode": "e6ff", + "unicode_decimal": 59135 + }, + { + "icon_id": "1665686", + "name": "前往", + "font_class": "qianwang", + "unicode": "e945", + "unicode_decimal": 59717 + }, + { + "icon_id": "4770735", + "name": "删除", + "font_class": "shanchu1", + "unicode": "e63a", + "unicode_decimal": 58938 + }, + { + "icon_id": "13080045", + "name": "标题", + "font_class": "biaoti", + "unicode": "e981", + "unicode_decimal": 59777 + }, + { + "icon_id": "13309705", + "name": "标题", + "font_class": "biaoti1", + "unicode": "e92f", + "unicode_decimal": 59695 + }, + { + "icon_id": "680974", + "name": "产品2", + "font_class": "chanpin2", + "unicode": "e71a", + "unicode_decimal": 59162 + }, + { + "icon_id": "1104742", + "name": "未标题-22", + "font_class": "weibiaoti22", + "unicode": "e61c", + "unicode_decimal": 58908 + }, + { + "icon_id": "9874536", + "name": "KHCFDC_图片", + "font_class": "tupian", + "unicode": "e6de", + "unicode_decimal": 59102 + }, + { + "icon_id": "551331", + "name": "项目管理", + "font_class": "xiangmuguanli", + "unicode": "e613", + "unicode_decimal": 58899 + }, + { + "icon_id": "554155", + "name": "加", + "font_class": "iconset0186", + "unicode": "e655", + "unicode_decimal": 58965 + }, + { + "icon_id": "6629866", + "name": "左 左", + "font_class": "zuozuo-", + "unicode": "e641", + "unicode_decimal": 58945 + }, + { + "icon_id": "688106", + "name": "手机", + "font_class": "shouji1", + "unicode": "e791", + "unicode_decimal": 59281 + }, + { + "icon_id": "1134339", + "name": "手机", + "font_class": "shouji", + "unicode": "e686", + "unicode_decimal": 59014 + }, + { + "icon_id": "5800406", + "name": "保存", + "font_class": "baocun", + "unicode": "e605", + "unicode_decimal": 58885 + }, + { + "icon_id": "6487822", + "name": "电脑", + "font_class": "diannao", + "unicode": "e67b", + "unicode_decimal": 59003 + }, + { + "icon_id": "6629890", + "name": "右 右", + "font_class": "youyou-", + "unicode": "e642", + "unicode_decimal": 58946 + } + ] +} diff --git a/public/fonts/design/iconfont.ttf b/public/fonts/design/iconfont.ttf new file mode 100644 index 00000000..608907ae Binary files /dev/null and b/public/fonts/design/iconfont.ttf differ diff --git a/public/fonts/design/iconfont.woff b/public/fonts/design/iconfont.woff new file mode 100644 index 00000000..dab1e1d9 Binary files /dev/null and b/public/fonts/design/iconfont.woff differ diff --git a/public/fonts/design/iconfont.woff2 b/public/fonts/design/iconfont.woff2 new file mode 100644 index 00000000..327d8b60 Binary files /dev/null and b/public/fonts/design/iconfont.woff2 differ diff --git a/public/vendor/iconfont/iconfont.json b/public/fonts/iconfont/iconfont.json similarity index 100% rename from public/vendor/iconfont/iconfont.json rename to public/fonts/iconfont/iconfont.json diff --git a/public/vendor/iconfont/iconfont.ttf b/public/fonts/iconfont/iconfont.ttf similarity index 100% rename from public/vendor/iconfont/iconfont.ttf rename to public/fonts/iconfont/iconfont.ttf diff --git a/public/vendor/iconfont/iconfont.woff b/public/fonts/iconfont/iconfont.woff similarity index 100% rename from public/vendor/iconfont/iconfont.woff rename to public/fonts/iconfont/iconfont.woff diff --git a/resources/beike/admin/css/_iconfont.scss b/resources/beike/admin/css/_iconfont.scss index 84275c61..fb3b17a3 100644 --- a/resources/beike/admin/css/_iconfont.scss +++ b/resources/beike/admin/css/_iconfont.scss @@ -17,8 +17,8 @@ // } @font-face {font-family: 'iconfont'; - src: url('/vendor/iconfont/iconfont.woff') format('woff'), /* chrome、firefox */ - url('/vendor/iconfont/iconfont.ttf') format('truetype'); /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ + src: url('/fonts/iconfont/iconfont.woff') format('woff'), /* chrome、firefox */ + url('/fonts/iconfont/iconfont.ttf') format('truetype'); /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ } .iconfont { diff --git a/resources/beike/admin/css/design/app.scss b/resources/beike/admin/css/design/app.scss index 79a39ac4..6e0b2f3d 100644 --- a/resources/beike/admin/css/design/app.scss +++ b/resources/beike/admin/css/design/app.scss @@ -1,7 +1,10 @@ -@import '../iconfont'; - $main_color: #0072ff; +@font-face {font-family: 'iconfont'; + src: url('/fonts/design/iconfont.woff') format('woff'), /* chrome、firefox */ + url('/fonts/design/iconfont.ttf') format('truetype'); /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ +} + body.page-design { background-color: #fff; padding: 0; @@ -10,6 +13,16 @@ body.page-design { height: 100vh; overflow: hidden; + .iconfont { + font-family:"iconfont" !important; + font-size:16px; + font-style:normal; + -webkit-font-smoothing: antialiased; + // -webkit-text-stroke-width: 0.2px; + -webkit-text-stroke-width: 0; + -moz-osx-font-smoothing: grayscale; + } + [class*=" el-icon-"], [class^=el-icon-] { font-weight: 600; } @@ -142,9 +155,11 @@ body.page-design { .icon { padding: 12px 0 7px; - width: 36px; + // width: 36px; height: 36px; - display: inline-block; + display: flex; + justify-content: center; + align-items: center; img { max-width: 100%; max-height: auto; diff --git a/resources/beike/admin/views/pages/design/builder/index.blade.php b/resources/beike/admin/views/pages/design/builder/index.blade.php index b6676e84..1a56b42a 100644 --- a/resources/beike/admin/views/pages/design/builder/index.blade.php +++ b/resources/beike/admin/views/pages/design/builder/index.blade.php @@ -48,7 +48,7 @@
-
+
@{{ item.name }}
diff --git a/resources/beike/shop/default/css/iconfont.scss b/resources/beike/shop/default/css/iconfont.scss index d9c5f345..206b7d43 100644 --- a/resources/beike/shop/default/css/iconfont.scss +++ b/resources/beike/shop/default/css/iconfont.scss @@ -1,8 +1,8 @@ @charset "UTF-8"; @font-face {font-family: 'iconfont'; - src: url('/vendor/iconfont/iconfont.woff') format('woff'), /* chrome、firefox */ - url('/vendor/iconfont/iconfont.ttf') format('truetype'); /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ + src: url('/fonts/iconfont/iconfont.woff') format('woff'), /* chrome、firefox */ + url('/fonts/iconfont/iconfont.ttf') format('truetype'); /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ } .iconfont {