From a19548eef6b6337c5db08735230bada9321b106a Mon Sep 17 00:00:00 2001
From: BeininX <1271798328@qq.com>
Date: Sat, 6 Jan 2024 09:03:54 +0800
Subject: [PATCH 01/13] Changes

---
 package-lock.json       | 68 +------------------------------------
 src/components/love.vue | 74 ++++++++++++-----------------------------
 src/utils/constant.js   |  8 ++---
 3 files changed, 26 insertions(+), 124 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4d826d6..a90ec91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,11 +17,9 @@
         "qs": "^6.10.3",
         "vue": "^2.6.11",
         "vue-baberrage": "^3.2.4",
-        "vue-ripple-directive": "^2.0.1",
         "vue-router": "^3.2.0",
         "vue-seamless-scroll": "^1.1.23",
-        "vuex": "^3.4.0",
-        "vuex-persistedstate": "^4.0.0"
+        "vuex": "^3.4.0"
       },
       "devDependencies": {
         "@vue/cli-plugin-babel": "~4.5.0",
@@ -12484,12 +12482,6 @@
       "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
       "dev": true
     },
-    "node_modules/shvl": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmmirror.com/shvl/-/shvl-2.0.3.tgz",
-      "integrity": "sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw==",
-      "deprecated": "older versions vulnerable to prototype pollution"
-    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
@@ -14623,14 +14615,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/vue-ripple-directive": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/vue-ripple-directive/-/vue-ripple-directive-2.0.1.tgz",
-      "integrity": "sha512-jXZEX6uZpo89wxmdcw02uFpsMBpm1pxjQ60uqghNLQ8H8ju9eon2vE0+vvSWJ1WGCOTEfxGDR4InabJJu5f1GA==",
-      "dependencies": {
-        "vue": "^2.2.1"
-      }
-    },
     "node_modules/vue-router": {
       "version": "3.5.3",
       "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.5.3.tgz",
@@ -14710,27 +14694,6 @@
         "vue": "^2.0.0"
       }
     },
-    "node_modules/vuex-persistedstate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmmirror.com/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz",
-      "integrity": "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "dependencies": {
-        "deepmerge": "^4.2.2",
-        "shvl": "^2.0.3"
-      },
-      "peerDependencies": {
-        "vuex": "^3.0 || ^4.0.0-rc"
-      }
-    },
-    "node_modules/vuex-persistedstate/node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-1.7.5.tgz",
@@ -26095,11 +26058,6 @@
       "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
       "dev": true
     },
-    "shvl": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmmirror.com/shvl/-/shvl-2.0.3.tgz",
-      "integrity": "sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw=="
-    },
     "side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
@@ -27882,14 +27840,6 @@
         }
       }
     },
-    "vue-ripple-directive": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/vue-ripple-directive/-/vue-ripple-directive-2.0.1.tgz",
-      "integrity": "sha512-jXZEX6uZpo89wxmdcw02uFpsMBpm1pxjQ60uqghNLQ8H8ju9eon2vE0+vvSWJ1WGCOTEfxGDR4InabJJu5f1GA==",
-      "requires": {
-        "vue": "^2.2.1"
-      }
-    },
     "vue-router": {
       "version": "3.5.3",
       "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.5.3.tgz",
@@ -27963,22 +27913,6 @@
       "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
       "requires": {}
     },
-    "vuex-persistedstate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmmirror.com/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz",
-      "integrity": "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==",
-      "requires": {
-        "deepmerge": "^4.2.2",
-        "shvl": "^2.0.3"
-      },
-      "dependencies": {
-        "deepmerge": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.2.2.tgz",
-          "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
-        }
-      }
-    },
     "watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-1.7.5.tgz",
diff --git a/src/components/love.vue b/src/components/love.vue
index da4ee9a..70e6217 100644
--- a/src/components/love.vue
+++ b/src/components/love.vue
@@ -2,11 +2,11 @@
   <div>
     <!-- 封面 -->
     <div class="bg-wrap my-animation-slide-top">
-      <!-- 背景图片 -->
       <el-image class="love-image my-el-image"
                 lazy
                 :src="love.bgCover"
-                fit="cover">
+                fit="cover"
+                style="width: 100%; height: 100vh;">
         <div slot="error" class="image-slot"></div>
       </el-image>
 
@@ -18,9 +18,7 @@
             {{love.manName}}
           </div>
         </div>
-        <div>
-          <img class="love-img" :src="$constant.loveLike" alt="心心">
-        </div>
+
         <div>
           <el-avatar class="love-avatar" :src="love.womanCover"></el-avatar>
           <div class="love-title">
@@ -41,7 +39,7 @@
           <!-- 计时 -->
           <div>
             <div class="love-time-title1">
-              这是我们一起走过的
+              我的开发流程
             </div>
             <div class="love-time1">
               第
@@ -69,7 +67,7 @@
 
       <div style="padding: 0 20px">
         <div class="family-button shadow-box-mini" @click="changeCard(4)">
-          <span class="family-button-title">{{card === 4 ? '回到主人家' : '开往表白墙'}}</span>
+
           <span class="family-button-car">
             <svg viewBox="0 0 1024 1024" width="40" height="40">
                 <path
@@ -110,37 +108,7 @@
       <div style="padding: 0 20px">
         <!-- 卡片 -->
         <div class="card-wrap" v-show="card !== 4">
-          <div class="card-content shadow-box-mini" @click="changeCard(1)">
-            <div>
-              <el-avatar :size="100"
-                         :src="$constant.loveWeiYan">
-              </el-avatar>
-            </div>
-            <div class="card-right">
-              <div class="card-title">
-                点点滴滴
-              </div>
-              <div class="card-desc">
-                ☀️今朝有酒今朝醉
-              </div>
-            </div>
-          </div>
 
-          <div class="card-content shadow-box-mini" @click="changeCard(2)">
-            <div>
-              <el-avatar :size="100"
-                         :src="$constant.lovePhoto">
-              </el-avatar>
-            </div>
-            <div class="card-right">
-              <div class="card-title">
-                时光相册
-              </div>
-              <div class="card-desc">
-                📸记录美好瞬间
-              </div>
-            </div>
-          </div>
 
           <div class="card-content shadow-box-mini" @click="changeCard(3)">
             <div>
@@ -150,10 +118,10 @@
             </div>
             <div class="card-right">
               <div class="card-title">
-                祝福板
+                记录
               </div>
               <div class="card-desc">
-                📋写下对我们的祝福
+                📋写下你的开发记录
               </div>
             </div>
           </div>
@@ -239,7 +207,7 @@
             </div>
             <div class="family-bottom" style="background-color: var(--lightGreen)" @click="addFamily()">
               <span style="line-height: 50px">
-                申请入住
+                设置
               </span>
               <span style="vertical-align:middle">
                 <svg viewBox="0 0 1024 1024" width="30" height="30"><path
@@ -256,7 +224,7 @@
         </div>
       </div>
 
-      <el-dialog title="入住表白墙"
+      <el-dialog title="开启你的记录流程吧"
                  :visible.sync="loveDialogVisible"
                  width="40%"
                  :close-on-click-modal="false"
@@ -287,7 +255,7 @@
                     </div>
                     <div>
                       <div class="form-title">
-                        男生头像&nbsp;
+                        头像&nbsp;
                       </div>
                       <div style=" display: flex">
                         <el-input maxlength="120" v-model="userLove.manCover"></el-input>
@@ -302,12 +270,12 @@
                     </div>
                     <div>
                       <div class="form-title">
