Merge branch 'dev' of www.gitinn.com:proginn/proginn-frontend into web

pages/user/_id/_type.vue

@@ -121,6 +121,7 @@
             </div>
           </div>
         </div>
+        <div class="panel panel-default">
         <div v-if="item == 'video'">
           <div class="btn-add" @click="addVideo">
             + 添加视频
@@ -186,6 +187,8 @@
             </div>
           </div>
         </div>
+        </div>
+        <div class="panel panel-default">
         <div v-if="item == 'heji'">
           <div class="btn-add" @click="addCollect()">
             + 添加合集
@@ -219,6 +222,7 @@
             </router-link>
           </div>
         </div>
+        </div>
         <!-- <div class="arts-title">
           一共
           <span style="color: var(--mainColor);">{{idInfo.topics_count}}</span> 篇文章

pages/user/select_new.vue

@@ -1,10 +1,12 @@
 <template>
   <div class="flex">
     <div class="box">
-      <div class="item">
-        <img src="~@/assets/quan/icon/new_article.png" alt="">
-        <div>投稿文章</div>
-      </div>
+      <router-link to="/user/new_article">
+        <div class="item">
+          <img src="~@/assets/quan/icon/new_article.png" alt="">
+          <div>投稿文章</div>
+        </div>
+      </router-link>
       <router-link to="/user/new_video">
         <div class="item">
           <img src="~@/assets/quan/icon/new_video.png" alt="">
@@ -28,45 +30,45 @@
       };
     },
     data() {
-      return {
-
-      };
+      return {};
     },
     mounted() {
       container = this.$refs.container;
     },
-    methods: {
-    },
+    methods: {},
   };
 </script>
 <style>
-  body{
+  body {
     background-color: white;
   }
 </style>
 <style lang='less' scoped>
- .flex{
+  .flex {
     height: 100vh;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
   }
-  .item{
+
+  .item {
     text-align: center;
-    font-size:0.3rem;
-    font-family:PingFangSC-Semibold,PingFang SC;
-    font-weight:600;
-    color:rgba(34,34,34,1);
-    line-height:0.35rem;
+    font-size: 0.3rem;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: rgba(34, 34, 34, 1);
+    line-height: 0.35rem;
   }
-  .box{
-    height:5.5rem;
+
+  .box {
+    height: 5.5rem;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
   }
-  img{
-      width:1.88rem;
-      height:1.88rem;
+
+  img {
+    width: 1.88rem;
+    height: 1.88rem;
   }
 </style>