From 37f969c4e6df6039440946f60e09a284939abaa5 Mon Sep 17 00:00:00 2001
From: youzi <2410633923@qq.com>
Date: Thu, 26 Dec 2024 11:34:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                           |   5 +-
 src/api/nav/index.js                |  20 +++-
 src/assets/style/index.less         |   5 +-
 src/components/arti.vue             |   2 +-
 src/components/menu.vue             |   1 +
 src/components/wea.vue              |   2 +-
 src/util/theme.js                   |  12 +--
 src/views/gallery/index.vue         |   2 +-
 src/views/home/navMenu.vue          | 138 ++++++++++++++--------------
 src/views/plink/right.vue           |   7 +-
 src/views/widget/component/gold.vue |   9 +-
 src/views/widget/index.vue          |   6 +-
 tailwind.config.js                  |  30 +++++-
 13 files changed, 150 insertions(+), 89 deletions(-)

diff --git a/README.md b/README.md
index bacda0f..ab94fe6 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,11 @@
 ## 主要功能
 
 ### √ 1.登录注册功能
-### √ 2.首页展示共享文章列表
+### √ 2.首页展示共享文章列表 × 首页大整改
 ### √ 3.画廊页面展示共享图片
+### √ 4.文章详情页展示文章内容
+### × 5.导航功能整改，前后端
+### × 6.友链--重新开发，力求精简
 
 
 ### × 4.控制台功能 --目前已完成：画廊上传共享
diff --git a/src/api/nav/index.js b/src/api/nav/index.js
index 0f7108d..38aae9c 100644
--- a/src/api/nav/index.js
+++ b/src/api/nav/index.js
@@ -1,10 +1,11 @@
 import request from '@/util/request';
 
 // listNav
-export function listNav() {
+export function listNav(params = {}) {
   return request({
     url: '/nav/menu',
-    method: 'get'
+    method: 'get',
+    params
   });
 }
 
@@ -16,6 +17,21 @@ export function addMenu(data) {
   });
 }
 
