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

src/assets/styles/common.css

@@ -294,6 +294,9 @@ page {
 .q-pb-md{
 	padding-bottom: 10px;
 }
+.q-pb-lg{
+	padding-bottom: 20px;
+}
 .q-relative{
 	position: relative;
 }

src/components/User/UserCard.vue

@@ -34,7 +34,7 @@
               <div class="row items-center MarketfigureName">
                 <span>{{ userInfo.nickname }}</span>
                 <img
-                  src="../../assets/img/homeVip1.png"
+                  src="../../assets/img/homeVip.png"
                   width="65"
                   height="16"
                 />

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -331,7 +331,7 @@
         {Name:'蓝',Id:6},
         {Name:'紫',Id:7},
         {Name:'玫红',Id:8},
-        {Name:'咖啡色',Id:9},
+        {Name:'棕色',Id:9},
         {Name:'白',Id:10},
         {Name:'黑',Id:11},
         {Name:'灰',Id:12},