From fd03bedff5c0f663dc34417eb3e5dd2583195d14 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Wed, 30 Aug 2023 10:50:20 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/Carousel/media.scss                |  2 +-
 assets/css/Header/icon.scss                   |  4 +--
 assets/css/Header/media.scss                  |  3 +-
 .../love_story/love_story_details/media.scss  | 13 ++++++++
 assets/css/poster/media.scss                  |  2 +-
 components/RichText/index.vue                 |  4 +--
 .../UploadFile/{FileUpload.vue => index.vue}  |  1 +
 components/UploadImage/index.vue              |  1 +
 pages/love-story/add-love-story/index.vue     | 32 ++++++++++++-------
 pages/love-story/details/[id].vue             |  3 +-
 server/api/banner/getBanner.js                |  2 +-
 server/api/common/common.js                   |  6 ++--
 server/api/flow/addFlowRecord.js              |  2 +-
 server/api/home/getHome.js                    |  2 +-
 server/api/loveStory/addLoveStory.js          |  2 +-
 server/api/loveStory/getLoveStoryInfo.js      |  2 +-
 server/api/loveStory/getLoveStoryList.js      |  2 +-
 server/api/poster/getPoster.js                |  2 +-
 server/api/tdk/getTdk.js                      |  2 +-
 server/api/wishList/addWishList.js            |  2 +-
 server/api/wishList/getWishListList.js        |  2 +-
 style/element/index.scss                      |  1 +
 22 files changed, 59 insertions(+), 33 deletions(-)
 rename components/UploadFile/{FileUpload.vue => index.vue} (99%)

