冲突合并

src/styles/common.scss

@@ -42,3 +42,18 @@ $customTabBarHeight: 100px;
   height: 100%;
 }
 
+.color-blue{
+  color: #3287EC;
+}
+.color-yellow{
+  color: #FF9100;
+}
+.color-green{
+  color: #00B837;
+}
+.color-grey{
+  color: #707070;
+}
+.color-white{
+  color: white;
+}

src/styles/iconfont.scss

@@ -1,9 +1,6 @@
-/* CDN 服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
 @font-face {
-  font-family: 'iconfont';
-  /* Project id 3619513 */
-  src: url('iconfont.ttf?t=1663065236955') format('truetype');
-
+  font-family: "iconfont"; /* Project id 3619513 */
+  src: url('/src/styles/iconfont.ttf?t=1663134774880') format('truetype');
 }
 
 .iconfont {
@@ -18,6 +15,22 @@
   content: "\e63e";
 }
 
+.icon-jizhumima:before {
+  content: "\e63c";
+}
+
+.icon-a-jizhumima:before {
+  content: "\e63d";
+}
+
+.icon-weixindenglu:before {
+  content: "\e63b";
+}
+
+.icon-kehuxinxi:before {
+  content: "\e63a";
+}
+
 .icon-yewuyuanqizi:before {
   content: "\e639";
 }
@@ -232,4 +245,5 @@
 
 .icon-gouwu:before {
   content: "\e607";
-}
+}
+