Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents c0c68187 46c78e3c
Showing 1 changed file with 85 additions and 29 deletions
app.wxss
@@ -742,14 +742,14 @@ background: #ffe3e2;
 /* 图标字体(ty) */
-@font-face {
-  font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_7asl31h61km.woff2?t=1648457743336') format('woff2'),
+/* @font-face { */
+  /* font-family: 'iconfont'; */ /* Project id 2054717 */
+  /* src: url('//at.alicdn.com/t/font_2054717_7asl31h61km.woff2?t=1648457743336') format('woff2'),
        url('//at.alicdn.com/t/font_2054717_7asl31h61km.woff?t=1648457743336') format('woff'),
        url('//at.alicdn.com/t/font_2054717_7asl31h61km.ttf?t=1648457743336') format('truetype');
-}
+} */
-.icon-zhibo:before {
+/* .icon-zhibo:before {
   content: "\e623";
 }
@@ -800,6 +800,69 @@ background: #ffe3e2;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+} */
+
+@font-face {
+  font-family: "iconfont"; /* Project id 2054717 */
+  src: url('//at.alicdn.com/t/c/font_2054717_k2sfcuqycll.woff2?t=1661217430593') format('woff2'),
+       url('//at.alicdn.com/t/c/font_2054717_k2sfcuqycll.woff?t=1661217430593') format('woff'),
+       url('//at.alicdn.com/t/c/font_2054717_k2sfcuqycll.ttf?t=1661217430593') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-shangjiantou:before {
+  content: "\e791";
+}
+
+.icon-zhibo:before {
+  content: "\e623";
+}
+
+.icon-dianhua:before {
+  content: "\e64b";
+}
+
+.icon-kefu1:before {
+  content: "\e651";
+}
+
+.icon-infofill:before {
+  content: "\e6e6";
+}
+
+.icon-geren:before {
+  content: "\e71d";
+}
+
+.icon-tupian:before {
+  content: "\e997";
+}
+
+.icon-wenhao:before {
+  content: "\e72d";
+}
+
+.icon-suoxiao:before {
+  content: "\e7af";
+}
+
+.icon-yanjing-kai:before {
+  content: "\e6f9";
+}
+
+.icon-yanjing-guan:before {
+  content: "\e6fa";
+}
+
+.icon-fangda:before {
+  content: "\e662";
 }
 .icon-checked:before {
@@ -826,6 +889,10 @@ background: #ffe3e2;
   content: "\e6ca";
 }
+.icon-xingyungou:before {
+  content: "\e622";
+}
+
 .icon-luck:before {
   content: "\e621";
 }
@@ -838,7 +905,6 @@ background: #ffe3e2;
   content: "\e6b4";
 }
-
 .icon-fenlei:before {
   content: "\e628";
 }
@@ -846,6 +912,7 @@ background: #ffe3e2;
 .icon-arrowup:before {
   content: "\e61e";
 }
+
 .icon-aixin:before {
   content: "\e8c3";
 }
@@ -878,13 +945,14 @@ background: #ffe3e2;
   content: "\e614";
 }
+.icon-erweimafenxiang:before {
+  content: "\e613";
+}
 .icon-zhiwen:before {
   content: "\e6aa";
 }
-
-
 .icon-guan:before {
   content: "\e612";
 }
@@ -897,8 +965,6 @@ background: #ffe3e2;
   content: "\e611";
 }
-
-
 .icon-zhuanpan:before {
   content: "\e642";
 }
@@ -955,6 +1021,14 @@ background: #ffe3e2;
   content: "\e61d";
 }
+.icon-shangjia:before {
+  content: "\e6e5";
+}
+
+.icon-xiajia:before {
+  content: "\e6e4";
+}
+
 .icon-shaixuan:before {
   content: "\e68a";
 }
@@ -975,7 +1049,6 @@ background: #ffe3e2;
   content: "\e638";
 }
-
 .icon-sousuo:before {
   content: "\e618";
 }
@@ -1016,14 +1089,6 @@ background: #ffe3e2;
   content: "\e609";
 }
-.icon-shangjia:before {
-  content: "\e6e5";
-}
-
-.icon-xiajia:before {
-  content: "\e6e4";
-}
-
 .icon-yongjin:before {
   content: "\e60c";
 }
@@ -1048,14 +1113,6 @@ background: #ffe3e2;
   content: "\e65e";
 }
-.icon-yihexiao:before {
-  content: "\e726";
-}
-
-.icon-daihexiao:before {
-  content: "\e727";
-}
-
 .icon-meirong2:before {
   content: "\e861";
 }
@@ -1133,12 +1190,10 @@ background: #ffe3e2;
 }
 .icon-arrow_right:before {
-  /* > */
   content: "\e61f";
 }
 .icon-arrow_down:before {
-  
   content: "\e600";
 }
@@ -1148,3 +1203,4 @@ background: #ffe3e2;
+