Merge branch 'dev-stage2-20191125' of...

Merge branch 'dev-stage2-20191125' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into dev-stage2-20191125

assets/style/in-activity.less

@@ -86,7 +86,7 @@
           float: left;
           width: 50px; height: 50px; overflow: hidden; border: 0; display: block;
           border-radius: 50px;
-          // border: 1px solid red;
+          // border: 1PX solid red;
           img{
             width: 50px; height: 50px; 
           }
@@ -99,7 +99,7 @@
           color:#373839;
           .name{
             width: 100%;
-            font-size: 18px; line-height: 18px; margin-top: 5px; font-weight: 700;
+            font-size: 18px; line-height: 28px;  font-weight: 700;
             .ellipsis;
           }
           .company{
@@ -111,7 +111,7 @@
         .detail{
           position: relative;
           float: left; box-sizing: border-box; font-weight: 700;
-          width: 68px; height: 25px; overflow: hidden; border-radius: 25px; border: 1px solid #FD5A2F;
+          width: 68px; height: 25px; overflow: hidden; border-radius: 25px; border: 1PX solid #FD5A2F;
           font-size: 12px; color: #FD5A2F; line-height: 23px; text-indent: 5px;
           margin-top: 18px;
           img{ 
@@ -150,7 +150,7 @@
           }
           .billboard-btn{
             position: relative;
-            width: 99px; height: 25px; border: 1px solid #FD5A2F; border-radius: 25px;
+            width: 99px; height: 25px; border: 1PX solid #FD5A2F; border-radius: 25px;
             margin-top: 15px;
             font-size: 12px; font-weight: 700; line-height: 25px; color: #FD5A2F; text-indent: 10px;
             img{ 
@@ -179,7 +179,7 @@
           position: relative;
           float: right;
           width: 81px; height: 25px; 
-          border: 1px solid #FD5A2F; border-radius: 25px;
+          border: 1PX solid #FD5A2F; border-radius: 25px;
           line-height: 25px; text-indent: 8px; font-size: 12px; line-height: 25px; color: #FD5A2F; font-weight: 700;
           img{ 
             position: absolute; right: 5px; top: 50%; margin-top:-6px;
@@ -247,7 +247,7 @@
         position: relative;
         float: left;
         width: 56px; height: 25px; margin: 14px 0 0 24px;
-        border: 1px solid #FD5A2F;
+        border: 1PX solid #FD5A2F;
         border-radius: 25px; font-size: 12px; line-height: 25px; text-indent: 8px;
         color: #FD5A2F; font-weight: 700;
         &.login-but-nojoin{

pages/activityPage.vue

@@ -107,21 +107,25 @@
             <li>
               <div class="add-btn" @click="eachDoctorClick">
                 <img src="../assets/img/stage-two/add-pic-icon.png" alt="">
+                <p class="text">昵称</p>
               </div>
             </li>
             <li>
               <div class="add-btn" @click="eachDoctorClick">
                 <img src="../assets/img/stage-two/add-pic-icon.png" alt="">
+                <p class="text">昵称</p>
               </div>
             </li>
             <li>
               <div class="add-btn" @click="eachDoctorClick">
                 <img src="../assets/img/stage-two/add-pic-icon.png" alt="">
+                <p class="text">昵称</p>
               </div>
             </li>
             <li>
               <div class="add-btn" @click="eachDoctorClick">
                 <img src="../assets/img/stage-two/add-pic-icon.png" alt="">
+                <p class="text">昵称</p>
               </div>
             </li>
           </template>
@@ -433,7 +437,7 @@
             "seqNo":1
           },{
             "key":"showTitle",
-            "value": false,
+            "value": true,
             "type":1,
             "seqNo":2
           },{