初步合并，可以运行，还差一些细节

src/assets/css/color.css

@@ -78,7 +78,7 @@
 
     --commentURL: url(../file/comment.jpg);
     --springBg: url(../file/bg1.jpg);
-    --admireImage: url(../file/bg1.jpg);
+    --admireImage: url(../file/bg2.jpg);
     --toTop: url(../file/top.jpg);
     --bannerWave1: url(../file/bannerwave1.png) repeat-x;
     --bannerWave2: url(../file/bannerwave2.png) repeat-x;

src/components/about.vue

@@ -33,22 +33,41 @@
     data() {
       return {
         sayShow: false,
+        // sayContent: [
+        //   {
+        //     "talk": ["Hi, there👋", "这是一个 Vue2 Vue3 与 SpringBoot 结合的产物~"],
+        //     "reply": ["然后呢？ 😃", "少废话！ 🙄"]
+        //   }, {
+        //     "talk": ["😘",
+        //       "本站平时仅用于交流和学习新知识",
+        //       "如涉及侵权请联系站长删除对应资源，谢谢！！！"],
+        //     "reply": ["这个网站有什么用吗？ 😂"]
+        //   }, {
+        //     "talk": ["拥有自己的独立网站难道不酷吗🚀",
+        //       "那就摸鱼吧👋",
+        //       "摸鱼大军请在聊天室集合🥝"],
+        //     "reply": []
+        //   }
+        // ],
         sayContent: [
           {
-            "talk": ["Hi, there👋", "这是一个 Vue2 Vue3 与 SpringBoot 结合的产物~"],
-            "reply": ["然后呢？ 😃", "少废话！ 🙄"]
+            "talk": ["大家好👋", "欢迎来到查询药物相互作用，病友间相互交流的平台~"],
+            "reply": ["然后呢？ 😃", "别废话！ 🙄"]
           }, {
             "talk": ["😘",
-              "本站平时仅用于交流和学习新知识",
-              "如涉及侵权请联系站长删除对应资源，谢谢！！！"],
-            "reply": ["这个网站有什么用吗？ 😂"]
+              "这个平台是一个温暖的港湾，让我们可以相互倾听、相互支持",
+              "在这里，我们可以分享经验、交流心情，共同战胜疾病的困难和挑战"],
+            "reply": ["这个平台有什么用吗？ 😂"]
           }, {
-            "talk": ["拥有自己的独立网站难道不酷吗🚀",
-              "那就摸鱼吧👋",
-              "摸鱼大军请在聊天室集合🥝"],
+            "talk": ["拥有一个专属的交流平台，我们能够找到理解和同伴🚀",
+              "一起度过艰难时刻，分享希望和勇气👋",
+              "病友们请在聊天室集合🥝"],
             "reply": []
           }
         ],
+
+
+
         sayIndex: 0
       }
     },

src/components/home.vue

@@ -56,7 +56,7 @@
             <!-- 旅拍 -->
             <li @click="$router.push({path: '/travel'})">
               <div class="my-menu">
-                🌏 <span>旅拍</span>
+                🌏 <span>照片</span>
               </div>
             </li>
 

src/components/myAside.vue

@@ -47,35 +47,35 @@
     </div>
 
     <!-- 推荐文章 -->
-    <div v-if="!$common.isEmpty(recommendArticles)"
-         style="padding: 25px;border-radius: 10px;margin-top: 30px;animation: hideToShow 1s ease-in-out"
-         class="shadow-box background-opacity wow">
-      <div class="card-content2-title">
-        <i class="el-icon-reading card-content2-icon"></i>
-        <span>推荐文章</span>
-      </div>
-      <div v-for="(article, index) in recommendArticles"
-           :key="index"
-           @click="$router.push({path: '/article', query: {id: article.id}})">
-        <div class="aside-post-detail">
-          <div class="aside-post-image">
-            <el-image lazy class="my-el-image" :src="article.articleCover" fit="cover">
-              <div slot="error" class="image-slot">
-                <div class="error-aside-image">
-                  {{article.username}}
-                </div>
-              </div>
-            </el-image>
-          </div>
-          <div class="aside-post-title">
-            {{ article.articleTitle }}
-          </div>
-        </div>
-        <div class="aside-post-date">
-          <i class="el-icon-date" style="color: var(--greyFont)"></i>{{ article.createTime }}
-        </div>
-      </div>
-    </div>
+<!--    <div v-if="!$common.isEmpty(recommendArticles)"-->
+<!--         style="padding: 25px;border-radius: 10px;margin-top: 30px;animation: hideToShow 1s ease-in-out"-->
+<!--         class="shadow-box background-opacity wow">-->
+<!--      <div class="card-content2-title">-->
+<!--        <i class="el-icon-reading card-content2-icon"></i>-->
+<!--        <span>推荐文章</span>-->
+<!--      </div>-->
+<!--      <div v-for="(article, index) in recommendArticles"-->
+<!--           :key="index"-->
+<!--           @click="$router.push({path: '/article', query: {id: article.id}})">-->
+<!--        <div class="aside-post-detail">-->
+<!--          <div class="aside-post-image">-->
+<!--            <el-image lazy class="my-el-image" :src="article.articleCover" fit="cover">-->
+<!--              <div slot="error" class="image-slot">-->
+<!--                <div class="error-aside-image">-->
+<!--                  {{article.username}}-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </el-image>-->
+<!--          </div>-->
+<!--          <div class="aside-post-title">-->
+<!--            {{ article.articleTitle }}-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <div class="aside-post-date">-->
+<!--          <i class="el-icon-date" style="color: var(&#45;&#45;greyFont)"></i>{{ article.createTime }}-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
 
     <!-- 速览 -->
     <div v-for="(sort, index) in sortInfo"

