From c7386067316da078510b0fcfdc22ef2f4b5b9881 Mon Sep 17 00:00:00 2001
From: shenhan <shenhanfly@163.com>
Date: Mon, 10 Mar 2025 17:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/img/activityIcon.png               | Bin 0 -> 1177 bytes
 app/assets/img/gzhqr.png                      | Bin 0 -> 53717 bytes
 app/assets/img/wallet.png                     | Bin 0 -> 1083 bytes
 app/components.d.ts                           |   3 +-
 app/components/EditUserInfo.vue               |  12 +-
 app/components/GoldPayment.vue                | 239 +++++++++
 app/components/Header.vue                     |   6 +-
 app/components/IntPayment.vue                 |  37 +-
 app/components/ModelList.vue                  |  12 +-
 app/components/Payment.vue                    | 264 +++++-----
 app/components/PersonalCenterCard.vue         |  52 +-
 app/components/PictureDetail.vue              |   8 +-
 app/components/PictureList.vue                |   9 +-
 app/components/Publish-picture.vue            |  10 +-
 app/components/WechatLoginQr.vue              |   4 +-
 app/components/WorkFlowList.vue               |  12 +-
 app/components/message/AttentionMsg.vue       |   1 -
 app/components/publishModel/CreateModels.vue  |  29 +-
 app/components/publishModel/EditVersion.vue   |  72 ++-
 app/components/publishModel/UploadImg.vue     |   7 +
 .../publishWorkFlow/EditVersion.vue           |  47 +-
 app/components/publishWorkFlow/UploadImg.vue  |   8 +-
 app/constants/index.ts                        |   4 +-
 app/layouts/default.vue                       |  90 +++-
 app/middleware/auth.global.ts                 |  19 +-
 app/pages/Int-detail/index.vue                | 144 ++++--
 app/pages/gold-detail/index.vue               | 145 ++++++
 app/pages/member-center/index.vue             | 476 +++++++++++-------
 app/pages/model-details/[id].vue              | 175 +++++--
 app/pages/personal-center/index.vue           | 204 ++++----
 app/pages/personal-publish/index.vue          |  20 +-
 app/pages/picture-square.vue                  |   2 +-
 app/pages/publish-model/index.vue             |   5 +-
 app/pages/publish-workflow/index.vue          |  12 +-
 app/pages/search/index.vue                    |   1 -
 app/pages/us/aboutUs/index.vue                |  19 +
 app/pages/us/agreement/index.vue              |  19 +
 app/pages/us/privacy/index.vue                | 119 +++++
 app/pages/wallet/index.vue                    | 224 +++++++++
 app/pages/work-square.vue                     |   2 +-
 app/pages/workflow-details/[id].vue           | 113 ++++-
 app/stores/user.ts                            |   7 +-
 app/utils/index.ts                            |  21 +
 app/utils/request.ts                          |   3 +-
 nuxt.config.ts                                |  11 +-
 public/favicon.ico                            | Bin 15086 -> 15406 bytes
 public/favicon1.ico                           | Bin 0 -> 15086 bytes
 public/favicon2.ico                           | Bin 0 -> 387 bytes
 48 files changed, 1968 insertions(+), 699 deletions(-)
 create mode 100644 app/assets/img/activityIcon.png
 create mode 100644 app/assets/img/gzhqr.png
 create mode 100644 app/assets/img/wallet.png
 create mode 100644 app/components/GoldPayment.vue
 create mode 100644 app/pages/gold-detail/index.vue
 create mode 100644 app/pages/us/aboutUs/index.vue
 create mode 100644 app/pages/us/agreement/index.vue
 create mode 100644 app/pages/us/privacy/index.vue
 create mode 100644 app/pages/wallet/index.vue
 create mode 100644 public/favicon1.ico
 create mode 100644 public/favicon2.ico

