Merge branch 'dev' of http://git.online.zzfzyc.com/mp/EShop into dev

src/styles/bak/iconfont.scss

@@ -1,89 +0,0 @@
-@font-face {
-  font-family: "iconfont"; /* Project id 2987621 */
-  src: 
-       url('iconfont.ttf?t=1650013104232') format('truetype');
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-yifahuo:before {
-  content: "\e65b";
-}
-
-.icon-daipeibu:before {
-  content: "\e662";
-}
-
-.icon-yaoqingtuandui:before {
-  content: "\e65a";
-}
-
-.icon-a-tuikuanshouhou:before {
-  content: "\e65c";
-}
-
-.icon-daifukuan:before {
-  content: "\e65d";
-}
-
-.icon-shezhi:before {
-  content: "\e65e";
-}
-
-.icon-yanseduibi:before {
-  content: "\e65f";
-}
-
-.icon-daifahuo:before {
-  content: "\e660";
-}
-
-.icon-baoguo:before {
-  content: "\e661";
-}
-
-.icon-tick-pressed:before {
-  content: "\e652";
-}
-
-.icon-wode-pressed:before {
-  content: "\e655";
-}
-
-.icon-fenlei-pressed:before {
-  content: "\e656";
-}
-
-.icon-sousuo:before {
-  content: "\e647";
-}
-
-.icon-fenxiang:before {
-  content: "\e648";
-}
-
-.icon-shaixuan:before {
-  content: "\e649";
-}
-
-.icon-gouwuche:before {
-  content: "\e64a";
-}
-
-.icon-qingkong:before {
-  content: "\e64c";
-}
-
-.icon-jia:before {
-  content: "\e64d";
-}
-
-.icon-jian:before {
-  content: "\e64e";
-}

src/styles/common.scss

@@ -19,7 +19,6 @@ $font_size_min: 22px;
 
 //省略号
 @mixin common_ellipsis($params:1) {
-
     overflow: hidden;
     display: -webkit-box;
     white-space:normal; 

src/styles/iconfont.scss

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2987621 */
-  src:url('iconfont.ttf?t=1652068398646') format('truetype');
+  src: url('iconfont.ttf?t=1653384789393') format('truetype');
 }
 
 .iconfont {
@@ -169,4 +169,5 @@
 
 .icon-sort-down-full:before {
   content: "\ea4d";
-}
+}
+