运营操作开发

src/views/operation/giftcode/batchGeneration/index.vue

@@ -16,11 +16,8 @@
             <el-option label="通用" value="1" />
           </el-select>
         </el-form-item>
-        <el-form-item label="礼包道具ID" prop="itemIds">
-          <el-input v-model="ruleForm.itemIds" placeholder="道具ID列表，逗号间隔" />
-        </el-form-item>
-        <el-form-item label="礼包道具数量" prop="itemCounts">
-          <el-input v-model="ruleForm.itemCounts" placeholder="道具数量列表，逗号间隔" />
+        <el-form-item label="礼包道具" prop="itemInfo">
+          <el-input v-model="ruleForm.itemInfo" placeholder="可填列表，逗号间隔" />
         </el-form-item>
         <el-form-item label="礼包生效时间" required>
           <el-col :span="11">
@@ -71,8 +68,7 @@ const ruleForm = reactive({
   validTime: '',
   invalidTime: '',
   giftItems: '',
-  itemIds:[],
-  itemCounts:[],
+  itemInfo:[],
   randomCount: 0,
   result:''
 })
@@ -101,19 +97,11 @@ const rules = reactive({
       trigger: 'change',
     },
   ],
-  itemIds: [
-    {
-      type: 'array',
-      required: true,
-      message: '请输入礼包道具ID',
-      trigger: 'change',
-    },
-  ],
-  itemCounts: [
+  itemInfo: [
     {
       type: 'array',
       required: true,
-      message: '请输入礼包道具数量',
+      message: '请输入礼包道具',
       trigger: 'change',
     },
   ],

src/views/operation/giftcode/listTable/index.vue

@@ -28,27 +28,34 @@
         <el-form-item label="礼包码" prop="code">
           <el-input readonly :value="ruleForm.code" />
         </el-form-item>
-        <el-form-item label="礼包的道具ID" prop="itemIds">
-          <el-input v-model="ruleForm.itemIds" />
+        <el-form-item label="礼包类型" prop="codeType">
+          <el-select v-model="ruleForm.codeType" placeholder="礼包类型">
+            <el-option label="一次性" value="0" />
+            <el-option label="通用" value="1" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="礼包的道具数量" prop="itemCounts">
-          <el-input v-model="ruleForm.itemCounts" />
+        <el-form-item label="礼包道具" prop="itemInfo">
+          <el-input v-model="ruleForm.itemInfo" />
         </el-form-item>
-        <el-form-item label="礼包生效时间" prop="validTime">
-          <el-date-picker
-                    v-model="ruleForm.validTime"
-                    type="datetime"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    clearable
-                />
-        </el-form-item>
-        <el-form-item label="礼包失效时间" prop="invalidTime">
-          <el-date-picker
-                    v-model="ruleForm.invalidTime"
-                    type="datetime"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    clearable
-                />
+        <el-form-item label="礼包生效时间" required>
+          <el-col :span="11">
+            <el-form-item prop="validTime">
+              <el-date-picker
+                  v-model="ruleForm.validTime"
+                  type="datetime"
+                  placeholder="选择开始时间"
+                  style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col class="text-center" :span="2" style="text-align: center">
+            <span class="text-gray-500">-</span>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="invalidTime">
+              <el-date-picker v-model="ruleForm.invalidTime"  type="datetime" placeholder="选择结束时间" style="width: 100%" />
+            </el-form-item>
+          </el-col>
         </el-form-item>
 
       </el-form>
@@ -74,8 +81,7 @@ for (let i = 0; i < 100; i++) {
   data.push({
     code: 'Code_' + i,
     codeType: i % 2,
-    itemIds:'1001,1002',
-    itemCounts:'100,200',
+    itemInfo:'1001-100,1002-200',
     validTime: '2023-8-18 10:00:00',
     invalidTime: '2023-9-18 10:00:00',
     usePlayer: '1000001',
@@ -101,8 +107,7 @@ const column = [
     ],
     valueType: 'select',
   },
-  { name: 'itemIds', label: '礼包道具ID'},
-  { name: 'itemCounts', label: '礼包道具数量'},
+  { name: 'itemInfo', label: '礼包道具'},
   { name: 'validTime', label: '礼包生效时间'},
   { name: 'invalidTime', label: '礼包失效时间'},
   { name: 'usePlayer', label: '使用的玩家', inSearch: true, valueType: 'input'},
@@ -128,10 +133,40 @@ const ruleForm = reactive({
 })
 
 const rules = reactive({
-  state: [
+  code: [
+    {
+      required: true,
+      message: '请输入礼包码',
+      trigger: 'change',
+    }
+  ],
+  codeType: [
+    {
+      required: true,
+      message: '请选择礼包类型',
+      trigger: 'change',
+    },
+  ],
+  itemInfo: [
+    {
+      required: true,
+      message: '请输入礼包道具',
+      trigger: 'change',
+    },
+  ],
+  validTime : [
+    {
+      required: true,
+      type: 'date',
+      message: '请选择礼包生效时间',
+      trigger: 'change',
+    },
+  ],
+  invalidTime: [
     {
       required: true,
-      message: '请选择状态',
+      type: 'date',
+      message: '请选择礼包失效时间',
       trigger: 'change',
     },
   ],

src/views/operation/gmmail/index.vue

@@ -43,7 +43,7 @@
           <el-input v-model="ruleForm.heroCondition" />
         </el-form-item>
 
-        <el-form-item label="收件人角色创建时间">
+        <el-form-item label="收件人角色创建">
           <el-col :span="11">
             <el-form-item prop="roleCreateTimeStart">
               <el-date-picker
@@ -93,7 +93,7 @@
           </el-col>
         </el-form-item>
         <el-form-item label="邮件内容" prop="content">
-          <el-input v-model="ruleForm.content" :rows="10" type="textarea" />
+          <el-input v-model="ruleForm.content" :rows="8" type="textarea" />
         </el-form-item>
       </el-form>
       <template #footer>