-                        女生头像&nbsp;
+                        项目logo&nbsp;
                       </div>
                       <div style=" display: flex">
                         <el-input maxlength="120" v-model="userLove.womanCover"></el-input>
                         <div style="margin: 3px 0 0 10px">
-                          <proButton :info="'上传头像'"
+                          <proButton :info="'上传logo'"
                                      @click.native="openPicture('womanCover')"
                                      :before="$constant.before_color_1"
                                      :after="$constant.after_color_1">
@@ -317,7 +285,7 @@
                     </div>
                     <div>
                       <div class="form-title">
-                        男生昵称&nbsp;
+                        昵称&nbsp;
                       </div>
                       <div>
                         <el-input maxlength="10" v-model="userLove.manName"></el-input>
@@ -325,7 +293,7 @@
                     </div>
                     <div>
                       <div class="form-title">
-                        女生昵称&nbsp;
+                        项目名&nbsp;
                       </div>
                       <div>
                         <el-input maxlength="10" v-model="userLove.womanName"></el-input>
@@ -369,7 +337,7 @@
                     </div>
                     <div>
                       <div class="form-title">
-                        告白信&nbsp;&nbsp;
+                        简述&nbsp;&nbsp;
                       </div>
                       <div>
                         <el-input type="textarea"
@@ -391,7 +359,7 @@
               <div>
                 <img :src="$constant.friendLetterBiLi" style="width: 100%;margin: 5px auto"/>
               </div>
-              <p style="font-size: 12px;text-align: center;color: #999">欢迎入住表白墙</p>
+              <p style="font-size: 12px;text-align: center;color: #999">开启记录</p>
             </div>
           </div>
         </div>
