1

common/css/font-icon.css

@@ -2,15 +2,9 @@
   font-family: "iconfont"; /* Project id 3674157 */
   /* Color fonts */
   src: 
-<<<<<<< HEAD
-       url('//at.alicdn.com/t/c/font_3674157_g66ibypnxco.woff2?t=1664268545368') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3674157_g66ibypnxco.woff?t=1664268545368') format('woff'),
-       url('//at.alicdn.com/t/c/font_3674157_g66ibypnxco.ttf?t=1664268545368') format('truetype');
-=======
-       url('//at.alicdn.com/t/c/font_3674157_s06nuze3vmg.woff2?t=1664269015349') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3674157_s06nuze3vmg.woff?t=1664269015349') format('woff'),
-       url('//at.alicdn.com/t/c/font_3674157_s06nuze3vmg.ttf?t=1664269015349') format('truetype');
->>>>>>> 13515de1e9c8b4cd337efde9822ad234d869d636
+       url('//at.alicdn.com/t/c/font_3674157_g19wel1yxjd.woff2?t=1664269541651') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3674157_g19wel1yxjd.woff?t=1664269541651') format('woff'),
+       url('//at.alicdn.com/t/c/font_3674157_g19wel1yxjd.ttf?t=1664269541651') format('truetype');
 }
 
 .iconfont {
@@ -21,6 +15,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shangdian:before {
+  content: "\e67a";
+}
+
 .icon-shangjiantou:before {
   content: "\e603";
 }
@@ -37,13 +35,10 @@
   content: "\e715";
 }
 
-<<<<<<< HEAD
-=======
 .icon-del-copy:before {
   content: "\e716";
 }
 
->>>>>>> 13515de1e9c8b4cd337efde9822ad234d869d636
 .icon-del:before {
   content: "\e616";
 }