修改

src/api/dictManage.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+export function createItem(data) {
+  return request({
+    url: '/mall-integral-obtain/commend/add',
+    method: 'post',
+    data
+  })
+}
+
+export function updateItem(data) {
+  return request({
+    url: '/mall-integral-obtain/commend/edit',
+    method: 'post',
+    data
+  })
+}
+
+export function list(query) {
+  return request({
+    url: '/mall-integral-obtain/commend/page',
+    method: 'get',
+    params:query
+  })
+}
+
+export function state(query) {
+  return request({
+    url: '/mall-integral-obtain/commend/modify/status',
+    method: 'post',
+    params:query
+  })
+}
+
+export function types(query) {
+  return request({
+    url: '/mall-integral-obtain/commend/types',
+    method: 'get',
+    params:query
+  })
+}
+
+
+
+

src/views/activityManage/activityList.vue

@@ -27,7 +27,7 @@
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="活动开始结束时间">
                 <template slot-scope="props">
-                   {{ props.row.startTimeStr }}~{{ props.row.endTimeStr }}
+                   {{ props.row.startTime }}~{{ props.row.endTime }}
                 </template>
             </el-table-column>
             <el-table-column align="center" min-width="80px" label="创建人" prop="creater">
@@ -73,12 +73,12 @@
                         </el-upload>
                     </el-tooltip>
                 </el-form-item>
-                <el-form-item label="开始日期" prop="startTimeStr">
-                    <el-date-picker value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.startTimeStr" type="date" placeholder="请选择开始时间" style="width: 350px">
+                <el-form-item label="开始日期" prop="startTime">
+                    <el-date-picker value-format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.startTime" type="date" placeholder="请选择开始时间" style="width: 350px">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="结束日期" prop="endTimeStr">
-                    <el-date-picker value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.endTimeStr" type="date" placeholder="请选择结束时间" style="width: 350px">
+                <el-form-item label="结束日期" prop="endTime">
+                    <el-date-picker value-format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.endTime" type="date" placeholder="请选择结束时间" style="width: 350px">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="参与人">
@@ -150,11 +150,11 @@ export default {
                 title: '',
                 imgUrl: '',
                 activityUrl: '',
-                startTimeStr: '',
-                endTimeStr: '',
+                startTime: '',
+                endTime: '',
                 participants: [],
                 content: '',
-                images: [],
+                images: [],startTime
             },
             dialogFormVisible: false,
             dialogStatus: '',