+// deleteMenu
+export function deleteMenu(id) {
+  return request({
+    url: '/nav/menu',
+    method: 'delete',
+    params:{
+      id
+    }
+  });
+}
+
+
+
+
+
 export function listClass(){
   return request({
     url: '/nav/class',
diff --git a/src/assets/style/index.less b/src/assets/style/index.less
index 27c102e..a134742 100644
--- a/src/assets/style/index.less
+++ b/src/assets/style/index.less
@@ -1,4 +1,4 @@
-@purple: #8a2be2;
+@purple: #a81b2b;
 @orange: #ffa500;
 @blue: #409eff;
 @dp: #f2e8fc;
@@ -7,6 +7,3 @@
 //#BE8AEF #B172EC #A45BE9 #9744E5 #8A2BE2 #7B1DD3 #6C19B9 #5C169F
 
 @jb: linear-gradient(90deg,#BE8AEF,#409eff,  #8A2BE2);
-:root:root {
-  --van-primary-color: #8a2be2;
-}
\ No newline at end of file
diff --git a/src/components/arti.vue b/src/components/arti.vue
index 42e85b0..08d4aed 100644
--- a/src/components/arti.vue
+++ b/src/components/arti.vue
@@ -64,7 +64,7 @@ function onEnter(el, done) {
   width: 90%;
   margin: 0 0 20px 5%;
   box-shadow: @ps;
-  background-color: #fafbfc;
+  background-color: unset;
 
 }
 :deep(.n-card__content) {
diff --git a/src/components/menu.vue b/src/components/menu.vue
index 58bcbb2..ee2138f 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -145,6 +145,7 @@ function logout() {
     },
     onNegativeClick: () => {
       push("/");
+      location.reload(true);
     },
   });
 }
diff --git a/src/components/wea.vue b/src/components/wea.vue
index fb6afb9..237a520 100644
--- a/src/components/wea.vue
+++ b/src/components/wea.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="info" @click="gotoWea">
     <div class="loc flex items-center">
-      <n-icon size="18" color="#8a2be2">
+      <n-icon size="18" color="#a81b2b">
         <IosPin />
       </n-icon>
       {{ addr }}
diff --git a/src/util/theme.js b/src/util/theme.js
index 25f08e9..8bf7514 100644
--- a/src/util/theme.js
+++ b/src/util/theme.js
@@ -1,15 +1,15 @@
 const themeOverrides = {
   lightOverrides: {
     common: {
-      primaryColor: "#8a2be2", //默认颜色
-      primaryColorHover: "#8a2be2", //hover颜色
-      primaryColorPressed: "#8a2be2", //点击颜色
+      primaryColor: "#a81b2b", //默认颜色
+      primaryColorHover: "#a81b2b", //hover颜色
+      primaryColorPressed: "#a81b2b", //点击颜色
       successColor: "#409EFF",
       successColorHover: "#409EFF",
       successColorPressed: "#409EFF",
-      infoColor: "#8a2be2",
-      infoColorHover: "#8a2be2",
-      infoColorPressed: "#8a2be2",
+      infoColor: "#a81b2b",
+      infoColorHover: "#a81b2b",
+      infoColorPressed: "#a81b2b",
     },
     Radio: {
       buttonColorActive: "#FFA50040",
diff --git a/src/views/gallery/index.vue b/src/views/gallery/index.vue
index 98d38fd..d5a764c 100644
--- a/src/views/gallery/index.vue
+++ b/src/views/gallery/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <n-scrollbar class="bg-[#f8f9fa]" :on-scroll="onScroll" :style="{ maxHeight: contH + 'px' }">
+  <n-scrollbar class="" :on-scroll="onScroll" :style="{ maxHeight: contH + 'px' }">
     <div class="w-[40vw] mx-auto my-6 md:w-[80vw]">
       <n-input-group>
         <n-input v-model:value="kw" placeholder="图片名 | 分享人" @keyup.enter.native="search" :style="{ width: '80%' }" />
diff --git a/src/views/home/navMenu.vue b/src/views/home/navMenu.vue
index e1baa7d..7a668ed 100644
--- a/src/views/home/navMenu.vue
+++ b/src/views/home/navMenu.vue
@@ -2,42 +2,25 @@
   <div class="box flex flex-wrap px-8">
     <n-card :style="{ height: boxH + 'px' }">
       <n-scrollbar :class="`h-[${boxH}px]`" :style="{ height: boxH - 40 + 'px' }">
-        <n-collapse default-expanded-names="0" accordion>
-          <n-collapse-item v-for="(i, idx) in navList" :name="idx + ''" :key="i.menuClass">
-            <template #arrow="{ collapsed }">
-              <img :class="{ zhuan: !collapsed }" width="20" height="20" :src="i.icon" alt="">
-            </template>
-            <template #header>
-              <div class="ml-4" :style="{ color: i.color }">
-                {{ i.menuClass }}
-              </div>
-            </template>
-            <template #header-extra="{collapsed}">
-              <n-icon size="26" :color="i.color">
-                <IosArrowDropright :class="{extra_collapsed:!collapsed}"  class="extra_collapse"></IosArrowDropright>
-              </n-icon>
-            </template>
-            <div class="flex flex-wrap items-center">
-              <div class="w-[200px] mr-20 my-4" v-for="(j,ii) in i.children">
-                <n-popover trigger="hover" animated :delay="1000" width="trigger">
-                  <template #trigger>
-                    <div>
-                      <n-button @click="link(j.menuLink)"  class="btn w-full  hover:text-[white]" type="primary" ghost>
-                        <template #icon>
-                          <img v-if="!j.exp" width="20" height="20" class="mr-2" :src="j.menuIcon" alt="" @error="navList[idx].children[ii].exp=true">
-                          <div :style="{backgroundColor:j.color}" class="w-[20px] h-[20px] text-[12px] text-[white] rounded-full flex justify-center items-center" v-else>{{ j.menuName[0] }}</div>
-                        </template>
-                        {{ j.menuName }}
-                      </n-button>
-                    </div>
-                  </template>
-                  {{ j.menuDesc }}
-                </n-popover>
+        <div class="grid gridSpace gap-4 items-center justify-center">
+          <div class="w-[200px]  my-4" v-for="(i, ii) in navList">
+            <n-button @click="link(i.menuLink)" class="btn w-full  hover:text-[white]" type="primary" ghost>
+              <template #icon>
+                <img v-if="!i.exp" width="20" height="20" class="mr-2" :src="i.menuIcon" alt="" @error="i.exp = true">
+                <div :style="{ backgroundColor: i.color }"
+                  class="w-[20px] h-[20px] text-[12px] text-[white] rounded-full flex justify-center items-center"
+                  v-else>{{ i.menuName[0] }}</div>
+              </template>
+              {{ i.menuName }}
+            </n-button>
+          </div>
+          <div class="w-[200px]  my-4">
+            <n-button @click="addMenu" class="btn w-full  hover:text-[white]" type="primary" ghost>
+              +
+            </n-button>
+          </div>
+        </div>
 
-              </div>
-            </div>
-          </n-collapse-item>
-        </n-collapse>
       </n-scrollbar>
 
     </n-card>
@@ -45,52 +28,63 @@
 </template>
 
 <script setup>
-import { IosArrowDropright } from "@vicons/ionicons4";
 import { onMounted } from 'vue';
+import cookie from "vue-cookies";
+import { useRouter } from 'vue-router';
 
 //mark import
 
 //mark data
 const navList = ref([])
-const isHaveIco = ref(true)
 const size = $store.size.usesizeStore()
 const boxH = ref(0)
-
+const token = cookie.get("token");
+const userinfo = cookie.get("userinfo");
+const router = useRouter()
+const fullPath = router.currentRoute.value.fullPath
+const { push } = router;
 //mark method
-function formatNav(list) {
-  let menu = []
-  let result = []
-  list.forEach(i => {
-    i.isHaveIco = true
-    if (!menu.includes(i.menuClass)) {
-      menu.push(i.menuClass)
-    }
-  });
-  menu.forEach(i => {
-    const children = list.filter(it => it.menuClass == i)
-    result.push({
-      menuClass: i,
-      children,
-      color: children[0].color,
-      icon: "https://www.hxyouzi.com/img/svg/menu/" + children[0].icon,
-      exp: false,
-    })
+async function getNav() {
+  let res = {}
+  if (!!token && !!userinfo) {
+    res = await $http.nav.listNav({ username: userinfo.username })
+  }
+  else {
+    res = await $http.nav.listNav()
+  }
+  navList.value = res.data.map((item) => {
+    item.exp = false
+    return item
   })
-  console.log(result);
-
-  return result
-  // return chunkArrayInGroups(result, 4)
-
 }
 
+function addMenu() {
+  if (!!token && !!userinfo) {}
+  else {
+    $dialog.success({
+    title: "该功能能需要登录账号",
+    content: "未登录账号，是否去登录？",
+    positiveText: "登录",
+    negativeText: "返回",
+    onPositiveClick: () => {
+      push({
+        path: "/login",
+        query: {
+          redirect: fullPath,
+        },
+      });
+    },
+  });
+  }
+}
 
 function link(url) {
   window.open(url, "_blank")
 }
 //mark 周期、内置函数等
-onMounted(async () => {
-  const res = await $http.nav.listNav()
-  navList.value = formatNav(res.data)
+onMounted(() => {
+  getNav()
+
   // 获取屏幕高度
   const screenHeight = document.documentElement.clientHeight
   boxH.value = screenHeight - size.searchH - size.menuH - 24 - 66
@@ -102,9 +96,12 @@ onMounted(async () => {
 <style scoped lang="less">
 .box {
   align-items: start;
-  
+
 }
 
+.gridSpace {
+  grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+}
 
 :deep(.n-collapse-item__header-main) {
   font-size: 20px;
@@ -135,20 +132,27 @@ onMounted(async () => {
   animation: rotate 2s infinite;
   /* 播放名为bounce的动画，循环无限次，每次动画时长1秒 */
 }
+
 .btn {
   transition: transform .5s ease-in-out;
+
   /* 指定过渡属性，持续时长，过渡曲线，何时开始 */
   &:hover {
     transform: translateX(10px);
-    background: linear-gradient(to right,  #7FC6E7, #4CAF50);
-  };
+    background: linear-gradient(to right, #dca4aa, #a81b2b, #dca4aa);
+  }
+
+  ;
 }
+
 .extra_collapse {
   transform: rotate(0deg);
 }
+
 .extra_collapsed {
   transform: rotate(90deg);
 }
+
 :deep(.n-card) {
   padding: 30px;
   background: #f1f2f370;
diff --git a/src/views/plink/right.vue b/src/views/plink/right.vue
index 6a49027..b349ea0 100644
--- a/src/views/plink/right.vue
+++ b/src/views/plink/right.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div id="plink" class="lianxi w-[80%] ml-[10%] mt-4 mb-4 bg-[#fafbfc] p-2">
+    <div id="plink" class="lianxi w-[80%] ml-[10%] mt-4 mb-4  p-2">
       <div class="t">
         <n-divider title-placement="center">
           <div class="flex items-center" @click="isAdd = !isAdd">
@@ -43,7 +43,7 @@
       </template>
     </div>
 
-    <div class="lianxi w-[80%] ml-[10%] mt-4 mb-4 bg-[#fafbfc] p-2">
+    <div class="lianxi w-[80%] ml-[10%] mt-4 mb-4  p-2">
       <div class="t">
         <n-divider title-placement="center">
           <div class="flex items-center" @click="isLink = !isLink">
@@ -265,4 +265,7 @@ onMounted(async () => {
 :deep(.n-form-item){
   align-items: center;
 }
+:deep(.n-card) {
+  background: unset !important;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/widget/component/gold.vue b/src/views/widget/component/gold.vue
index 8566d7d..6f15e89 100644
--- a/src/views/widget/component/gold.vue
+++ b/src/views/widget/component/gold.vue
@@ -71,4 +71,11 @@ onMounted(async () => {
 
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped>
+:deep(.n-descriptions-table-wrapper) {
+  background: unset !important;
+}
+:deep(.n-descriptions-table-wrapper th) {
+  background: unset !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/widget/index.vue b/src/views/widget/index.vue
index 4925f4c..d857c55 100644
--- a/src/views/widget/index.vue
+++ b/src/views/widget/index.vue
@@ -81,4 +81,8 @@ function handdleWidget(i) {
 
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped>
+:deep(.n-card) {
+  background: unset !important;
+}
+</style>
\ No newline at end of file
diff --git a/tailwind.config.js b/tailwind.config.js
index 4b2e7d8..c3e7a3e 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -18,6 +18,17 @@ module.exports = {
     },
     colors: {
       pp: {
+        100: "#eed1d5",
+        200: "#dca4aa",
+        300: "#cb7680",
+        400: "#b94955",
+        500: "#a81b2b",
+        600: "#861622",
+        700: "#65101a",
+        800: "#430b11",
+        900: "#220509"
+},
+      purple: {
         100: "#BE8AEF",
         200: "#B172EC",
         300: "#A45BE9",
@@ -30,14 +41,29 @@ module.exports = {
         default: "#8A2BE2",
       },
       orange: {
+        100: "#ffedcc",
+        200: "#ffdb99",
+        300: "#ffc966",
+        400: "#ffb733",
         500: "#ffa500",
+        600: "#cc8400",
+        700: "#996300",
+        800: "#664200",
+        900: "#332100",
         default: "#ffa500"
       },
       suc: {
+        100: "#dcf3d1",
+        200: "#bae7a3",
+        300: "#97dc76",
+        400: "#75d048",
         500: "#52c41a",
+        600: "#429d15",
+        700: "#317610",
+        800: "#214e0a",
+        900: "#102705",
         default: "#52c41a"
-
-      }
+      },
     },
   },
   plugins: [],