From 33e36039325271e2f2be03f19f609597b476254b Mon Sep 17 00:00:00 2001
From: zhenhui <1276357500@qq.com>
Date: Wed, 4 Mar 2026 13:43:56 +0800
Subject: [PATCH] =?UTF-8?q?[=E8=89=B2=E5=AD=90=E6=B8=B8=E6=88=8F]=E7=8E=A9?=
 =?UTF-8?q?=E5=AE=B6=E6=8A=BD=E5=A5=96=E8=AE=B0=E5=BD=95-=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=8A=BD=E5=A5=96roll=5Farray=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BA=94=E4=B8=AA=E8=89=B2=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../play_record/index/modules/edit-dialog.vue | 28 +++++++++----------
 .../dice/model/play_record/DicePlayRecord.php |  2 +-
 .../play_record/DicePlayRecordValidate.php    |  6 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/edit-dialog.vue b/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/edit-dialog.vue
index d88d419..e11cd05 100644
--- a/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/edit-dialog.vue
+++ b/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/edit-dialog.vue
@@ -108,7 +108,7 @@
       <el-form-item label="摇取点数" prop="rollArrayItems">
         <div class="roll-array-wrap">
           <el-input-number
-            v-for="(_, i) in 6"
+            v-for="(_, i) in 5"
             :key="i"
             v-model="formData.rollArrayItems[i]"
             :min="1"
@@ -120,7 +120,7 @@
             :disabled="dialogType === 'edit'"
           />
         </div>
-        <div class="roll-array-hint">固定 6 个数，每个 1～6</div>
+        <div class="roll-array-hint">固定 5 个数，每个 1～6</div>
       </el-form-item>
       <el-form-item label="奖励配置" prop="reward_config_id">
         <el-select
@@ -191,13 +191,13 @@
     rollArrayItems: [
       {
         validator: (_rule: any, value: (number | null)[], callback: (e?: Error) => void) => {
-          if (!value || value.length !== 6) {
-            callback(new Error('摇取点数必须为 6 个数'))
+          if (!value || value.length !== 5) {
+            callback(new Error('摇取点数必须为 5 个数'))
             return
           }
           const ok = value.every((n) => n != null && n >= 1 && n <= 6)
           if (!ok) {
-            callback(new Error('摇取点数必须填写 6 个数，每个 1～6'))
+            callback(new Error('摇取点数必须填写 5 个数，每个 1～6'))
             return
           }
           callback()
@@ -226,8 +226,8 @@
     reward_config_id: null as number | null
   }
 
-  /** 摇取点数固定 6 位 [n0..n5]，每项 1～6 */
-  const rollArrayItemsDefault = (): (number | null)[] => [null, null, null, null, null, null]
+  /** 摇取点数固定 5 位 [n0..n4]，每项 1～6 */
+  const rollArrayItemsDefault = (): (number | null)[] => [null, null, null, null, null]
 
   const formData = reactive({
     ...initialFormData,
@@ -297,26 +297,26 @@
     })
   }
 
-  /** 将接口的 roll_array 转为固定 6 项数组，不足补 null */
+  /** 将接口的 roll_array 转为固定 5 项数组，不足补 null */
   function parseRollArrayToItems(val: unknown): (number | null)[] {
     let arr: number[] = []
     if (Array.isArray(val)) {
-      arr = val.map((n) => (typeof n === 'number' && !Number.isNaN(n) ? n : 0)).slice(0, 6)
+      arr = val.map((n) => (typeof n === 'number' && !Number.isNaN(n) ? n : 0)).slice(0, 5)
     } else if (typeof val === 'string') {
       try {
         const parsed = JSON.parse(val)
-        arr = Array.isArray(parsed) ? parsed.slice(0, 6).map((n: any) => Number(n) || 0) : []
+        arr = Array.isArray(parsed) ? parsed.slice(0, 5).map((n: any) => Number(n) || 0) : []
       } catch {
         arr = val
           .split(',')
           .map((n) => parseInt(n, 10))
           .filter((n) => !Number.isNaN(n))
-          .slice(0, 6)
+          .slice(0, 5)
       }
     }
     const items: (number | null)[] = [...arr]
-    while (items.length < 6) items.push(null)
-    return items.slice(0, 6)
+    while (items.length < 5) items.push(null)
+    return items.slice(0, 5)
   }
 
   const handleClose = () => {
@@ -329,7 +329,7 @@
     try {
       await formRef.value.validate()
       const payload = { ...formData } as Record<string, unknown>
-      // 将 6 个输入值拼成 [1,2,3,4,5,6] 格式，确保每项为 1～6 的整数
+      // 将 5 个输入值拼成 [1,2,3,4,5] 格式，确保每项为 1～6 的整数
       const items = formData.rollArrayItems
       payload.roll_array = items.map((n) => {
         const v = n != null ? Number(n) : 1
diff --git a/server/app/dice/model/play_record/DicePlayRecord.php b/server/app/dice/model/play_record/DicePlayRecord.php
index cd0c31f..d942c57 100644
--- a/server/app/dice/model/play_record/DicePlayRecord.php
+++ b/server/app/dice/model/play_record/DicePlayRecord.php
@@ -28,7 +28,7 @@ use think\model\relation\BelongsTo;
  * @property  $lottery_id 奖池
  * @property  $start_index 起始索引
  * @property  $target_index 结束索引
- * @property  $roll_array 摇取点数，格式:[1,2,3,4,5,6]
+ * @property  $roll_array 摇取点数，格式:[1,2,3,4,5]（5个点数）
  * @property  $lottery_name 奖池名
  * @property  $create_time 创建时间
  * @property  $update_time 修改时间
diff --git a/server/app/dice/validate/play_record/DicePlayRecordValidate.php b/server/app/dice/validate/play_record/DicePlayRecordValidate.php
index fabbeaa..46a54e1 100644
--- a/server/app/dice/validate/play_record/DicePlayRecordValidate.php
+++ b/server/app/dice/validate/play_record/DicePlayRecordValidate.php
@@ -64,7 +64,7 @@ class DicePlayRecordValidate extends BaseValidate
     ];
 
     /**
-     * 验证 roll_array：必须为 6 个元素，每个值在 1～6 之间
+     * 验证 roll_array：必须为 5 个元素，每个值在 1～6 之间
      * @param mixed $value
      * @param mixed $rule
      * @param array $data
@@ -80,8 +80,8 @@ class DicePlayRecordValidate extends BaseValidate
         if (!is_array($value)) {
             return '摇取点数必须为数组';
         }
-        if (count($value) !== 6) {
-            return '摇取点数必须为 6 个数';
+        if (count($value) !== 5) {
+            return '摇取点数必须为 5 个数';
         }
         foreach ($value as $i => $n) {
             $v = is_numeric($n) ? (int) $n : null;