Merge branch 'router' of http://gitlab.oytour.com/viitto/pptist into router

src/App.vue

@@ -42,6 +42,7 @@ useFontStore().loadAllFonts()
 
 <style lang="scss">
 @import url('@/assets/styles/common.css');
+@import url('//at.alicdn.com/t/c/font_635492_mmnd6nkbmf8.css');
 #app {
   height: 100%;
 }

src/assets/styles/common.css

@@ -215,6 +215,9 @@ page {
 .q-mb-sm{
 	margin-bottom: 5px;
 }
+.q-ml-md{
+	margin-left: 10px;
+}
 .q-mx-sm{
 	margin-left: 5px;
 	margin-right: 5px;
@@ -233,10 +236,17 @@ page {
 	padding-left: 5px;
 	padding-right:5px ;
 }
+.q-px-md{
+	padding-left: 10px;
+	padding-right: 10px ;
+}
 .q-px-xl{
 	padding-left: 30px;
 	padding-right: 30px;
 }
+.q-pa-xs{
+	padding: 5px;
+}
 .q-pa-xl{
 	padding: 30px;
 }
@@ -434,6 +444,9 @@ page {
 .q-mr-lg{
 	margin-right:20px
 }
+.q-mt-xs{
+	margin-top: 5px;
+}
 .q-mt-lg{
 	margin-top:20px
 }
@@ -457,6 +470,13 @@ page {
 	-ms-border-radius: 8px;
 	-o-border-radius: 8px;
 }
+.rounded6{
+	border-radius: 6px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	-ms-border-radius: 6px;
+	-o-border-radius: 6px;
+}
 .relative{
 	position: relative;
 }
@@ -475,16 +495,61 @@ page {
 .text-nategive{
 	color: #FF4B86;
 }
+.color0{
+	color: #000;
+}
+.colorF{
+	color: #FFF;
+}
+.colorBA{
+	color: #BABABA;
+}
 .text-right{
 	text-align: right;
 }
 .text-left{
 	text-align: left;
 }
+.text-center{
+	text-align: center;
+}
 .text-small{
 	font-size: 12px;
 	font-family: microsoft yahei;
 }
+.PingFangSC{
+	font-family: 'PingFang SC';
+}
+.fz12{
+	font-size: 12px;
+}
+.fz14{
+	font-size: 14px;
+}
+.fz16{
+	font-size: 16px;
+}
+.fz18{
+	font-size: 18px;
+}
+.fz20{
+	font-size: 20px;
+}
+.fz22{
+	font-size: 12px;
+}
+.fz24{
+	font-size: 24px;
+}
+.fz26{
+	font-size: 26px;
+}
+.fz28{
+	font-size: 28px;
+}
+.fz30{
+	font-size: 30px;
+}
 .text-title{
 	font-size: 1.25rem;
 	font-family: alifont;
@@ -553,4 +618,10 @@ page {
 	top: 0;
 	bottom: 0;
 	z-index: 9;
+}
+.opacity0{
+	opacity: 0;
+}
+.columnCount5 {
+	column-count: 5;
 }
\ No newline at end of file

src/components/User/UserCard.vue

@@ -112,7 +112,9 @@ import { storeToRefs } from "pinia";
 
 const useUser = useUserStore();
 const { userInfo } = storeToRefs(useUser);
-
+const format = (percentage: number) => {
+    return percentage == 100 ? '' : ``
+}
 const moreList = [
   { icon: require("@/assets/img/homeMore0.png"), Name: "添加到桌面" },
   { icon: require("@/assets/img/homeMore1.png"), Name: "关注公众号" },

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -330,8 +330,11 @@
         {Name:'青',Id:5},
         {Name:'蓝',Id:6},
         {Name:'紫',Id:7},
-        {Name:'黑',Id:8},
-        {Name:'白',Id:9},
+        {Name:'玫红',Id:8},
+        {Name:'咖啡色',Id:9},
+        {Name:'白',Id:10},
+        {Name:'黑',Id:11},
+        {Name:'灰',Id:12},
     ]
 
     const cursors = [] as Array<any>