@@ -165,11 +165,11 @@ export default {
             rules: {
                 title: [{ required: true, message: "请填写活动名称", trigger: "blur" }],
                 imgUrl: [{ required: true, message: "图片不能为空", trigger: "blur" }],
-                startTimeStr: [
+                startTime: [
                     { required: true, message: "请选择活动开始时间", trigger: "change" },
                     { validator: this.checkStartTime, trigger: 'change' }
                 ],
-                endTimeStr: [
+                endTime: [
                     { required: true, message: "请选择活动结束时间", trigger: "change" },
                     { validator: this.checkEndTime, trigger: 'change' }
                 ],
@@ -188,9 +188,9 @@ export default {
             if (!value) {
                 callback(new Error("请选择活动开始时间！"));
             } else {
-                if (this.dataForm.endTimeStr && Date.parse(value)  > Date.parse(this.dataForm.endTimeStr)) {
+                if (this.dataForm.endTime && Date.parse(value)  > Date.parse(this.dataForm.endTime)) {
                     callback(new Error("活动开始时间必须小于等于活动结束时间！"))
-                    this.dataForm.startTimeStr = '';
+                    this.dataForm.startTime = '';
                 } else {
                     callback();
                 }
@@ -201,12 +201,12 @@ export default {
             if (!value) {
                 callback(new Error("请选择活动结束时间！"));
             } else {
-                if (!this.dataForm.startTimeStr) {
+                if (!this.dataForm.startTime) {
                     callback(new Error("请选择活动开始时间！"))
-                    this.dataForm.endTimeStr = '';
-                } else if (Date.parse(this.dataForm.startTimeStr) > Date.parse(value)) {
+                    this.dataForm.endTime = '';
+                } else if (Date.parse(this.dataForm.startTime) > Date.parse(value)) {
                     callback(new Error("活动结束时间必须大于等于活动开始时间！"))
-                    this.dataForm.endTimeStr = '';
+                    this.dataForm.endTime = '';
                 } else {
                     callback();
                 }
@@ -255,8 +255,8 @@ export default {
                 title: '',
                 imgUrl: '',
                 activityUrl: '',
-                startTimeStr: '',
-                endTimeStr: '',
+                startTime: '',
+                endTime: '',
                 participants: undefined,
                 content: '',
                 images: [],

src/views/festivalManage/festivalList.vue

@@ -24,7 +24,7 @@
   
         <el-table-column align="center" min-width="100px" label="节日" prop="title">
         </el-table-column>
-        <el-table-column align="center" min-width="200px" label="日期" prop="startTimeStr">
+        <el-table-column align="center" min-width="200px" label="日期" prop="startTime">
         </el-table-column>
         <el-table-column align="center" min-width="100px" label="积分" prop="integral">
         </el-table-column>
@@ -59,14 +59,14 @@
         :title="textMap[dialogStatus]"
         :visible.sync="dialogFormVisible"
         width="40%"
-      >
+      >startTime
         <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="50px" style='width: 700px; margin-left:50px;'>
          <el-form-item  label="节日" prop="title">
               <el-input style="width: 350px" v-model="dataForm.title"></el-input>
             </el-form-item>
-            <el-form-item label="日期" prop="startTimeStr">
+            <el-form-item label="日期" prop="startTime">
                 <el-date-picker
-                  v-model="dataForm.startTimeStr"
+                  v-model="dataForm.startTime"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期"
@@ -118,17 +118,17 @@
         list: [
           {
             title:'端午节',
-            startTimeStr:'2023-6-22',
+            startTime:'2023-6-22',
             integral:'50'
           },
           {
             title:'中秋节',
-            startTimeStr:'2023-9-29',
+            startTime:'2023-9-29',
             integral:'100'
           },
           {
             title:'国庆节',
-            startTimeStr:'2023-10-1',
+            startTime:'2023-10-1',
             integral:'100'
           },
 
@@ -143,7 +143,7 @@
         dataForm: {
           title: undefined,
           integral: undefined,
-          startTimeStr: undefined,
+          startTime: undefined,
         },
         dialogFormVisible: false,
         dialogStatus: '',
@@ -153,7 +153,7 @@
         },
         rules: {
           title: [{ required: true, message: "节日不能为空", trigger: "blur" }],
-          startTimeStr: [{ required: true, message: "请选择日期", trigger: "blur" }],
+          startTime: [{ required: true, message: "请选择日期", trigger: "blur" }],
           integral: [{ required: true, message: "积分不能为空", trigger: "blur" }],
         },
       }
@@ -167,7 +167,7 @@
         this.dataForm = {
           title: undefined,
           integral: undefined,
-          startTimeStr: undefined,
+          startTime: undefined,
         };
       },
       handleCreate() {

src/views/welfareManage/welfareList.vue

@@ -30,7 +30,7 @@
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="福利开始结束时间">
                 <template slot-scope="props">
-                   {{ props.row.startTimeStr }}~{{ props.row.endTimeStr }}
+                   {{ props.row.startTime }}~{{ props.row.endTime }}
                 </template>
             </el-table-column>
             <el-table-column align="center" min-width="80px" label="创建人" prop="creater">
@@ -73,12 +73,12 @@
                         </el-upload>
                     </el-tooltip>
                 </el-form-item>
-                <el-form-item label="开始日期" prop="startTimeStr">
-                    <el-date-picker value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.startTimeStr" type="date" placeholder="请选择开始时间" style="width: 350px">
+                <el-form-item label="开始日期" prop="startTime">
+                    <el-date-picker value-format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.startTime" type="date" placeholder="请选择开始时间" style="width: 350px">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="结束日期" prop="endTimeStr">
-                    <el-date-picker value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.endTimeStr" type="date" placeholder="请选择结束时间" style="width: 350px">
+                <el-form-item label="结束日期" prop="endTime">
+                    <el-date-picker value-format="yyyy-MM-dd" :picker-options="setDisabled" v-model="dataForm.endTime" type="date" placeholder="请选择结束时间" style="width: 350px">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="参与人">
@@ -150,8 +150,8 @@ export default {
             dataForm: {
                 title: '',
                 imgUrl: '',
-                startTimeStr: '',
-                endTimeStr: '',
+                startTime: '',
+                endTime: '',
                 participants: [],
                 content: '',
                 images: [],
@@ -165,11 +165,11 @@ export default {
             rules: {
                 title: [{ required: true, message: "请填写福利名称", trigger: "blur" }],
                 imgUrl: [{ required: true, message: "图片不能为空", trigger: "blur" }],
-                startTimeStr: [
+                startTime: [
                     { required: true, message: "请选择福利开始时间", trigger: "change" },
                     { validator: this.checkStartTime, trigger: 'change' }
                 ],
-                endTimeStr: [
+                endTime: [
                     { required: true, message: "请选择福利结束时间", trigger: "change" },
                     { validator: this.checkEndTime, trigger: 'change' }
                 ],
@@ -188,9 +188,9 @@ export default {
             if (!value) {
                 callback(new Error("请选择福利开始时间！"));
             } else {
-                if (this.dataForm.endTimeStr && Date.parse(value)  > Date.parse(this.dataForm.endTimeStr)) {
+                if (this.dataForm.endTime && Date.parse(value)  > Date.parse(this.dataForm.endTime)) {
                     callback(new Error("福利开始时间必须小于等于福利结束时间！"))
-                    this.dataForm.startTimeStr = '';
+                    this.dataForm.startTime = '';
                 } else {
                     callback();
                 }
@@ -201,12 +201,12 @@ export default {
             if (!value) {
                 callback(new Error("请选择福利结束时间！"));
             } else {
-                if (!this.dataForm.startTimeStr) {
+                if (!this.dataForm.startTime) {
                     callback(new Error("请选择福利开始时间！"))
-                    this.dataForm.endTimeStr = '';
-                } else if (Date.parse(this.dataForm.startTimeStr) > Date.parse(value)) {
+                    this.dataForm.endTime = '';
+                } else if (Date.parse(this.dataForm.startTime) > Date.parse(value)) {
                     callback(new Error("福利结束时间必须大于等于福利开始时间！"))
-                    this.dataForm.endTimeStr = '';
+                    this.dataForm.endTime = '';
                 } else {
                     callback();
                 }
@@ -254,8 +254,8 @@ export default {
             this.dataForm = {
                 title: '',
                 imgUrl: '',
-                startTimeStr: '',
-                endTimeStr: '',
+                startTime: '',
+                endTime: '',
                 participants: [],
                 content: '',
                 images: [],