diff --git a/.gitignore b/.gitignore
index 694a590..9805cf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+env.d.ts
diff --git a/env.d.ts b/env.d.ts
index 0b5612e..06bac64 100644
--- a/env.d.ts
+++ b/env.d.ts
@@ -1,6 +1,8 @@
 /// <reference types="vite/client" />
 interface ImportMeta {
   env: {
-    VITE_DEBUG_API?: string
+    VITE_DEBUG_DEV_API?: string
+    VITE_DEBUG_RELEASE_API?: string
+    VITE_API?: string
   }
 }
diff --git a/index.html b/index.html
index 927ea28..7248f94 100644
--- a/index.html
+++ b/index.html
@@ -23,11 +23,5 @@
     </noscript>
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>
-
-    <script>
-      document.body.clientWidth < 700
-        ? (document.getElementById('afdian_leaflet_vtsuru').width = '100%')
-        : (document.getElementById('afdian_leaflet_vtsuru').width = '640')
-    </script>
   </body>
 </html>
diff --git a/src/api/api-models.ts b/src/api/api-models.ts
index c43dc7f..57502f7 100644
--- a/src/api/api-models.ts
+++ b/src/api/api-models.ts
@@ -15,6 +15,12 @@ export enum IndexTypes {
 export enum SongListTypes {
   Default,
 }
+export enum GuardLevel {
+  None = 0,
+  Zongdu = 1,
+  Tidu = 2,
+  Jianzhang = 3,
+}
 export interface UserBasicInfo {
   name: string
   id: number
@@ -242,7 +248,7 @@ export enum QueueSortType {
   GuardFirst,
   PaymentFist,
   TimeFirst,
-  FansMedalFirst
+  FansMedalFirst,
 }
 
 export enum QueueGiftFilterType {
@@ -604,6 +610,10 @@ export enum GoodsTypes {
   Physical,
   Virtual,
 }
+export interface PointGoodsSetting {
+  guardFree?: { year: number; month: number }
+  allowGuardLevel?: GuardLevel
+}
 export interface ResponsePointGoodModel {
   id: number
   name: string
@@ -620,6 +630,10 @@ export interface ResponsePointGoodModel {
   maxBuyCount?: number
   collectUrl?: string
   embedCollectUrl?: boolean
+
+  canFreeBuy: boolean
+  allowGuardLevel: GuardLevel
+  setting: PointGoodsSetting
 }
 export interface ImageUploadModel {
   existImages: string[]
@@ -640,6 +654,8 @@ export interface PointGoodsModel {
   content?: string
   isAllowRebuy: boolean
   maxBuyCount?: number
+
+  setting: PointGoodsSetting
 }
 export interface AddressInfo {
   id?: string
@@ -727,7 +743,7 @@ export enum PointFrom {
   Use,
 }
 
-export interface ResponseUserIndexModel{
+export interface ResponseUserIndexModel {
   notification: string
   videos: VideoCollectVideo[]
   links: {
diff --git a/src/components/manage/PointGoodsItem.vue b/src/components/manage/PointGoodsItem.vue
index 671a410..70f52ee 100644
--- a/src/components/manage/PointGoodsItem.vue
+++ b/src/components/manage/PointGoodsItem.vue
@@ -1,17 +1,19 @@
 <script setup lang="ts">
 import { GoodsTypes, ResponsePointGoodModel } from '@/api/api-models'
 import { FILE_BASE_URL, IMGUR_URL } from '@/data/constants'
-import { NCard, NEllipsis, NEmpty, NFlex, NImage, NTag, NText } from 'naive-ui'
+import { NAlert, NCard, NEllipsis, NEmpty, NFlex, NIcon, NImage, NTag, NText } from 'naive-ui'
+import { VehicleShip20Filled } from '@vicons/fluent'
 
 const props = defineProps<{
   goods: ResponsePointGoodModel | undefined
+  contentStyle?: string | undefined
 }>()
 const emptyCover = IMGUR_URL + 'None.png'
 </script>
 
 <template>
   <NEmpty v-if="!goods" description="已失效" />
-  <NCard v-else embedded>
+  <NCard v-else embedded :style="props.contentStyle">
     <template #cover>
       <NImage
         :src="goods.cover ? FILE_BASE_URL + goods.cover : emptyCover"
@@ -44,10 +46,18 @@ const emptyCover = IMGUR_URL + 'None.png'
       </NFlex>
     </template>
     <NFlex vertical>
-      <NText :depth="goods.description ? 1 : 3" :italic="!goods.description">
-        {{ goods.description ? goods.description : '暂无描述' }}
-      </NText>
+      <NEllipsis :line-clamp="2">
+        <NText :depth="goods.description ? 1 : 3" :italic="!goods.description">
+          {{ goods.description ? goods.description : '暂无描述' }}
+        </NText>
+      </NEllipsis>
       <NFlex>
+        <NTag v-if="goods.allowGuardLevel > 0"  size="tiny" :color="{ color: '#5f5f5f', textColor: 'gold' }">
+          <template #icon>
+            <NIcon :component="VehicleShip20Filled" />
+          </template>
+          仅限舰长
+        </NTag>
         <NTag v-for="tag in goods.tags" :key="tag" :bordered="false" size="tiny">{{ tag }}</NTag>
       </NFlex>
     </NFlex>
diff --git a/src/data/constants.ts b/src/data/constants.ts
index 4b6f0df..c224597 100644
--- a/src/data/constants.ts
+++ b/src/data/constants.ts
@@ -1,7 +1,8 @@
 import DefaultIndexTemplateVue from '@/views/view/indexTemplate/DefaultIndexTemplate.vue'
 import { defineAsyncComponent, ref } from 'vue'
 
-const debugAPI = import.meta.env.VITE_DEBUG_API
+const debugAPI =
+  import.meta.env.VITE_API == 'dev' ? import.meta.env.VITE_DEBUG_DEV_API : import.meta.env.VITE_DEBUG_RELEASE_API
 const releseAPI = `https://vtsuru.suki.club/`
 const failoverAPI = `https://failover-api.vtsuru.suki.club/`
 
diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue
index ad58746..0ca5eef 100644
--- a/src/views/AboutView.vue
+++ b/src/views/AboutView.vue
@@ -45,6 +45,12 @@ import { NButton, NCard, NDivider, NLayoutContent, NSpace, NText, NTimeline, NTi
           ></iframe>
           <NDivider title-placement="left"> 更新日志 </NDivider>
           <NTimeline>
+            <NTimelineItem
+              type="info"
+              title="功能更新"
+              content="礼物兑换允许上舰用户免费兑换, 以及仅允许上舰用户兑换"
+              time="2024-4-23"
+            />
             <NTimelineItem
               type="info"
               title="功能更新"
diff --git a/src/views/manage/point/PointManage.vue b/src/views/manage/point/PointManage.vue
index 2421832..ffa0a5f 100644
--- a/src/views/manage/point/PointManage.vue
+++ b/src/views/manage/point/PointManage.vue
@@ -70,6 +70,7 @@ const defaultGoodsModel = {
     status: GoodsStatus.Normal,
     maxBuyCount: 1,
     isAllowRebuy: false,
+    setting: {},
   } as PointGoodsModel,
   fileList: [],
 } as { goods: PointGoodsModel; fileList: UploadFileInfo[] }
@@ -82,6 +83,24 @@ const showAddGoodsModal = ref(false)
 const isAllowedPrivacyPolicy = ref(false)
 const isUpdating = ref(false)
 
+const allowedYearOptions = computed(() => {
+  //从2024到现在的年份
+  return Array.from({ length: new Date().getFullYear() - 2024 + 1 }, (_, i) => 2024 + i).map((item) => {
+    return {
+      label: item.toString() + '年',
+      value: item,
+    }
+  })
+})
+const allowedMonthOptions = computed(() => {
+  return Array.from({ length: 12 }, (_, i) => i + 1).map((item) => {
+    return {
+      label: item.toString() + '月',
+      value: item + 1,
+    }
+  })
+})
+
 const rules = {
   name: {
     required: true,
@@ -197,13 +216,12 @@ async function updateGoods(e: MouseEvent) {
       if (currentGoodsModel.value.fileList.length > 0) {
         currentGoodsModel.value.goods.cover = await getImageUploadModel(currentGoodsModel.value.fileList)
       }
-      console.log(currentGoodsModel.value.goods)
       await QueryPostAPI<ResponsePointGoodModel>(POINT_API_URL + 'update-goods', currentGoodsModel.value.goods)
         .then((data) => {
           if (data.code == 200) {
             message.success('成功')
             showAddGoodsModal.value = false
-            currentGoodsModel.value.goods = {} as PointGoodsModel
+            currentGoodsModel.value = JSON.parse(JSON.stringify(defaultGoodsModel))
             if (goods.value.find((g) => g.id == data.data.id)) {
               goods.value[goods.value.findIndex((g) => g.id == data.data.id)] = data.data
             } else {
@@ -495,6 +513,59 @@ onMounted(() => {})
             + {{ currentGoodsModel.goods.cover ? '更换' : '上传' }}封面
           </NUpload>
         </NFormItem>
+        <NFormItem path="goods.guardFree" label="兑换规则">
+          <NFlex vertical>
+            <NCheckbox
+              :checked="currentGoodsModel.goods.setting?.guardFree != undefined"
+              @update:checked="
+                (v) => {
+                  // @ts-ignore
+                  currentGoodsModel.goods.setting.guardFree = v ? { year: undefined, month: undefined } : undefined
+                }
+              "
+            >
+              允许舰长免费兑换
+              <NTooltip>
+                <template #trigger>
+                  <NIcon :component="Info24Filled" />
+                </template>
+                仅当
+                <NButton type="info" text tag="a" href="/manage/event" target="_blank">舰长和SC</NButton>
+                中存在对应记录时才能生效
+              </NTooltip>
+            </NCheckbox>
+            <NFlex v-if="currentGoodsModel.goods.setting?.guardFree">
+              <NSelect
+                v-model:value="currentGoodsModel.goods.setting.guardFree.year"
+                :options="allowedYearOptions"
+                placeholder="请选择年份"
+              />
+              <NSelect
+                v-model:value="currentGoodsModel.goods.setting.guardFree.month"
+                :options="allowedMonthOptions"
+                placeholder="请选择月份"
+              />
+            </NFlex>
+            <NText>
+              最低兑换等级
+              <NTooltip>
+                <template #trigger>
+                  <NIcon :component="Info24Filled" />
+                </template>
+                仅当
+                <NButton type="info" text tag="a" href="/manage/event" target="_blank">舰长和SC</NButton>
+                中存在对应记录时才能生效
+              </NTooltip>
+            </NText>
+
+            <NRadioGroup v-model:value="currentGoodsModel.goods.setting.allowGuardLevel">
+              <NRadioButton :value="0">不限</NRadioButton>
+              <NRadioButton :value="1">总督</NRadioButton>
+              <NRadioButton :value="2">提督</NRadioButton>
+              <NRadioButton :value="3">舰长</NRadioButton>
+            </NRadioGroup>
+          </NFlex>
+        </NFormItem>
         <NFormItem path="goods.type" label="类型">
           <NRadioGroup v-model:value="currentGoodsModel.goods.type">
             <NRadioButton :value="GoodsTypes.Virtual">虚拟礼物</NRadioButton>
diff --git a/src/views/manage/point/PointUserManage.vue b/src/views/manage/point/PointUserManage.vue
index 99f7e6b..fcdfcd9 100644
--- a/src/views/manage/point/PointUserManage.vue
+++ b/src/views/manage/point/PointUserManage.vue
@@ -305,7 +305,7 @@ onMounted(async () => {
   <NModal
     v-model:show="showModal"
     preset="card"
-    style="max-width: 1800px; min-width: 400px"
+    style="max-width: 90vw; min-width: 400px; width: 1600px;"
     title="用户详情"
     content-style="padding: 0"
   >
diff --git a/src/views/pointViews/PointGoodsView.vue b/src/views/pointViews/PointGoodsView.vue
index 6b83635..b7ccfb4 100644
--- a/src/views/pointViews/PointGoodsView.vue
+++ b/src/views/pointViews/PointGoodsView.vue
@@ -196,7 +196,7 @@ onMounted(async () => {
       立即认证
     </NButton>
   </NAlert>
-  <NCard v-else style="max-width: 600px" embedded hoverable>
+  <NCard v-else style="max-width: 600px; margin: 0 auto;" embedded hoverable>
     <template #header> 你好, {{ useAuth.biliAuth.name }} </template>
     <template #header-extra>
       <NFlex>
@@ -209,41 +209,44 @@ onMounted(async () => {
   <NDivider />
   <NSpin :show="isLoading">
     <NEmpty v-if="goods.length == 0"> 暂无礼物 </NEmpty>
-    <NGrid v-else cols="1 500:2 700:3 1000:4 1200:5" x-gap="12" y-gap="8">
-      <NGridItem v-for="item in goods" :key="item.id">
-        <PointGoodsItem :goods="item">
-          <template #footer>
-            <NFlex justify="space-between" align="center">
+    <NFlex justify="center">
+      <PointGoodsItem v-for="item in goods" :key="item.id" :goods="item" content-style="max-width: 300px;height: 365px">
+        <template #footer>
+          <NFlex justify="space-between" align="center">
+            <NTooltip>
+              <template #trigger>
+                <NButton
+                  :disabled="getTooltip(item) != '开始兑换'"
+                  size="small"
+                  type="primary"
+                  @click="onBuyClick(item)"
+                  >兑换</NButton
+                >
+              </template>
+              {{ getTooltip(item) }}
+            </NTooltip>
+            <NFlex style="flex: 1" justify="end">
               <NTooltip>
                 <template #trigger>
-                  <NButton
-                    :disabled="getTooltip(item) != '开始兑换'"
-                    size="small"
-                    type="primary"
-                    @click="onBuyClick(item)"
-                    >兑换</NButton
-                  >
+                  <NText style="size: 34px" :delete="item.canFreeBuy">
+                    🪙
+                    {{ item.price }}
+                  </NText>
                 </template>
-                {{ getTooltip(item) }}
+                {{ item.canFreeBuy ? '你可以免费兑换此礼物' : '付费' }}
               </NTooltip>
-              <NFlex style="flex: 1" justify="end">
-                <NText style="size: 34px">
-                  🪙
-                  {{ item.price }}
-                </NText>
-              </NFlex>
             </NFlex>
-          </template>
-        </PointGoodsItem>
-      </NGridItem>
-    </NGrid>
+          </NFlex>
+        </template>
+      </PointGoodsItem>
+    </NFlex>
   </NSpin>
   <NModal
     v-model:show="showBuyModal"
     v-if="currentGoods"
     preset="card"
     title="确认兑换"
-    style="width: 400px; max-width: 90vw; height: auto"
+    style="width: 500px; max-width: 90vw; height: auto"
   >
     <template #header>
       <NFlex align="baseline">
@@ -295,6 +298,7 @@ onMounted(async () => {
     </NDivider>
     <NButton type="primary" :disabled="!canDoBuy" @click="buyGoods" :loading="isLoading"> 确认兑换 </NButton>
     <NText>
+      <NDivider vertical />
       所需积分: {{ currentGoods.price * buyCount }}
       <NDivider vertical />
       当前积分: {{ currentPoint }}