diff --git a/assets/css/Carousel/media.scss b/assets/css/Carousel/media.scss
index 57172b7..b039205 100644
--- a/assets/css/Carousel/media.scss
+++ b/assets/css/Carousel/media.scss
@@ -10,7 +10,7 @@
     height: 40vw!important;
   }
   .Carousel-container{
-    margin-top: 63px !important;
+    margin-top: 11px !important;
   }
   .carousel-items{
     height: 40vw!important;
diff --git a/assets/css/Header/icon.scss b/assets/css/Header/icon.scss
index 6a9501e..ec63b67 100644
--- a/assets/css/Header/icon.scss
+++ b/assets/css/Header/icon.scss
@@ -16,8 +16,8 @@
       position: relative;
 
       img {
-        height: 100%;
-        width: 100%;
+        height: 85%;
+        width: 85%;
         object-fit: contain;
         // margin-top: 9px;
       }
diff --git a/assets/css/Header/media.scss b/assets/css/Header/media.scss
index 6f30d30..20b4ece 100644
--- a/assets/css/Header/media.scss
+++ b/assets/css/Header/media.scss
@@ -23,7 +23,8 @@
 /*小于*/
 @media screen and (max-width: 1037px) {
   .Header-container {
-    height: 111px !important;
+    height: 60px !important;
+    justify-content: center;
   }
 
   .HeaderSearch-Icon {
diff --git a/assets/css/business/love_story/love_story_details/media.scss b/assets/css/business/love_story/love_story_details/media.scss
index 3c4b7c7..b4c4213 100644
--- a/assets/css/business/love_story/love_story_details/media.scss
+++ b/assets/css/business/love_story/love_story_details/media.scss
@@ -31,4 +31,17 @@
     .return {
         display: none;
     }
+    .music-box{
+        width: 100%;
+        position: relative !important;
+        display: flex;
+        flex-direction: column;
+        margin:  1rem;
+    }
+    .joint-details-pos-box{
+        padding: 1rem 0 15rem 0 !important;
+    }
+    audio{
+        margin: 0 auto;
+    }
 }
\ No newline at end of file
diff --git a/assets/css/poster/media.scss b/assets/css/poster/media.scss
index bb68e6c..e57b3e8 100644
--- a/assets/css/poster/media.scss
+++ b/assets/css/poster/media.scss
@@ -38,7 +38,7 @@
  @media screen and (max-width: 480px) {
     .Poster-container{
         height: 35vw !important;
-        margin-top: 63px !important;
+        margin-top: 11px !important;
        }
     .Poster-text{
         display: none !important;
diff --git a/components/RichText/index.vue b/components/RichText/index.vue
index 345678f..a672232 100644
--- a/components/RichText/index.vue
+++ b/components/RichText/index.vue
@@ -37,7 +37,7 @@ export default {
     }
     //上传图片
     editorConfig.MENU_CONF['uploadImage'] = {
-      server: "http://localhost:3003/api-v" + '/CommonApi.CommonApi/uploadImg',
+      server: "http://xdxw.aerwen.net/api-v" + '/CommonApi.CommonApi/uploadImg',
       // form-data fieldName ，默认值 'wangeditor-uploaded-image'
       fieldName: 'file',
       // 单个文件的最大体积限制，默认为 2M
@@ -70,7 +70,7 @@ export default {
     }
     //上传视频
     editorConfig.MENU_CONF['uploadVideo'] = {
-      server: "http://localhost:3003/api-v" + '/CommonApi.CommonApi/uploadFile',
+      server: "http://xdxw.aerwen.net/api-v" + '/CommonApi.CommonApi/uploadFile',
       // form-data fieldName ，默认值 'wangeditor-uploaded-video'
       fieldName: 'file',
 
diff --git a/components/UploadFile/FileUpload.vue b/components/UploadFile/index.vue
similarity index 99%
rename from components/UploadFile/FileUpload.vue
rename to components/UploadFile/index.vue
index 5eb4832..7a5741c 100644
--- a/components/UploadFile/FileUpload.vue
+++ b/components/UploadFile/index.vue
@@ -56,6 +56,7 @@
 <script setup>
 import { ref,reactive,watch,computed } from "vue";
 import { fileUpload } from "~/server/api/common/common";
+import { ElMessage, ElMessageBox } from 'element-plus'
 
 const props = defineProps({
   modelValue: [String, Object, Array],
diff --git a/components/UploadImage/index.vue b/components/UploadImage/index.vue
index cc9ddcc..657351f 100644
--- a/components/UploadImage/index.vue
+++ b/components/UploadImage/index.vue
@@ -30,6 +30,7 @@
 <script setup>
 import { ref, reactive, watch, computed } from "vue";
 import { imageUpload } from "~/server/api/common/common";
+import { ElMessage, ElMessageBox } from 'element-plus'
 
 const props = defineProps({
     modelValue: [String, Object, Array],
diff --git a/pages/love-story/add-love-story/index.vue b/pages/love-story/add-love-story/index.vue
index 40cdc43..02c0407 100644
--- a/pages/love-story/add-love-story/index.vue
+++ b/pages/love-story/add-love-story/index.vue
@@ -28,13 +28,15 @@
                 </el-col>
                 <el-col :span='12'>
                     <el-form-item :label-width='labelWidth' label='封面' prop='love_story_cover'>
-                        <input ref="love_story_cover" type="file" accept=".jpg,.png,.jpeg">
+                        <UploadImage ref='uploadRef' v-model='formData.love_story_cover' :data=uoloadData :limit='1'
+                            :fileSize='5' :drag='true' :isShowTip='false' />
                     </el-form-item>
                 </el-col>
 
                 <el-col :span='12'>
                     <el-form-item :label-width='labelWidth' label='音乐' prop='love_story_music'>
-                        <input ref="love_story_music" type="file" accept=".mp3,.m4a,.flac">
+                        <UploadFile v-model='formData.love_story_music'
+                            :fileType="['mp3', 'wma', 'wav', 'ape', 'flac', 'ogg', 'aac']" :data=uoloadData :limit="1" />
                     </el-form-item>
                 </el-col>
                 <client-only>
@@ -64,7 +66,7 @@
 </template>
   
 <script setup>
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 
 // --业务参数
 const router = useRouter()
@@ -73,7 +75,19 @@ const love_story_cover = ref(null)
 
 
 // --业务方法
+const imgFileList = ref([
 
+])
+
+
+const beforeRemove = (uploadFile, uploadFiles) => {
+    return ElMessageBox.confirm(
+        `确定要删除 ${uploadFile.name} 吗?`
+    ).then(
+        () => true,
+        () => false
+    )
+}
 
 
 // --基础参数
@@ -120,21 +134,15 @@ const handleAddClick = async (formEl) => {
         if (!valid) {
             return;
         }
-        if (!love_story_cover.value.value) {
-            ElMessage({
-                message: "请上传封面",
-                type: 'error',
-            })
-        }
-
+ 
         useFetch('/api/loveStory/addLoveStory', {
             method: "post", body: {
                 love_story_title: formData.love_story_title,
                 love_story_author: formData.love_story_author,
                 love_story_place: formData.love_story_place,
                 love_story_date: formData.love_story_date,
-                love_story_cover: love_story_cover.value.value,
-                love_story_music: love_story_music.value.value,
+                love_story_cover: formData.love_story_cover,
+                love_story_music: formData.love_story_music,
                 love_story_content: formData.love_story_content,
             }
         }).then(res => {
diff --git a/pages/love-story/details/[id].vue b/pages/love-story/details/[id].vue
index eca0fbc..e4eae80 100644
--- a/pages/love-story/details/[id].vue
+++ b/pages/love-story/details/[id].vue
@@ -10,7 +10,7 @@
 
         <div class="--box--">
 
-            <div class="music-box" v-if="loveStoryInfo.love_story_music != null">
+            <div class="music-box" v-if="loveStoryInfo.love_story_music">
                 <div class="music-name">{{ loveStoryInfo.love_story_music_name }}</div>
                 <audio controls="controls" height="100" width="100" autoplay>
                     <source :src=loveStoryInfo.love_story_music type="audio/mp3" />
@@ -89,6 +89,7 @@ useFetch('/api/loveStory/getLoveStoryInfo', { params: { love_story_id: route.par
         [...document.querySelectorAll('.joint-details-content-box video')].map(item => {
             item.style.maxWidth = 100 + '%'
             item.style.height = 0 + '%'
+            item.style.margin = "0 auto"
         })
 
         
diff --git a/server/api/banner/getBanner.js b/server/api/banner/getBanner.js
index dfb5fdd..8d20160 100644
--- a/server/api/banner/getBanner.js
+++ b/server/api/banner/getBanner.js
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
     const method = getMethod(event).toUpperCase()
     let body
     if (method !== 'GET') body = await readRawBody(event)
-    const res = await $fetch(baseURL + "/Banners.Banner/getBannerList", {
+    const res = await $fetch("http://xdxw.api.aerwen.net/api.php/Banners.Banner/getBannerList", {
         method,
         baseURL: event.context.baseUrl,
         headers: event.context.headers,
diff --git a/server/api/common/common.js b/server/api/common/common.js
index 8fa01ea..9db1f65 100644
--- a/server/api/common/common.js
+++ b/server/api/common/common.js
@@ -2,14 +2,14 @@
   /**
    * 上传图片
    */
-  export const imageUpload = '/common/uploadImg';
+  export const imageUpload = 'http://xdxw.aerwen.net/api-v/CommonApi.CommonApi/uploadImg';
   
   /**
    * 上传文件
    */
-  export const fileUpload = '/common/uploadFile';
+  export const fileUpload = 'http://xdxw.aerwen.net/api-v/CommonApi.CommonApi/uploadFile';
   
   /**
    * 上传视频
    */
-  export const videoUpload = '/common/uploadVideo';
\ No newline at end of file
+  export const videoUpload = 'http://xdxw.aerwen.net/api-v/CommonApi.CommonApi/uploadVideo';
\ No newline at end of file
diff --git a/server/api/flow/addFlowRecord.js b/server/api/flow/addFlowRecord.js
index c579fe6..d8b3856 100644
--- a/server/api/flow/addFlowRecord.js
+++ b/server/api/flow/addFlowRecord.js
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
     const method = getMethod(event).toUpperCase()
     let body
     if (method !== 'GET') body = await readRawBody(event)
-    const res = await $fetch(baseURL + "/Flow.Flow/AddFlowRecord", {
+    const res = await $fetch("http://xdxw.api.aerwen.net/api.php/Flow.Flow/AddFlowRecord", {
         method,
         baseURL: event.context.baseUrl,
         headers: event.context.headers,
diff --git a/server/api/home/getHome.js b/server/api/home/getHome.js
index 3f70f2c..7ae8b34 100644
--- a/server/api/home/getHome.js
+++ b/server/api/home/getHome.js
@@ -13,7 +13,7 @@ export default defineEventHandler(async (event) => {
     const method = getMethod(event).toUpperCase()
     let body
     if (method !== 'GET') body = await readRawBody(event)
-    const res = await $fetch(baseURL + "/Home.Home/getHomeData", {
+    const res = await $fetch("http://xdxw.api.aerwen.net/api.php/Home.Home/getHomeData", {
         method,
         baseURL: event.context.baseUrl,
         headers: event.context.headers,
diff --git a/server/api/loveStory/addLoveStory.js b/server/api/loveStory/addLoveStory.js
index 6f984d6..8c6ff5e 100644
--- a/server/api/loveStory/addLoveStory.js
+++ b/server/api/loveStory/addLoveStory.js
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
     const method = getMethod(event).toUpperCase()
     let body
     if (method !== 'GET') body = await readRawBody(event)
-    const res = await $fetch(baseURL + "/LoveStory.LoveStory/addLoveStory", {
+    const res = await $fetch("http://xdxw.api.aerwen.net/api.php/LoveStory.LoveStory/addLoveStory", {
         method,
         baseURL: event.context.baseUrl,
         headers: event.context.headers,
diff --git a/server/api/loveStory/getLoveStoryInfo.js b/server/api/loveStory/getLoveStoryInfo.js
index 200f089..3064cc8 100644
--- a/server/api/loveStory/getLoveStoryInfo.js
+++ b/server/api/loveStory/getLoveStoryInfo.js
@@ -13,7 +13,7 @@ export default defineEventHandler(async (event) => {
     const method = getMethod(event).toUpperCase()
     let body
     if (method !== 'GET') body = await readRawBody(event)
-    const res = await $fetch(baseURL + "/LoveStory.LoveStory/getLoveStoryInfo", {
+    const res = await $fetch("http://xdxw.api.aerwen.net/api.php/LoveStory.LoveStory/getLoveStoryInfo", {
         method,
         baseURL: event.context.baseUrl,
         headers: event.context.headers,
diff --git a/server/api/loveStory/getLoveStoryList.js b/server/api/loveStory/getLoveStoryList.js
index 66d213e..02f4312 100644
--- a/server/api/loveStory/getLoveStoryList.js
+++ b/server/api/loveStory/getLoveStoryList.js
@@ -14,7 +14,7 @@ export default defineEventHandler(async (event) => {
     const method = getMethod(event).toUpperCase()
     let body
     if (method !== 'GET') body = await readRawBody(event)
-    const res = await $fetch(baseURL + "/LoveStory.LoveStory/getLoveStoryList", {
+    const res = await $fetch("http://xdxw.api.aerwen.net/api.php/LoveStory.LoveStory/getLoveStoryList", {
         method,
         baseURL: event.context.baseUrl,
         headers: event.context.headers,
diff --git a/server/api/poster/getPoster.js b/server/api/poster/getPoster.js
index 1903e3c..e181804 100644
--- a/server/api/poster/getPoster.js
+++ b/server/api/poster/getPoster.js
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
     const method = getMethod(event).toUpperCase()
     let body
     if (method !== 'GET') body = await readRawBody(event)
-    const res = await $fetch(baseURL + "/Banners.Poster/getPoster", {
+    const res = await $fetch("http://xdxw.api.aerwen.net/api.php/Banners.Poster/getPoster", {
         method,
         baseURL: event.context.baseUrl,
         headers: event.context.headers,
diff --git a/server/api/tdk/getTdk.js b/server/api/tdk/getTdk.js
index 58c43ec..21a04f3 100644
--- a/server/api/tdk/getTdk.js
+++ b/server/api/tdk/getTdk.js
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
     const method = getMethod(event).toUpperCase()
     let body
     if (method !== 'GET') body = await readRawBody(event)
-    const res = await $fetch(baseURL + "/Tdk.Tdk/getTdkInfo", {
+    const res = await $fetch("http://xdxw.api.aerwen.net/api.php/Tdk.Tdk/getTdkInfo", {
         method,
         baseURL: event.context.baseUrl,
         headers: event.context.headers,
diff --git a/server/api/wishList/addWishList.js b/server/api/wishList/addWishList.js
index 1f0e033..7b4c5a6 100644
--- a/server/api/wishList/addWishList.js
+++ b/server/api/wishList/addWishList.js
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
     const method = getMethod(event).toUpperCase()
     let body
     if (method !== 'GET') body = await readRawBody(event)
-    const res = await $fetch(baseURL + "/WishList.WishList/addWishList", {
+    const res = await $fetch("http://xdxw.api.aerwen.net/api.php/WishList.WishList/addWishList", {
         method,
         baseURL: event.context.baseUrl,
         headers: event.context.headers,
diff --git a/server/api/wishList/getWishListList.js b/server/api/wishList/getWishListList.js
index b57fdc9..e3d908e 100644
--- a/server/api/wishList/getWishListList.js
+++ b/server/api/wishList/getWishListList.js
@@ -14,7 +14,7 @@ export default defineEventHandler(async (event) => {
     const method = getMethod(event).toUpperCase()
     let body
     if (method !== 'GET') body = await readRawBody(event)
-    const res = await $fetch(baseURL + "/WishList.WishList/getWishListList", {
+    const res = await $fetch("http://xdxw.api.aerwen.net/api.php/WishList.WishList/getWishListList", {
         method,
         baseURL: event.context.baseUrl,
         headers: event.context.headers,
diff --git a/style/element/index.scss b/style/element/index.scss
index 1ac236a..a3f446d 100644
--- a/style/element/index.scss
+++ b/style/element/index.scss
@@ -16,3 +16,4 @@
 @use "element-plus/theme-chalk/src/pagination.scss" as *;
 @use "element-plus/theme-chalk/src/date-picker.scss" as *;
 @use "element-plus/theme-chalk/src/upload.scss" as *;
+@use "element-plus/theme-chalk/src/link.scss" as *;