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/myAside.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- 网站信息 -->
+<!--     网站信息 -->
     <div class="card-content1 shadow-box background-opacity">
       <el-avatar style="margin-top: 20px" class="user-avatar" :size="120" :src="webInfo.avatar"></el-avatar>
       <div class="web-name">{{webInfo.webName}}</div>

src/components/travel.vue

@@ -5,22 +5,16 @@
       <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>
 
       <div class="travel-content my-animation-slide-bottom">
@@ -61,174 +55,177 @@
 
 <script>
 
-  const myFooter = () => import( "./common/myFooter");
+const myFooter = () => import( "./common/myFooter");
-  const photo = () => import( "./common/photo");
+const photo = () => import( "./common/photo");
-  const proTag = () => import( "./common/proTag");
+const proTag = () => import( "./common/proTag");
-
+
-  export default {
+export default {
-    components: {
+  components: {
-      photo,
+    photo,
-      proTag,
+    proTag,
-      myFooter
+    myFooter
+  },
+
+  data() {
+    return {
+      photoPagination: {
+        current: 1,
+        size: 10,
+        total: 0,
+        resourceType: "lovePhoto",
+        classify: ""
+      },
+      photoTitleList: [
+        { classify: "公益计划", count: 6 },
+        { classify: "科研项目", count: 2 },
+      ],
+      photoList: []
+    }
+  },
+
+  computed: {},
+
+  watch: {},
+
+  created() {
+    this.getPhotoTitles();
+  },
+
+  mounted() {
+
+  },
+
+  methods: {
+    getPhotoTitles() {
+      this.$http.get(this.$constant.baseURL + "/webInfo/listAdminLovePhoto")
+        .then((res) => {
+          if (!this.$common.isEmpty(res.data)) {
+            this.photoTitleList = res.data;
+            this.photoPagination = {
+              current: 1,
+              size: 10,
+              total: 0,
+              resourceType: "lovePhoto",
+              classify: this.photoTitleList[0].classify
+            };
+            this.changePhoto();
+          }
+        })
+        .catch((error) => {
+          this.$message({
+            message: error.message,
+            type: "error"
+          });
+        });
     },
-
+    changePhotoTitle(classify) {
-    data() {
+      if (classify !== this.photoPagination.classify) {
-      return {
+        this.photoPagination = {
-        photoPagination: {
           current: 1,
           size: 10,
           total: 0,
           resourceType: "lovePhoto",
-          classify: ""
+          classify: classify
-        },
+        };
-        photoTitleList: [],
+        this.photoList = [];
-        photoList: []
+        this.changePhoto();
       }
     },
-
+    pagePhotos() {
-    computed: {},
+      this.photoPagination.current = this.photoPagination.current + 1;
-
+      this.changePhoto();
-    watch: {},
-
-    created() {
-      this.getPhotoTitles();
-    },
-
-    mounted() {
-
     },
-
+    changePhoto() {
-    methods: {
+      this.$http.post(this.$constant.baseURL + "/webInfo/listResourcePath", this.photoPagination)
-      getPhotoTitles() {
+        .then((res) => {
-        this.$http.get(this.$constant.baseURL + "/webInfo/listAdminLovePhoto")
+          if (!this.$common.isEmpty(res.data)) {
-          .then((res) => {
+            this.photoList = this.photoList.concat(res.data.records);
-            if (!this.$common.isEmpty(res.data)) {
+            this.photoPagination.total = res.data.total;
-              this.photoTitleList = res.data;
+          }
-              this.photoPagination = {
+        })
-                current: 1,
+        .catch((error) => {
-                size: 10,
+          this.$message({
-                total: 0,
+            message: error.message,
-                resourceType: "lovePhoto",
+            type: "error"
-                classify: this.photoTitleList[0].classify
-              };
-              this.changePhoto();
-            }
-          })
-          .catch((error) => {
-            this.$message({
-              message: error.message,
-              type: "error"
-            });
-          });
-      },
-      changePhotoTitle(classify) {
-        if (classify !== this.photoPagination.classify) {
-          this.photoPagination = {
-            current: 1,
-            size: 10,
-            total: 0,
-            resourceType: "lovePhoto",
-            classify: classify
-          };
-          this.photoList = [];
-          this.changePhoto();
-        }
-      },
-      pagePhotos() {
-        this.photoPagination.current = this.photoPagination.current + 1;
-        this.changePhoto();
-      },
-      changePhoto() {
-        this.$http.post(this.$constant.baseURL + "/webInfo/listResourcePath", this.photoPagination)
-          .then((res) => {
-            if (!this.$common.isEmpty(res.data)) {
-              this.photoList = this.photoList.concat(res.data.records);
-              this.photoPagination.total = res.data.total;
-            }
-          })
-          .catch((error) => {
-            this.$message({
-              message: error.message,
-              type: "error"
-            });
           });
-      }
+        });
     }
   }
+}
 </script>
 
 <style scoped>
 
-  .travel-container {
+.travel-container {
-    padding: 25px;
+  padding: 25px;
-    background: var(--favoriteBg);
+  background: var(--favoriteBg);
-  }
+}
-
+
-  .travel-header {
+.travel-header {
-    margin: 60px auto 30px;
+  margin: 60px auto 30px;
-    height: 300px;
+  height: 400px;
-    position: relative;
+  position: relative;
-    overflow: hidden;
+  overflow: hidden;
-    border-radius: 20px;
+  border-radius: 20px;
-    max-width: 1200px;
+  max-width: 1200px;
-    color: var(--white);
+  color: var(--white);
-    user-select: none;
+  user-select: none;
-  }
+}
-
+
-  .index-video {
+.index-video {
-    width: 100%;
+  width: 100%;
-    height: 100%;
+  height: 100%;
-    object-fit: cover;
+  object-fit: cover;
-    background: var(--lightGreen);
+  background: var(--lightGreen);
-  }
+}
-
+
-  .travel-content {
+.travel-content {
-    margin: 0 auto;
+  margin: 0 auto;
-    max-width: 1200px;
+  max-width: 1200px;
-  }
+}
-
+
+.photo-title-warp {
+  max-width: 1150px;
+  margin: 50px auto;
+  padding: 20px;
+  border-radius: 10px;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.isActive {
+  animation: scale 2.5s ease-in-out infinite;
+}
+
+.photo-title {
+  text-align: center;
+  font-size: 30px;
+  font-weight: 700;
+  line-height: 80px;
+  letter-spacing: 2px;
+}
+
+.pagination-wrap {
+  display: flex;
+  justify-content: center;
+  margin-top: 40px;
+}
+
+.pagination {
+  padding: 13px 15px;
+  border: 1px solid var(--lightGray);
+  border-radius: 3rem;
+  color: var(--greyFont);
+  width: 100px;
+  user-select: none;
+  cursor: pointer;
+  text-align: center;
+}
+
+@media screen and (max-width: 1150px) {
   .photo-title-warp {
-    max-width: 1150px;
+    max-width: 780px;
-    margin: 50px auto;
-    padding: 20px;
-    border-radius: 10px;
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-  .isActive {
-    animation: scale 2.5s ease-in-out infinite;
-  }
-
-  .photo-title {
-    text-align: center;
-    font-size: 30px;
-    font-weight: 700;
-    line-height: 80px;
-    letter-spacing: 2px;
-  }
-
-  .pagination-wrap {
-    display: flex;
-    justify-content: center;
-    margin-top: 40px;
-  }
-
-  .pagination {
-    padding: 13px 15px;
-    border: 1px solid var(--lightGray);
-    border-radius: 3rem;
-    color: var(--greyFont);
-    width: 100px;
-    user-select: none;
-    cursor: pointer;
-    text-align: center;
-  }
-
-  @media screen and (max-width: 1150px) {
-    .photo-title-warp {
-      max-width: 780px;
-    }
   }
+}
 
 </style>