point add guard limit

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="功能更新"

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>

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"
   >

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 }}