@@ -529,7 +497,7 @@
       submitLove() {
         if (this.userLove.bgCover.trim() === "") {
           this.$message({
-            message: "你还没设置背景封面呢~",
+            message: "你还没设置呢~",
             type: "warning"
           });
           return;
@@ -537,7 +505,7 @@
 
         if (this.userLove.manCover.trim() === "") {
           this.$message({
-            message: "你还没设置男生头像呢~",
+            message: "你还没设置呢~",
             type: "warning"
           });
           return;
@@ -545,7 +513,7 @@
 
         if (this.userLove.womanCover.trim() === "") {
           this.$message({
-            message: "你还没设置女生头像呢~",
+            message: "你还没设置呢~",
             type: "warning"
           });
           return;
@@ -553,7 +521,7 @@
 
         if (this.userLove.manName.trim() === "") {
           this.$message({
-            message: "你还没写男生昵称呢~",
+            message: "你还没写呢~",
             type: "warning"
           });
           return;
@@ -561,7 +529,7 @@
 
         if (this.userLove.womanName.trim() === "") {
           this.$message({
-            message: "你还没写女生昵称呢~",
+            message: "你还没写呢~",
             type: "warning"
           });
           return;
diff --git a/src/utils/constant.js b/src/utils/constant.js
index 545abf2..7841679 100644
--- a/src/utils/constant.js
+++ b/src/utils/constant.js
@@ -1,7 +1,7 @@
 export default {
-  baseURL: "http://localhost:8081",
-  imBaseURL: "http://localhost:81",
-  webURL: "http://localhost",
+  baseURL: "http://172.20.10.3:8081",
+  imBaseURL: "http://172.20.10.3:81",
+  webURL: "http://172.20.10.3",
 
   // baseURL: "https://poetize.cn/api",
   // imBaseURL: "https://poetize.cn/im",
@@ -18,7 +18,7 @@ export default {
   //前后端定义的密钥，AES使用16位
   cryptojs_key: "aoligeimeimaobin",
   qiniuUrl: "https://upload.qiniup.com",
-  qiniuDownload: "$$$$七牛云下载地址，仿照【https://file.poetize.cn/】",
+  qiniuDownload: "https://portal.qiniu.com/cdn/domain/s6q4ppvdk.hd-bkt.clouddn.com",
 
   favoriteVideo: "$$$$自己找一个视频链接作为百宝箱的封面",
 

From bd3496195d5dda3e64c75a00ab25a898f4d36299 Mon Sep 17 00:00:00 2001
From: ynmlzdwsp <2727940448@qq.com>
Date: Sat, 6 Jan 2024 09:30:51 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=BB=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/index.vue   | 61 +++++++++++++++++++++-----------------
 src/components/myAside.vue | 42 +++++++++++++-------------
 src/utils/table1.js        |  6 ++++
 3 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/src/components/index.vue b/src/components/index.vue
index 372f960..ce0ee00 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -75,20 +75,14 @@
               <div class="announcement background-opacity">
                 <i class="fa fa-volume-up" aria-hidden="true"></i>
                 <div>
-                  <div v-for="(notice, index) in $store.state.webInfo.notices" :key="index">
-                    {{ notice }}
-                  </div>
+<!--                  <div v-for="(notice, index) in $store.state.webInfo.notices" :key="index">-->
+<!--                    {{ notice }}-->
+<!--                  </div>-->
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;世界上只有一种真正的英雄主义，那就是看清生活的真相之后，依然勇敢地热爱生活。
                 </div>
               </div>
               <articleList :articleList="articles"></articleList>
-<!--              <div class="pagination-wrap">-->
-<!--                <div @click="pageArticles()" class="pagination" v-if="pagination.total !== articles.length">-->
-<!--                  下一页-->
-<!--                </div>-->
-<!--                <div v-else style="user-select: none">-->
-<!--                  ~~到底啦~~-->
-<!--                </div>-->
-<!--              </div>-->
+
               <template>
                 <div class="pagination-wrap">
                   <el-table :data="table1List">
@@ -109,20 +103,17 @@
 
 
                 </div>
-<!--                <div  style="user-select: none;text-align: center">-->
-<!--                  ~~到底啦~~-->
-<!--                </div>-->
 
                 <!--分页组件-->
                 <div class="block">
                   <el-pagination
                     @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"
-                    :current-page="currentPage4"
-                    :page-sizes="[100, 200, 300, 400]"
-                    :page-size="100"
+                    :current-page="currentPage1"
+                    :page-sizes="[7, 10, 15, 20]"
+                    :page-size="7"
                     layout="total, sizes, prev, pager, next, jumper"
-                    :total="400">
+                    :total=this.pagination.total>
                   </el-pagination>
                 </div>
               </template>
@@ -141,7 +132,7 @@
   </div>
 </template>
 <script>
-  import {listTable1} from "@/utils/table1";
+import {listTable1, listTotal} from "@/utils/table1";
 
   const loader = () => import( "./common/loader");
   const zombie = () => import( "./common/zombie");
@@ -162,9 +153,9 @@
 
     data() {
       return {
-        currentPage1: 5,
-        currentPage2: 5,
-        currentPage3: 5,
+        currentPage1: 1,
+        currentPage2: 2,
+        currentPage3: 3,
         currentPage4: 4,
         loading: false,
         showAside: true,
@@ -188,7 +179,7 @@
         // 查询参数
         queryParams: {
           pageNum: 1,
-          pageSize: 10,
+          pageSize: 7,
           drug1: null,
           drug2: null,
           reaction: null
@@ -201,31 +192,45 @@
     created() {
       this.getGuShi();
       this.getArticles();
-      this.getList();
+      this.handleQuery();
     },
 
     mounted() {
     },
 
     methods: {
+      /** 查询药品作用列表条数 */
+      getTotal() {
+        listTotal(this.queryParams).then(response => {
+          this.pagination.total = parseInt(response);
+          console.log(this.pagination.total);
+        });
+      },
       handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
+        this.queryParams.pageSize = val; // 修改每页显示数量
+        this.getList();
       },
       handleCurrentChange(val) {
-        console.log(`当前页: ${val}`);
+        this.queryParams.pageNum = val; // 修改每页显示数量
+        this.getList();
       },
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
         this.getList();
+        this.getTotal();
+        // 页面自动下滑效果
+        const targetElement = document.querySelector('.recent-posts');
+        if (targetElement) {
+          targetElement.scrollIntoView({ behavior: "smooth", block: "start" });
+        }
       },
       /** 查询药品作用管理列表 */
       getList() {
         // this.loading = true;
         this.table1List = []; // 初始化为空数组
         listTable1(this.queryParams).then(response => {
-            this.table1List = response;
-            console.log(this.table1List[0].reaction);
+          this.table1List = response;
         });
       },
       async selectSort(sort) {
diff --git a/src/components/myAside.vue b/src/components/myAside.vue
index 81809e3..ccb63f6 100644
--- a/src/components/myAside.vue
+++ b/src/components/myAside.vue
@@ -1,27 +1,27 @@
 <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>-->
-<!--      <div class="web-info">-->
-<!--        <div class="blog-info-box">-->
-<!--          <span>文章</span>-->
-<!--          <span class="blog-info-num">{{ $store.getters.articleTotal }}</span>-->
-<!--        </div>-->
-<!--        <div class="blog-info-box">-->
-<!--          <span>分类</span>-->
-<!--          <span class="blog-info-num">{{ sortInfo.length }}</span>-->
-<!--        </div>-->
-<!--        <div class="blog-info-box">-->
-<!--          <span>访问量</span>-->
-<!--          <span class="blog-info-num">{{ webInfo.historyAllCount }}</span>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--      <a class="collection-btn" @click="showTip()">-->
-<!--        <i class="el-icon-star-off" style="margin-right: 2px"></i>朋友圈-->
-<!--      </a>-->
-<!--    </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>
+      <div class="web-info">
+        <div class="blog-info-box">
+          <span>文章</span>
+          <span class="blog-info-num">{{ $store.getters.articleTotal }}</span>
+        </div>
+        <div class="blog-info-box">
+          <span>分类</span>
+          <span class="blog-info-num">{{ sortInfo.length }}</span>
+        </div>
+        <div class="blog-info-box">
+          <span>访问量</span>
+          <span class="blog-info-num">{{ webInfo.historyAllCount }}</span>
+        </div>
+      </div>
+      <a class="collection-btn" @click="showTip()">
+        <i class="el-icon-star-off" style="margin-right: 2px"></i>朋友圈
+      </a>
+    </div>
 
     <!-- 搜索 -->
     <div style="padding: 15px;border-radius: 10px;margin-top: 30px;animation: hideToShow 1s ease-in-out"
diff --git a/src/utils/table1.js b/src/utils/table1.js
index ae69705..f5e1fd0 100644
--- a/src/utils/table1.js
+++ b/src/utils/table1.js
@@ -7,6 +7,12 @@ export function listTable1(query) {
     .catch(error => console.error(error));
 }
 
+export function listTotal(query) {
+  const url = '/system/table1/total';
+  return axios.get(url, { params: query })
+    .then(response => response.data)
+    .catch(error => console.error(error));
+}
 
 // 查询药品作用管理详细
 export function getTable1(id) {

From 8acb8d3359f8ed244f5fd492906ddf026733a806 Mon Sep 17 00:00:00 2001
From: ynmlzdwsp <2727940448@qq.com>
Date: Sat, 6 Jan 2024 10:35:00 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=8D=AF=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/index.vue   | 14 +++---
 src/components/myAside.vue | 94 +++++++++++++++++++-------------------
 2 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/src/components/index.vue b/src/components/index.vue
index ce0ee00..db2fcf2 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -39,6 +39,10 @@
               <input class="ais-SearchBox-input" type="text"
                      v-model="queryParams.drug2"
                      placeholder="请输入药品B名称" maxlength="32">
+              <div style="width: 10px"></div>
+              <input class="ais-SearchBox-input" type="text"
+                     v-model="queryParams.reaction"
+                     placeholder="请输入相互作用效果" maxlength="32">
               <div class="ais-SearchBox-submit" @click="handleQuery()">
                 <svg style="margin-top: 3.5px;margin-left: 18px" viewBox="0 0 1024 1024" width="20" height="20">
                   <path
@@ -110,8 +114,8 @@
                     @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"
                     :current-page="currentPage1"
-                    :page-sizes="[7, 10, 15, 20]"
-                    :page-size="7"
+                    :page-sizes="[10, 15, 20, 15]"
+                    :page-size="10"
                     layout="total, sizes, prev, pager, next, jumper"
                     :total=this.pagination.total>
                   </el-pagination>
@@ -154,9 +158,6 @@ import {listTable1, listTotal} from "@/utils/table1";
     data() {
       return {
         currentPage1: 1,
-        currentPage2: 2,
-        currentPage3: 3,
-        currentPage4: 4,
         loading: false,
         showAside: true,
         printerInfo: "你看对面的青山多漂亮",
@@ -179,7 +180,7 @@ import {listTable1, listTotal} from "@/utils/table1";
         // 查询参数
         queryParams: {
           pageNum: 1,
-          pageSize: 7,
+          pageSize: 10,
           drug1: null,
           drug2: null,
           reaction: null
@@ -523,6 +524,7 @@ import {listTable1, listTotal} from "@/utils/table1";
     border-radius: 40px;
     color: var(--maxGreyFont);
     background: var(--white);
+    opacity: 0.5;
   }
 
   @media screen and (max-width: 1100px) {
diff --git a/src/components/myAside.vue b/src/components/myAside.vue
index ccb63f6..f0a440a 100644
--- a/src/components/myAside.vue
+++ b/src/components/myAside.vue
@@ -98,59 +98,59 @@
          style="margin-top: 30px;padding: 25px 25px 5px;border-radius: 10px;animation: hideToShow 1s ease-in-out">
       <div class="card-content2-title">
         <i class="el-icon-folder-opened card-content2-icon"></i>
-        <span>分类</span>
-      </div>
-      <div v-for="(sort, index) in sortInfo"
-           :key="index"
-           class="post-sort"
-           @click="$router.push({path: '/sort', query: {sortId: sort.id}})">
-        <div>
-          <span v-for="(s, i) in sort.sortName.split('')" :key="i">{{ s }}</span>
-        </div>
+        <span>药品详情</span>
       </div>
+<!--      <div v-for="(sort, index) in sortInfo"-->
+<!--           :key="index"-->
+<!--           class="post-sort"-->
+<!--           @click="$router.push({path: '/sort', query: {sortId: sort.id}})">-->
+<!--        <div>-->
+<!--          <span v-for="(s, i) in sort.sortName.split('')" :key="i">{{ s }}</span>-->
+<!--        </div>-->
+<!--      </div>-->
     </div>
 
     <!-- 赞赏 -->
-<!--    <div class="shadow-box-mini background-opacity wow admire-box"-->
-<!--         v-if="!$common.isEmpty(admires)">-->
-<!--      <div style="font-weight: bold;margin-bottom: 20px">🧨赞赏名单</div>-->
-<!--      <div>-->
-<!--        <vue-seamless-scroll :data="admires" style="height: 200px;overflow: hidden">-->
-<!--          <div v-for="(item, i) in admires"-->
-<!--               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>-->
-<!--              <div style="margin-left: 10px;height: 36px;line-height: 36px;overflow: hidden;max-width: 80px">-->
-<!--                {{ item.username }}-->
-<!--              </div>-->
-<!--            </div>-->
-<!--            <div style="height: 36px;line-height: 36px">-->
-<!--              {{ item.admire }}元-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </vue-seamless-scroll>-->
-<!--      </div>-->
-<!--      <div class="admire-btn" @click="showAdmire()">-->
-<!--        赞赏-->
-<!--      </div>-->
-<!--    </div>-->
+    <div class="shadow-box-mini background-opacity wow admire-box"
+         v-if="!$common.isEmpty(admires)">
+      <div style="font-weight: bold;margin-bottom: 20px">🧨赞赏</div>
+      <div>
+        <vue-seamless-scroll :data="admires" style="height: 200px;overflow: hidden">
+          <div v-for="(item, i) in admires"
+               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>
+              <div style="margin-left: 10px;height: 36px;line-height: 36px;overflow: hidden;max-width: 80px">
+                {{ item.username }}
+              </div>
+            </div>
+            <div style="height: 36px;line-height: 36px">
+              {{ item.admire }}元
+            </div>
+          </div>
+        </vue-seamless-scroll>
+      </div>
+      <div class="admire-btn" @click="showAdmire()">
+        赞赏
+      </div>
+    </div>
 
 <!--     微信 -->
-<!--    <el-dialog title="赞赏"-->
-<!--               :visible.sync="showAdmireDialog"-->
-<!--               width="25%"-->
-<!--               :append-to-body="true"-->
-<!--               destroy-on-close-->
-<!--               center>-->
-<!--      <div>-->
-<!--        <div class="admire-image"></div>-->
-<!--        <div>-->
-<!--          <div class="admire-content">1. 感谢老铁送来的666</div>-->
-<!--          <div class="admire-content">2. 申请通过后会加博客交流群，不需要加群或者退群后会定期清理好友（强迫症福利）</div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </el-dialog>-->
+    <el-dialog title="赞赏"
+               :visible.sync="showAdmireDialog"
+               width="25%"
+               :append-to-body="true"
+               destroy-on-close
+               center>
+      <div>
+        <div class="admire-image"></div>
+        <div>
+          <div class="admire-content">1. 感谢老铁送来的666</div>
+          <div class="admire-content">2. 申请通过后会加博客交流群，不需要加群或者退群后会定期清理好友（强迫症福利）</div>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 

From c6ac90d1d2d8899c220bac06fa576e27b7eb2878 Mon Sep 17 00:00:00 2001
From: BeininX <1271798328@qq.com>
Date: Sat, 6 Jan 2024 10:36:58 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/love.vue | 116 +++++++++++++++++++++++++++++++---------
 1 file changed, 91 insertions(+), 25 deletions(-)

diff --git a/src/components/love.vue b/src/components/love.vue
index 70e6217..07daf2c 100644
--- a/src/components/love.vue
+++ b/src/components/love.vue
@@ -1,46 +1,45 @@
 <template>
   <div>
     <!-- 封面 -->
-    <div class="bg-wrap my-animation-slide-top">
-      <el-image class="love-image my-el-image"
-                lazy
-                :src="love.bgCover"
-                fit="cover"
-                style="width: 100%; height: 100vh;">
-        <div slot="error" class="image-slot"></div>
-      </el-image>
-
-      <!-- 对象 -->
-      <div class="love-wrap transformCenter">
-        <div>
-          <el-avatar class="love-avatar" :src="love.manCover"></el-avatar>
-          <div class="love-title">
-            {{love.manName}}
+    <div class="card-content1 shadow-box background-opacity">
+
+      <div class="bg-wrap my-animation-slide-top">
+        <el-image class="love-image my-el-image" lazy :src="love.bgCover" fit="cover" style="width: 100%; height: 100vh;">
+          <div slot="error" class="image-slot"></div>
+        </el-image>
+
+        <div class="love-wrap transformCenter">
+          <div>
+            <el-avatar class="love-avatar" :src="love.manCover"></el-avatar>
+            <div class="love-title">{{love.manName}}</div>
           </div>
-        </div>
 
-        <div>
-          <el-avatar class="love-avatar" :src="love.womanCover"></el-avatar>
-          <div class="love-title">
-            {{love.womanName}}
+          <div>
+            <el-avatar class="love-avatar" :src="love.womanCover"></el-avatar>
+            <div class="love-title">{{love.womanName}}</div>
           </div>
         </div>
-      </div>
 
-      <div id="bannerWave1"></div>
-      <div id="bannerWave2"></div>
+        <div id="bannerWave1"></div>
+        <div id="bannerWave2"></div>
+
+      </div>
     </div>
 
     <!-- 内容 -->
     <div class="love-container">
+
       <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 class="love-time1">
               第
               <span class="love-time1-item">{{timing.year}}</span>
@@ -63,6 +62,7 @@
             {{love.countdownTitle}}: {{countdownChange}}
           </div>
         </div>
+
       </div>
 
       <div style="padding: 0 20px">
@@ -419,6 +419,15 @@
           timing: "",
           familyInfo: ""
         },
+        pagination: {
+          current: 1,
+          size: 5,
+          recommendStatus: true
+        },
+        recommendArticles: [],
+        admires: [],
+        showAdmireDialog: false,
+        articleSearch: "",
         loveDialogVisible: false,
         addPictureDialog: false,
         pictureType: "",
@@ -463,7 +472,14 @@
       }
     },
 
-    computed: {},
+    computed: {
+      webInfo() {
+        return this.$store.state.webInfo;
+      },
+      sortInfo() {
+        return this.$store.state.sortInfo;
+      }
+    },
 
     watch: {},
 
@@ -471,6 +487,8 @@
       this.getAdminFamily();
       this.card = 1;
       this.getWeiYan();
+      this.getRecommendArticles();
+      this.getAdmire();
     },
 
     mounted() {
@@ -478,6 +496,54 @@
     },
 
     methods: {
+      selectSort(sort) {
+        this.$emit("selectSort", sort);
+      },
+      selectArticle() {
+        this.$emit("selectArticle", this.articleSearch);
+      },
+      showAdmire() {
+        if (this.$common.isEmpty(this.$store.state.currentUser)) {
+          this.$message({
+            message: "请先登录！",
+            type: "error"
+          });
+          return;
+        }
+
+        this.showAdmireDialog = true;
+      },
+      getAdmire() {
+        this.$http.get(this.$constant.baseURL + "/webInfo/getAdmire")
+          .then((res) => {
+            if (!this.$common.isEmpty(res.data)) {
+              this.admires = res.data;
+            }
+          })
+          .catch((error) => {
+            this.$message({
+              message: error.message,
+              type: "error"
+            });
+          });
+      },
+      getRecommendArticles() {
+        this.$http.post(this.$constant.baseURL + "/article/listArticle", this.pagination)
+          .then((res) => {
+            if (!this.$common.isEmpty(res.data)) {
+              this.recommendArticles = res.data.records;
+            }
+          })
+          .catch((error) => {
+            this.$message({
+              message: error.message,
+              type: "error"
+            });
+          });
+      },
+      showTip() {
+        this.$router.push({path: '/weiYan'});
+      },
       openPicture(type) {
         this.pictureType = type;
         this.addPictureDialog = true;

From 0aba6236c6676aa12fc486e9f256f28d540b91fe Mon Sep 17 00:00:00 2001
From: ynmlzdwsp <2727940448@qq.com>
Date: Sat, 6 Jan 2024 14:42:39 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=81=9A=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=A1=A8=E6=A0=BC=E8=8D=AF=E5=93=81=E5=90=8D=EF=BC=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=8D=AF=E5=93=81=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/index.vue   | 19 +++++++++++++++----
 src/components/myAside.vue | 25 +++++++++++++++++--------
 src/utils/table1.js        | 30 ++++++++++++++++++++++++------
 3 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/src/components/index.vue b/src/components/index.vue
index db2fcf2..104cc9f 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -88,10 +88,21 @@
               <articleList :articleList="articles"></articleList>
 
               <template>
-                <div class="pagination-wrap">
+                <div class=" pagination-wrap">
                   <el-table :data="table1List">
-                    <el-table-column prop="drug1" label="药品A"></el-table-column>
-                    <el-table-column prop="drug2" label="药品B"></el-table-column>
+<!--                    <el-table-column prop="drug1" label="药品A"></el-table-column>-->
+<!--                    <el-table-column prop="drug2" label="药品B"></el-table-column>-->
+                    <el-table-column label="药品A">
+                      <template slot-scope="{ row }">
+                        <span @click="selectDrugDetails(row.drug1)">{{ row.drug1 }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="药品B">
+                      <template slot-scope="{ row }">
+                        <span @click="selectDrugDetails(row.drug2)">{{ row.drug2 }}</span>
+                      </template>
+                    </el-table-column>
+
                     <el-table-column prop="reaction" label="相互作用效果"></el-table-column>
                   </el-table>
 <!--                  <div @click="pageArticles()" class="pagination" v-if="pagination.total !== articles.length">-->
@@ -136,7 +147,7 @@
   </div>
 </template>
 <script>
-import {listTable1, listTotal} from "@/utils/table1";
+import {listTable1, listTotal, selectDetails} from "@/utils/table1";
 
   const loader = () => import( "./common/loader");
   const zombie = () => import( "./common/zombie");
diff --git a/src/components/myAside.vue b/src/components/myAside.vue
index f0a440a..afe12ff 100644
--- a/src/components/myAside.vue
+++ b/src/components/myAside.vue
@@ -31,9 +31,9 @@
       </div>
       <div style="display: flex">
         <input class="ais-SearchBox-input" type="text"
-               v-model="articleSearch"
+               v-model="drugName"
                placeholder="搜索药品" maxlength="32">
-        <div class="ais-SearchBox-submit" @click="selectArticle()">
+        <div class="ais-SearchBox-submit" @click="selectDrugDetails()">
           <svg style="margin-top: 3.5px;margin-left: 18px" viewBox="0 0 1024 1024" width="20" height="20">
             <path
               d="M51.2 508.8c0 256.8 208 464.8 464.8 464.8s464.8-208 464.8-464.8-208-464.8-464.8-464.8-464.8 208-464.8 464.8z"
@@ -108,12 +108,13 @@
 <!--          <span v-for="(s, i) in sort.sortName.split('')" :key="i">{{ s }}</span>-->
 <!--        </div>-->
 <!--      </div>-->
+      {{drugDetails}}
     </div>
 
     <!-- 赞赏 -->
     <div class="shadow-box-mini background-opacity wow admire-box"
          v-if="!$common.isEmpty(admires)">
-      <div style="font-weight: bold;margin-bottom: 20px">🧨赞赏</div>
+      <div style="font-weight: bold;margin-bottom: 20px">🧨援助</div>
       <div>
         <vue-seamless-scroll :data="admires" style="height: 200px;overflow: hidden">
           <div v-for="(item, i) in admires"
@@ -132,12 +133,12 @@
         </vue-seamless-scroll>
       </div>
       <div class="admire-btn" @click="showAdmire()">
-        赞赏
+        援助
       </div>
     </div>
 
 <!--     微信 -->
-    <el-dialog title="赞赏"
+    <el-dialog title="援助"
                :visible.sync="showAdmireDialog"
                width="25%"
                :append-to-body="true"
@@ -146,8 +147,8 @@
       <div>
         <div class="admire-image"></div>
         <div>
-          <div class="admire-content">1. 感谢老铁送来的666</div>
-          <div class="admire-content">2. 申请通过后会加博客交流群，不需要加群或者退群后会定期清理好友（强迫症福利）</div>
+          <div class="admire-content">1. 身处热闹人间，没有谁可以保持真正的清醒；不踩到生死边界，活得都是一场梦。</div>
+          <div class="admire-content">2. 如果您愿意帮助其他病友，可以伸出您的援助之手，我们将会将赞助全部援助到病友手中</div>
         </div>
       </div>
     </el-dialog>
@@ -156,6 +157,7 @@
 
 <script>
   import vueSeamlessScroll from "vue-seamless-scroll";
+  import {listTable1, selectDetails} from "@/utils/table1";
 
   export default {
     components: {
@@ -171,7 +173,9 @@
         recommendArticles: [],
         admires: [],
         showAdmireDialog: false,
-        articleSearch: ""
+        articleSearch: "",
+        drugDetails: '',
+        drugName:''
       }
     },
     computed: {
@@ -187,6 +191,11 @@
       this.getAdmire();
     },
     methods: {
+      selectDrugDetails(){
+        selectDetails(this.drugName).then(response => {
+          this.drugDetails = response;
+        });
+      },
       selectSort(sort) {
         this.$emit("selectSort", sort);
       },
diff --git a/src/utils/table1.js b/src/utils/table1.js
index f5e1fd0..0075fa1 100644
--- a/src/utils/table1.js
+++ b/src/utils/table1.js
@@ -7,6 +7,11 @@ export function listTable1(query) {
     .catch(error => console.error(error));
 }
 
+/**
+ * 查询药品总条数
+ * @param query
+ * @returns {Promise<AxiosResponse<any> | void>}
+ */
 export function listTotal(query) {
   const url = '/system/table1/total';
   return axios.get(url, { params: query })
@@ -14,14 +19,27 @@ export function listTotal(query) {
     .catch(error => console.error(error));
 }
 
-// 查询药品作用管理详细
-export function getTable1(id) {
-  return request({
-    url: '/system/table1/' + id,
-    method: 'get'
-  })
+/**
+ * 查询药品详细描述
+ * @param query
+ * @returns {Promise<AxiosResponse<any> | void>}
+ */
+export function selectDetails(drugName) {
+  const url = '/system/table1/details';
+  return axios.get(url, { params:  { drugName } })
+    .then(response => response.data)
+    .catch(error => console.error(error));
 }
 
+
+// 查询药品作用管理详细
+// export function getTable1(id) {
+//   return request({
+//     url: '/system/table1/' + id,
+//     method: 'get'
+//   })
+// }
+
 // // 新增药品作用管理
 // export function addTable1(data) {
 //   return request({

From 1e96017f8e734f727101c233fe752fdb7b421989 Mon Sep 17 00:00:00 2001
From: ynmlzdwsp <2727940448@qq.com>
Date: Sat, 6 Jan 2024 15:51:36 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=81=9A=E9=A2=84?=
 =?UTF-8?q?=E6=B5=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/index.css   |  4 ++--
 src/components/index.vue   | 26 +++++++-------------------
 src/components/myAside.vue |  9 +++++++--
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index f128908..f45dec4 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -43,8 +43,8 @@ body {
 
 /* 模块化背景色及透明度 */
 .background-opacity {
-    /*background: var(--background);*/
-    /*opacity: 0.88;*/
+    background-color: var(--background);
+    opacity: 0.88;
 }
 
 .my-el-image {
diff --git a/src/components/index.vue b/src/components/index.vue
index 104cc9f..34a8464 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -73,7 +73,7 @@
         <div class="page-container-wrap">
           <div class="page-container">
             <div class="aside-content" v-if="showAside">
-              <myAside @selectSort="selectSort" @selectArticle="selectArticle"></myAside>
+              <myAside ref="myAsideRef" @selectSort="selectSort" @selectArticle="selectArticle"></myAside>
             </div>
             <div class="recent-posts">
               <div class="announcement background-opacity">
@@ -88,13 +88,11 @@
               <articleList :articleList="articles"></articleList>
 
               <template>
-                <div class=" pagination-wrap">
+                <div class="shadow-box pagination-wrap background-opacity">
                   <el-table :data="table1List">
-<!--                    <el-table-column prop="drug1" label="药品A"></el-table-column>-->
-<!--                    <el-table-column prop="drug2" label="药品B"></el-table-column>-->
                     <el-table-column label="药品A">
                       <template slot-scope="{ row }">
-                        <span @click="selectDrugDetails(row.drug1)">{{ row.drug1 }}</span>
+                        <span  @click="selectDrugDetails(row.drug1)">{{ row.drug1 }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column label="药品B">
@@ -102,25 +100,12 @@
                         <span @click="selectDrugDetails(row.drug2)">{{ row.drug2 }}</span>
                       </template>
                     </el-table-column>
-
                     <el-table-column prop="reaction" label="相互作用效果"></el-table-column>
                   </el-table>
-<!--                  <div @click="pageArticles()" class="pagination" v-if="pagination.total !== articles.length">-->
-<!--                    下一页-->
-<!--                  </div>-->
-<!--                  <pagination-->
-<!--                    v-show="total>0"-->
-<!--                    :total="total"-->
-<!--                    :page.sync="queryParams.pageNum"-->
-<!--                    :limit.sync="queryParams.pageSize"-->
-<!--                    @pagination="getList"-->
-<!--                  />-->
-
-
                 </div>
 
                 <!--分页组件-->
-                <div class="block">
+                <div class="block background-opacity">
                   <el-pagination
                     @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"
@@ -211,6 +196,9 @@ import {listTable1, listTotal, selectDetails} from "@/utils/table1";
     },
 
     methods: {
+      selectDrugDetails(drugName) {
+        this.$refs.myAsideRef.updateDrugName(drugName);
+      },
       /** 查询药品作用列表条数 */
       getTotal() {
         listTotal(this.queryParams).then(response => {
diff --git a/src/components/myAside.vue b/src/components/myAside.vue
index afe12ff..f0e8222 100644
--- a/src/components/myAside.vue
+++ b/src/components/myAside.vue
@@ -98,7 +98,7 @@
          style="margin-top: 30px;padding: 25px 25px 5px;border-radius: 10px;animation: hideToShow 1s ease-in-out">
       <div class="card-content2-title">
         <i class="el-icon-folder-opened card-content2-icon"></i>
-        <span>药品详情</span>
+        <span>药品简述</span>
       </div>
 <!--      <div v-for="(sort, index) in sortInfo"-->
 <!--           :key="index"-->
@@ -127,7 +127,8 @@
               </div>
             </div>
             <div style="height: 36px;line-height: 36px">
-              {{ item.admire }}元
+<!--              {{ item.admire }}元-->
+              500元
             </div>
           </div>
         </vue-seamless-scroll>
@@ -191,6 +192,10 @@
       this.getAdmire();
     },
     methods: {
+      updateDrugName(drugName) {
+        this.drugName = drugName;
+        this.selectDrugDetails();
+      },
       selectDrugDetails(){
         selectDetails(this.drugName).then(response => {
           this.drugDetails = response;

From 699feb233dfa0ce97d60ce1910451c723d4e22a7 Mon Sep 17 00:00:00 2001
From: ynmlzdwsp <2727940448@qq.com>
Date: Sat, 6 Jan 2024 20:40:09 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=A4=8F=E8=B4=9D=E5=AE=81=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index 8d6c669..d739f60 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,7 +8,8 @@ import common from './utils/common'
 import constant from './utils/constant'
 import mavonEditor from 'mavon-editor'
 //引入js
-import './utils/live2d'
+//注释掉下面一行就取消了看板娘
+// import './utils/live2d'
 import './utils/title'
 //引入css
 import './assets/css/animation.css'

From 401d492826c0fbc03b26db1d8070b9791479e165 Mon Sep 17 00:00:00 2001
From: ynmlzdwsp <2727940448@qq.com>
Date: Sun, 7 Jan 2024 14:30:22 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=B8=8B=E5=8D=88=E5=9C=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=BC=80=E5=A7=8B=E5=90=91python=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=A2=84=E6=B5=8B=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/love.vue | 62 +++++++++++++++++++++++++++++++++++++++++
 src/utils/constant.js   |  4 +--
 src/utils/table1.js     | 13 +++++++++
 3 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/src/components/love.vue b/src/components/love.vue
index 07daf2c..efe68a5 100644
--- a/src/components/love.vue
+++ b/src/components/love.vue
@@ -26,6 +26,7 @@
       </div>
     </div>
 
+
     <!-- 内容 -->
     <div class="love-container">
 
@@ -106,6 +107,41 @@
       </div>
 
       <div style="padding: 0 20px">
+
+
+        <div style="width: 350px ;padding: 15px;border-radius: 10px;margin-top: 30px;animation: hideToShow 1s ease-in-out" class="card-wrap card-content shadow-box-mini background-opacity wow" v-show="card !== 4">
+          <div style="display: flex; flex-wrap: wrap">
+            <div style="flex-basis: 100%; margin-bottom: 10px;">
+              <div style="color: var(--lightGreen);font-size: 20px;font-weight: bold;margin-bottom: 10px; white-space: nowrap;">
+                预测DDI
+              </div>
+            </div>
+            <div style="flex-basis: 100%; margin-bottom: 10px;">
+              <input class="ais-SearchBox-input" type="text"
+                     v-model="smiles1"
+                     placeholder="请输入SMILES" maxlength="32">
+            </div>
+            <div style="flex-basis: 100%; margin-bottom: 10px;">
+              <input class="ais-SearchBox-input" type="text"
+                     v-model="smiles2"
+                     placeholder="请输入SMILES" maxlength="32">
+            </div>
+            <div style="flex-basis: 100%; margin-bottom: 10px;">
+              <div class="ais-SearchBox-input" style="background-color: white; padding: 6px; border-radius: 4px;border: none; text-align: center;">
+                {{predictResult}}
+              </div>
+            </div>
+
+            <div class="ais-SearchBox-submit" @click="handleQuery();" style="flex-basis: 100%;display: flex; justify-content: right; align-items: center;" >
+              <svg style="margin-top: 3.5px;margin-left: 18px" viewBox="0 0 1024 1024" width="20" height="20">
+                <path d="M51.2 508.8c0 256.8 208 464.8 464.8 464.8s464.8-208 464.8-464.8-208-464.8-464.8-464.8-464.8 208-464.8 464.8z" fill="#51C492"></path>
+                <path d="M772.8 718.4c48-58.4 76.8-132.8 76.8-213.6 0-186.4-151.2-337.6-337.6-337.6-186.4 0-337.6 151.2-337.6 337.6 0 186.4 151.2 337.6 337.6 337.6 81.6 0 156-28.8 213.6-76.8L856 896l47.2-47.2-130.4-130.4zM512 776c-149.6 0-270.4-121.6-270.4-271.2S363.2 233.6 512 233.6c149.6 0 271.2 121.6 271.2 271.2C782.4 654.4 660.8 776 512 776z" fill="#FFFFFF"></path>
+              </svg>
+            </div>
+          </div>
+        </div>
+
+
         <!-- 卡片 -->
         <div class="card-wrap" v-show="card !== 4">
 
@@ -387,6 +423,8 @@
 
 <script>
 
+import {listTable1, predictReaction} from "@/utils/table1";
+
   const treeHole = () => import( "./common/treeHole");
   const comment = () => import( "./comment/comment");
   const myFooter = () => import( "./common/myFooter");
@@ -408,6 +446,9 @@
 
     data() {
       return {
+        predictResult:'000',
+        smiles1 :'',
+        smiles2 :'',
         userLove: {
           bgCover: "",
           manCover: "",
@@ -496,6 +537,14 @@
     },
 
     methods: {
+      /** 预测按钮操作 */
+      handleQuery() {
+        this.predictResult='';
+        predictReaction(this.smiles1,this.smiles2).then(response => {
+          this.predictResult = response.data; // 将预测结果赋值给 predictResult
+        });
+        // this.predictResult = '666';
+      },
       selectSort(sort) {
         this.$emit("selectSort", sort);
       },
@@ -858,6 +907,19 @@
 
 <style scoped>
 
+.ais-SearchBox-input {
+  padding: 0 14px;
+  height: 30px;
+  width: calc(100% - 50px);
+  outline: 0;
+  border: 2px solid var(--lightGreen);
+  border-right: 0;
+  border-radius: 40px;
+  color: var(--maxGreyFont);
+  background: var(--white);
+  opacity: 0.5;
+}
+
   .love-container {
     background-image: linear-gradient(to right, rgba(37, 82, 110, 0.1) 1px, var(--background) 1px), linear-gradient(to bottom, rgba(37, 82, 110, 0.1) 1px, var(--background) 1px);
     background-size: 3rem 3rem;
diff --git a/src/utils/constant.js b/src/utils/constant.js
index 545abf2..1b3a006 100644
--- a/src/utils/constant.js
+++ b/src/utils/constant.js
@@ -18,8 +18,8 @@ export default {
   //前后端定义的密钥，AES使用16位
   cryptojs_key: "aoligeimeimaobin",
   qiniuUrl: "https://upload.qiniup.com",
-  qiniuDownload: "$$$$七牛云下载地址，仿照【https://file.poetize.cn/】",
-
+  // qiniuDownload: "$$$$七牛云下载地址，仿照【https://file.poetize.cn/】",
+  qiniuDownload: "http://s6ondx7d9.hd-bkt.clouddn.com/",
   favoriteVideo: "$$$$自己找一个视频链接作为百宝箱的封面",
 
   loveWeiYan: "https://s1.ax1x.com/2022/12/04/zsKgDs.jpg",
diff --git a/src/utils/table1.js b/src/utils/table1.js
index 0075fa1..3392b7d 100644
--- a/src/utils/table1.js
+++ b/src/utils/table1.js
@@ -31,6 +31,19 @@ export function selectDetails(drugName) {
     .catch(error => console.error(error));
 }
 
+/**
+ *
+ * @param drugName
+ * @returns {Promise<AxiosResponse<any> | void>}
+ */
+export function predictReaction(mol1, mol2) {
+  const url = 'http://127.0.0.1:5000/predict';
+  return axios.get(url, { params: { mol1, mol2 } })
+    .then(response => response.data)
+    .catch(error => console.error(error));
+}
+
+
 
 // 查询药品作用管理详细
 // export function getTable1(id) {

From 203e6bd789d82cc8d7e1dac7197f59583ac03493 Mon Sep 17 00:00:00 2001
From: ynmlzdwsp <2727940448@qq.com>
Date: Sun, 7 Jan 2024 15:14:51 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/love.vue | 13 ++++++++-----
 src/utils/table1.js     |  3 +--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/love.vue b/src/components/love.vue
index efe68a5..d6b4269 100644
--- a/src/components/love.vue
+++ b/src/components/love.vue
@@ -539,11 +539,14 @@ import {listTable1, predictReaction} from "@/utils/table1";
     methods: {
       /** 预测按钮操作 */
       handleQuery() {
-        this.predictResult='';
-        predictReaction(this.smiles1,this.smiles2).then(response => {
-          this.predictResult = response.data; // 将预测结果赋值给 predictResult
-        });
-        // this.predictResult = '666';
+        this.predictResult = '';
+        predictReaction(this.smiles1, this.smiles2)
+          .then(prediction => {
+            this.predictResult = prediction;
+          })
+          .catch(error => {
+            console.error(error);
+          });
       },
       selectSort(sort) {
         this.$emit("selectSort", sort);
diff --git a/src/utils/table1.js b/src/utils/table1.js
index 3392b7d..5a9e279 100644
--- a/src/utils/table1.js
+++ b/src/utils/table1.js
@@ -39,12 +39,11 @@ export function selectDetails(drugName) {
 export function predictReaction(mol1, mol2) {
   const url = 'http://127.0.0.1:5000/predict';
   return axios.get(url, { params: { mol1, mol2 } })
-    .then(response => response.data)
+    .then(response => Number(response.data))
     .catch(error => console.error(error));
 }
 
 
-
 // 查询药品作用管理详细
 // export function getTable1(id) {
 //   return request({

From e24a8a8883913810f2991d52bf7339d0f29a4fa1 Mon Sep 17 00:00:00 2001
From: ynmlzdwsp <2727940448@qq.com>
Date: Sun, 7 Jan 2024 15:21:03 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/love.vue | 2 +-
 src/utils/table1.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/love.vue b/src/components/love.vue
index d6b4269..cef092d 100644
--- a/src/components/love.vue
+++ b/src/components/love.vue
@@ -539,7 +539,7 @@ import {listTable1, predictReaction} from "@/utils/table1";
     methods: {
       /** 预测按钮操作 */
       handleQuery() {
-        this.predictResult = '';
+        this.predictResult = '预测出错，请重试';
         predictReaction(this.smiles1, this.smiles2)
           .then(prediction => {
             this.predictResult = prediction;
diff --git a/src/utils/table1.js b/src/utils/table1.js
index 5a9e279..33a5bcf 100644
--- a/src/utils/table1.js
+++ b/src/utils/table1.js
@@ -40,7 +40,7 @@ export function predictReaction(mol1, mol2) {
   const url = 'http://127.0.0.1:5000/predict';
   return axios.get(url, { params: { mol1, mol2 } })
     .then(response => Number(response.data))
-    .catch(error => console.error(error));
+    .catch(error => {console.error(error);throw new Error('请求出错');}); // 抛出错误
 }
 
 

From c64f67086fb4707ffe07fb487aa988ec916646a5 Mon Sep 17 00:00:00 2001
From: ynmlzdwsp <2727940448@qq.com>
Date: Sun, 7 Jan 2024 15:49:03 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/home.vue | 2 +-
 src/components/love.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/home.vue b/src/components/home.vue
index 70cdd77..b82311f 100644
--- a/src/components/home.vue
+++ b/src/components/home.vue
@@ -41,7 +41,7 @@
             <!-- 爱情买卖 -->
             <li @click="$router.push({path: '/love'})">
               <div class="my-menu">
-                💋 <span>预测研发流程</span>
+                🥼 <span>预测研发流程</span>
               </div>
             </li>
 
diff --git a/src/components/love.vue b/src/components/love.vue
index cef092d..103cf52 100644
--- a/src/components/love.vue
+++ b/src/components/love.vue
@@ -446,7 +446,7 @@ import {listTable1, predictReaction} from "@/utils/table1";
 
     data() {
       return {
-        predictResult:'000',
+        predictResult:'type预测结果',
         smiles1 :'',
         smiles2 :'',
         userLove: {
@@ -539,10 +539,10 @@ import {listTable1, predictReaction} from "@/utils/table1";
     methods: {
       /** 预测按钮操作 */
       handleQuery() {
-        this.predictResult = '预测出错，请重试';
+        this.predictResult = '输入的SMILES错误，请重试';
         predictReaction(this.smiles1, this.smiles2)
           .then(prediction => {
-            this.predictResult = prediction;
+            this.predictResult = "type:"+prediction;
           })
           .catch(error => {
             console.error(error);

From ade3f4da0323a73194e0df42a9e5671d00b60575 Mon Sep 17 00:00:00 2001
From: BeininX <1271798328@qq.com>
Date: Sun, 7 Jan 2024 16:56:10 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/love.vue    | 25 +++++++++++++++++++------
 src/components/myAside.vue |  2 +-
 src/components/travel.vue  | 10 +++-------
 src/utils/constant.js      |  2 +-
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/love.vue b/src/components/love.vue
index 07daf2c..ea13689 100644
--- a/src/components/love.vue
+++ b/src/components/love.vue
@@ -34,11 +34,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">
               第
@@ -126,7 +122,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"
@@ -381,6 +390,7 @@
         <!-- 页脚 -->
         <myFooter></myFooter>
       </div>
+
     </div>
   </div>
 </template>
@@ -938,7 +948,10 @@
   }
 
   .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;
diff --git a/src/components/myAside.vue b/src/components/myAside.vue
index f0e8222..7ef9db5 100644
--- a/src/components/myAside.vue
+++ b/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>
diff --git a/src/components/travel.vue b/src/components/travel.vue
index 303561e..f3473d9 100644
--- a/src/components/travel.vue
+++ b/src/components/travel.vue
@@ -10,17 +10,12 @@
         <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">
@@ -38,6 +33,7 @@
 
         <div class="photo-title">
           {{photoPagination.classify}}
+          qqqqqqqqqqqqqqqqqqqqqqqqqq
         </div>
 
         <photo :resourcePathList="photoList"></photo>
diff --git a/src/utils/constant.js b/src/utils/constant.js
index 545abf2..7c8cd59 100644
--- a/src/utils/constant.js
+++ b/src/utils/constant.js
@@ -18,7 +18,7 @@ export default {
   //前后端定义的密钥，AES使用16位
   cryptojs_key: "aoligeimeimaobin",
   qiniuUrl: "https://upload.qiniup.com",
-  qiniuDownload: "$$$$七牛云下载地址，仿照【https://file.poetize.cn/】",
+  qiniuDownload: "http://s6q4ppvdk.hd-bkt.clouddn.com/",
 
   favoriteVideo: "$$$$自己找一个视频链接作为百宝箱的封面",
 

From e597676bae0704a4a02e95a29f3b693d308710ed Mon Sep 17 00:00:00 2001
From: BeininX <1271798328@qq.com>
Date: Tue, 9 Jan 2024 08:47:38 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E7=85=A7=E7=89=87=EF=BC=88=E5=85=AC?=
 =?UTF-8?q?=E7=9B=8A=E8=AE=A1=E5=88=92=E5=92=8C=E7=A7=91=E7=A0=94=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/travel.vue | 313 +++++++++++++++++++-------------------
 src/utils/constant.js     |   4 +-
 2 files changed, 159 insertions(+), 158 deletions(-)

diff --git a/src/components/travel.vue b/src/components/travel.vue
index f3473d9..585f013 100644
--- a/src/components/travel.vue
+++ b/src/components/travel.vue
@@ -5,14 +5,13 @@
       <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 style="font-size: 36px;font-weight: bold;line-height: 1.5;margin-top: 20px">
-              著名制药公司
+              让照片留下医药学的足迹
             </div>
           </div>
         </div>
@@ -33,7 +32,6 @@
 
         <div class="photo-title">
           {{photoPagination.classify}}
-          qqqqqqqqqqqqqqqqqqqqqqqqqq
         </div>
 
         <photo :resourcePathList="photoList"></photo>
@@ -57,174 +55,177 @@
 
 <script>
 
-  const myFooter = () => import( "./common/myFooter");
-  const photo = () => import( "./common/photo");
-  const proTag = () => import( "./common/proTag");
-
-  export default {
-    components: {
-      photo,
-      proTag,
-      myFooter
+const myFooter = () => import( "./common/myFooter");
+const photo = () => import( "./common/photo");
+const proTag = () => import( "./common/proTag");
+
+export default {
+  components: {
+    photo,
+    proTag,
+    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"
+          });
+        });
     },
-
-    data() {
-      return {
-        photoPagination: {
+    changePhotoTitle(classify) {
+      if (classify !== this.photoPagination.classify) {
+        this.photoPagination = {
           current: 1,
           size: 10,
           total: 0,
           resourceType: "lovePhoto",
-          classify: ""
-        },
-        photoTitleList: [],
-        photoList: []
+          classify: classify
+        };
+        this.photoList = [];
+        this.changePhoto();
       }
     },
-
-    computed: {},
-
-    watch: {},
-
-    created() {
-      this.getPhotoTitles();
-    },
-
-    mounted() {
-
+    pagePhotos() {
+      this.photoPagination.current = this.photoPagination.current + 1;
+      this.changePhoto();
     },
-
-    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) {
-        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"
-            });
+    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 {
-    padding: 25px;
-    background: var(--favoriteBg);
-  }
-
-  .travel-header {
-    margin: 60px auto 30px;
-    height: 300px;
-    position: relative;
-    overflow: hidden;
-    border-radius: 20px;
-    max-width: 1200px;
-    color: var(--white);
-    user-select: none;
-  }
-
-  .index-video {
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-    background: var(--lightGreen);
-  }
-
-  .travel-content {
-    margin: 0 auto;
-    max-width: 1200px;
-  }
-
+.travel-container {
+  padding: 25px;
+  background: var(--favoriteBg);
+}
+
+.travel-header {
+  margin: 60px auto 30px;
+  height: 400px;
+  position: relative;
+  overflow: hidden;
+  border-radius: 20px;
+  max-width: 1200px;
+  color: var(--white);
+  user-select: none;
+}
+
+.index-video {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  background: var(--lightGreen);
+}
+
+.travel-content {
+  margin: 0 auto;
+  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;
-    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;
-    }
+    max-width: 780px;
   }
+}
 
 </style>
diff --git a/src/utils/constant.js b/src/utils/constant.js
index 7c8cd59..0a0f63f 100644
--- a/src/utils/constant.js
+++ b/src/utils/constant.js
@@ -20,8 +20,8 @@ export default {
   qiniuUrl: "https://upload.qiniup.com",
   qiniuDownload: "http://s6q4ppvdk.hd-bkt.clouddn.com/",
 
-  favoriteVideo: "$$$$自己找一个视频链接作为百宝箱的封面",
-
+  favoriteVideo: "",
+  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",
   lovePhoto: "https://s1.ax1x.com/2022/12/04/zsKh5V.jpg",