diff --git a/app/assets/img/activityIcon.png b/app/assets/img/activityIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4d0c10a0b6b4f599c4f514b3ec492ad74a8c9d7
GIT binary patch
literal 1177
zcmV;K1ZMk*P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(Q%OWYRA@u(nNLU*Q5e9#+0{)=NrlKRbrFn$FlVBaO1*i>OUF9px)FGdj;^N&
z34(&qG79XJrwTgmR+pk3SBeU+L0X8q<@#^d*;n7&dBe=xfAeNX*R9@V)qUTa@Av(G
zjsz9Hqzcy`{#^h?QF;vT(a%^c7Ix}QLzc-4$@0%|<pD)e!i11vJgj|>zBRMyufm@t
zNg62zBFl0F0D6wql4Nx{U1P{b4cVwuBd~qK08IH{lMaK;IuK2Rw5GvCvKA&*YYRd!
z<;Pm9L9Umm?7R6Dc(_^v(^@sCsw%9HumA!K9`Fr^x=#Z1Uj`T*0(~V3dNK(^%MDZ!
zNs@YFv6#)83_R50hfpX4@N9w_5oO;mZBp4>a>YC%3?R!gp-SAkmpOZMh<<4E-|1)9
zk7oRcs;b&+eYh!y;MeYE<YuRB@bOfjXb6^^1EwNqMO=m@F&t8hOVk6rHJSBe?SYK)
zvvE^yYjKH&;80>8#I>p&0f@-;zMipGnzy#ahZ4rLEp%G^0Bs%A^0*i@^PH0+P_hTG
z1QJ3bED`wwF_bJ`7{O{qLk^Ya7PCGp0G=kXrOszP*eIbr2*I!P+B)d#>t<!a?+fjV
zYgM#*VcwtzawRQa5UhK$lGs|~a~)RBzvT)s8-PXmyw(r_z)&-+D%_yB=g_W=p65$#
zP5?d@N$|AU_C)}ccq($F&i8n-&HqS5&bl|1SZT-K15=-FV+G_(v<(0|<sZUVY#boL
zt}qbNjji8}0?Ld=lQ&laJ3Wsjx-SrbzPW~(giaFH9+Tw(BxFfL20H270{sJ-=e3=%
zKbO^W{2sqEni|{WB><jz<!95z#|`OiUI43hG;D|zp>-RZkI}Gf1PFjN9rqvrx5sM$
zV^pzqdENtTG>)18d93Rs1a=(2ngf3ifD=>a*|R%5P-y_DFUxW=(1~@|_43*SII8pA
zI4g-+_rzXc^Z|NxbhEqwV8bE1wG{+FB`bOsvRaveuvzBL`Sf#tTCW%J#MKv75R`S0
z54wv)bzXu8s=we>Gw+p>&HZe6(kD8W$yTaS1mM(ofC3E4x`>#$cY4kTXoN!d1jhhm
zsxLEE2rT8s0))=gLFnvW0Vx1|@f+P=5&+8wbFgy(F#cv0<ii1w4`p9`3K4k*V4ICx
z00^1gvUz&}&fNrfeci2Yj^sQ8zzYORVlxLWyvzVBd?>1n`ZXmSK6t1n07exWHoGzl
zAprnP;<1a3!VsPS@aA>nfwEVjQbVY$0DL2>I1l6n*niwn0@FTH&PJ9O;OHfQ&yz(f
z(C!7mKJev<BQNYu4>+=YX45|pa9{P)aoW{1iWW4=D1GTbp7w=70-@VksUGkGfR51Y
z8b_x3gl;Bo0La=eNUyJ$qja&C9!1}gmHCR9^{$Oi!J+`hy#OyVLYEnVT+g+Y{yV<V
riw!2^2%tn|wpIK;z_yy#!QsCF=W(!J8g@o+00000NkvXXu0mjfq)!_X

literal 0
HcmV?d00001

diff --git a/app/assets/img/gzhqr.png b/app/assets/img/gzhqr.png
new file mode 100644
index 0000000000000000000000000000000000000000..89960d321f8287ef15ca40d22b3cd682152243b1
GIT binary patch
literal 53717
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
KMNUMnLSTZljPk(%

literal 0
HcmV?d00001

diff --git a/app/assets/img/wallet.png b/app/assets/img/wallet.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee6a0f691c77bc4944b22933f160c40e07caba45
GIT binary patch
literal 1083
zcmV-B1jPG^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&^+`lQR9HvFm)naJM-;}t>h77HU3XR`E=XiujhBcoV*UX~d{GEu!~{X`9#L39
zA+Q0_RUs=PqTswqNa700=3!L`NI+dgR8TSKi-?%Lcv)PO;B3#WyQ@Ogbl3FsR8RM;
z57tx9bX9%7^PO|Ls|h~yAfH(uO#zrk`m>~DuO%I=-5{C{0s=z^EQi6e9abujvRvW%
zjC1`xaRZA5kncVILWm|4Mx%|HSp;kcDBDG6Y;s-ta&|ZhBod(T%PA{LSc;U&U`4C)
z(=35~m>Qv_@{UFzp#Wy@@gZ$a$A+i~YVO+(gbVIq?>-7gXuh~Q3_=MoEpaXy1o+Pc
z$_`MpK#S#L>A~#LU_f;MQ~M7c(C2raX)1DWasWW2!7Nq4rix%1>YS(pC>%R!p{+#}
zoAK>B7|WK1ve1t?kd|cVee3N6oWJjYJ$fntU^&C>e`Z(v7t{dckMzGF>9$2ed`$+%
z$`#WVw<q6&Q7YEchfhHNx>a!js7XZ)K;hI`<|!KAZ-mj^r38qI+%L{IU@ynu3=CCV
z0MI^|mAdjGSa`|Z+o8>xDHhnzo`e27BCg5oSzzx!h-+;@H}u6{)i#1Ja@h^}0-Q6y
zg7Ko{Kt2~FfIs(qk`lnR)Y~`+;6=^~ZYwg^(1}Snm##$s^q;0k=n}{eAo3Vda9o^@
zj)PvmAsrDB^EPyc=YT&ARR?_e4>}M_+{}Ys90XbZHOMzBKw48(VcQ0M{u1=JA^D$I
z2ay1A#Cf%|@z)}H{l~518a4%4*agPL%{=gG0`&JL0ibCO``lmcH2`C;1OVoLSrO-B
z{4MAoSE{bK52bJic5MS`YgM+P=nO@*JLfMzTe}9NYhE>SZ-={&L2uq~kb)DZnRvIm
zBe87@w2rhAKqW5Pt55{H_Xzaf<GOYJ0#p}a--!a+tCbT55GF1w-OITjAz(ik<RiKI
zAUbgPAJU$xJbMit$$dMa&FrX&WLn~UhtW5n16S+v&;O7BxxGJU^f~EU-YjF&dKk-=
z$VJl@j|;%(nFkM#kQu3NVS*3flf-##3|s{peNzd>XMc?YUa01tUWTL&($)fF^LIe!
z7xJy9sz}-AA^pN`KLoq|Kxw}cU~0!t!z7`vk}KxT1)19!vOT~iChPB&ZJ=ybqjqNm
zU&TrQ{%7uoo}*eS*@sjjR9Jb#J^3h|3Y-JHIiZJA4ncrEl1c)GCORWj)H@0DBe`Oz
zB98>{oZt|0&mcsIpr4_UcxVdz8{{_kWQc=45M-Lk2N&k^RVQKpK9L_L-ed_<!48Fq
zD;z5YVG(l}d5<Ck4dN3l&Zk&#&)5z$V}CPq{|6kqOh4#(fMfsw002ovPDHLkV1g&@
B>N5ZU

literal 0
HcmV?d00001

diff --git a/app/components.d.ts b/app/components.d.ts
index d200d25..6b6e898 100644
--- a/app/components.d.ts
+++ b/app/components.d.ts
@@ -24,7 +24,7 @@ declare module 'vue' {
     NInfiniteScroll: typeof import('naive-ui')['NInfiniteScroll']
     NInput: typeof import('naive-ui')['NInput']
     NInputGroup: typeof import('naive-ui')['NInputGroup']
-    NMessageProvider: typeof import('naive-ui')['NMessageProvider']
+    NInputNumber: typeof import('naive-ui')['NInputNumber']
     NModal: typeof import('naive-ui')['NModal']
     NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NQrCode: typeof import('naive-ui')['NQrCode']
@@ -32,6 +32,7 @@ declare module 'vue' {
     NRadioGroup: typeof import('naive-ui')['NRadioGroup']
     NSelect: typeof import('naive-ui')['NSelect']
     NSpace: typeof import('naive-ui')['NSpace']
+    NSpin: typeof import('naive-ui')['NSpin']
     NTabPane: typeof import('naive-ui')['NTabPane']
     NTabs: typeof import('naive-ui')['NTabs']
     NTooltip: typeof import('naive-ui')['NTooltip']
diff --git a/app/components/EditUserInfo.vue b/app/components/EditUserInfo.vue
index b4a91d0..bc43d02 100644
--- a/app/components/EditUserInfo.vue
+++ b/app/components/EditUserInfo.vue
@@ -17,7 +17,7 @@ const ruleForm = ref({})
 const rules = ref({
   nickName: [
     { required: true, message: '请输入用户名', trigger: 'blur' },
-    { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' },
+    { min: 2, max: 15, message: '长度在 2 到 15 个字符', trigger: 'blur' },
   ],
 })
 // 文件输入引用
@@ -79,7 +79,8 @@ watch(
       ruleForm.value.avatar = newUserInfo.avatar
       ruleForm.value.brief = newUserInfo.brief
       ruleForm.value.userId = newUserInfo.userId
-      // ruleForm.value.invitationName = newUserInfo.invitationName
+      ruleForm.value.invitationName = newUserInfo.invitationName
+      ruleForm.value.invitationCode = newUserInfo.invitationCode
     }
   },
   { immediate: true, deep: true }, // 立即执行一次，初始化 ruleForm
@@ -128,13 +129,14 @@ onMounted(() => {
       <n-form-item path="nickName" label="用户名">
         <n-input v-model:value="ruleForm.nickName" placeholder="请输入用户名" @keydown.enter.prevent />
       </n-form-item>
-      <div v-if="userInfo.invitationName" class="mb-3">
-        已经填写: {{ userInfo.invitationName }} 的邀请码
+      
+      <div v-if="userStore.userInfo.invitationName" class="mb-3">
+        已经填写: {{ userStore.userInfo.invitationName }} 的邀请码
       </div>
       <!-- <n-form-item v-if="userInfo.invitationName" path="invitationCode">
       </n-form-item> -->
       <n-form-item v-else path="invitationCode" label="邀请码">
-        <n-input v-model:value="ruleForm.invitationName" placeholder="请输入邀请码" @keydown.enter.prevent />
+        <n-input v-model:value="ruleForm.invitationCode" placeholder="请输入邀请码" @keydown.enter.prevent />
       </n-form-item>
      
       <n-form-item label="简介" path="textareaValue">
diff --git a/app/components/GoldPayment.vue b/app/components/GoldPayment.vue
new file mode 100644
index 0000000..424f3a6
--- /dev/null
+++ b/app/components/GoldPayment.vue
@@ -0,0 +1,239 @@
+<script setup lang="ts">
+import { RotateCcw, X } from 'lucide-vue-next';
+import type { FormInst } from 'naive-ui';
+import { defineProps, onBeforeMount, onBeforeUnmount, ref } from 'vue';
+
+const props = defineProps({
+  isMember: {
+    type: Object,
+    default: () => {},
+  },
+})
+
+const emit = defineEmits(['closePayment', 'paymentSuccess'])
+
+const message = useMessage()
+
+let pollingTimer: ReturnType<typeof setInterval> | undefined
+const formRef = ref<FormInst | null>(null)
+// const isShowPayment = ref(false)
+const userStore = useUserStore()
+
+interface UserInfoType {
+  nickName: string
+  avatar: string
+  brief: string
+  userId: number | string
+}
+const userInfo = {
+  nickName: userStore.userInfo?.nickName ?? '',
+  avatar: userStore.userInfo?.avatar ?? '',
+  brief: userStore.userInfo?.brief ?? '',
+  userId: userStore.userInfo?.userId ?? '',
+} as UserInfoType
+
+function onCloseModel() {
+  emit('closePayment')
+}
+function onPaymentSuccess() {
+  emit('paymentSuccess')
+}
+const qrUrl = ref('')
+
+// 初始化获取支付二维码
+const paymentStatus = ref(1)
+const amount = ref(10)
+const paymentParams = ref({
+  amount: 10,
+  type: 'wallet',
+})
+
+async function getQrCode() {
+  try {
+    paymentParams.value.amount = amount.value
+    const res = await request.post(`/ali/pay/doPay`, paymentParams.value)
+    if (res.code === 200) {
+      paymentStatus.value = 1
+      qrUrl.value = res.data.url
+      pollingTimer && clearTimeout(pollingTimer)
+      pollingTimer = setInterval(async () => {
+        try {
+          const res2 = await request.get(`/order/queryTradeStatus?outTradeNo=${res.data.orderNo}`)
+          if (res2.data === 2) { // 1代支付 2支付成功 4超时
+            paymentStatus.value = 2
+            clearTimeout(pollingTimer)
+            onPaymentSuccess()
+            emit('closePayment')
+            message.success('支付成功!')
+          }
+          else if (res2.data === 4) {
+            paymentStatus.value = 4
+            clearTimeout(pollingTimer)
+          }
+        }
+        catch (err) {
+          console.log('object', err)
+        }
+      }, 2000)
+    }
+  }
+  catch (err) {
+    console.log(err)
+  }
+}
+
+// 二维码是否过去
+const isVisible = ref(true)
+
+// 获取积分余额和历史记录
+// const points = ref(0)
+// async function getPoints() {
+//   try {
+//     const res = await request.get('/member/getPoints')
+//     if (res.code === 200) {
+//       points.value = res.data.points
+//     }
+//   }
+//   catch (err) {
+//     console.log(err)
+//   }
+// }
+// getPoints()
+
+// 是否是会员
+// const isMember = ref(false)
+// async function getIsMember() {
+//   try {
+//     const res = await request.get('/member/isMember')
+//     if (res.code === 200) {
+//       isMember.value = res.data
+//     }
+//   }
+//   catch (err) {
+//     console.log(err)
+//   }
+// }
+// getIsMember()
+
+onBeforeMount (() => {
+  getQrCode()
+})
+defineExpose({
+  isVisible,
+})
+onBeforeUnmount(() => {
+  clearInterval(pollingTimer)
+})
+</script>
+
+<template>
+  <n-modal
+    v-model:show="isVisible"
+    :preset="null"
+    :mask-closable="false"
+    transform-origin="center"
+    class="custom-modal"
+  >
+    <div class="bg-white rounded-xl w-200">
+      <div
+        class="p-4 flex justify-between rounded-t-xl bg-gradient-to-r from-[#fcf2da] to-[#f9db9f]"
+      >
+        <div class="flex items-center">
+          <div>
+            <img :src="userInfo.avatar" class="w-14 h-14 rounded-full mr-4">
+          </div>
+          <div class="flex flex-col">
+            <div class="text-[#814600] text-xl">
+              {{ userInfo.nickName }}
+            </div>
+            <div class="text-[#6a6a6a] text-xs mt-1">
+              {{ props.isMember.result === '1' ? `会员到期时间: ${props.isMember.endDate}` : '您还不是魔创未来的会员' }}
+            </div>
+          </div>
+        </div>
+        <div @click="onCloseModel">
+          <component :is="X" class="h-[18px] w-[18px] text-[#61666d] cursor-pointer" />
+        </div>
+      </div>
+      <!-- <div class="p-4">
+        余额：{{ points }}积分
+      </div> -->
+      <div class="mb-4 mt-6 flex">
+        <n-form
+          ref="formRef"
+          :label-width="80"
+          :model="paymentParams"
+          size="large"
+          label-placement="left"
+          style="width: 240px"
+        >
+          <n-form-item label="输入积分" path="modelProduct.modelName">
+            <n-input v-model:value="amount" type="number" placeholder="输入积分" />
+          </n-form-item>
+        </n-form>
+        <!-- <div>
+          确定
+        </div> -->
+        <n-button type="primary" class="mt-1 ml-2" @click="getQrCode">
+          确定
+        </n-button>
+      </div>
+      <!-- <div v-for="(item, index) in activityList" :key="index">
+        {{ item.activityName }}
+      </div> -->
+      <div class="mt-1 text-[#9d8c75] text-[12px] w-[500px] px-3">
+        1000个算力约可生图1000张，或训练5次。按照生图默认参数、或训练基础参数预估（即训练图片张数20张*单张训练次数15*训练轮数10）。
+        您充值的算力永久有效
+        算力充值不退不换
+      </div>
+      <div class="flex justify-center items-center my-4">
+        <div class="w-30 h-30 flex justify-center items-center relative">
+          <n-qr-code :value="qrUrl" :size="90" style="padding: 0;" />
+          <div v-if="paymentStatus === 4" class="absolute top-0 left-0 w-full h-full flex cursor-pointer flex-col justify-center items-center bg-opacity-50 bg-black text-white" @click="getQrCode">
+            请点击刷新<RotateCcw />
+          </div>
+        </div>
+        <div class="flex justify-center ml-2 flex-col pb-[14px]">
+          <div class="flex items-baseline">
+            <div class="text-[#222] font-medium mr-1">
+              支付
+            </div>
+            <div class="text-[#814600] mr-1">
+              <span class="text-[16px] mr-1">¥</span>
+              <span class="text-[40px]">{{ paymentParams.amount }}</span>
+            </div>
+            <!-- <div class="px-2 bg-gradient-to-r from-[#ffa700] to-[#ff006b] text-[#814600] text-white rounded-[4px] ml-1 text-[12px">
+              已减¥11
+            </div> -->
+          </div>
+          <div class="flex items-center mb-1">
+            <img src="@/assets/img/alipay.png" class="mr-1"> 请扫码完成支付
+          </div>
+          <div class="text-[12px]">
+            <span class="text-[#999]">
+              开通即代表同意
+            </span>
+            <span class="text-[#814600]">
+              《魔创未来会员协议》
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </n-modal>
+</template>
+
+<style lang="scss" scoped>
+.member-item {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 16.66%;
+  height: 40px;
+  border: 1px solid #f0f0f0;
+  font-size: 12px;
+  font-weight: 400;
+  margin-right: -1px;
+  margin-bottom: -1px;
+}
+</style>
diff --git a/app/components/Header.vue b/app/components/Header.vue
index 25e4d2d..754fb4e 100644
--- a/app/components/Header.vue
+++ b/app/components/Header.vue
@@ -190,11 +190,11 @@ onMounted(() => {});
           <div class="flex items-center gap-2">
             <NuxtLink to="/" class="text-xl font-semibold tracking-tight no-underline">
               <!-- <img src="/vite.png" alt="Logo" class="h-9 w-9" /> -->
-              <!-- 魔创未来 -->
-              <img
+              魔创未来
+              <!-- <img
                 src="https://liblibai-web-static.liblib.cloud/liblibai_v4_online/static/_next/static/images/icon-logo.e3ce24f316fb81dbde1cafc3bf956080.svg"
                 alt=""
-              />
+              /> -->
               <!-- <a class="Topbar_iconLogo__RhuYB" style="background-image: url(&quot;https://liblibai-web-static.liblib.cloud/liblibai_v4_online/static/_next/static/images/icon-logo.e3ce24f316fb81dbde1cafc3bf956080.svg&quot;);"></a> -->
             </NuxtLink>
             <!-- <span class="text-xl font-semibold tracking-tight">魔创未来</span> -->
diff --git a/app/components/IntPayment.vue b/app/components/IntPayment.vue
index 5cbf060..bee0293 100644
--- a/app/components/IntPayment.vue
+++ b/app/components/IntPayment.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
-import { RotateCcw, X } from 'lucide-vue-next'
-import { defineProps, onBeforeMount, onBeforeUnmount, ref } from 'vue'
+import { RotateCcw, X } from 'lucide-vue-next';
+import type { FormInst } from 'naive-ui';
+import { defineProps, onBeforeMount, onBeforeUnmount, ref } from 'vue';
 
 const props = defineProps({
   isMember: {
@@ -85,19 +86,19 @@ async function getQrCode() {
 const isVisible = ref(true)
 
 // 获取积分余额和历史记录
-const points = ref(0)
-async function getPoints() {
-  try {
-    const res = await request.get('/member/getPoints')
-    if (res.code === 200) {
-      points.value = res.data.points
-    }
-  }
-  catch (err) {
-    console.log(err)
-  }
-}
-getPoints()
+// const points = ref(0)
+// async function getPoints() {
+//   try {
+//     const res = await request.get('/member/getPoints')
+//     if (res.code === 200) {
+//       points.value = res.data.points
+//     }
+//   }
+//   catch (err) {
+//     console.log(err)
+//   }
+// }
+// getPoints()
 
 // 是否是会员
 // const isMember = ref(false)
@@ -154,10 +155,10 @@ onBeforeUnmount(() => {
           <component :is="X" class="h-[18px] w-[18px] text-[#61666d] cursor-pointer" />
         </div>
       </div>
-      <div class="p-4">
+      <!-- <div class="p-4">
         余额：{{ points }}积分
-      </div>
-      <div class="mt-4 px-6 flex">
+      </div> -->
+      <div class="mb-4 mt-6 flex">
         <n-form
           ref="formRef"
           :label-width="80"
diff --git a/app/components/ModelList.vue b/app/components/ModelList.vue
index 6848ad0..ec9d5cc 100644
--- a/app/components/ModelList.vue
+++ b/app/components/ModelList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-wrap justify-center">
+  <div class="w-full">
     <div class="grid grid-cols-2 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-6 gap-4 p-4">
       <div
         v-for="item in dataList"
@@ -42,7 +42,7 @@
         <!-- 作者信息条 -->
         <div class="mt-1 px-2 py-1">
           <div>
-          <span class="text-[#19191c] text-[14px]">
+          <span class="text-[#19191c] text-[14px] max-w-xs truncate ">
             {{ item.modelName }}
           </span>
           </div>
@@ -52,13 +52,13 @@
           </div>
         </div>
       </div>
-      <div v-if="!loading && dataList.length === 0">
-        <Empty></Empty>
-      </div>
+    </div>
+    <div class="w-full flex justify-center" v-if="!loading && dataList.length === 0">
+      <Empty></Empty>
     </div>
     <div
       ref="loadingTrigger"
-      class="h-20 w-[1000px] text-center text-gray-500 flex justify-center items-center"
+      class="h-20 w-full text-center text-gray-500 flex justify-center items-center"
     >
       <div v-if="loading">加载中...</div>
       <div v-if="finished && dataList.length >= 20">没有更多数据了</div>
diff --git a/app/components/Payment.vue b/app/components/Payment.vue
index 9810129..9c9f401 100644
--- a/app/components/Payment.vue
+++ b/app/components/Payment.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { RotateCcw, X } from 'lucide-vue-next';
-import { useMessage } from 'naive-ui';
-import { defineProps, onBeforeMount, onBeforeUnmount, ref } from 'vue';
+import { RotateCcw, X } from "lucide-vue-next";
+import { useMessage } from "naive-ui";
+import { defineProps, onBeforeMount, onBeforeUnmount, ref } from "vue";
 
 const props = defineProps({
   info: {
@@ -12,139 +12,144 @@ const props = defineProps({
     type: Object,
     default: () => {},
   },
-})
+});
 
-const emit = defineEmits(['closePayment', 'paymentSuccess'])
+const emit = defineEmits(["closePayment", "paymentSuccess"]);
 
-const message = useMessage()
+const message = useMessage();
 
-let pollingTimer: ReturnType<typeof setInterval> | undefined
+let pollingTimer: ReturnType<typeof setInterval> | undefined;
 
-const currentNeedPayment = ref<number>(0)
+const currentNeedPayment = ref<number>(0);
 // const isShowPayment = ref(false)
-const userStore = useUserStore()
+const userStore = useUserStore();
 
 interface UserInfoType {
-  nickName: string
-  avatar: string
-  brief: string
-  userId: number | string
+  nickName: string;
+  avatar: string;
+  brief: string;
+  userId: number | string;
 }
 const userInfo = {
-  nickName: userStore.userInfo?.nickName ?? '',
-  avatar: userStore.userInfo?.avatar ?? '',
-  brief: userStore.userInfo?.brief ?? '',
-  userId: userStore.userInfo?.userId ?? '',
-} as UserInfoType
+  nickName: userStore.userInfo?.nickName ?? "",
+  avatar: userStore.userInfo?.avatar ?? "",
+  brief: userStore.userInfo?.brief ?? "",
+  userId: userStore.userInfo?.userId ?? "",
+} as UserInfoType;
 
 function onCloseModel() {
-  emit('closePayment')
+  emit("closePayment");
 }
 function onPaymentSuccess() {
-  emit('paymentSuccess')
+  emit("paymentSuccess");
 }
-const qrUrl = ref('')
+const qrUrl = ref("");
 
 interface Member {
-  id: number
-  title: string
-  price: number
-  originalPrice: number
-  desc: string
+  id: number;
+  title: string;
+  price: number;
+  originalPrice: number;
+  desc: string;
 }
 
 // 活动列表
-const currentActivity = ref(null)
-const activityList = ref<Member[]>([])
+const currentActivity = ref(null);
+const activityList = ref<Member[]>([]);
 async function getPromotionList() {
   try {
-    const res = await request.get(`/promotion/promotionList`)
+    const res = await request.post(`/promotion/myPromotionList`, {
+      pageNum: 1,
+      pageSize: 50,
+    });
     if (res.code === 200) {
-      activityList.value = res.data
+      activityList.value = res.rows;
     }
-  }
-  catch (err) {
-    console.log(err)
+  } catch (err) {
+    console.log(err);
   }
 }
-getPromotionList()
+getPromotionList();
 // 支付
 
 // 初始化获取支付二维码
 // const paymentParams = ref({})
-const paymentStatus = ref(1)
+const paymentStatus = ref(1);
 
 const paymentParams = ref({
   amount: props.info[0].unitPrice,
   productId: props.info[0].id,
   promotionId: 0,
-  type: 'member',
-})
+  type: "member",
+});
 async function getQrCode() {
   try {
-    const res = await request.post(`/ali/pay/doPay`, paymentParams.value)
+    const res = await request.post(`/ali/pay/doPay`, paymentParams.value);
     if (res.code === 200) {
-      paymentStatus.value = 1
-      qrUrl.value = res.data.url
-      pollingTimer && clearTimeout(pollingTimer)
+      paymentStatus.value = 1;
+      qrUrl.value = res.data.url;
+      pollingTimer && clearTimeout(pollingTimer);
       pollingTimer = setInterval(async () => {
         try {
-          const res2 = await request.get(`/order/queryTradeStatus?outTradeNo=${res.data.orderNo}`)
+          const res2 = await request.get(
+            `/order/queryTradeStatus?outTradeNo=${res.data.orderNo}`
+          );
           if (res2.data === 2) {
-            paymentStatus.value = 2
-            clearTimeout(pollingTimer)
-            message.success('支付成功!')
-            onPaymentSuccess()
-            emit('closePayment')
-          }
-          else if (res2.data === 4) {
-            paymentStatus.value = 4
-            clearTimeout(pollingTimer)
+            paymentStatus.value = 2;
+            clearTimeout(pollingTimer);
+            message.success("支付成功!");
+            onPaymentSuccess();
+            emit("closePayment");
+          } else if (res2.data === 4) {
+            paymentStatus.value = 4;
+            clearTimeout(pollingTimer);
           }
+        } catch (err) {
+          console.log("object", err);
         }
-        catch (err) {
-          console.log('object', err)
-        }
-      }, 2000)
+      }, 2000);
     }
-  }
-  catch (err) {
-    console.log(err)
+  } catch (err) {
+    console.log(err);
   }
 }
 
 // 切换活动
 async function handleActivityChange(value: number) {
-  paymentParams.value.promotionId = value
-  const res1 = await request.get(`/member/calculatePayment?promotionId=${value}&memberLevelId=${paymentParams.value.productId}`)
+  paymentParams.value.promotionId = value;
+  const res1 = await request.get(
+    `/member/calculatePayment?promotionId=${value}&memberLevelId=${paymentParams.value.productId}`
+  );
   if (res1.code === 200) {
-    paymentParams.value.amount = res1.data
-    getQrCode()
+    paymentParams.value.amount = res1.data;
+    getQrCode();
   }
 }
 
 // 切换pay Card
 async function changeCurrentNeedPayment(index: number) {
-  currentNeedPayment.value = index
-  paymentParams.value.productId = props.info[index].id
-  const res1 = await request.get(`/member/calculatePayment?promotionId=${paymentParams.value.promotionId}&memberLevelId=${paymentParams.value.productId}`)
+  currentNeedPayment.value = index;
+  paymentParams.value.productId = props.info[index].id;
+  const res1 = await request.get(
+    `/member/calculatePayment?promotionId=${paymentParams.value.promotionId}&memberLevelId=${paymentParams.value.productId}`
+  );
   if (res1.code === 200) {
-    paymentParams.value.amount = res1.data
-    getQrCode()
+    paymentParams.value.amount = res1.data;
+    getQrCode();
   }
 }
 
 // 二维码是否过去
-const isVisible = ref(true)
-onBeforeMount (() => {
-  getQrCode()
-})
+const isVisible = ref(true);
+onBeforeMount(() => {
+  getQrCode();
+});
 defineExpose({
   isVisible,
-})
+});
 onBeforeUnmount(() => {
-  clearInterval(pollingTimer)
-})
+  clearInterval(pollingTimer);
+});
 </script>
 
 <template>
@@ -161,14 +166,18 @@ onBeforeUnmount(() => {
       >
         <div class="flex items-center">
           <div>
-            <img :src="userInfo.avatar" class="w-14 h-14 rounded-full mr-4">
+            <img :src="userInfo.avatar" class="w-14 h-14 rounded-full mr-4" />
           </div>
           <div class="flex flex-col">
             <div class="text-[#814600] text-xl">
               {{ userInfo.nickName }}
             </div>
             <div class="text-[#6a6a6a] text-xs mt-1">
-              {{ props.isMember.result === '1' ? `会员到期时间: ${props.isMember.endDate}` : '您还不是魔创未来的会员' }}
+              {{
+                props.isMember.result === "1"
+                  ? `会员到期时间: ${props.isMember.endDate}`
+                  : "您还不是魔创未来的会员"
+              }}
             </div>
           </div>
         </div>
@@ -180,12 +189,14 @@ onBeforeUnmount(() => {
         <div
           v-for="(item, index) in info"
           :key="item"
-          :style="[currentNeedPayment === index
-            ? {
-              background: 'linear-gradient(90deg, #fffaf1, #ffeccf)',
-              border: '1px solid #f7b252',
-            }
-            : {}]"
+          :style="[
+            currentNeedPayment === index
+              ? {
+                  background: 'linear-gradient(90deg, #fffaf1, #ffeccf)',
+                  border: '1px solid #f7b252',
+                }
+              : {},
+          ]"
           class="select-none h-44 border-1 border-solid border-[#e9e9e9] rounded-lg bg-[#f9f9f9] flex justify-between items-center flex-col p-4 box-border cursor-pointer"
           @click="changeCurrentNeedPayment(index)"
         >
@@ -197,7 +208,9 @@ onBeforeUnmount(() => {
           <div class="card-item">
             <span class="text-[#814600] text-[20px] mr-2">¥</span>
             <span class="text-[#814600] text-[36px] mr-2">{{ item.unitPrice }}</span>
-            <span class="text-gray-400 text-[20px] line-through">{{ item.originalPrice }}</span>
+            <span class="text-gray-400 text-[20px] line-through">{{
+              item.originalPrice
+            }}</span>
           </div>
           <div class="card-item text-[#814600] w-7/10 text-center text-[12px]">
             {{ item.subscriptionPeriod }}
@@ -205,57 +218,36 @@ onBeforeUnmount(() => {
         </div>
       </div>
       <div class="flex items-center my-4">
-        <div class="w-[50px] text-right mr-2">
-          活动:
-        </div>
+        <div class="w-[50px] text-right mr-2">活动:</div>
         <n-select
           v-model:value="currentActivity"
-          placeholder="请选择活动" class="w-[200px]" label-field="activityName" value-field="id" :options="activityList" @change="handleActivityChange"
+          placeholder="请选择活动"
+          class="w-[200px]"
+          label-field="activityName"
+          value-field="id"
+          :options="activityList"
+          @change="handleActivityChange"
         />
       </div>
       <!-- <div v-for="(item, index) in activityList" :key="index">
         {{ item.activityName }}
       </div> -->
       <div class="mt-4 px-6">
-        <div class="flex border-collapse ">
-          <div class="member-item bg-[#fef9f8]">
-            基础版VIP
-          </div>
-          <div class="member-item">
-            每月15000点算力
-          </div>
-          <div class="member-item">
-            20G存储空间
-          </div>
-          <div class="member-item">
-            每月800次生图
-          </div>
-          <div class="member-item">
-            2个生图任务并行
-          </div>
-          <div class="member-item">
-            --
-          </div>
+        <div class="flex border-collapse">
+          <div class="member-item bg-[#fef9f8]">基础版VIP</div>
+          <div class="member-item">每月15000点算力</div>
+          <div class="member-item">20G存储空间</div>
+          <div class="member-item">每月800次生图</div>
+          <div class="member-item">2个生图任务并行</div>
+          <div class="member-item">--</div>
         </div>
-        <div class="flex border-collapse ">
-          <div class="member-item bg-[#fef9f8]">
-            专业版
-          </div>
-          <div class="member-item">
-            每月35000点算力
-          </div>
-          <div class="member-item">
-            50G存储空间
-          </div>
-          <div class="member-item">
-            每月5000次生图
-          </div>
-          <div class="member-item">
-            3个生图任务并行
-          </div>
-          <div class="member-item">
-            可训练XL模型
-          </div>
+        <div class="flex border-collapse">
+          <div class="member-item bg-[#fef9f8]">专业版</div>
+          <div class="member-item">每月35000点算力</div>
+          <div class="member-item">50G存储空间</div>
+          <div class="member-item">每月5000次生图</div>
+          <div class="member-item">3个生图任务并行</div>
+          <div class="member-item">可训练XL模型</div>
         </div>
       </div>
       <div class="px-6 mt-1 text-[#9d8c75] text-[12px]">
@@ -263,16 +255,18 @@ onBeforeUnmount(() => {
       </div>
       <div class="flex justify-center items-center my-4">
         <div class="w-30 h-30 flex justify-center items-center relative">
-          <n-qr-code :value="qrUrl" :size="90" style="padding: 0;" />
-          <div v-if="paymentStatus === 4" class="absolute top-0 left-0 w-full h-full flex cursor-pointer flex-col justify-center items-center bg-opacity-50 bg-black text-white" @click="getQrCode">
+          <n-qr-code :value="qrUrl" :size="90" style="padding: 0" />
+          <div
+            v-if="paymentStatus === 4"
+            class="absolute top-0 left-0 w-full h-full flex cursor-pointer flex-col justify-center items-center bg-opacity-50 bg-black text-white"
+            @click="getQrCode"
+          >
             请点击刷新<RotateCcw />
           </div>
         </div>
         <div class="flex justify-center ml-2 flex-col pb-[14px]">
           <div class="flex items-baseline">
-            <div class="text-[#222] font-medium mr-1">
-              支付
-            </div>
+            <div class="text-[#222] font-medium mr-1">支付</div>
             <div class="text-[#814600] mr-1">
               <span class="text-[16px] mr-1">¥</span>
               <span class="text-[40px]">{{ paymentParams.amount }}</span>
@@ -282,15 +276,11 @@ onBeforeUnmount(() => {
             </div> -->
           </div>
           <div class="flex items-center mb-1">
-            <img src="@/assets/img/alipay.png" class="mr-1"> 请扫码完成支付
+            <img src="@/assets/img/alipay.png" class="mr-1" /> 请扫码完成支付
           </div>
           <div class="text-[12px]">
-            <span class="text-[#999]">
-              开通即代表同意
-            </span>
-            <span class="text-[#814600]">
-              《魔创未来会员协议》
-            </span>
+            <span class="text-[#999]"> 开通即代表同意 </span>
+            <span class="text-[#814600]"> 《魔创未来会员协议》 </span>
           </div>
         </div>
       </div>
diff --git a/app/components/PersonalCenterCard.vue b/app/components/PersonalCenterCard.vue
index 629e0c9..a6a8f7a 100644
--- a/app/components/PersonalCenterCard.vue
+++ b/app/components/PersonalCenterCard.vue
@@ -8,6 +8,7 @@ Play
 import { NConfigProvider, NMessageProvider } from "naive-ui";
 import { nextTick, ref } from 'vue';
 import { useRouter } from 'vue-router';
+const message = useMessage()
 
 const props = defineProps({
   item: {
@@ -28,15 +29,22 @@ const props = defineProps({
 const emit = defineEmits(['topedRefresh'])
 
 const router = useRouter()
-
+const isDelete = ref(false)
 // 跳转详情
 function toDetails() {
   if (props.currentType === '0') {
-    router.push(`/model-details/${props.item.id}`)
+    if(props.currentState === 'mallProduct'){
+      router.push(`/model-details/${props.item.id}`)
+    }else{
+      router.push(`/model-details/${props.item.modelId}`)
+    }
   }
   else if (props.currentType === '1') {
-    // console.log('object', 111);
-    router.push(`/workflow-details/${props.item.id}`)
+    if(props.currentState === 'mallProduct'){
+      router.push(`/workflow-details/${props.item.id}`)
+    }else{
+      router.push(`/workflow-details/${props.item.workFlowId}`)
+    }
   }else if(props.currentType === '2'){
     onEditPicture()
   }
@@ -94,6 +102,7 @@ function handleSelect(event: Event, key: string) {
 }
 
 // 置顶
+const menuRef = ref(null)
 interface TopUrlType {
   [key: string | number]: string
 }
@@ -109,6 +118,8 @@ async function handleTop() {
         .isTop}`,
     )
     if (res.code === 200) {
+      message.success('置顶成功！')
+      menuRef.value.style.display = 'none';
       // 刷新列表
       emit('topedRefresh')
     }
@@ -122,7 +133,11 @@ interface Response {
   code: number
 }
 
+// 删除
 async function handleDelete(): Promise<void> {
+  isDelete.value = true
+}
+async function onDelete(){
   const { currentType, item } = props
   let url: string
 
@@ -142,6 +157,7 @@ async function handleDelete(): Promise<void> {
     const res: Response = await request.get(url)
     if (res.code === 200) {
       // 刷新列表
+      message.success('删除成功!')
       emit('topedRefresh')
     }
   }
@@ -200,7 +216,12 @@ function updateLike(type:number){
       props.item.likeNum += 1;
     }
 }
-
+function showMenu(){
+  menuRef.value.style.display = 'block';
+}
+function hiddenMenu(){
+  menuRef.value.style.display = 'none';
+}
 </script>
 
 <template>
@@ -285,10 +306,13 @@ function updateLike(type:number){
           >
             <div class="menu-content">
               <component
+              @mouseenter="showMenu"
                 :is="EllipsisVertical"
-                class="h-[18px] w-[18px] text-white menu-icon"
+                class="h-[18px] w-[18px] text-white menu-icon-ellipsis"
               />
               <div
+              @mouseleave="hiddenMenu"
+              ref="menuRef"
                 class="menu-group text-[#000000] text-[12px] bg-white rounded-lg text-center w-20 mt-2 hidden"
               >
                 <div class="menu-item" @click="(event) => handleSelect(event, 'edit')">
@@ -335,7 +359,7 @@ function updateLike(type:number){
         </div>
       </div>
       <div v-if="currentType !== '2'" class="mt-2 text-[12px] text-[#67787e]">
-        <div class="text-[#19191c] text-[14px]">
+        <div class="text-[#19191c] text-[14px] max-w-xs truncate ">
           <span v-if="currentType === '0'">
             {{ item.modelName }}
           </span>
@@ -363,10 +387,24 @@ function updateLike(type:number){
         <Publish-picture v-if="isShowPublishPicture" type="edit" ref="PublishPictureRef" :form-data="publishPictureData" @close-publish-img="closePublishImg" />
       </NMessageProvider>
     </NConfigProvider>
+    <n-modal
+        v-model:show="isDelete"
+        :mask-closable="false"
+        preset="dialog"
+        title="提示！"
+        content="确定要将模型删除? 模型删除后无法找回"
+        negative-text="取消"
+        positive-text="确认"
+        @negative-click="isDelete = false"
+        @positive-click="onDelete"
+      />
   </div>
 </template>
 
 <style lang="scss">
+.menu-icon-ellipsis:hover + .menu-group{
+  display: block;
+}
 .modelSelectByUserIdModel {
   position: absolute;
   &:hover {
diff --git a/app/components/PictureDetail.vue b/app/components/PictureDetail.vue
index 523a003..38584d3 100644
--- a/app/components/PictureDetail.vue
+++ b/app/components/PictureDetail.vue
@@ -17,8 +17,10 @@ const props = defineProps({
 const dataInfo = ref({});
 const isAttention = ref(false)
 async function getDetail() {
-  if (props.item && props.item.id) {
-    const res = await request.get(`/image/detail?id=${props.item.id}`);
+  if (props.item) {
+    // 如果是发布下的图片使用modelImageId 否则使用id
+    let id = props.item.modelImageId || props.item.id
+    const res = await request.get(`/image/detail?id=${id}`);
     if (res.code === 200) {
       dataInfo.value = res.data;
       const res1 = await request.get(`/attention/selectAttention?userId=${res.data.userId}`)
@@ -30,8 +32,8 @@ async function getDetail() {
   }
 }
 getDetail();
-const tagsList = ref([]);
 // 获取图片标签
+const tagsList = ref([]);
 async function getDictType() {
   try {
     const res = await commonApi.dictType({ type: "image_label" });
diff --git a/app/components/PictureList.vue b/app/components/PictureList.vue
index eff3a1f..bde0450 100644
--- a/app/components/PictureList.vue
+++ b/app/components/PictureList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-wrap justify-center">
+  <div class="flex flex-wrap w-full">
     <div class="grid grid-cols-2 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-7 gap-4 p-4">
       <div
         v-for="item in dataList"
@@ -74,13 +74,14 @@
           </div>
         </div> -->
       </div>
-      <div v-if="!loading && dataList.length === 0">
+     
+    </div>
+    <div class="w-full flex justify-center" v-if="!loading && dataList.length === 0">
         <Empty></Empty>
       </div>
-    </div>
     <div
       ref="loadingTrigger"
-      class="h-20 w-[1000px] text-center text-gray-500 flex justify-center items-center"
+      class="h-20 w-full text-center text-gray-500 flex justify-center items-center"
     >
       <div v-if="loading">加载中...</div>
       <div v-if="finished && dataList.length >= 20">没有更多数据了</div>
diff --git a/app/components/Publish-picture.vue b/app/components/Publish-picture.vue
index f42e3cb..6c29229 100644
--- a/app/components/Publish-picture.vue
+++ b/app/components/Publish-picture.vue
@@ -14,9 +14,9 @@ const props = defineProps({
     default: "",
   }
 })
-debugger
 const emit = defineEmits(['closePublishImg'])
 const message = useMessage()
+const loading = ref(false)
 
 const isVisible = ref(true)
 const fileInput = ref<HTMLInputElement | null>(null)
@@ -38,11 +38,14 @@ async function handleFileChange(event: Event) {
 
   if (files && files.length > 0) {
     try{
+      loading.value = true
       const res = await uploadImagesInBatches(files)
       const urlList = res.map(item => item.url)
       props.formData.imagePaths.push(...urlList)
     }catch(err){
       console.log(err);
+    }finally{
+      loading.value = false
     }
   }
   target.value = ''
@@ -63,6 +66,7 @@ async function getDictType() {
 async function onPublish() {
   try {
     const param = cloneDeep(props.formData)
+    if(param.imagePaths.length === 0) return message.warning('请上传图片')
     param.imagePaths = param.imagePaths.join(',')
     param.tags = param.tags.join(',')
     if (param.id) {
@@ -114,6 +118,8 @@ function closePublishImg() {
           </div>
         </div>
         <div>
+          <n-spin :show="loading">
+
           <div class="upload-content">
             <div class="flex flex-col bg-[#f3f5f9] justify-center items-center w-30 h-30 border border-dashed mt-2 rounded-lg bg-white">
               <div class="my-6 w-24 bg-gradient-to-r from-[#2D28FF] to-[#1A7DFF] h-8 text-white rounded-sm bg-[#3162ff] cursor-pointer flex justify-center items-center mt-6" @click="triggerFileInput()">
@@ -124,6 +130,8 @@ function closePublishImg() {
               </div> -->
             </div>
           </div>
+        </n-spin>
+
           <div class="grid grid-cols-3 gap-2.5 mt-4 w-full">
             <div v-for="(item, index) in props.formData.imagePaths" :key="index">
               <img class="w-full h-[180px] object-cover rounded-lg" :src="item" alt="">
diff --git a/app/components/WechatLoginQr.vue b/app/components/WechatLoginQr.vue
index cf71ebb..c750f0c 100644
--- a/app/components/WechatLoginQr.vue
+++ b/app/components/WechatLoginQr.vue
@@ -31,9 +31,9 @@ async function onGetUUid() {
     // /wx/uuid/get
     const res = await request.get('/wx/uuid/get')
     if (res.code === 200) {
-      const appid = 'wx7d0003f44e27fbfd'
+      const appid = 'wx0a72f196ec9c3a70'
       const { uuid } = res
-      const redirect_uri = `http://a7u3z9.natappfree.cc/wx/uuid/bind/openid?uuid=${uuid}`
+      const redirect_uri = `http://www.mc158c.com/api/wx/uuid/bind/openid?uuid=${uuid}`
       const codeUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${encodeURIComponent(
         redirect_uri,
       )}&response_type=code&scope=snsapi_userinfo&state=123456#wechat_redirect`
diff --git a/app/components/WorkFlowList.vue b/app/components/WorkFlowList.vue
index 211b541..a03385b 100644
--- a/app/components/WorkFlowList.vue
+++ b/app/components/WorkFlowList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-wrap justify-center">
+  <div class="flex flex-wrap w-full">
     <div class="grid grid-cols-2 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-7 gap-4 p-4">
       <div
         v-for="item in dataList"
@@ -42,7 +42,7 @@
         <!-- 作者信息条 -->
         <div class="mt-1 px-2 py-1">
           <div>
-          <span class="text-[#19191c] text-[14px]">
+          <span class="text-[#19191c] text-[14px] max-w-xs truncate ">
             {{ item.workflowName }}
           </span>
           </div>
@@ -52,13 +52,13 @@
           </div>
         </div>
       </div>
-      <div v-if="!loading && dataList.length === 0">
-        <Empty></Empty>
-      </div>
+    </div>
+    <div class="w-full flex justify-center" v-if="!loading && dataList.length === 0">
+      <Empty></Empty>
     </div>
     <div
       ref="loadingTrigger"
-      class="h-20 w-[1000px] text-center text-gray-500 flex justify-center items-center"
+      class="h-20 w-full text-gray-500 flex justify-center items-center"
     >
       <div v-if="loading">加载中...</div>
       <div v-if="finished && dataList.length >= 20">没有更多数据了</div>
diff --git a/app/components/message/AttentionMsg.vue b/app/components/message/AttentionMsg.vue
index e2a9d49..7728dc2 100644
--- a/app/components/message/AttentionMsg.vue
+++ b/app/components/message/AttentionMsg.vue
@@ -31,7 +31,6 @@ const props = defineProps({
 async function toDetail(item:any){
     // try{
     //     const res = await request.get(`/advice/read?adviceId=${item.id}`)
-    //     debugger
 
     // }catch(err){
     //     console.log(err);
diff --git a/app/components/publishModel/CreateModels.vue b/app/components/publishModel/CreateModels.vue
index 9486546..b3f45c9 100644
--- a/app/components/publishModel/CreateModels.vue
+++ b/app/components/publishModel/CreateModels.vue
@@ -128,8 +128,17 @@ function handleCategoryUpdateValue(value) {
   //   localForm.value.modelProduct.category = value.includes('-') ? value : `${value}-0`
   // }
 }
+const isPublicList = [
+  {
+    label: "公开",
+    value: 1,
+  },
+  {
+    label: "仅自己可见",
+    value: 0,
+  },
+];
 // function changeModelType(item){
-//   debugger
 // }
 </script>
 
@@ -244,6 +253,24 @@ function handleCategoryUpdateValue(value) {
           {{ item.label }}
         </div>
       </div>
+
+
+      <div class="">权限设置</div>
+          <div class="mt-1 mb-2 text-gray-400 text-[12px]">可见范围</div>
+          <div>
+            <n-radio-group v-model:value="localForm.modelProduct.jurisdiction" name="radiogroup">
+              <n-space>
+                <n-radio
+                  v-for="(isPublicItem, isPublicIndex) in isPublicList"
+                  :key="isPublicIndex"
+                  :value="isPublicItem.value"
+                >
+                  {{ isPublicItem.label }}
+                </n-radio>
+              </n-space>
+            </n-radio-group>
+          </div>
+
       <div v-if="localForm.modelProduct.isOriginal === 1" class="text-[12px]">
         <div class="my-3">
           魔创未来原创模型加密保护计划
diff --git a/app/components/publishModel/EditVersion.vue b/app/components/publishModel/EditVersion.vue
index a5a111d..54c3bcd 100644
--- a/app/components/publishModel/EditVersion.vue
+++ b/app/components/publishModel/EditVersion.vue
@@ -19,7 +19,7 @@ const emit = defineEmits(["update:modelValue", "nextStep", "prevStep"]);
 const acceptTypes =
   ".safetensors,.ckpt,.pt,.bin,.pth,.zip,.json,.flow,.lightflow,.yaml,.yml,.onnx,.gguf,.sft";
 const modelVersionItem = {
-  objectKey:null,
+  objectKey: null,
   isEncrypt: 0, //0不加密
   delFlag: "0", // 0代表存在 2代表删除
   versionName: "", //	版本名称
@@ -29,7 +29,7 @@ const modelVersionItem = {
   fileName: "", //
   sampleImagePaths: [], // 第三部的图片路径最多20张,切割
   triggerWords: "", // 触发词
-  isPublic: 1, // 权限是否公
+  isPublic: null, // 权限是否公
   isOnlineUse: 1, //在线使用
   allowFusion: 1, // 是否允许融合
   isFree: 0, // 0免费
@@ -41,20 +41,11 @@ const modelVersionItem = {
   hideImageGenInfo: 0, //隐藏图片生成信息
   id: null,
 };
-const isPublicList = [
-  {
-    label: "公开",
-    value: 1,
-  },
-  {
-    label: "仅自己可见",
-    value: 0,
-  },
-];
+
 defineExpose({
   addVersion,
 });
-
+const loading = ref(false);
 const localForm = computed({
   get() {
     return props.modelValue;
@@ -147,20 +138,25 @@ async function handleFileChange(event: Event) {
   const files = target.files;
 
   if (files && files.length > 0) {
-    const { name, size} = files[0] as { name: string, size: number};
+    const { name, size } = files[0] as { name: string; size: number };
     try {
       // 上传文件前先校验是否存在  存在为0 不存在为1
       const res1 = await request.get(`/file/selectFile?type=model&name=${name}`);
       if (res1.code == 200) {
         if (res1.data === 1) {
           try {
+            loading.value = true;
             const res = await uploadFileBatches(files);
-            localForm.value.modelVersionList[uploadFileIndex.value].filePath = res[0].path;
-            localForm.value.modelVersionList[uploadFileIndex.value].objectKey = res[0].objectKey;
+            localForm.value.modelVersionList[uploadFileIndex.value].filePath =
+              res[0].path;
+            localForm.value.modelVersionList[uploadFileIndex.value].objectKey =
+              res[0].objectKey;
             localForm.value.modelVersionList[uploadFileIndex.value].fileName = name;
-            localForm.value.modelVersionList[uploadFileIndex.value].fileSize = size
+            localForm.value.modelVersionList[uploadFileIndex.value].fileSize = size;
           } catch (err) {
             console.log(err);
+          } finally {
+            loading.value = false;
           }
         } else {
           message.warning("该模型名称已存在");
@@ -262,22 +258,24 @@ function onDelete(index: number) {
             </div>
           </div>
           <div v-else>
-            <div class="upload-content">
-              <div
-                class="flex flex-col justify-center items-center w-30 h-40 border border-dashed mt-2 rounded-lg bg-white"
-              >
+            <n-spin :show="loading">
+              <div class="upload-content">
                 <div
-                  class="w-24 bg-gradient-to-r from-[#2D28FF] to-[#1A7DFF] h-8 text-white rounded-sm bg-[#3162ff] cursor-pointer flex justify-center items-center"
-                  @click="triggerFileInput(index)"
+                  class="flex flex-col justify-center items-center w-30 h-40 border border-dashed mt-2 rounded-lg bg-white"
                 >
-                  上传文件
-                </div>
-                <div class="my-3">点击上传文件</div>
-                <div class="text-[#999999] text-xs">
-                  .safetensors/.ckpt/.pt/.bin/.pth/.zip/.json/.flow/.lightflow/.yaml/.yml/.onnx/.gguf/.sft
+                  <div
+                    class="w-24 bg-gradient-to-r from-[#2D28FF] to-[#1A7DFF] h-8 text-white rounded-sm bg-[#3162ff] cursor-pointer flex justify-center items-center"
+                    @click="triggerFileInput(index)"
+                  >
+                    上传文件
+                  </div>
+                  <div class="my-3">点击上传文件</div>
+                  <div class="text-[#999999] text-xs">
+                    .safetensors/.ckpt/.pt/.bin/.pth/.zip/.json/.flow/.lightflow/.yaml/.yml/.onnx/.gguf/.sft
+                  </div>
                 </div>
               </div>
-            </div>
+            </n-spin>
           </div>
           <div class="flex mt-6">
             版本介绍 <Asterisk :size="10" color="#ff0000" class="mt-1" />
@@ -308,21 +306,7 @@ function onDelete(index: number) {
              </div>
           </div> -->
 
-          <div class="">权限设置</div>
-          <div class="mt-1 mb-2 text-gray-400 text-[12px]">可见范围</div>
-          <div>
-            <n-radio-group v-model:value="item.isPublic" name="radiogroup">
-              <n-space>
-                <n-radio
-                  v-for="(isPublicItem, isPublicIndex) in isPublicList"
-                  :key="isPublicIndex"
-                  :value="isPublicItem.value"
-                >
-                  {{ isPublicItem.label }}
-                </n-radio>
-              </n-space>
-            </n-radio-group>
-          </div>
+         
         </n-form>
         <div v-if="item.isPublic === 1">
           <div class="mt-4 mb-1 text-gray-400 text-[12px]">付费设置</div>
diff --git a/app/components/publishModel/UploadImg.vue b/app/components/publishModel/UploadImg.vue
index b88f67e..30411bc 100644
--- a/app/components/publishModel/UploadImg.vue
+++ b/app/components/publishModel/UploadImg.vue
@@ -17,6 +17,7 @@ const route = useRoute()
 const { type } = route.query
 
 const message = useMessage()
+const loading = ref(false)
 
 const localForm = computed({
   get() {
@@ -103,11 +104,14 @@ async function handleFileChange(event: Event) {
     if (sum >= 20)
       return message.error('最多20张')
       try{
+        loading.value = true
         const res = await uploadImagesInBatches(files)
         const urlList = res.map(item => item.url)
         localForm.value.modelVersionList[uploadFileIndex.value].sampleImagePaths.push(...urlList)
       }catch(err){
         console.log(err);
+      }finally{
+        loading.value = false
       }
   }
   target.value = ''
@@ -145,6 +149,7 @@ function onPositiveClick() {
               最多20张图片, 图片不超过30M
             </div>
           </div>
+          <n-spin :show="loading">
           <div>
             <div class="flex flex-col justify-center items-center w-30 h-40 border border-dashed mt-2 rounded-lg bg-white">
               <div class="w-24 bg-gradient-to-r from-[#2D28FF] to-[#1A7DFF] h-8 text-white rounded-sm bg-[#3162ff] cursor-pointer flex justify-center items-center" @click="triggerFileInput(index)">
@@ -158,6 +163,8 @@ function onPositiveClick() {
               </div>
             </div>
           </div>
+        </n-spin>
+
           <div class="grid grid-cols-3 gap-2.5 mt-4 w-full">
             <div v-for="(subItem, subIndex) in item.sampleImagePaths" :key="subIndex">
               <img class="w-full h-[200px] object-cover rounded-lg" :src="subItem" alt="">
diff --git a/app/components/publishWorkFlow/EditVersion.vue b/app/components/publishWorkFlow/EditVersion.vue
index 3715f10..12da886 100644
--- a/app/components/publishWorkFlow/EditVersion.vue
+++ b/app/components/publishWorkFlow/EditVersion.vue
@@ -13,7 +13,7 @@ const props = defineProps({
   },
 });
 const emit = defineEmits(["update:modelValue", "nextStep", "preStep"]);
-
+const loading = ref(false)
 const localForm = computed({
   get() {
     return props.modelValue;
@@ -25,7 +25,7 @@ const localForm = computed({
 
 watch(
   () => localForm.value,
-  (newVal:any) => {
+  (newVal: any) => {
     console.log("newVal", newVal);
     emit("update:modelValue", newVal);
   },
@@ -84,8 +84,8 @@ async function nextStep() {
   }
   try {
     const promises = formRefs.value
-      .filter((form:any): form is FormInst => form !== null)
-      .map((form:any) => form.validate());
+      .filter((form: any): form is FormInst => form !== null)
+      .map((form: any) => form.validate());
 
     await Promise.all(promises);
     emit("nextStep");
@@ -116,20 +116,25 @@ async function handleFileChange(event: Event) {
   const files = target.files;
 
   if (files && files.length > 0) {
-    const { name , size} = files[0] as { name: string, size: number};
+    const { name, size } = files[0] as { name: string; size: number };
     try {
       const res1 = await request.get(`/file/selectFile?type=workflow&name=${name}`);
       if (res1.code == 200) {
         if (res1.data === 1) {
           //存在为0 不存在为1
           try {
+            loading.value = true
             const res = await uploadFileBatches(files);
-            localForm.value.workFlowVersionList[uploadFileIndex.value].filePath = res[0].path;
-            localForm.value.workFlowVersionList[uploadFileIndex.value].objectKey = res[0].objectKey;
-            localForm.value.workFlowVersionList[uploadFileIndex.value].fileName = name
-            localForm.value.workFlowVersionList[uploadFileIndex.value].fileSize = size
+            localForm.value.workFlowVersionList[uploadFileIndex.value].filePath =
+              res[0].path;
+            localForm.value.workFlowVersionList[uploadFileIndex.value].objectKey =
+              res[0].objectKey;
+            localForm.value.workFlowVersionList[uploadFileIndex.value].fileName = name;
+            localForm.value.workFlowVersionList[uploadFileIndex.value].fileSize = size;
           } catch (err) {
             console.log(err);
+          }finally{
+            loading.value = false
           }
         } else {
           message.error("该工作流名称已存在");
@@ -143,7 +148,7 @@ async function handleFileChange(event: Event) {
 }
 
 function computedDelFlag() {
-  return localForm.value.workFlowVersionList.filter((item:any) => item.delFlag === "0");
+  return localForm.value.workFlowVersionList.filter((item: any) => item.delFlag === "0");
 }
 function onDelete(index: number) {
   if (computedDelFlag().length === 1) return;
@@ -203,20 +208,22 @@ function onDelete(index: number) {
               </div>
             </div>
             <div v-else>
-              <div class="upload-content">
-                <div
-                  class="flex flex-col justify-center items-center w-30 h-40 border border-dashed mt-2 rounded-lg bg-white"
-                >
+              <n-spin :show="loading">
+                <div class="upload-content">
                   <div
-                    class="w-24 bg-gradient-to-r from-[#2D28FF] to-[#1A7DFF] h-8 text-white rounded-sm bg-[#3162ff] cursor-pointer flex justify-center items-center"
-                    @click="triggerFileInput(index)"
+                    class="flex flex-col justify-center items-center w-30 h-40 border border-dashed mt-2 rounded-lg bg-white"
                   >
-                    上传文件
+                    <div
+                      class="w-24 bg-gradient-to-r from-[#2D28FF] to-[#1A7DFF] h-8 text-white rounded-sm bg-[#3162ff] cursor-pointer flex justify-center items-center"
+                      @click="triggerFileInput(index)"
+                    >
+                      上传文件
+                    </div>
+                    <div class="my-3">点击上传文件</div>
+                    <div class="text-[#999999] text-xs">.json/.zip</div>
                   </div>
-                  <div class="my-3">点击上传文件</div>
-                  <div class="text-[#999999] text-xs">.json/.zip</div>
                 </div>
-              </div>
+              </n-spin>
             </div>
           </n-form>
         </div>
diff --git a/app/components/publishWorkFlow/UploadImg.vue b/app/components/publishWorkFlow/UploadImg.vue
index f60bdf0..b5128a8 100644
--- a/app/components/publishWorkFlow/UploadImg.vue
+++ b/app/components/publishWorkFlow/UploadImg.vue
@@ -30,7 +30,7 @@ function preStep() {
   emit("preStep");
 }
 const showSuccessModal = ref(false);
-
+const loading = ref(false)
 async function handlePublish() {
   for (let i = 0; i < localForm.value.workFlowVersionList.length; i++) {
     if (
@@ -107,6 +107,7 @@ async function handleFileChange(event: Event) {
       files.length;
     if (sum >= 20) return message.error("最多20张");
     try {
+      loading.value = true
       const res = await uploadImagesInBatches(files);
       const urlList = res.map((item) => item.url);
       localForm.value.workFlowVersionList[uploadFileIndex.value].imagePaths.push(
@@ -114,6 +115,8 @@ async function handleFileChange(event: Event) {
       );
     } catch (err) {
       console.log(err);
+    }finally{
+      loading.value = false
     }
   }
   target.value = "";
@@ -151,6 +154,7 @@ function onPositiveClick() {
             <div class="text-[12px] text-gray-400">最多20张图片，图片不超过30M</div>
           </div>
           <div>
+            <n-spin :show="loading">
             <div
               class="flex flex-col justify-center items-center w-30 h-40 border border-dashed mt-2 rounded-lg bg-white"
             >
@@ -165,6 +169,8 @@ function onPositiveClick() {
                 请勿上传裸露、暴力、血腥或其他包含非法信息图片
               </div>
             </div>
+          </n-spin>
+
           </div>
           <div class="grid grid-cols-3 gap-2.5 mt-4 w-full">
             <div v-for="(subItem, subIndex) in item.imagePaths" :key="subIndex">
diff --git a/app/constants/index.ts b/app/constants/index.ts
index c0a3a1b..a7e7fc0 100644
--- a/app/constants/index.ts
+++ b/app/constants/index.ts
@@ -1,8 +1,8 @@
 
 export const appName = '魔创未来'
 export const appDescription = '魔创未来'
-export const authRoutes = ['/personal-center', '/publish-model', '/publish-workflow']
-export const verifyBlankRoute = ['/member-center', '/int-detail', '/personal-publish']
+export const authRoutes = ['/personal-center']
+export const verifyBlankRoute = ['/member-center']
 export const isOriginalList = [{
   label: '原创',
   value: 0,
diff --git a/app/layouts/default.vue b/app/layouts/default.vue
index d029ee4..bcd492d 100644
--- a/app/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -2,14 +2,27 @@
 import {
 Binary,
 Code2,
-Crown, Earth, Image,
+Crown,
+Earth,
+Image,
 LayoutGrid,
 Lightbulb,
-Maximize, Network, User,
+Maximize,
+Network,
+User,
 Workflow
 } from "lucide-vue-next";
 import { useRouter } from "vue-router";
 const userStore = useUserStore();
+// definePageMeta({
+//   middleware:[
+//     function (to, from ){
+//       if(to.path === "/personal-center" && !userStore.isLoggedIn){
+//         return abortNavigation()
+//       }
+//     }
+//   ]
+// })
 const modalStore = useModalStore();
 
 const menuStore = useMenuStore();
@@ -66,7 +79,7 @@ const menuItems2 = ref({
       icon: Network,
       text: "在线工作流",
       route: "",
-      desc:'Comfy UI'
+      desc: "Comfy UI",
     },
     {
       icon: Earth,
@@ -92,7 +105,7 @@ const menuItems3 = ref({
 });
 
 // 更新菜单项中的图标
-menuStore.menuItems = menuStore.menuItems.map((item:any) => ({
+menuStore.menuItems = menuStore.menuItems.map((item: any) => ({
   ...item,
   LucideIcon: iconMap[item.path], // 添加 Lucide 图标组件
 }));
@@ -109,27 +122,45 @@ function handleSide(event: Event, path: string) {
     }
     // 确保当前路由不变
     // nextTick(() => {
-    //   debugger
     //   if (route.path !== window.location.pathname) {
     //     navigateTo(route.path, { replace: true })
     //   }
     // })
+  } else if (path === "/personal-center" && !userStore.isLoggedIn) {
+      modalStore.showLoginModal();
   } else {
     menuStore.setActiveMenu(path);
   }
 }
+
+const appList = ref([]);
+async function getAppList() {
+  try {
+    const res = await request.get(`/app/list`);
+    if (res.code === 200) {
+      appList.value = res.data;
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+getAppList();
+
+function toUs(url: string) {
+  const baseUrl = window.location.origin;
+  window.open(`${baseUrl}/us/${url}`, "_blank", "noopener,noreferrer");
+}
 </script>
 
 <template>
   <div class="flex h-screen flex-col bg-white dark:bg-dark-800">
     <!-- Header -->
     <Header />
-
     <!-- Main Content -->
     <div class="flex flex-1 overflow-hidden">
       <!-- Sidebar -->
       <nav
-        class="w-[220px] border-r border-gray-100 bg-gray-50/50 dark:border-dark-700 dark:bg-dark-800/50"
+        class="w-[230px] border-r border-gray-100 bg-gray-50/50 dark:border-dark-700 dark:bg-dark-800/50 overflow-y-auto"
       >
         <div class="space-y-1 px-2">
           <div class="text-[#000] p-4">
@@ -183,12 +214,11 @@ function handleSide(event: Event, path: string) {
                 target="_blank"
                 @click="(event: Event) => handleSide(event, item.route)"
               >
-                <div class="cursor-pointer mb-3 flex flex-col justify-center py-3 px-2 w-full block hover:bg-gray-100 border-[#ccc] rounded-lg border-dashed border">
+                <div
+                  class="cursor-pointer mb-3 flex flex-col justify-center py-3 px-2 w-full block hover:bg-gray-100 border-[#ccc] rounded-lg border-dashed border"
+                >
                   <div class="flex items-center">
-                    <component
-                      :is="item.icon"
-                      class="h-[18px] w-[18px] mr-[10px]"
-                    />
+                    <component :is="item.icon" class="h-[18px] w-[18px] mr-[10px]" />
                     <div class="text-sm">
                       {{ item.text }}
                     </div>
@@ -237,6 +267,41 @@ function handleSide(event: Event, path: string) {
               </NuxtLink>
             </div>
           </div>
+          <div class="px-4">
+            <div class="text-xs text-gray-500 flex flex-wrap gap-2">
+              <div
+                class="cursor-pointer relative group"
+                v-for="(item, index) in appList"
+                :key="index"
+              >
+                {{ item.name }}
+                <div
+                  class="flex flex-col justify-center items-center gap-2 absolute bottom-4 left-0 w-[90px] h-[115px] hidden group-hover:block bg-white p-2 z-index-999 border border-solid border-[#ccc] rounded-lg"
+                >
+                  <div class="text-xs text-center mb-2">扫码关注</div>
+                  <img class="w-[80px] h-[70px]" :src="item.url" alt="" />
+                </div>
+              </div>
+            </div>
+            <div class="flex justify-between text-xs text-gray-400 mt-2">
+              <div class="cursor-pointer" @click="toUs('agreement')">用户协议</div>
+              <div class="cursor-pointer" @click="toUs('privacy')">隐私政策</div>
+              <div class="cursor-pointer" @click="toUs('aboutUs')">关于我们</div>
+            </div>
+            <!-- <div class="justify-between text-xs text-gray-400 mt-2 scale-80">
+              <div class="cursor-pointer scale-80">广州魔创未来科技有限公司</div>
+            </div>
+            <div class="justify-between text-xs text-gray-400 mt-2 scale-80">
+              <div class="cursor-pointer scale-80">京ICP备2023015442号</div>
+            </div>
+            <div class="justify-between text-xs text-gray-400 mt-2 scale-80">
+              <div class="cursor-pointer scale-80">网信算备</div>
+              <div class="cursor-pointer scale-80">110112129623601230015号</div>
+            </div>
+            <div class="justify-between text-xs text-gray-400 mt-2 scale-80">
+              <div class="cursor-pointer scale-80">备案号: Beijing-PianYu-202402</div>
+            </div> -->
+          </div>
           <!-- <NuxtLink
             v-for="item in menuStore.menuItems"
             :key="item.path"
@@ -282,6 +347,7 @@ function handleSide(event: Event, path: string) {
   /* cursor: pointer; */
   background: var(--primary);
   color: white;
+  /* position: absolute; */
   /* border: dashed; */
 }
 
diff --git a/app/middleware/auth.global.ts b/app/middleware/auth.global.ts
index 68905c1..53012e6 100644
--- a/app/middleware/auth.global.ts
+++ b/app/middleware/auth.global.ts
@@ -1,5 +1,6 @@
 // middleware/auth.ts
-import { authRoutes, verifyBlankRoute } from '@/constants/index'
+import { verifyBlankRoute } from '@/constants/index';
+
 // import { useRouter } from 'vue-router'
 
 // const router = useRouter()
@@ -14,19 +15,17 @@ import { authRoutes, verifyBlankRoute } from '@/constants/index'
 export default defineNuxtRouteMiddleware((to, from) => {
   const userStore = useUserStore()
   const modalStore = useModalStore()
+  const menuStore = useMenuStore()
   if(to.path !== '/search'){
     modalStore.searchQuery = ''
   }
-  const menuStore = useMenuStore()
+  
   if (verifyBlankRoute.includes(to.path) && !verifyBlankRoute.includes(from.path)) {
     return abortNavigation()
   }
-  // 如果是需要登录的路由，且用户未登录
-  if (authRoutes.includes(to.path) && !userStore.isLoggedIn) {
-    // 显示登录模态框
-    modalStore.showLoginModal()
-    menuStore.setActiveMenu(from.path)
-    // return abortNavigation()
-    // return navigateTo('/model-square')
-  }
+
+  // if(to.path === "/personal-center" && !userStore.isLoggedIn){
+  //   return abortNavigation()
+  // }
+  menuStore.setActiveMenu(from.path)
 })
diff --git a/app/pages/Int-detail/index.vue b/app/pages/Int-detail/index.vue
index 4719262..8374f0a 100644
--- a/app/pages/Int-detail/index.vue
+++ b/app/pages/Int-detail/index.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { nextTick, onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
 
 definePageMeta({
   layout: 'header',
 })
-const activeTab = ref('')
+const activeTab = ref('oasis')
 
 // const route = useRoute();
 // const { id } = route.params as { id: string };
@@ -12,16 +12,30 @@ interface PointsResult {
   points: number
   memberConsumeList: any[]
 }
-const pointsResult = ref<PointsResult>(null)
+
+// 获取已消耗积分
+const consumePointsFinished = ref(false);
+const consumePointsParams = ref({
+  "pageNum": 1,
+  "pageSize": 20
+})
+const pointsResult = ref([])
 async function getPoints() {
   try {
-    const res = await request.get('/member/getPoints')
+    if (consumePointsFinished.value) return
+    const res = await request.post('/member/getConsumePoints', {
+      ...consumePointsParams.value
+    })
     if (res.code === 200) {
-      pointsResult.value = res.data as PointsResult
-      debugger
-      nextTick(() => {
-        activeTab.value = 'beatles'
-      })
+      if(consumePointsParams.value.pageNum === 1){
+        pointsResult.value = res.rows
+      }else{
+        pointsResult.value = [...pointsResult.value, ...res.rows]
+      }
+      if (pointsResult.value.length >= res.total) {
+        consumePointsFinished.value = true;
+      }
+      consumePointsParams.value.pageNum++
     }
   }
   catch (err) {
@@ -29,6 +43,40 @@ async function getPoints() {
   }
 }
 getPoints()
+
+// 已获取的积分
+const rechargePointsFinished = ref(false);
+const rechargePointsParams = ref({
+  "pageNum": 1,
+  "pageSize": 20
+})
+const rechargePoints = ref([])
+async function getRechargePoints() {
+  try {
+    if (rechargePointsFinished.value) return;
+    const res = await request.post('/member/getRechargePoints', {
+      ...rechargePointsParams.value
+    })
+    if (res.code === 200) {
+      if (rechargePointsParams.value.pageNum === 1) {
+        rechargePoints.value = res.rows;
+      } else {
+        rechargePoints.value = [...rechargePoints.value, ...res.rows];
+      }
+      // 判断是否加载完所有数据
+      if (rechargePoints.value.length >= res.total) {
+        rechargePointsFinished.value = true;
+      }
+      rechargePointsParams.value.pageNum++;
+    }
+  }
+  catch (err) {
+    console.log(err)
+  }
+}
+getRechargePoints()
+
+
 onMounted(() => {
   // nextTick(() => {
   //   activeTab.value = 'beatles'
@@ -40,47 +88,56 @@ onMounted(() => {
   <div class="flex justify-center bg-[#f2f5f8] items-center h-[calc(100vh-48px)]">
     <div class="w-[1200px] bg-white rounded-lg shadow-lg p-10 h-[calc(100%-40px)]">
       <h1 class="text-2xl font-bold mb-4">
-        算力明细
+        积分明细
       </h1>
       <n-tabs v-model:value="activeTab" type="line" animated>
-        <!-- <n-tab-pane name="oasis" tab="已获取">
-          <div class="h-[500px] overflow-y-auto">
-            <div class="mc-table flex w-full">
+        <n-tab-pane name="oasis" tab="已获取">
+          <div class="border border-solid border-gray-200 rounded-lg relative">
+            <div class="mc-table flex w-full bg-gray-200 sticky top-0">
               <div class="w-[250px]">
                 获取时间
               </div>
-              <div class="w-[250px]">
+              <div class="w-[200px]">
                 获取来源
               </div>
-              <div class="flex-1">
-                算力生效时间
-              </div>
-              <div class="flex-1">
-                算力到期时间
-              </div>
-              <div class="w-[200px]">
-                算力值
-              </div>
-            </div>
-            <div v-for="item in pointsResult.memberConsumeList" :key="item" class="mc-table flex w-full">
               <div class="w-[250px]">
-                {{ item.consumeTime }}
+                积分生效时间
               </div>
               <div class="w-[250px]">
-                每日赠送算力清零
+                积分到期时间
               </div>
               <div class="flex-1">
-                -
-              </div>
-              <div class="w-[180px]">
-                {{ item.consumePoints }}
+                积分值
               </div>
             </div>
+            <n-infinite-scroll
+              style="height: calc(100vh - 300px)"
+              :distance="10"
+              @load="getRechargePoints"
+            >
+              <div v-for="item in rechargePoints" :key="item" class="mc-table flex w-full">
+                <div class="w-[250px]">
+                  {{ item.rechargeTime }}
+                </div>
+                <div class="w-[200px]">
+                  {{ item.getSource }}
+                </div>
+                <div class="w-[250px]">
+                  {{ item.effectStartTime }}
+                </div>
+                <div class="w-[250px]">
+                  {{ item.effectEndTime }}
+                </div>
+                <div class="flex-1">
+                  {{ item.points }}
+                </div>
+              </div>
+            </n-infinite-scroll>
           </div>
-        </n-tab-pane> -->
+        </n-tab-pane>
         <n-tab-pane name="beatles" tab="已消耗">
-          <div class="h-[500px] overflow-y-auto">
-            <div class="mc-table flex w-full">
+          <div class="border border-solid border-gray-200 rounded-lg relative">
+            <div class="mc-table flex w-full bg-gray-200 sticky top-0">
               <div class="w-[250px]">
                 消耗时间
               </div>
@@ -91,10 +148,15 @@ onMounted(() => {
                 任务详情
               </div>
               <div class="w-[200px]">
-                算力值
+                积分值
               </div>
             </div>
-            <div v-for="item in pointsResult.memberConsumeList" :key="item" class="mc-table flex w-full">
+            <n-infinite-scroll
+              style="height: calc(100vh - 300px)"
+              :distance="10"
+              @load="getPoints"
+            >
+            <div v-for="item in pointsResult" :key="item" class="mc-table flex w-full">
               <div class="w-[250px]">
                 {{ item.consumeTime }}
               </div>
@@ -108,6 +170,8 @@ onMounted(() => {
                 {{ item.consumePoints }}
               </div>
             </div>
+          </n-infinite-scroll>
+
           </div>
         </n-tab-pane>
       </n-tabs>
@@ -117,10 +181,8 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .mc-table {
-  > div {
-    line-height: 40px;
-    height: 50px;
-    border-bottom: 1px solid #eee;
-  }
+  padding: 10px;
+  line-height: 40px;
+  border-bottom: 1px solid #eee;
 }
 </style>
diff --git a/app/pages/gold-detail/index.vue b/app/pages/gold-detail/index.vue
new file mode 100644
index 0000000..06e1de3
--- /dev/null
+++ b/app/pages/gold-detail/index.vue
@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import { onMounted, ref } from "vue";
+
+definePageMeta({
+  layout: "header",
+});
+const activeTab = ref("oasis");
+
+// const route = useRoute();
+// const { id } = route.params as { id: string };
+
+// 获取充值记录
+const recordFinished = ref(false)
+const recordParams = ref({
+  "pageNum": 1,
+  "pageSize": 10
+})
+const pointsResult = ref([]);
+async function getPoints() {
+  try {
+    if(recordFinished.value) return
+    const res = await request.post("/personalCenter/getRecord",{...recordParams.value});
+    if (res.code === 200) {
+      if (recordParams.value.pageNum === 1) {
+        pointsResult.value = res.rows;
+      } else {
+        pointsResult.value = [...pointsResult.value, ...res.rows];
+      }
+      // 判断是否加载完所有数据
+      if (pointsResult.value.length >= res.total) {
+        recordFinished.value = true;
+      }
+      recordParams.value.pageNum++;
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+getPoints();
+
+// 已获消费的积分
+const walletRecordFinished = ref(false)
+const walletRecordParams = ref({
+  "pageNum": 1,
+  "pageSize": 15
+})
+const walletRecordList = ref([]);
+async function getWalletRecord() {
+  try {
+    if(walletRecordFinished.value) return
+    const res = await request.post("/personalCenter/getWalletRecord", {...walletRecordParams.value});
+    if (res.code === 200) {
+      if (walletRecordParams.value.pageNum === 1) {
+        walletRecordList.value = res.rows;
+      } else {
+        walletRecordList.value = [...walletRecordList.value, ...res.rows];
+      }
+      // 判断是否加载完所有数据
+      if (walletRecordList.value.length >= res.total) {
+        walletRecordFinished.value = true;
+      }
+      walletRecordParams.value.pageNum++;
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+getWalletRecord();
+
+onMounted(() => {
+  // nextTick(() => {
+  //   activeTab.value = 'beatles'
+  // })
+});
+</script>
+
+<template>
+  <div class="flex justify-center bg-[#f2f5f8] items-center h-[calc(100vh-48px)]">
+    <div class="w-[1200px] bg-white rounded-lg shadow-lg p-10 h-[calc(100%-40px)]">
+      <h1 class="text-2xl font-bold mb-4">金币明细</h1>
+      <n-tabs v-model:value="activeTab" type="line" animated>
+        <n-tab-pane name="oasis" tab="充值记录">
+          <div class="border border-solid border-gray-200 rounded-lg relative">
+            <div class="mc-table flex w-full bg-gray-200 sticky top-0">
+              <div class="w-[250px]">获取时间</div>
+              <div class="w-[250px]">获取来源</div>
+              <div class="flex-1">详情</div>
+              <div class="w-[200px]">金币值</div>
+            </div>
+            <n-infinite-scroll
+              style="height: calc(100vh - 300px);"
+              :distance="10"
+              @load="getPoints"
+            >
+            <div v-for="item in pointsResult" :key="item" class="mc-table flex w-full">
+              <div class="w-[250px]">
+                {{ item.orderTime }}
+              </div>
+              <div class="w-[250px]">{{ item.productName }}</div>
+              <div class="flex-1">-</div>
+              <div class="w-[200px]">
+                {{ item.paymentAmount }}
+              </div>
+            </div>
+          </n-infinite-scroll>
+          </div>
+        </n-tab-pane>
+        <n-tab-pane name="beatles" tab="消费记录">
+          <div class="border border-solid border-gray-200 rounded-lg relative">
+            <div class="mc-table flex w-full bg-gray-200 sticky top-0">
+              <div class="w-[250px]">消耗时间</div>
+              <div class="w-[250px]">消耗类型</div>
+              <div class="flex-1">详情</div>
+              <div class="w-[200px]">充值金币值</div>
+            </div>
+            <n-infinite-scroll
+              style="height: calc(100vh - 300px);"
+              :distance="10"
+              @load="getWalletRecord"
+            >
+            <div v-for="item in walletRecordList" :key="item" class="mc-table flex w-full">
+              <div class="w-[250px]">
+                {{ item.consumeDate }}
+              </div>
+              <div class="w-[250px]">{{ item.productName }}</div>
+              <div class="flex-1">-</div>
+              <div class="w-[200px]">
+                {{ item.amount }}
+              </div>
+            </div>
+          </n-infinite-scroll>
+          </div>
+        </n-tab-pane>
+      </n-tabs>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.mc-table {
+  padding: 10px;
+  line-height: 40px;
+  border-bottom: 1px solid #eee;
+}
+</style>
diff --git a/app/pages/member-center/index.vue b/app/pages/member-center/index.vue
index 10bb65b..7edaf8c 100644
--- a/app/pages/member-center/index.vue
+++ b/app/pages/member-center/index.vue
@@ -1,132 +1,212 @@
-<script setup lang="ts">
-import { CheckmarkCircleSharp, Close } from '@vicons/ionicons5';
-import { NConfigProvider, NMessageProvider } from 'naive-ui';
+<script setup>
+import { CheckmarkCircleSharp, Close } from "@vicons/ionicons5";
+import { NConfigProvider, NMessageProvider } from "naive-ui";
+const message = useMessage();
 
 definePageMeta({
-  layout: 'header',
-})
+  layout: "header",
+});
 
 // 订单
-const needPayment = ref([{
-  amount: '',
-  productId: '',
-  promotionId: '',
-  type: 'member',
-}])
-const userStore = useUserStore()
-const userInfo = userStore.userInfo as UserInfoType
+const needPayment = ref([
+  {
+    amount: "",
+    productId: "",
+    promotionId: "",
+    type: "member",
+  },
+]);
+const userStore = useUserStore();
+const userInfo = userStore.userInfo;
 // 显示支付弹框
-interface Payment {
-  isVisible: boolean
-}
+// interface Payment {
+//   isVisible: boolean;
+// }
 
 // 是否是会员
-const isMember = ref(false)
+const isMember = ref(false);
 async function getIsMember() {
   try {
-    const res = await request.get('/member/isMember')
+    const res = await request.get("/member/isMember");
     if (res.code === 200) {
-      isMember.value = res.data
+      isMember.value = res.data;
     }
-  }
-  catch (err) {
-    console.log(err)
+  } catch (err) {
+    console.log(err);
   }
 }
-getIsMember()
+getIsMember();
 
 // 获取会员等级及权益列表
-const MemberBenefitList = ref([])
+const MemberBenefitList = ref([]);
 async function getMemberBenefitList() {
   try {
-    const res = await request.get('/memberLevel/getMemberBenefitList')
+    const res = await request.get("/memberLevel/getMemberBenefitList");
     if (res.code === 200) {
-      MemberBenefitList.value = res.data
+      MemberBenefitList.value = res.data;
     }
-  }
-  catch (err) {
-    console.log(err)
+  } catch (err) {
+    console.log(err);
   }
 }
-getMemberBenefitList()
+getMemberBenefitList();
 
 // 获取会员等级列表
-interface memberLevel {
-  memberName: string
-  unitPrice: number
-  originalPrice: number
-  subscriptionPeriod: number
-}
-const memberLevelList = ref<memberLevel[]>([])
+// interface memberLevel {
+//   memberName: string;
+//   unitPrice: number;
+//   originalPrice: number;
+//   subscriptionPeriod: number;
+// }
+const memberLevelList = ref([]);
 async function getMemberLevelList() {
   try {
-    const res = await request.get('/memberLevel/list')
+    const res = await request.get("/memberLevel/list");
     if (res.code === 200) {
-      memberLevelList.value = res.data
+      memberLevelList.value = res.data;
     }
-  }
-  catch (err) {
-    console.log(err)
+  } catch (err) {
+    console.log(err);
   }
 }
-getMemberLevelList()
+getMemberLevelList();
 
 // 显示会员支付的弹框
-const isShowPayment = ref(false)
-const PaymentRef = ref<Payment | null>(null)
-function showPayment(info: any) {
+const isShowPayment = ref(false);
+const PaymentRef = ref(null);
+function showPayment(info) {
   if (info === 1) {
-    needPayment.value = memberLevelList.value
+    needPayment.value = memberLevelList.value;
+  } else {
+    needPayment.value = [info];
   }
-  else {
-    needPayment.value = [info]
-  }
-  isShowPayment.value = true
+  isShowPayment.value = true;
   if (PaymentRef.value) {
-    PaymentRef.value.isVisible = true
+    PaymentRef.value.isVisible = true;
   }
 }
 
 // 关闭开通会员弹框
 function closePayment() {
-  isShowPayment.value = false
+  isShowPayment.value = false;
   if (PaymentRef.value) {
-    PaymentRef.value.isVisible = false
+    PaymentRef.value.isVisible = false;
   }
 }
 // 显示积分的弹框
-const isShowIntPayment = ref(false)
+const isShowIntPayment = ref(false);
 
-const IntPaymentRef = ref<Payment | null>(null)
+const IntPaymentRef = ref(null);
 function showIntPayment() {
-  isShowIntPayment.value = true
+  isShowIntPayment.value = true;
   if (IntPaymentRef.value) {
-    IntPaymentRef.value.isVisible = true
+    IntPaymentRef.value.isVisible = true;
   }
 }
 
 // 关闭充值积分弹框
 function closeIntPayment() {
-  isShowIntPayment.value = false
+  isShowIntPayment.value = false;
   if (IntPaymentRef.value) {
-    IntPaymentRef.value.isVisible = false
+    IntPaymentRef.value.isVisible = false;
+  }
+}
+
+// 关闭充值金币弹框
+const isShowGoldPayment = ref(false);
+const goldPaymentRef = ref(null);
+
+function closeGoldPayment() {
+  isShowGoldPayment.value = false;
+  if (goldPaymentRef.value) {
+    goldPaymentRef.value.isVisible = false;
   }
 }
 
 // 支付成功后刷新会员信息
 function paymentSuccess() {
-  getIsMember()
+  getIsMember();
+  integralGold();
 }
 
 // 跳转到积分详情页
 function toIntDetail() {
-  const baseUrl = window.location.origin
-  window.open(`${baseUrl}/int-detail`, '_blank', 'noopener,noreferrer')
+  const baseUrl = window.location.origin;
+  window.open(`${baseUrl}/int-detail`, "_blank", "noopener,noreferrer");
 }
 
-function toOrderManage(){
-  const baseUrl = window.location.origin
-  window.open(`${baseUrl}/order-management`, '_blank', 'noopener,noreferrer')
+// 订单管理
+function toOrderManage() {
+  const baseUrl = window.location.origin;
+  window.open(`${baseUrl}/order-management`, "_blank", "noopener,noreferrer");
+}
+
+// 跳转到金币详情
+function toGoldDetail() {
+  const baseUrl = window.location.origin;
+  window.open(`${baseUrl}/gold-detail`, "_blank", "noopener,noreferrer");
+}
+
+// 显示充值金币的框
+function showGoldPayment() {
+  isShowGoldPayment.value = true;
+  if (goldPaymentRef.value) {
+    goldPaymentRef.value.isVisible = true;
+  }
+}
+
+// 获取积分和金币余额
+const integralGold = ref({});
+async function getIntegralGold() {
+  try {
+    const res = await request.post("/personalCenter/getPointAndWallet");
+    if (res.code === 200) {
+      integralGold.value = res.data;
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+getIntegralGold();
+const isShowActivity = ref(true);
+
+// 关闭活动的图标
+function closeActivityIcon() {
+  isShowActivity.value = false;
+}
+
+// 活动列表
+const activityList = ref([])
+const isShowactivityList = ref(false);
+async function showActivityList() {
+  try {
+    const res = await request.post("/promotion/promotionList", {
+      pageNum: 1,
+      pageSize: 50,
+    });
+    if (res.code === 200) {
+      activityList.value = res.rows
+      isShowactivityList.value = true;
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+
+// 参与活动
+async function getActivity(item) {
+  if(item.isJoin === 1) return
+  try {
+    const res = await request.get(`/promotion/joinPromotion?promotionId=${item.id}`);
+    if (res.code === 200) {
+      message.success('领取成功')
+      item.isJoin = 1
+    }
+  } catch (err) {
+    if(err.code === 601){
+      message.warning(err.msg)
+    }
+  }
 }
 </script>
 
@@ -137,16 +217,23 @@ function toOrderManage(){
         <!-- 左侧用户信息 -->
         <div class="w-60 bg-[#2b2421] rounded-lg p-6 my-3">
           <!-- 右上角订阅管理 -->
-          <div class="text-right">
-            <button class="text-[#8b8685] text-sm bg-inherit border-none cursor-pointer" @click="toOrderManage">
+          <!-- <div class="text-right">
+            <button
+              class="text-[#8b8685] text-sm bg-inherit border-none cursor-pointer"
+              @click="toOrderManage"
+            >
               订阅管理 >
             </button>
-          </div>
+          </div> -->
 
           <!-- 用户头像和信息 -->
           <div class="flex flex-col items-center mt-2">
             <client-only>
-              <img :src="userInfo.avatar" alt="头像" class="w-20 h-20 rounded-full mb-3">
+              <img
+                :src="userInfo.avatar"
+                alt="头像"
+                class="w-20 h-20 rounded-full mb-3"
+              />
               <span class="text-white text-sm mb-2">{{ userInfo.nickName }}</span>
             </client-only>
             <div class="flex items-center text-[#8b8685] text-xs">
@@ -160,7 +247,11 @@ function toOrderManage(){
                   d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z"
                 />
               </svg>
-              {{ isMember.result === '1' ? `会员到期时间: ${isMember.endDate}` : '您还不是魔创未来的会员' }}
+              {{
+                isMember.result === "1"
+                  ? `会员到期时间: ${isMember.endDate}`
+                  : "您还不是魔创未来的会员"
+              }}
             </div>
           </div>
 
@@ -187,41 +278,49 @@ function toOrderManage(){
             <div class="grid grid-cols-3 gap-8">
               <!-- 算力余额 -->
               <div>
-                <h3 class="text-[#c3986b] mb-4">
-                  算力余额
-                </h3>
+                <h3 class="text-[#c3986b] mb-4">积分余额</h3>
                 <div class="flex items-center mb-2">
-                  <span class="text-[#c3986b] mr-2">300点</span>
-                  <button class="text-[#c3986b] bg-inherit border-none cursor-pointer" @click="showIntPayment">
+                  <span class="text-[#c3986b] mr-2">{{ integralGold.point || 0 }}点</span>
+                  <button
+                    class="text-[#c3986b] bg-inherit border-none cursor-pointer"
+                    @click="showIntPayment"
+                  >
                     充值 >
                   </button>
                 </div>
-                <button class="text-white bg-inherit border-none cursor-pointer p-0" @click="toIntDetail">
-                  算力明细 >
+                <button
+                  class="text-white bg-inherit border-none cursor-pointer p-0"
+                  @click="toIntDetail"
+                >
+                  积分明细 >
                 </button>
               </div>
 
               <!-- 生图加速余额 -->
               <div>
-                <h3 class="text-[#c3986b] mb-4">
-                  生图加速余额
-                </h3>
+                <h3 class="text-[#c3986b] mb-4">金币余额</h3>
                 <div class="flex items-center mb-2">
-                  <span class="text-[#c3986b] mr-2">0次</span>
-                  <button class="text-[#c3986b] bg-inherit border-none cursor-pointer">
+                  <span class="text-[#c3986b] mr-2"
+                    >{{ integralGold.wallet || 0 }} 点</span
+                  >
+                  <button
+                    class="text-[#c3986b] bg-inherit border-none cursor-pointer"
+                    @click="showGoldPayment"
+                  >
                     充值 >
                   </button>
                 </div>
-                <button class="text-white bg-inherit border-none cursor-pointer p-0">
+                <button
+                  class="text-white bg-inherit border-none cursor-pointer p-0"
+                  @click="toGoldDetail"
+                >
                   加速明细 >
                 </button>
               </div>
 
               <!-- 训练加速余额 -->
               <div>
-                <h3 class="text-[#c3986b] mb-4">
-                  训练加速余额
-                </h3>
+                <h3 class="text-[#c3986b] mb-4">训练加速余额</h3>
                 <div class="flex items-center mb-2">
                   <span class="text-[#c3986b]">0次</span>
                 </div>
@@ -244,9 +343,7 @@ function toOrderManage(){
             <!-- 进度条 -->
             <div class="relative">
               <div class="h-1 bg-[#3a322e] rounded-full">
-                <div class="absolute right-0 -top-6 text-[#8b8685] text-sm">
-                  0G/3G
-                </div>
+                <div class="absolute right-0 -top-6 text-[#8b8685] text-sm">0G/3G</div>
               </div>
             </div>
 
@@ -281,14 +378,17 @@ function toOrderManage(){
             <div class="card-item">
               <span class="text-[#814600] text-[20px] mr-2">¥</span>
               <span class="text-[#814600] text-[40px] mr-2">{{ item.unitPrice }}</span>
-              <span class="text-gray-400 text-[20px] line-through">¥{{ item.originalPrice }}</span>
+              <span class="text-gray-400 text-[20px] line-through"
+                >¥{{ item.originalPrice }}</span
+              >
             </div>
             <div class="card-item text-[#e08909] w-7/10 text-center text-[12px]">
               {{ item.subscriptionPeriod }}
             </div>
             <div class="card-item">
               <button
-                class="bg-gradient-to-r from-[#fbdfa4] to-[#f3c180] text-[#4c3d33] w-40 h-10 rounded-full text-[12px] border-none cursor-pointer" @click="showPayment(item)"
+                class="bg-gradient-to-r from-[#fbdfa4] to-[#f3c180] text-[#4c3d33] w-40 h-10 rounded-full text-[12px] border-none cursor-pointer"
+                @click="showPayment(item)"
               >
                 立即开通
               </button>
@@ -297,9 +397,7 @@ function toOrderManage(){
         </div>
         <div class="py-8">
           <div class="flex justify-center mb-4">
-            <div class="text-xl font-bold">
-              会员权益
-            </div>
+            <div class="text-xl font-bold">会员权益</div>
           </div>
           <!-- <div class="flex items-center">
             <div v-for="(item, index) in MemberBenefitList" :key="index" class="w-1/4 w-full">
@@ -315,67 +413,35 @@ function toOrderManage(){
           </div> -->
           <div class="text-[#525252]">
             <div class="flex gap-2">
-              <div class="member-item bg-[#f7f0ea]">
-                会员权益
-              </div>
-              <div class="member-item bg-[#f5f5f5]">
-                用户免费
-              </div>
-              <div class="member-item bg-[#fdf6ea]">
-                基础版VIP
-              </div>
-              <div class="member-item bg-[#fce6bf]">
-                专业版VIP
-              </div>
+              <div class="member-item bg-[#f7f0ea]">会员权益</div>
+              <div class="member-item bg-[#f5f5f5]">用户免费</div>
+              <div class="member-item bg-[#fdf6ea]">基础版VIP</div>
+              <div class="member-item bg-[#fce6bf]">专业版VIP</div>
             </div>
             <div class="flex gap-2">
-              <div class="member-item bg-[#fff]">
-                算力
-              </div>
-              <div class="member-item bg-[#fff]">
-                每天300点
-              </div>
-              <div class="member-item bg-[#fff]">
-                每月15000点
-              </div>
-              <div class="member-item bg-[#fff]member-item">
-                每月35000点
-              </div>
+              <div class="member-item bg-[#fff]">算力</div>
+              <div class="member-item bg-[#fff]">每天300点</div>
+              <div class="member-item bg-[#fff]">每月15000点</div>
+              <div class="member-item bg-[#fff]member-item">每月35000点</div>
             </div>
             <div class="flex gap-2">
-              <div class="member-item bg-[#fafafa]">
-                云端存储空间
-              </div>
-              <div class="member-item bg-[#fafafa]">
-                3GB
-              </div>
-              <div class="member-item bg-[#fdf6ea]">
-                20GB
-              </div>
-              <div class="member-item bg-[#fce6bf]">
-                50GB
-              </div>
+              <div class="member-item bg-[#fafafa]">云端存储空间</div>
+              <div class="member-item bg-[#fafafa]">3GB</div>
+              <div class="member-item bg-[#fdf6ea]">20GB</div>
+              <div class="member-item bg-[#fce6bf]">50GB</div>
             </div>
             <div class="flex gap-2">
-              <div class="member-item bg-[#fff]">
-                生图加速特权
-              </div>
+              <div class="member-item bg-[#fff]">生图加速特权</div>
               <div class="member-item bg-[#fff]member-item">
                 <n-icon size="20" color="#ed7470">
                   <Close />
                 </n-icon>
               </div>
-              <div class="member-item bg-[#fff]">
-                每月800次
-              </div>
-              <div class="member-item bg-[#fff]">
-                每月5000次
-              </div>
+              <div class="member-item bg-[#fff]">每月800次</div>
+              <div class="member-item bg-[#fff]">每月5000次</div>
             </div>
             <div class="flex gap-2">
-              <div class="member-item bg-[#fafafa]">
-                会员专属模型
-              </div>
+              <div class="member-item bg-[#fafafa]">会员专属模型</div>
               <div class="member-item bg-[#fafafa]">
                 <n-icon size="20" color="#ed7470">
                   <Close />
@@ -393,9 +459,7 @@ function toOrderManage(){
               </div>
             </div>
             <div class="flex gap-2">
-              <div class="member-item bg-[#fff]">
-                生图高级功能
-              </div>
+              <div class="member-item bg-[#fff]">生图高级功能</div>
               <div class="member-item bg-[#fff]">
                 <n-icon size="20" color="#ed7470">
                   <Close />
@@ -413,9 +477,7 @@ function toOrderManage(){
               </div>
             </div>
             <div class="flex gap-2">
-              <div class="member-item bg-[#fafafa]">
-                训练XL模型
-              </div>
+              <div class="member-item bg-[#fafafa]">训练XL模型</div>
               <div class="member-item bg-[#fafafa]">
                 <n-icon size="20" color="#ed7470">
                   <Close />
@@ -433,9 +495,7 @@ function toOrderManage(){
               </div>
             </div>
             <div class="flex gap-2">
-              <div class="member-item bg-[#fff]">
-                图片去水印下载
-              </div>
+              <div class="member-item bg-[#fff]">图片去水印下载</div>
               <div class="member-item bg-[#fff]">
                 <n-icon size="20" color="#ed7470">
                   <Close />
@@ -453,46 +513,126 @@ function toOrderManage(){
               </div>
             </div>
             <div class="flex gap-2">
-              <div class="member-item bg-[#fafafa]">
-                多任务并行生图
-              </div>
+              <div class="member-item bg-[#fafafa]">多任务并行生图</div>
               <div class="member-item bg-[#fafafa]">
                 <n-icon size="20" color="#58c08f">
                   <CheckmarkCircleSharp />
                 </n-icon>
               </div>
-              <div class="member-item bg-[#fdf6ea]">
-                2个
-              </div>
-              <div class="member-item bg-[#fce6bf] ">
-                3个
-              </div>
+              <div class="member-item bg-[#fdf6ea]">2个</div>
+              <div class="member-item bg-[#fce6bf]">3个</div>
             </div>
           </div>
         </div>
         <div class="text-[#999] text-[12px]">
           <div class="mt-1">
-            会员每月算力和加速特权按月下发，有效期31天，到期重置。会员模型下载次数上限为每月200次
+            会员每月算力和加速特权按月下发, 有效期31天,
+            到期重置。会员模型下载次数上限为每月200次
           </div>
           <div class="mt-1">
-            发票或团队/企业定制需求，请点击立即咨询联系我们，企业合作需求也可直接联系xxxx
-          </div>
-          <div class="mt-1">
-            更多问题可见帮助中心
+            发票或团队/企业定制需求, 请点击立即咨询联系我们, 企业合作需求也可直接联系xxxx
           </div>
+          <div class="mt-1">更多问题可见帮助中心</div>
         </div>
       </div>
     </div>
     <NConfigProvider>
       <NMessageProvider>
-        <Payment v-if="isShowPayment" ref="PaymentRef" :info="needPayment" :is-member="isMember" @close-payment="closePayment" />
-        <IntPayment v-if="isShowIntPayment" ref="IntPaymentRef" :is-member="isMember" @payment-success="paymentSuccess" @close-payment="closeIntPayment" />
+        <Payment
+          v-if="isShowPayment"
+          ref="PaymentRef"
+          :info="needPayment"
+          :is-member="isMember"
+          @close-payment="closePayment"
+        />
+        <IntPayment
+          v-if="isShowIntPayment"
+          ref="IntPaymentRef"
+          :is-member="isMember"
+          @payment-success="paymentSuccess"
+          @close-payment="closeIntPayment"
+        />
+        <GoldPayment
+          v-if="isShowGoldPayment"
+          ref="goldPaymentRef"
+          :is-member="isMember"
+          @payment-success="paymentSuccess"
+          @close-payment="closeGoldPayment"
+        />
       </NMessageProvider>
     </NConfigProvider>
+    <div class="activity-box" v-if="isShowActivity">
+      <div class="absolute -top-6 -right-0 cursor-pointer">
+        <n-icon size="20" color="#bbb" @click="closeActivityIcon">
+          <Close />
+        </n-icon>
+      </div>
+      <img
+        class="cursor-pointer"
+        @click="showActivityList"
+        src="@/assets/img/activityIcon.png"
+        alt=""
+      />
+    </div>
+
+    <n-modal v-model:show="isShowactivityList" transform-origin="center">
+      <n-card
+        style="width: 350px; background: #e65e40"
+        :bordered="false"
+        size="huge"
+        :content-style="{ padding: 0 }"
+        role="dialog"
+        aria-modal="true"
+      >
+        <div class="p-4 rounded-lg">
+          <div class="flex justify-end mb-4">
+            <n-icon
+              class="cursor-pointer"
+              @click="isShowactivityList = false"
+              size="20"
+              color="#bbb"
+            >
+              <Close />
+            </n-icon>
+          </div>
+          <div class="flex flex-col gap-3">
+            <div
+              class="px-2 py-4 bg-white h-20 w-full flex rounded-lg"
+              v-for="(item, index) in activityList"
+              :key="index"
+            >
+              <div class="w-[70%] flex flex-col justify-around">
+                <div>{{ item.activityName }}</div>
+                <div class="text-xs text-gray-500">有效期: {{item.startTime}}</div>
+                <div class="text-xs text-gray-500">失效期: {{item.endTime}}</div>
+              </div>
+              <div class="w-[30%] flex items-center justify-center">
+                <div
+                  @click="getActivity(item)"
+                  class="w-14 h-6 flex items-center justify-center cursor-pointer text-white text-xs bg-[#e9613f] rounded-full"
+                  :style="{backgroundColor: item.isJoin === 0 ? '#e9613f' : '#ccc'}"
+                >
+                {{ item.isJoin === 0 ? '领取' : '已领取' }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </n-card>
+    </n-modal>
   </div>
 </template>
 
 <style scoped>
+/* .n-card__content{
+  padding:20px !important
+} */
+.activity-box {
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  justify-content: space-around
+}
 .card-item {
   @apply flex items-center justify-center h-1/4;
 }
diff --git a/app/pages/model-details/[id].vue b/app/pages/model-details/[id].vue
index 7e6875a..9032742 100644
--- a/app/pages/model-details/[id].vue
+++ b/app/pages/model-details/[id].vue
@@ -1,13 +1,17 @@
-<script setup lang="ts">
+<script setup>
 import { commonApi } from "@/api/common";
 import { Close, DiamondSharp, PersonAddOutline } from "@vicons/ionicons5";
-
 import {
 CircleUser,
 Download,
-EllipsisVertical, Heart, Play,
+EllipsisVertical,
+Heart,
+Play,
+SquareCheck,
 SquarePlus
 } from "lucide-vue-next";
+//
+import { formatFileSize } from '@/utils/index.ts';
 import { NConfigProvider, NMessageProvider } from "naive-ui";
 import { ref } from "vue";
 import { useRouter } from "vue-router";
@@ -21,11 +25,11 @@ definePageMeta({
 });
 // const userStore = useUserStore()
 const route = useRoute();
-const { id } = route.params as { id: string };
+const { id } = route.params
 const activeTab = ref(null);
 const commentHeight = ref(800);
 const detailsInfo = ref({});
-const currentUserInfo = ref<any>({});
+const currentUserInfo = ref({});
 const isVisibleReport = ref(false);
 // 先获取用户信息 再获取版本信息
 const versionByWorkInfo = ref([]);
@@ -34,7 +38,9 @@ async function getInfo() {
     const res = await request.get(`/model/selectModelById?id=${id}`);
     if (res.code === 200) {
       detailsInfo.value = res.data;
-      detailsInfo.value.styleList = JSON.parse(res.data.styleList);
+      if (res.data.tags) {
+        detailsInfo.value.tagsList = JSON.parse(res.data.tags);
+      }
       // detailsInfo.value.styleList =JSON.parse(res.data.styleList)
       // // 1翻译
       try {
@@ -73,15 +79,15 @@ async function getInfo() {
 getInfo();
 
 // 获取用户点赞/粉丝/关注数量
-interface SelectUserInfo {
-  attention: number;
-  bean: number;
-  imageLikeNum: number;
-  modelDownLoadNum: number;
-  modelLikeNum: number;
-  modelRunNum: number;
-}
-const selectUserInfo = ref<SelectUserInfo>({
+// interface SelectUserInfo {
+//   attention: number;
+//   bean: number;
+//   imageLikeNum: number;
+//   modelDownLoadNum: number;
+//   modelLikeNum: number;
+//   modelRunNum: number;
+// }
+const selectUserInfo = ref({
   attention: 0,
   bean: 0,
   imageLikeNum: 0,
@@ -106,8 +112,8 @@ async function getAttention() {
 
 // 举报/编辑/删除
 const isDelete = ref(false);
-async function handleSelect(event: Event, type: string) {
-  event.stopPropagation(); // 阻止事件冒泡
+async function handleSelect(type) {
+  // event.stopPropagation(); // 阻止事件冒泡
   if (type === "report") {
     isVisibleReport.value = true;
     // await request.get(`/WorkFlow/report?id=${id}`) // 举报
@@ -183,7 +189,7 @@ async function onLike() {
 const reportParams = ref({
   reportId: undefined,
   text: "",
-  type:1
+  type: 1,
 });
 const reportList = ref([]);
 async function getDictType() {
@@ -197,7 +203,7 @@ async function getDictType() {
   }
 }
 getDictType();
-function handleChange(item: any) {
+function handleChange(item) {
   reportParams.value.reportId = item.dictValue;
   if (item.dictValue !== "5") {
     reportParams.value.text = "";
@@ -209,30 +215,78 @@ function closeReport() {
   isVisibleReport.value = false;
 }
 
-async function onReport(){
-  if( reportParams.value.reportId !== undefined){
-    reportParams.value.productId = detailsInfo.value.id
-    try{
-      const res = await request.post('/report/addReport', reportParams.value)
-      if(res.code === 200){
+async function onReport() {
+  if (reportParams.value.reportId !== undefined) {
+    reportParams.value.productId = detailsInfo.value.id;
+    try {
+      const res = await request.post("/report/addReport", reportParams.value);
+      if (res.code === 200) {
         message.success("举报成功");
-        closeReport()
+        closeReport();
       }
-    }catch(err){
-console.log(err);
+    } catch (err) {
+      console.log(err);
     }
   }
 }
 
-function toPersonalCenter(){
-  const baseUrl = window.location.origin
-  if(userStore?.userInfo?.userId === detailsInfo.value.userId){
-    window.open(`${baseUrl}/personal-center`, '_blank', 'noopener,noreferrer')
-  }else{
-    debugger
-    window.open(`${baseUrl}/personal-publish?userId=${detailsInfo.value.userId}`, '_blank', 'noopener,noreferrer')
+function toPersonalCenter() {
+  const baseUrl = window.location.origin;
+  if (userStore?.userInfo?.userId === detailsInfo.value.userId) {
+    window.open(`${baseUrl}/personal-center`, "_blank", "noopener,noreferrer");
+  } else {
+    window.open(
+      `${baseUrl}/personal-publish?userId=${detailsInfo.value.userId}`,
+      "_blank",
+      "noopener,noreferrer"
+    );
   }
 }
+const currentTabsIndex = ref(0);
+function handleTabChange(id) {
+  for (let i = 0; i < versionByWorkInfo.value.length; i++) {
+    if (id === versionByWorkInfo.value[i].id) {
+      currentTabsIndex.value = i;
+    }
+  }
+}
+
+
+async function addCollect(){
+  try {
+    const params = {
+      "productId": versionByWorkInfo.value[currentTabsIndex.value].id,
+      "productType": 0,
+    }
+    const res = await request.post("/collect/addCollect", params);
+    if (res.code === 200) {
+      versionByWorkInfo.value[currentTabsIndex.value].isCollect = res.data
+      if(res.data === 0){
+        message.success("已加入模型库, 可通过在线生图使用");
+      }else{
+        message.success("已从模型库中移除");
+      }
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+
+async function handelDown(){
+  try {
+      const res = await request.get(`/ModelVersion/modelFileDownload?id=${versionByWorkInfo.value[currentTabsIndex.value].id}`);
+      if (res.code === 200) {
+        const link = document.createElement('a');
+      link.href = res.data;
+      link.download = res.msg; // 自定义文件名
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      }
+    } catch (err) {
+      console.log(err);
+    }
+}
 </script>
 
 <template>
@@ -270,10 +324,7 @@ function toPersonalCenter(){
           <template #trigger>
             <div class="flex items-center bg-[#f4f5f9] px-2 rounded-full">
               <!-- <img src="@/assets/img/heart.png" class="w-[14px] h-[14px] mr-1" alt="" /> -->
-              <component
-                  :is="Heart"
-                  class="h-[12px] w-[12px] mr-1 text-[#000]"
-                />
+              <component :is="Heart" class="h-[12px] w-[12px] mr-1 text-[#000]" />
               <span>{{ detailsInfo.likeNum || 0 }} </span>
             </div>
           </template>
@@ -283,7 +334,7 @@ function toPersonalCenter(){
 
       <div class="flex items-center mt-3 mb-5">
         <div
-          v-for="(item, index) in detailsInfo.styleList"
+          v-for="(item, index) in detailsInfo.tagsList"
           :key="index"
           class="text-[12px] bg-[#ebf2fe] p-1 px-2 text-[#557abf] mr-4 rounded-md"
         >
@@ -293,7 +344,12 @@ function toPersonalCenter(){
       <div class="flex w-full gap-1">
         <div class="w-2/3">
           <div class="w-full">
-            <n-tabs v-model:value="activeTab" type="line" animated>
+            <n-tabs
+              v-model:value="activeTab"
+              @update:value="handleTabChange"
+              type="line"
+              animated
+            >
               <n-tab-pane
                 v-for="(item, index) in versionByWorkInfo"
                 :key="index"
@@ -471,23 +527,32 @@ function toPersonalCenter(){
           </div>
           <div class="flex gap-y-2">
             <div
-              class="flex flex-1 items-center justify-center bg-[#eceef4] h-[50px] mt-4 mr-1 rounded-md"
+              v-if="versionByWorkInfo.length > 0"
+              @click="addCollect"
+              class="flex flex-1 items-center justify-center bg-[#eceef4] h-[50px] mt-4 mr-1 rounded-md cursor-pointer"
             >
               <component
-                :is="SquarePlus"
+                :is="
+                  versionByWorkInfo[currentTabsIndex].isCollect === 1
+                    ? SquarePlus
+                    : SquareCheck
+                "
                 class="h-[20px] w-[20px] text-black menu-icon m-1 text-[#969798]"
               />
-              <span class="mr-1">加入模型课</span>
+              <span class="mr-1">
+                {{ versionByWorkInfo[currentTabsIndex].isCollect === 1 ? '加入模型库' : '已加入'}}
+              </span>
             </div>
 
             <div
+            @click="handelDown"
               class="flex flex-1 items-center bg-gradient-to-r from-[#ffe9c8] to-[#ffd264] justify-center ml-1 mt-4 text-black bg-[#eceef4] w-full rounded-md h-[50px] cursor-pointer"
             >
               <component
                 :is="Download"
                 class="h-[20px] w-[20px] text-black menu-icon m-1 text-[#969798]"
               />
-              <span class="mr-1"> 下载 (122.22MB) </span>
+              <span class="mr-1" v-if="versionByWorkInfo.length > 0"> 下载 {{ formatFileSize(versionByWorkInfo[currentTabsIndex].fileSize) }} </span>
             </div>
           </div>
 
@@ -505,7 +570,7 @@ function toPersonalCenter(){
             content="确定要将模型删除? 模型删除后无法找回"
             negative-text="取消"
             positive-text="确认"
-            @negative-click="onDelete"
+            @negative-click="isDelete = false"
             @positive-click="onDelete"
           />
 
@@ -539,7 +604,9 @@ function toPersonalCenter(){
                   {{ item.dictLabel }}
                 </n-radio>
                 <n-input
-                  v-if="reportParams.reportId !== undefined && reportParams.reportId === '5'"
+                  v-if="
+                    reportParams.reportId !== undefined && reportParams.reportId === '5'
+                  "
                   v-model:value="reportParams.text"
                   placeholder="点击输入"
                   type="textarea"
@@ -549,12 +616,10 @@ function toPersonalCenter(){
                   }"
                 />
                 <div
-                @click="onReport"
+                  @click="onReport"
                   class="mt-4 w-[100%] h-10 flex rounded-lg text-white items-center justify-center cursor-pointer"
                   :class="[
-                    reportParams.reportId !== undefined
-                      ? 'bg-[#4c79ee]'
-                      : 'bg-[#cccccc]',
+                    reportParams.reportId !== undefined ? 'bg-[#4c79ee]' : 'bg-[#cccccc]',
                   ]"
                 >
                   确认
@@ -571,7 +636,7 @@ function toPersonalCenter(){
   </div>
 </template>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .header-num {
   @apply flex items-center bg-[#f4f5f9] px-2 rounded-full;
 }
@@ -599,9 +664,9 @@ function toPersonalCenter(){
   background: linear-gradient(90deg, #173eff 0%, #1b7dff 100%);
   border-radius: 2px;
   transition: left 0.2s var(--n-bezier), max-width 0.2s var(--n-bezier),
-  opacity 0.3s var(--n-bezier), background-color 0.3s var(--n-bezier);
+    opacity 0.3s var(--n-bezier), background-color 0.3s var(--n-bezier);
 }
-.original{
+.original {
   margin: 2px 0;
   padding: 2px 0;
   display: flex;
@@ -609,7 +674,7 @@ function toPersonalCenter(){
   justify-content: center;
   width: 90px;
   font-size: 12px;
-  color: #aa8645; 
+  color: #aa8645;
   font-weight: 400;
   background: linear-gradient(94.11deg, #efd6a9 10.52%, #f0dcbc 107.96%);
   border-radius: 4px;
diff --git a/app/pages/personal-center/index.vue b/app/pages/personal-center/index.vue
index ff42213..f3d14b5 100644
--- a/app/pages/personal-center/index.vue
+++ b/app/pages/personal-center/index.vue
@@ -8,6 +8,8 @@ import { useUserStore } from "@/stores/user";
 import { formatDate } from "@/utils/index.ts";
 import { NConfigProvider, NMessageProvider } from "naive-ui";
 import { nextTick, onMounted, onUnmounted, ref } from "vue";
+let pollingTimer: ReturnType<typeof setInterval> | undefined
+
 const route = useRoute();
 const { type, status } = route.query as { type: string; status: string };
 
@@ -16,6 +18,9 @@ const finished = ref(false);
 const total = ref(0); // 总条数
 const loadingTrigger = ref(null);
 
+import { useRouter } from "vue-router";
+const router = useRouter();
+
 const observer = ref<IntersectionObserver | null>(null);
 definePageMeta({
   layout: "default",
@@ -58,7 +63,7 @@ const typeList = ref([
 // 发布的form查询条件
 const publishParams = ref({
   pageNum: 1,
-  pageSize: 12,
+  pageSize: 20,
   status: "0",
   orderByColumn: "create_time",
   date: null,
@@ -69,7 +74,7 @@ const publishParams = ref({
 function initPublishParams() {
   publishParams.value = {
     pageNum: 1,
-    pageSize: 12,
+    pageSize: 20,
     status: "0",
     orderByColumn: "create_time",
     date: null,
@@ -81,14 +86,14 @@ function initPublishParams() {
 // 点赞form的查询条件
 const likesParams = ref({
   pageNum: 1,
-  pageSize: 12,
+  pageSize: 20,
   orderByColumn: "create_time",
 });
 
 function initLikesParams() {
   likesParams.value = {
     pageNum: 1,
-    pageSize: 12,
+    pageSize: 20,
     orderByColumn: "create_time",
   };
 }
@@ -245,7 +250,7 @@ getAttention();
 // Banner 样式
 const bannerStyle = {
   backgroundImage:
-    "url('https://liblibai-web-static.liblib.cloud/liblibai_v4_online/static/_next/static/images/defaultBgImg.381282c0f2b01780c83d8fe6dc0aa90a.png')",
+    "url('https://img.zcool.cn/community/special_cover/3a9a64d3628c000c2a1000657eec.jpg')",
 };
 
 // 定义响应接口
@@ -362,7 +367,7 @@ const attentionFinished = ref(false);
 const attentionList = ref([]);
 const attentionListParams = ref({
   pageNumber: 1,
-  pageSize: 15,
+  pageSize: 20,
 });
 async function getAttentionList() {
   try {
@@ -397,7 +402,8 @@ const likeFinished = ref(false);
 const likeList = ref([]);
 const likeListParams = ref({
   pageNumber: 1,
-  pageSize: 15,
+  pageSize: 20,
+  type:null
 });
 async function getLikeList() {
   try {
@@ -434,6 +440,10 @@ function closefanList() {
 // 去关注/取消关注当前用户
 async function onAttention(item: any) {
   try {
+    const userId = userStore.userInfo.userId
+    if(userId === item.userId){
+      return message.warning('自己不能关注自己')
+    }
     const res = await request.get(`/attention/addAttention?userId=${item.userId}`);
     if (res.code === 200) {
       if (res.data) {
@@ -490,101 +500,7 @@ function handlePositiveClick() {
 const activeTab =  ref('like')
 
 //邀请码列表
-const invitationList = ref({
-  totalAmount: 2889,
-  earningsDisplayList: [
-    {
-      user: {
-        userId: 2,
-        userName: "ry",
-        avatar:
-          "https://img1.baidu.com/it/u=728383910,3448060628&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-      },
-      count: 1,
-    },
-    {
-      user: {
-        userId: 105,
-        userName: "默认用户:oKwIrhqh",
-        avatar:
-          "https://img1.baidu.com/it/u=728383910,3448060628&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-      },
-      count: 2,
-    },
-    {
-      user: {
-        userId: 105,
-        userName: "默认用户:oKwIrhqh",
-        avatar:
-          "https://img1.baidu.com/it/u=728383910,3448060628&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-      },
-      count: 2,
-    },
-    {
-      user: {
-        userId: 105,
-        userName: "默认用户:oKwIrhqh",
-        avatar:
-          "https://img1.baidu.com/it/u=728383910,3448060628&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-      },
-      count: 2,
-    },
-    {
-      user: {
-        userId: 105,
-        userName: "默认用户:oKwIrhqh",
-        avatar:
-          "https://img1.baidu.com/it/u=728383910,3448060628&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-      },
-      count: 2,
-    },
-    {
-      user: {
-        userId: 105,
-        userName: "默认用户:oKwIrhqh",
-        avatar:
-          "https://img1.baidu.com/it/u=728383910,3448060628&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-      },
-      count: 2,
-    },
-    {
-      user: {
-        userId: 105,
-        userName: "默认用户:oKwIrhqh",
-        avatar:
-          "https://img1.baidu.com/it/u=728383910,3448060628&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-      },
-      count: 2,
-    },
-    {
-      user: {
-        userId: 105,
-        userName: "默认用户:oKwIrhqh",
-        avatar:
-          "https://img1.baidu.com/it/u=728383910,3448060628&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-      },
-      count: 2,
-    },
-    {
-      user: {
-        userId: 105,
-        userName: "默认用户:oKwIrhqh",
-        avatar:
-          "https://img1.baidu.com/it/u=728383910,3448060628&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-      },
-      count: 2,
-    },
-    {
-      user: {
-        userId: 107,
-        userName: "默认用户:hQDEthgT",
-        avatar:
-          "https://img1.baidu.com/it/u=728383910,3448060628&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800",
-      },
-      count: 0,
-    },
-  ],
-});
+const invitationList = ref({});
 async function handleNegativeClick() {
   try {
     const res = await request.get(`/invitation/earningsDisplay`);
@@ -600,13 +516,64 @@ const showLike = (type:string) =>{
   isShowFan.value= true
   activeTab.value = type
 }
+const toWallet = () => {
+  router.push({
+    path: `/wallet`,
+  });
+}
+
+// 查询是否已绑定支付宝
+const zfbStatus = ref('0')
+async function getBindStatus(){
+  const res = await request.get(`/ali/pay/queryBindStatus`)
+    if (res.data === '1') { //'1 绑定 0不绑定
+      zfbStatus.value = res.data
+      message.success('绑定成功!')
+    }
+}
+getBindStatus()
+
+// 绑定支付宝
+const qrUrl = ref('')
+const isShowBindingModal = ref(false)
+const showBinding = async() =>{
+  try {
+    const res = await request.get(`/ali/pay/generateQrCode`);
+    if (res.code === 200) {
+      qrUrl.value = res.data;
+      isShowBindingModal.value = true
+
+      pollingTimer && clearTimeout(pollingTimer)
+      pollingTimer = setInterval(async () => {
+        try {
+          const res2 = await request.get(`/ali/pay/queryBindStatus`)
+          if (res2.data === '1') {
+            closeBindingModal()
+            message.success('绑定成功!')
+          }
+        }
+        catch (err) {
+          closeBindingModal()
+          message.warning('绑定失败，请稍后再试!')
+        }
+      }, 2000)
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+
+const closeBindingModal = () =>{
+  pollingTimer && clearTimeout(pollingTimer)
+  isShowBindingModal.value = false
+}
+
 </script>
 
 <template>
-  <div class="mx-auto">
+  <div class="mx-auto relative">
     <!-- Banner Section -->
     <div class="banner-content h-32 bg-blue bg-cover bg-center" :style="bannerStyle" />
-
     <!-- User Info Section -->
     <div class="info-content mt-[-50px] p-5">
       <div class="edit-info-content flex items-center">
@@ -662,6 +629,15 @@ const showLike = (type:string) =>{
             邀请码: {{ invitationCode }}
           </n-popconfirm>
         </div>
+        <div class="ml-4 cursor-pointer" @click="toWallet()">
+          <img src="@/assets/img/wallet.png" alt="">
+        </div>
+        <div v-if="zfbStatus === '1'" class="bg-[#3875f6] rounded-full px-4 py-2">
+          已绑定支付宝
+        </div>
+        <div v-else @click="showBinding" class="text-xs px-3 py-2 border border-solid border-[#ccc] rounded-full ml-4 bg-white cursor-pointer">
+          绑定支付宝
+        </div>
       </div>
 
       <!-- User Details -->
@@ -946,6 +922,26 @@ const showLike = (type:string) =>{
         </div>
       </n-card>
     </n-modal>
+    <div v-if="isShowBindingModal" class="fan-centent">
+      <div class="relative flex flex-col items-center">
+      <div class="bg-[#000] py-10 px-20 flex flex-col items-center justify-center rounded-lg">
+        <div class="text-xl text-white mb-4">
+          扫码绑定
+        </div>
+        <n-qr-code :value="qrUrl" :size="150" style="padding: 0;" />
+        <div class="text-base text-white mt-4">
+          请用手机支付宝扫码
+        </div>
+      </div>
+        <n-icon
+          size="30"
+          class="cursor-pointer mt-4 text-white"
+          @click="closeBindingModal"
+        >
+          <Close />
+        </n-icon>
+      </div>
+    </div>
   </div>
 </template>
 
diff --git a/app/pages/personal-publish/index.vue b/app/pages/personal-publish/index.vue
index de07428..e2c71db 100644
--- a/app/pages/personal-publish/index.vue
+++ b/app/pages/personal-publish/index.vue
@@ -140,7 +140,7 @@
                   <img :src="item.avatar || ''" alt="" class="w-14 h-14 rounded-full mr-2" />
                   {{ item.nickName }}
                 </div>
-                <div class="bg-[#f4f5f9] px-4 py-2 rounded-full cursor-pointer" @click="onAttention(item)">
+                <div class="bg-[#f4f5f9] px-4 py-2 rounded-full cursor-pointer" @click="onAttention(item, 'attention')">
                   {{ item.attention ? '已关注' : '未关注' }}
                 </div>
               </div>
@@ -161,7 +161,7 @@
                 <img :src="item.avatar || ''" alt="" class="w-14 h-14 rounded-full mr-2" />
                 {{ item.nickName }}
               </div>
-              <div class="bg-[#f4f5f9] px-4 py-2 rounded-full cursor-pointer" @click="onAttention(item)">
+              <div class="bg-[#f4f5f9] px-4 py-2 rounded-full cursor-pointer" @click="onAttention(item, 'like')">
                 {{ item.attention ? '已关注' : '未关注' }}
               </div>
             </div>
@@ -182,7 +182,7 @@ import { nextTick, onMounted, onUnmounted, ref } from "vue";
 import { useRoute } from "vue-router";
 const observer = ref<IntersectionObserver | null>(null);
 const message = useMessage()
-
+const userStore = useUserStore();
 const route = useRoute();
 const { userId } = route.query;
 const loading = ref(false);
@@ -191,9 +191,9 @@ const total = ref(0); // 总条数
 const loadingTrigger = ref(null);
 
 const urlList = ref({
-  "0": "/model/selectByUserIdModel",
-  "1": "/model/selectByUserIdWorkFlow",
-  "2": "/model/selectByUserIdImage",
+  "0": "/personalCenter/selectByUserIdModel",
+  "1": "/personalCenter/selectByUserIdWorkFlow",
+  "2": "/personalCenter/selectByUserIdImage",
 });
 const currentType = ref("0");
 const typeList = ref([
@@ -222,12 +222,12 @@ function closefanList() {
 
 const bannerStyle = {
   backgroundImage:
-    "url('https://liblibai-web-static.liblib.cloud/liblibai_v4_online/static/_next/static/images/defaultBgImg.381282c0f2b01780c83d8fe6dc0aa90a.png')",
+    "url('https://img.zcool.cn/community/special_cover/3a9a64d3628c000c2a1000657eec.jpg')",
 };
 
 const publishParams = ref({
   pageNum: 1,
-  pageSize: 12,
+  pageSize: 20,
   orderByColumn: "create_time",
   userId: userId,
 });
@@ -287,6 +287,10 @@ getIsAttention()
 
 // 去关注/取消关注当前用户
 async function onAttention(item:any){
+  const myUserId = userStore.userInfo.userId
+    if(myUserId === item.userId){
+      return message.warning('自己不能关注自己')
+    }
   let paramsUserId
   if(item.userId){
     paramsUserId = item.userId
diff --git a/app/pages/picture-square.vue b/app/pages/picture-square.vue
index ab6c4cb..7453db2 100644
--- a/app/pages/picture-square.vue
+++ b/app/pages/picture-square.vue
@@ -110,7 +110,7 @@ function changeCategory(item: any) {
         </MenuFold>
       </div>
     </div>
-    <div class="flex flex-wrap">
+    <div class="w-full">
       <NConfigProvider>
         <NMessageProvider>
           <PictureList ref="listRef" :params="params" />
diff --git a/app/pages/publish-model/index.vue b/app/pages/publish-model/index.vue
index 0d08d80..673b74a 100644
--- a/app/pages/publish-model/index.vue
+++ b/app/pages/publish-model/index.vue
@@ -19,6 +19,7 @@ async function initFormData() {
   if (type === "add") {
     formData.value = {
       modelProduct: {
+        jurisdiction:1, //是否公开
         modelName: "",
         modelType: null, // ,，模型类型
         category: null, // 垂类分类
@@ -102,10 +103,10 @@ const timeLineList = ref([
   },
 ]);
 async function nextStep() {
-  if(currentStep.value === 1){
+  if(currentStep.value === 1 && type === 'add'){
     const name =  formData.value.modelProduct.modelName
     try {
-      const res = await request.get(`/file/selectFile?type=model&name=${name}`);
+      const res = await request.get(`/model/selectModelByName?name=${name}`);
       if (res.code == 200) {
         if(res.data === 1){ //存在为0 不存在为1
           currentStep.value += 1;
diff --git a/app/pages/publish-workflow/index.vue b/app/pages/publish-workflow/index.vue
index 34e78e5..1b4f03a 100644
--- a/app/pages/publish-workflow/index.vue
+++ b/app/pages/publish-workflow/index.vue
@@ -5,10 +5,10 @@ import UploadImg from "@/components/publishWorkFlow/UploadImg.vue";
 import { CirclePlus } from "lucide-vue-next";
 import { NConfigProvider, NMessageProvider } from "naive-ui";
 import { useRoute } from "vue-router";
+const message = useMessage();
 
 const route = useRoute();
 const { type, id } = route.query;
-
 const formData = ref();
 
 async function initFormData() {
@@ -73,12 +73,16 @@ function handleAddVersion() {
 }
 async function nextStep() {
   // currentStep.value += 1;
-  if(currentStep.value === 1){
+  if(currentStep.value === 1 && type === 'add'){
     const name =  formData.value.workFlow.workflowName
     try {
-      const res = await request.get(`/file/selectFile?type=workflow&name=${name}`);
+      const res = await request.get(`/WorkFlow/selectWorkFlowByName?name=${name}`);
       if (res.code == 200) {
-        currentStep.value += 1;
+        if(res.data === 0 ){
+          currentStep.value += 1;
+        }else{
+          message.warning('该工作流名称已存在')
+        }
       }
     } catch (err) {
       console.log(err);
diff --git a/app/pages/search/index.vue b/app/pages/search/index.vue
index 389f2a3..1dc032b 100644
--- a/app/pages/search/index.vue
+++ b/app/pages/search/index.vue
@@ -67,7 +67,6 @@ const imageParams = ref({
 if(type != 'undefined'){
   currentType.value = type
 }
-// debugger
 // if(keyword){
 //   modelParams.value.name = keyword;
 //   imageParams.value.name = keyword;
diff --git a/app/pages/us/aboutUs/index.vue b/app/pages/us/aboutUs/index.vue
new file mode 100644
index 0000000..21fe470
--- /dev/null
+++ b/app/pages/us/aboutUs/index.vue
@@ -0,0 +1,19 @@
+<template>
+  <div class="max-w-4xl mx-auto bg-white rounded-xl shadow-md overflow-hidden">
+    <div class="p-8">
+      <h1
+        class="text-3xl font-bold text-center text-blue-600 mb-10 pb-6 border-b border-gray-200"
+      >
+        关于魔创未来
+      </h1>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "header",
+});
+</script>
+
+<style scoped></style>
diff --git a/app/pages/us/agreement/index.vue b/app/pages/us/agreement/index.vue
new file mode 100644
index 0000000..10191cf
--- /dev/null
+++ b/app/pages/us/agreement/index.vue
@@ -0,0 +1,19 @@
+<template>
+  <div class="max-w-4xl mx-auto bg-white rounded-xl shadow-md overflow-hidden">
+    <div class="p-8">
+      <h1
+        class="text-3xl font-bold text-center text-blue-600 mb-10 pb-6 border-b border-gray-200"
+      >
+        用户协议
+      </h1>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "header",
+});
+</script>
+
+<style scoped></style>
diff --git a/app/pages/us/privacy/index.vue b/app/pages/us/privacy/index.vue
new file mode 100644
index 0000000..0dc85cb
--- /dev/null
+++ b/app/pages/us/privacy/index.vue
@@ -0,0 +1,119 @@
+<template>
+  <div class="min-h-screen bg-gray-50 py-12 px-4 sm:px-6 lg:px-8">
+    <div class="max-w-4xl mx-auto bg-white rounded-xl shadow-md overflow-hidden">
+      <div class="p-8">
+        <h1 class="text-3xl font-bold text-center text-blue-600 mb-10 pb-6 border-b border-gray-200">
+          隐私声明
+        </h1>
+
+        <div class="space-y-8">
+          <!-- 声明内容 -->
+          <section class="hover:bg-gray-50 p-6 rounded-lg transition duration-300">
+            <p class="text-gray-600 leading-relaxed">
+              我们重视您的隐私。本网站承诺对您的个人信息进行严格保密，未经您的许可，我们不会向任何第三方透露您的个人信息。
+            </p>
+          </section>
+
+          <!-- 信息收集范围 -->
+          <section class="hover:bg-gray-50 p-6 rounded-lg transition duration-300">
+            <h2 class="text-xl font-semibold text-gray-800 mb-4 flex items-center">
+              <div class="w-1 h-6 bg-blue-500 rounded mr-3"></div>
+              信息收集范围
+            </h2>
+            <p class="text-gray-600 mb-4">在您浏览本网站时，我们可能会收集以下信息：</p>
+            <ul class="list-disc list-inside text-gray-600 space-y-2">
+              <li>必要的访问日志（IP地址、访问时间）</li>
+              <li>浏览器类型、操作系统等基本设备信息</li>
+              <li>访问页面的记录</li>
+            </ul>
+          </section>
+
+          <!-- 信息用途 -->
+          <section class="hover:bg-gray-50 p-6 rounded-lg transition duration-300">
+            <h2 class="text-xl font-semibold text-gray-800 mb-4 flex items-center">
+              <div class="w-1 h-6 bg-blue-500 rounded mr-3"></div>
+              信息用途
+            </h2>
+            <p class="text-gray-600 mb-4">我们收集这些信息的目的是：</p>
+            <ul class="list-disc list-inside text-gray-600 space-y-2">
+              <li>优化网站性能和用户体验</li>
+              <li>进行网站安全维护</li>
+              <li>提供更好的服务支持</li>
+            </ul>
+          </section>
+
+          <!-- Cookie说明 -->
+          <section class="hover:bg-gray-50 p-6 rounded-lg transition duration-300">
+            <h2 class="text-xl font-semibold text-gray-800 mb-4 flex items-center">
+              <div class="w-1 h-6 bg-blue-500 rounded mr-3"></div>
+              Cookie说明
+            </h2>
+            <p class="text-gray-600">
+              本网站使用Cookie来改善您的浏览体验。这些Cookie不会收集您的个人身份信息。您可以通过浏览器设置来管理或禁用Cookie。
+            </p>
+          </section>
+
+          <!-- 安全措施 -->
+          <section class="hover:bg-gray-50 p-6 rounded-lg transition duration-300">
+            <h2 class="text-xl font-semibold text-gray-800 mb-4 flex items-center">
+              <div class="w-1 h-6 bg-blue-500 rounded mr-3"></div>
+              安全措施
+            </h2>
+            <p class="text-gray-600">
+              我们采用业界标准的安全措施来保护您的信息安全，包括但不限于：SSL加密传输、数据访问控制等。
+            </p>
+          </section>
+
+          <!-- 免责声明 -->
+          <section class="hover:bg-gray-50 p-6 rounded-lg transition duration-300">
+            <h2 class="text-xl font-semibold text-gray-800 mb-4 flex items-center">
+              <div class="w-1 h-6 bg-blue-500 rounded mr-3"></div>
+              免责声明
+            </h2>
+            <p class="text-gray-600">
+              对于通过本网站链接到的第三方网站，我们不对其隐私保护措施负责。建议您在访问这些网站时查看其隐私政策。
+            </p>
+          </section>
+
+          <!-- 更新提醒 -->
+          <section class="hover:bg-gray-50 p-6 rounded-lg transition duration-300">
+            <h2 class="text-xl font-semibold text-gray-800 mb-4 flex items-center">
+              <div class="w-1 h-6 bg-blue-500 rounded mr-3"></div>
+              更新提醒
+            </h2>
+            <p class="text-gray-600">
+              我们保留随时更新本隐私声明的权利。更新后的声明将在本页面公布，请您定期查看。
+            </p>
+          </section>
+
+          <!-- 联系方式 -->
+          <section class="hover:bg-gray-50 p-6 rounded-lg transition duration-300">
+            <h2 class="text-xl font-semibold text-gray-800 mb-4 flex items-center">
+              <div class="w-1 h-6 bg-blue-500 rounded mr-3"></div>
+              联系方式
+            </h2>
+            <div class="bg-gray-50 p-6 rounded-lg">
+              <p class="text-gray-600">如您对本隐私声明有任何疑问，请通过以下方式联系我们：</p>
+              <p class="text-gray-600 mt-2">📧 邮箱：contact@example.com</p>
+            </div>
+          </section>
+
+          <!-- 更新日期 -->
+          <div class="text-right text-gray-500 pt-6 border-t border-gray-200">
+            最后更新日期：2024年3月8日
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "header",
+});
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/app/pages/wallet/index.vue b/app/pages/wallet/index.vue
new file mode 100644
index 0000000..46089ce
--- /dev/null
+++ b/app/pages/wallet/index.vue
@@ -0,0 +1,224 @@
+<template>
+  <div>
+    <div class="p-4 flex text-white gap-3">
+      <div
+        class="w-60 h-28 bg-[#a494f7] px-8 py-6 rounded-lg flex flex-col justify-around"
+      >
+        <div class="text-xl">累计收入金额</div>
+        <div class="text-base">¥ {{ totalAmount || 0 }}</div>
+      </div>
+      <div
+        class="w-60 h-28 bg-[#e87988] px-8 py-6 rounded-lg flex flex-col justify-around"
+      >
+        <div class="text-xl flex justify-between items-center">
+          <div>可提现金额</div>
+          <div
+            class="text-sm cursor-pointer select-none text-[#524f4f]"
+            @click="showModal"
+          >
+            提现 >
+          </div>
+        </div>
+        <div class="text-base">¥ {{ integralGold.wallet || 0 }}</div>
+      </div>
+    </div>
+    <div class="p-4 text-[#06186d]">
+      <n-tabs v-model:value="activeTab" type="line" animated>
+        <!-- <n-tab-pane name="allDetail" tab="全部明细">
+          <div
+            class="border border-solid border-gray-200 rounded-lg relative text-[#06186d]"
+          >
+            <div class="mc-table flex w-full bg-gray-100 sticky top-0">
+              <div class="w-[250px]">获取时间</div>
+              <div class="w-[250px]">获取来源</div>
+              <div class="flex-1">详情</div>
+              <div class="w-[200px]">金币值</div>
+            </div>
+            <n-infinite-scroll
+              style="height: calc(100vh - 300px)"
+              :distance="10"
+              @load="getPoints"
+            >
+              <div v-for="item in allDetailList" :key="item" class="mc-table flex w-full">
+                <div class="w-[250px]">
+                  {{ item.orderTime }}
+                </div>
+                <div class="w-[250px]">{{ item.productName }}</div>
+                <div class="flex-1">-</div>
+                <div class="w-[200px]">
+                  {{ item.paymentAmount }}
+                </div>
+              </div>
+            </n-infinite-scroll>
+          </div>
+        </n-tab-pane> -->
+        <n-tab-pane name="withdrawDetail" tab="提现明细">
+          <div class="border border-solid border-gray-200 rounded-lg relative">
+            <div class="mc-table flex w-full bg-[#e5ecf4] sticky top-0">
+              <div class="w-[250px]">提现时间</div>
+              <div class="w-[250px]">账户类型</div>
+              <div class="flex-1">详情</div>
+              <div class="w-[200px]">提现金额</div>
+            </div>
+            <n-infinite-scroll
+              style="height: calc(100vh - 300px)"
+              :distance="10"
+              @load="getWithdrawDetail"
+            >
+              <div
+                v-for="item in withdrawDetailList"
+                :key="item"
+                class="mc-table flex w-full"
+              >
+                <div class="w-[250px]">
+                  {{ item.createTime }}
+                </div>
+                <div class="w-[250px]">{{ item.account }}</div>
+                <div class="flex-1">-</div>
+                <div class="w-[200px]">
+                  {{ item.amount }}
+                </div>
+              </div>
+            </n-infinite-scroll>
+          </div>
+        </n-tab-pane>
+      </n-tabs>
+    </div>
+
+    <n-modal v-model:show="showWalletModal">
+      <n-card
+        style="width: 600px"
+        :bordered="false"
+        size="huge"
+        role="dialog"
+        aria-modal="false"
+        preset="dialog"
+      >
+        <div class="flex justify-between">
+        <div class="text-xl">
+          提现
+        </div>
+          <n-icon size="20" class="mr-2 cursor-pointer" @click="closeWalletModal">
+            <Close />
+          </n-icon>
+        </div>
+        <div class="py-4">
+          <div class="text-sm text-gray-600">
+            可提现金额: ¥ {{ integralGold.wallet || 0 }}
+          </div>
+          <div class="mt-6">
+            <n-input-number
+              placeholder="输入要提现的金额"
+              v-model:value="needWalletNum"
+              :precision="2"
+              clearable
+            />
+          </div>
+        </div>
+        <div class="flex justify-center mt-6">
+          <n-button type="error" @click="closeWalletModal"> 取消 </n-button>
+          <n-button type="primary" class="ml-8" @click="handleWallet"> 确定 </n-button>
+        </div>
+      </n-card>
+    </n-modal>
+  </div>
+</template>
+
+<script setup>
+import { isAmount } from '@/utils/index.ts';
+import { Close } from "@vicons/ionicons5";
+import { ref } from "vue";
+const activeTab = ref("withdrawDetail");
+const showWalletModal = ref(false);
+const showModal = () => {
+  showWalletModal.value = true;
+};
+const closeWalletModal = () => {
+  showWalletModal.value = false;
+  needWalletNum.value = 0
+};
+// const allDetailList = ref([]);
+// 获取可提现金额
+const integralGold = ref({});
+async function getIntegralGold() {
+  try {
+    const res = await request.post("/personalCenter/getPointAndWallet");
+    if (res.code === 200) {
+      integralGold.value = res.data;
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+getIntegralGold();
+
+// 提现操作
+const needWalletNum = ref(0)
+const handleWallet = async() =>{
+  if(isAmount(needWalletNum.value)){
+    try {
+      const res = await request.get(`/ali/pay/fetch?amount=${needWalletNum.value}`);
+      if (res.code === 200) {
+        closeWalletModal()
+        getIntegralGold()
+      }
+    } catch (err) {
+      console.log(err);
+    }
+  }else{
+    message.warning('请输入正确的金额')
+  }
+}
+
+//获取累计收入金额
+const totalAmount = ref(0);
+async function getTotalAmount() {
+  try {
+    const res = await request.get("/invitation/totalAmount");
+    if (res.code === 200) {
+      totalAmount.value = res.data;
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+getTotalAmount();
+
+//获取提现明细列表
+const withdrawFinished = ref(false);
+const withdrawDetailList = ref([]);
+const withdrawParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+});
+async function getWithdrawDetail() {
+  try {
+    if (withdrawFinished.value) return;
+    const res = await request.post("/invitation/withdrawalRecord", withdrawParams.value);
+    if (res.code === 200) {
+      // withdrawDetailList.value = res.data;
+      if (withdrawParams.value.pageNum === 1) {
+        withdrawDetailList.value = res.rows;
+      } else {
+        withdrawDetailList.value = [...withdrawDetailList.value, ...res.rows];
+      }
+      // 判断是否加载完所有数据
+      if (withdrawDetailList.value.length >= res.total) {
+        withdrawFinished.value = true;
+      }
+      withdrawParams.value.pageNum++;
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+getWithdrawDetail();
+</script>
+
+<style scoped>
+.mc-table {
+  padding: 10px;
+  line-height: 40px;
+  border-bottom: 1px solid #eee;
+}
+</style>
diff --git a/app/pages/work-square.vue b/app/pages/work-square.vue
index 54cc94c..9dbf1f3 100644
--- a/app/pages/work-square.vue
+++ b/app/pages/work-square.vue
@@ -109,7 +109,7 @@ function changeCategory(item: any) {
         </MenuFold>
       </div>
     </div>
-    <div class="flex flex-wrap">
+    <div class="w-full">
       <NConfigProvider>
         <NMessageProvider>
           <WorkFlowList ref="listRef" :params="params" />
diff --git a/app/pages/workflow-details/[id].vue b/app/pages/workflow-details/[id].vue
index 8fe21fe..1aad2cb 100644
--- a/app/pages/workflow-details/[id].vue
+++ b/app/pages/workflow-details/[id].vue
@@ -1,11 +1,12 @@
-<script setup lang="ts">
+<script setup>
 import { commonApi } from "@/api/common";
+import { formatFileSize } from '@/utils/index.ts';
 import { Close, DiamondSharp, PersonAddOutline } from '@vicons/ionicons5';
 
 import {
 CircleUser,
 Download,
-EllipsisVertical, Heart, Play
+EllipsisVertical, Heart, Play, SquareCheck, SquarePlus
 } from 'lucide-vue-next';
 // import { NConfigProvider, NMessageProvider } from 'naive-ui';
 import { nextTick, ref } from 'vue';
@@ -20,11 +21,11 @@ definePageMeta({
 })
 // const userStore = useUserStore()
 const route = useRoute()
-const { id } = route.params as { id: string }
+const { id } = route.params
 const activeTab = ref(null)
 const commentHeight = ref(800)
 const detailsInfo = ref({})
-const currentUserInfo = ref<any>({})
+const currentUserInfo = ref({})
 const isVisibleReport = ref(false);
 
 // 先获取用户信息 再获取版本信息
@@ -74,13 +75,13 @@ async function getInfo() {
 getInfo()
 
 // 获取用户点赞/粉丝/关注数量
-interface SelectUserInfo {
-  likeCount: number
-  bean: number
-  download: number
-  attention: number
-}
-const selectUserInfo = ref<SelectUserInfo>({
+// interface SelectUserInfo {
+//   likeCount: number
+//   bean: number
+//   download: number
+//   attention: number
+// }
+const selectUserInfo = ref({
   likeCount: 0,
   bean: 0,
   download: 0,
@@ -102,8 +103,7 @@ async function getAttention() {
 
 // 举报/编辑/删除
 const isDelete = ref(false)
-async function handleSelect(event: Event, type: string) {
-  event.stopPropagation() // 阻止事件冒泡
+async function handleSelect(type) {
   if (type === 'report') {
     // await request.get(`/WorkFlow/report?id=${id}`) // 举报
     isVisibleReport.value = true;
@@ -195,7 +195,7 @@ async function getDictType() {
   }
 }
 getDictType();
-function handleChange(item: any) {
+function handleChange(item) {
   reportParams.value.reportId = item.dictValue;
   if (item.dictValue !== "5") {
     reportParams.value.text = "";
@@ -230,6 +230,50 @@ function toPersonalCenter(){
     window.open(`${baseUrl}/personal-publish?userId=${detailsInfo.value.userId}`, '_blank', 'noopener,noreferrer')
   }
 }
+
+const currentTabsIndex = ref(0);
+function handleTabChange(id) {
+  for (let i = 0; i < versionByWorkInfo.value.length; i++) {
+    if (id === versionByWorkInfo.value[i].id) {
+      currentTabsIndex.value = i;
+    }
+  }
+}
+async function addCollect(){
+  try {
+    const params = {
+      "productId": versionByWorkInfo.value[currentTabsIndex.value].id,
+      "productType": 1,
+    }
+    const res = await request.post("/collect/addCollect", params);
+    if (res.code === 200) {
+      versionByWorkInfo.value[currentTabsIndex.value].isCollect = res.data
+      if(res.data === 0){
+        message.success("已加入收藏");
+      }else{
+        message.success("已取消收藏");
+      }
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+
+async function handelDown(){
+  try {
+      const res = await request.get(`/WorkFlowVersion/workFlowFileDownload?id=${versionByWorkInfo.value[currentTabsIndex.value].id}`);
+      if (res.code === 200) {
+        const link = document.createElement('a');
+      link.href = res.data;
+      link.download = res.msg; // 自定义文件名
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      }
+    } catch (err) {
+      console.log(err);
+    }
+}
 </script>
 
 <template>
@@ -290,7 +334,9 @@ function toPersonalCenter(){
       <div class="flex w-full gap-1">
         <div class="w-2/3">
           <div class="w-full">
-            <n-tabs v-model:value="activeTab" type="line" animated>
+            <n-tabs v-model:value="activeTab" type="line" animated 
+            @update:value="handleTabChange"
+            >
               <n-tab-pane
                 v-for="(item, index) in versionByWorkInfo"
                 :key="index"
@@ -462,7 +508,7 @@ function toPersonalCenter(){
             <span class="mr-1"> 立即生图 </span>
           </div>
 
-          <div
+          <!-- <div
             class="flex items-center justify-center mt-4 w-full h-14 text-black bg-[#eceef4] w-full rounded-md h-[50px] cursor-pointer hover:bg-[#f1f2f7]"
           >
             <component
@@ -470,8 +516,37 @@ function toPersonalCenter(){
               class="h-[20px] w-[20px] text-black menu-icon m-1 text-[#969798]"
             />
             <span class="mr-1"> 下载 (122.22MB) </span>
-          </div>
+          </div> -->
+          <div class="flex gap-y-2">
+            <div
+              v-if="versionByWorkInfo.length > 0"
+              @click="addCollect"
+              class="flex flex-1 items-center justify-center bg-[#eceef4] h-[50px] mt-4 mr-1 rounded-md cursor-pointer"
+            >
+              <component
+                :is="
+                  versionByWorkInfo[currentTabsIndex].isCollect === 1
+                    ? SquarePlus
+                    : SquareCheck
+                "
+                class="h-[20px] w-[20px] text-black menu-icon m-1 text-[#969798]"
+              />
+              <span class="mr-1">
+                {{ versionByWorkInfo[currentTabsIndex].isCollect === 1 ? '加入收藏' : '已收藏'}}
+              </span>
+            </div>
 
+            <div
+            @click="handelDown"
+              class="flex flex-1 items-center bg-gradient-to-r from-[#ffe9c8] to-[#ffd264] justify-center ml-1 mt-4 text-black bg-[#eceef4] w-full rounded-md h-[50px] cursor-pointer"
+            >
+              <component
+                :is="Download"
+                class="h-[20px] w-[20px] text-black menu-icon m-1 text-[#969798]"
+              />
+              <span class="mr-1" v-if="versionByWorkInfo.length > 0"> 下载 {{ formatFileSize(versionByWorkInfo[currentTabsIndex].fileSize) }} </span>
+            </div>
+          </div>
           <!-- <div style="background: linear-gradient(135deg,#3cc9ff, #8fa6ff, 41%, #d8b4ff 74%,#326bff)" class="flex items-center justify-center mt-4 w-full h-14 text-black bg-[#fff] w-full rounded-md h-[80px] cursor-pointer hover:bg-[#f1f2f7]">
             <component :is="Download" class="h-[20px] w-[20px] text-black menu-icon m-1 text-[#969798]" />
             <span class="mr-1">
@@ -486,7 +561,7 @@ function toPersonalCenter(){
             content="确定要将工作流删除? 工作流删除后无法找回"
             negative-text="取消"
             positive-text="确认"
-            @negative-click="onDelete"
+            @negative-click="isDelete = false"
             @positive-click="onDelete"
           />
 
@@ -550,7 +625,7 @@ function toPersonalCenter(){
   </div>
 </template>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .header-num {
   @apply flex items-center bg-[#f4f5f9] px-2 rounded-full;
 }
diff --git a/app/stores/user.ts b/app/stores/user.ts
index 83eeb8d..b2b24a3 100644
--- a/app/stores/user.ts
+++ b/app/stores/user.ts
@@ -24,7 +24,9 @@ export const useUserStore = defineStore('user', () => {
 
   function setUserInfo(info: any) {
     userInfo.value = info
-    debugger
+    if(!info.avatar){
+      userInfo.value.avatar = defaultAvatar
+    }
   }
   async function getUserInfo() {
     const res = await request.get('/system/user/selectUserById', {
@@ -37,7 +39,6 @@ export const useUserStore = defineStore('user', () => {
   }
   // 登出
   function logout() {
-    console.log('object-------out');
     isLoggedIn.value = false
     token.value = ''
     userInfo.value = {} as UserInfoType
@@ -97,11 +98,9 @@ export const useUserStore = defineStore('user', () => {
 //   actions: {
 //     setToken(token: string) {
 //       this.token = token
-//       debugger
 //     },
 //     setUserInfo(userInfo: Record<string, any>) {
 //       this.userInfo = userInfo
-//       debugger
 //     },
 //     // logout() {
 //     //   getLogout().then(() => {
diff --git a/app/utils/index.ts b/app/utils/index.ts
index fc2cf26..78151ab 100644
--- a/app/utils/index.ts
+++ b/app/utils/index.ts
@@ -5,3 +5,24 @@ export async function formatDate(timestamp: string) {
   const day = String(date.getDate()).padStart(2, '0')
   return `${year}-${month}-${day}`
 }
+
+export function formatFileSize(bytes:number = 0, decimals = 2) {
+  if (bytes === 0) return '0 B';
+
+  const k = 1024; // 1 KB = 1024 B
+  const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+  const i = Math.floor(Math.log(bytes) / Math.log(k)); // 计算单位索引
+
+  // 转换为合适的单位并保留指定小数位数
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(decimals)) + ' ' + sizes[i];
+}
+
+export function isAmount(str:any) {
+  const amountRegex = /^\d+(\.\d{1,2})?$/;
+  return amountRegex.test(str);
+}
+
+// function isAmount(str) {
+//   // 正则表达式
+ 
+// }
\ No newline at end of file
diff --git a/app/utils/request.ts b/app/utils/request.ts
index 57b7c0e..b383376 100644
--- a/app/utils/request.ts
+++ b/app/utils/request.ts
@@ -3,7 +3,6 @@ import { useModalStore } from '@/stores/modal.ts';
 import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
 import axios from 'axios';
 import { createDiscreteApi } from 'naive-ui';
-
 const { message, loadingBar } = createDiscreteApi(['message', 'loadingBar'])
 
 // 定义响应数据接口
@@ -105,7 +104,7 @@ class RequestHttp {
         message.error('请求参数错误')
         break
       case 401:
-        // message.error('未登录或登录已过期')
+        message.error('未登录或登录已过期')
         break
       case 403:
         message.error('没有权限')
diff --git a/nuxt.config.ts b/nuxt.config.ts
index cd055dc..a22deba 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -28,9 +28,9 @@ export default defineNuxtConfig({
     head: {
       viewport: 'width=device-width,initial-scale=1',
       link: [
-        { rel: 'icon', href: '/favicon.ico', sizes: 'any' },
-        { rel: 'icon', type: 'image/svg+xml', href: '/nuxt.svg' },
-        { rel: 'apple-touch-icon', href: '/apple-touch-icon.png' },
+        // { rel: 'icon', href: '/favicon.ico', sizes: 'any' },
+        // { rel: 'icon', type: 'image/svg+xml', href: '/nuxt.svg' },
+        // { rel: 'apple-touch-icon', href: '/apple-touch-icon.png' },
       ],
       meta: [
         { name: 'viewport', content: 'width=device-width, initial-scale=1' },
@@ -80,11 +80,12 @@ export default defineNuxtConfig({
   compatibilityDate: '2025-01-23',
 
   nitro: {
+    preset: 'node-server',
     devProxy: {
       '/api': {
         // target: 'http://1.13.246.108:8080', // 线上
-        // target: 'http://192.168.2.10:8080', // 代
-        target: 'http://192.168.2.7:8080', // 嗨
+        target: 'http://192.168.2.10:8080', // 代
+        // target: 'http://192.168.2.7:8080', // 嗨
         // target: 'https://2d1a399f.r27.cpolar.top', // 嗨
         changeOrigin: true,
         prependPath: true,
diff --git a/public/favicon.ico b/public/favicon.ico
index 6a1b12d929477f05380b22db8936134c3a2db0a1..1d6a3a970d7b5eace10f80c06a62ee06efe6640b 100644
GIT binary patch
literal 15406
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

literal 15086
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
UA~Q#bY~eZY8YJ*-xA-adE_@>bX#fBK

diff --git a/public/favicon1.ico b/public/favicon1.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6a1b12d929477f05380b22db8936134c3a2db0a1
GIT binary patch
literal 15086
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
UA~Q#bY~eZY8YJ*-xA-adE_@>bX#fBK

literal 0
HcmV?d00001

diff --git a/public/favicon2.ico b/public/favicon2.ico
new file mode 100644
index 0000000000000000000000000000000000000000..779d0f11c401fccc7554331d9ba79c4bc8ed9301
GIT binary patch
literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$JxN4CR9HvtmO&1}AP_~FuIo}ggN=8vo=iQN^$w<<!Mbd>b_|$CL}2I?ZA{9B
zMWMX;%pV5C$OA?`U;H;fea-e#!P&A@GiR_BsBh~WuszB{5ygQE!3Jom)lmq@M*+~I
z?_}qyz*0bu{^tO;=!Zb`R=^hhR{><iqHR^O$pIjCe!F3T2q%#wg|g`UtY+8vP(XSc
z05@HRbG&Weg9;>FT(<i6Hvr%L#sWb|wz?_~1t^($I5w+Vlkj;BaUooF!s&vT5WXVi
zwP6ehszQ==U<d?txUzLfI{Au^dp{PY<!oyM0Wu5$HP@tzlKelpK>oC;Mg$mAoXn!b
zx`IIf0i6<g1=Q;&A05E^&h~ahaY1PF@l?tLp`8$*z$*bmA~HcJCy)SLKhU@94c$iq
haQxqA&jc_j@Bm!3#vvD28%O{E002ovPDHLkV1gbAq5J><

literal 0
HcmV?d00001