Merge branch 'master' of https://gitee.com/ynmlzdwsp/ddi2

src/components/blog.vue

@@ -3,7 +3,7 @@
     <!-- 组件的内容 -->
     <!-- 网站信息 -->
     <div class="card-content1 shadow-box background-opacity">
-      <el-avatar style="margin-top: 20px" class="user-avatar" :size="120" :src="webInfo.avatar"></el-avatar>
+      <el-avatar style="margin-top: 20px" class="user-avatar" :size="120" :src="currentUser.avatar"></el-avatar>
       <div class="web-name">{{webInfo.webName}}</div>
       <div class="web-info">
         <div class="blog-info-box">
@@ -133,6 +133,9 @@ import axios from "axios";
 import * as events from "events";
 import upload from '../utils/ajaxUpload';
 export default {
+  avatar: {
+    type: String
+  },
   // 组件的逻辑和配置
   data() {
     return {
@@ -141,6 +144,7 @@ export default {
         size: 5,
         recommendStatus: true
       },
+      currentUser: this.$store.state.currentUser,
       recommendArticles: [],
       admires: [],
       showAdmireDialog: false,

src/components/common/treeHole.vue

@@ -6,8 +6,7 @@
           :key="index">
         <div class="tree-hole-content"
              :class="{ leftTreeHole: index % 2 === 0 && !$common.mobile(), rightTreeHole: index % 2 !== 0 || $common.mobile() }">
-          <el-avatar shape="square" class="avatar-img" :size="36"
+          <el-avatar shape="circle" class="avatar-img" :size="36" :src="currentUser.avatar"></el-avatar>
-                     :src="avatar"></el-avatar>
           <div class="tree-hole-box"
                :style="{background: $constant.tree_hole_color[index % $constant.tree_hole_color.length]}">
             <div class="box-tag" v-if="index % 2 === 0 && !$common.mobile()"
@@ -49,7 +48,9 @@
     },
 
     data() {
-      return {}
+      return {
+        currentUser: this.$store.state.currentUser,
+      }
     },
 
     computed: {},

src/components/home.vue

@@ -53,10 +53,10 @@
             </li>
 
 
-            <!-- 旅拍 -->
+
             <li @click="$router.push({path: '/travel'})">
               <div class="my-menu">
-                🌏 <span>旅拍</span>
+                📷 <span>记录</span>
               </div>
             </li>
 

src/components/myAside.vue

@@ -2,7 +2,13 @@
   <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>
+      <!--<el-avatar style="margin-top: 20px" class="user-avatar" :size="120" src="http://s6qc8qkjn.hd-bkt.clouddn.com/userAvatar/Sara11704850554971625.jpg"></el-avatar>-->
+      <!--<el-avatar style="margin-top: 20px" class="user-avatar" :size="120" src="webInfo.avatar"></el-avatar>-->
+      <el-avatar style="margin-top: 20px"
+                 class="user-avatar"
+                 :size="120"
+                 :src="!$common.isEmpty($store.state.currentUser)?$store.state.currentUser.avatar:$store.state.webInfo.avatar">
+      </el-avatar>
       <div class="web-name">{{webInfo.webName}}</div>
       <div class="web-info">
         <div class="blog-info-box">
@@ -121,7 +127,11 @@
                style="display: flex;justify-content: space-between"
                :key="i">
             <div style="display: flex">
-              <el-avatar style="margin-bottom: 10px" :size="36" :src="item.avatar"></el-avatar>
+              <el-avatar
+                style="margin-bottom: 10px"
+                :size="36"
+                :src="!$common.isEmpty($store.state.currentUser)?$store.state.currentUser.avatar:$store.state.webInfo.avatar">
+              </el-avatar>
               <div style="margin-left: 10px;height: 36px;line-height: 36px;overflow: hidden;max-width: 80px">
                 {{ item.username }}
               </div>

src/utils/constant.js

@@ -18,9 +18,10 @@ export default {
   //前后端定义的密钥，AES使用16位
   cryptojs_key: "aoligeimeimaobin",
   qiniuUrl: "https://upload.qiniup.com",
-  qiniuDownload: "https://s6xqq8hhg.hd-bkt.clouddn.com/",
+  qiniuDownload: "http://s6qc8qkjn.hd-bkt.clouddn.com/",
 
-  favoriteVideo: "$$$$自己找一个视频链接作为百宝箱的封面",
+  favoriteVideo: "http://s6q4ppvdk.hd-bkt.clouddn.com/new.mp4",
+  favoriteVideo2: "http://s6q4ppvdk.hd-bkt.clouddn.com/images/340c8040d037c2f3217e8a1ade444fc8.mp4",
 
   loveWeiYan: "https://s1.ax1x.com/2022/12/04/zsKgDs.jpg",
   loveMessage: "https://s1.ax1x.com/2022/12/04/zsKgDs.jpg",