src/components/travel.vue

@@ -11,7 +11,7 @@
           <!-- 标题 -->
           <div style="margin: 10px">
             <div style="font-size: 36px;font-weight: bold;line-height: 1.5;margin-top: 20px">
-              让照片留下医药学的足迹
+              悲伤和希望，都是一缕光
             </div>
           </div>
         </div>
@@ -89,6 +89,7 @@ export default {
 
   created() {
     this.getPhotoTitles();
+    this.changePhotoTitle();
   },
 
   mounted() {

src/components/user.vue

@@ -83,7 +83,7 @@
                 <div v-if="!$common.isEmpty(currentUser.phoneNumber)">
                   {{ currentUser.phoneNumber }} <span class="changeInfo" @click="changeDialog('修改手机号')">修改（功能未接入）</span>
                 </div>
-                <div v-else><span class="changeInfo" @click="changeDialog('绑定手机号')">绑定手机号（功能未接入）</span></div>
+                <div v-else><span class="changeInfo" @click="changeDialog('绑定手机号')">绑定手机号</span></div>
               </div>
               <div>
                 <div v-if="!$common.isEmpty(currentUser.email)">

src/utils/constant.js

@@ -3,9 +3,9 @@ export default {
   imBaseURL: "http://localhost:81",
   webURL: "http://localhost",
 
-  // baseURL: "https://poetize.cn/api",
-  // imBaseURL: "https://poetize.cn/im",
-  // webURL: "https://poetize.cn",
+  // baseURL: "http://192.168.190.1:8081",
+  // imBaseURL: "http://192.168.190.1:81",
+  // webURL: "http://192.168.190.1.250",
 
   live2d_path: "https://cdn.jsdelivr.net/gh/stevenjoezhang/live2d-widget@latest/",
   cdnPath: "https://cdn.jsdelivr.net/gh/fghrsh/live2d_api/",
@@ -18,7 +18,7 @@ export default {
   //前后端定义的密钥，AES使用16位
   cryptojs_key: "aoligeimeimaobin",
   qiniuUrl: "https://upload.qiniup.com",
-  qiniuDownload: "https://s6xqq8hhg.hd-bkt.clouddn.com/",
+  qiniuDownload: "http://s6ondx7d9.hd-bkt.clouddn.com/",
 
   favoriteVideo: "$$$$自己找一个视频链接作为百宝箱的封面",
   favoriteVideo2:"http://s6ondx7d9.hd-bkt.clouddn.com/images/340c8040d037c2f3217e8a1ade444fc8.mp4",
@@ -26,7 +26,7 @@ export default {
   loveWeiYan: "https://s1.ax1x.com/2022/12/04/zsKgDs.jpg",
   loveMessage: "https://s1.ax1x.com/2022/12/04/zsKgDs.jpg",
   lovePhoto: "https://s1.ax1x.com/2022/12/04/zsKh5V.jpg",
-  loveLike: "https://cdn.cbd.int//hexo-butterfly-envelope/lib/violet.jpg",
+  loveLike: "http://s6ondx7d9.hd-bkt.clouddn.com/images/R-C.jpg",
   loveSortId: 1,
   loveLabelId: 1,
 
@@ -34,7 +34,7 @@ export default {
   friendLetterTop: "https://cdn.cbd.int/hexo-butterfly-envelope/lib/before.png",
   friendLetterBottom: "https://cdn.cbd.int/hexo-butterfly-envelope/lib/after.png",
   friendLetterBiLi: "https://cdn.cbd.int/hexo-butterfly-envelope/lib/line.png",
-  friendLetterMiddle: "https://cdn.cbd.int//hexo-butterfly-envelope/lib/violet.jpg",
+  friendLetterMiddle: "http://s6ondx7d9.hd-bkt.clouddn.com/images/aaa.jpg",
 
   before_color_list: ["#ff4b2b", "#EF794F", "#67C23A", "orange", "rgb(131, 123, 199)", "#23d5ab"],