Merge branch 'master' into yp-dev

src/components/devStyle/components/textStyle.vue

@@ -83,6 +83,21 @@ const tableData = ref([
     { name: '2级提示文字-加粗', className: 'text-tip-2-bold' },
 
     { name: '3级提示文字', className: 'text-tip-3' },
+
+    { name: '黑色', className: 'text-primary-clor'},
+    { name: '黑色90% / 主标题文字颜色', className: 'text-primary-90-clor'},
+    { name: '黑色80% / 小标题文字颜色', className: 'text-primary-80-clor'},
+    { name: '黑色65% / 正文颜色', className: 'text-primary-65-clor'},
+    { name: '黑色50%', className: 'text-primary-50-clor'},
+
+    { name: '黑色10%', className: 'bg-black-10'},
+    { name: '黑色5% / 分割线颜色', className: 'bg-black-5'},
+    { name: '黑色2% / 灰色背景色', className: 'bg-black-2'},
+    { name: '白色主色', className: 'bg-white-100'},
+
+    {name: '主色', className: 'main-color'},
+    {name: '高亮背景色', className: 'color-bg-active'}
+
 ])
 </script>
 

src/styles/common.scss

@@ -186,3 +186,48 @@
 .color-bg-active{
     background: rgb(246, 250, 255);
 }
+
+// 黑色
+.text-primary-clor{
+    color: #0a121e;
+}
+
+// 黑色90% / 主标题文字颜色
+.text-primary-90-clor{
+    color: #222934;
+}
+
+// 黑色80% / 小标题文字颜色
+.text-primary-80-clor{
+    color: #3b414b;
+}
+
+// 黑色65% / 正文颜色
+.text-primary-65-clor{
+    color: #5f656c;
+}
+
+// 黑色50%
+.text-primary-50-clor{
+    color: #84888e;
+}
+
+// 黑色10%
+.bg-black-10{
+    background: #E6E7E8;
+}
+
+// 黑色5%
+.bg-black-5{
+    background: #EAECEE;
+}
+
+// 黑色2%
+.bg-black-2{
+    background: #F7F8F9;
+}
+
+// 白色主色
+.bg-white-100{
+    background: #FFFFFF;
+}
\ No newline at end of file