Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/utils/constant.js

src/components/love.vue

@@ -35,11 +35,7 @@
         <div>
           <!-- 计时 -->
           <div>
-            <div class="love-time-title1">
+
-              <a class="collection-btn" @click="showTip()">
-                <i class="el-icon-star-off" style="margin-right: 2px"></i>我的开发流程
-              </a>
-            </div>
 
             <div class="love-time1">
               第
@@ -162,7 +158,20 @@
             </div>
           </div>
         </div>
+        <div class="myCenter love-content">
+          <!-- 时间 -->
+          <div>
+            <!-- 计时 -->
+            <div>
+              <div class="love-time-title1">
+                <a class="collection-btn" @click="showTip()">
+                  <i class="el-icon-star-off" style="margin-right: 2px"></i>
+                </a>
+              </div>
+            </div>
+          </div>
 
+        </div>
         <div class="card-container">
           <div v-show="card === 1 && !$common.isEmpty(treeHoleList)">
             <treeHole :treeHoleList="treeHoleList"
@@ -417,6 +426,7 @@
         <!-- 页脚 -->
         <myFooter></myFooter>
       </div>
+
     </div>
   </div>
 </template>
@@ -1003,7 +1013,10 @@ import {listTable1, predictReaction} from "@/utils/table1";
   }
 
   .love-time-title1 {
-    font-size: 2rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 3rem;
     font-weight: 600;
     letter-spacing: 0.2rem;
     line-height: 4rem;

src/components/travel.vue

@@ -5,21 +5,15 @@
       <div class="travel-header my-animation-slide-top">
         <!-- 背景图片 -->
         <video class="index-video" autoplay="autoplay" muted="muted" loop="loop"
-               :src="$constant.favoriteVideo">
+               :src="$constant.favoriteVideo2">
         </video>
         <div style="position: absolute;left: 20px;top: 20px">
           <!-- 标题 -->
           <div style="margin: 10px">
-            <div>
-              旅拍集
-            </div>
             <div style="font-size: 36px;font-weight: bold;line-height: 1.5;margin-top: 20px">
-              这里是我的旅拍哦
+              让照片留下医药学的足迹
-            </div>
             </div>
           </div>
-        <div style="position: absolute;left: 20px;bottom: 40px;margin: 10px">
-          每一张照片都是一次美好的记忆。
         </div>
       </div>
 
@@ -81,7 +75,10 @@
         resourceType: "lovePhoto",
         classify: ""
       },
-        photoTitleList: [],
+      photoTitleList: [
+        { classify: "公益计划", count: 6 },
+        { classify: "科研项目", count: 2 },
+      ],
       photoList: []
     }
   },
@@ -166,7 +163,7 @@
 
 .travel-header {
   margin: 60px auto 30px;
-    height: 300px;
+  height: 400px;
   position: relative;
   overflow: hidden;
   border-radius: 20px;