-
-
{{ item.name }}
+
+ {{ item.name }}
@@ -63,7 +64,7 @@
import store from "../../store/index";
export default {
name: "useActivityStepFoure",
- data() {
+ data () {
return {
useData: store.getters.useData,
operate: "收起",
@@ -71,7 +72,7 @@ export default {
groups: [],
};
},
- created() {
+ created () {
let _this = this;
console.log(this.useData.stores);
this.useData.company.forEach((item) => {
@@ -81,10 +82,10 @@ export default {
);
_this.groups.push(item);
});
- console.log(this.groups);
+ console.log(this.useData);
},
methods: {
- isDisplay() {
+ isDisplay () {
if (this.operate === "展开") {
this.operate = "收起";
this.displayActivityShopFlag = false;
diff --git a/src/pages/activity/useActivityStepOne.vue b/src/pages/activity/useActivityStepOne.vue
index f8d5fd0..ebcd351 100644
--- a/src/pages/activity/useActivityStepOne.vue
+++ b/src/pages/activity/useActivityStepOne.vue
@@ -18,7 +18,7 @@
+ prop="beginTime">
至
+ prop="endTime">
-
{{
item.name
}} ---- {{
- item.key
+ item.defaultVal
}}
+
+
{{
item.name
}} ---- {{
- item.key
+ item.defaultVal
}}
@@ -107,7 +111,7 @@ export default {
activityName: [
{ required: true, message: "活动名称不能为空", trigger: "blur" },
],
- activityStartDate: [
+ beginTime: [
{
required: true,
type: "date",
@@ -115,7 +119,7 @@ export default {
trigger: "change",
},
],
- activityEndDate: [
+ endTime: [
{
required: true,
type: "date",
@@ -140,7 +144,7 @@ export default {
_this.formValidate.activityStyle = item.id;
});
}
- console.log(22, this.formValidate);
+ console.log(22, this.isModify);
},
methods: {
onChange (e) {
diff --git a/src/pages/activity/useTable.vue b/src/pages/activity/useTable.vue
index 59faf2c..b195c82 100644
--- a/src/pages/activity/useTable.vue
+++ b/src/pages/activity/useTable.vue
@@ -55,6 +55,7 @@ import useActivityStepThree from "./useActivityStepThree";
import useActivityStepFoure from "./useActivityStepFoure";
import ActivityManager from "../../services/ActivityManager/ActivityManager";
import store from "../../store/index";
+import { formatDate } from '../../utils/Common';
export default {
name: "useTable",
components: {
@@ -74,7 +75,10 @@ export default {
id: String,
schedule: Object,
show: Boolean,
- isModify: Boolean
+ isModify: {
+ type: Boolean,
+ default: false
+ }
},
watch: {
show () {
@@ -129,6 +133,13 @@ export default {
return;
}
}
+ if (typeof data.beginTime == "object") {
+ data.beginTime = formatDate(data.beginTime);
+ }
+ if (typeof data.endTime == "object") {
+ data.endTime = formatDate(data.endTime);
+ }
+ console.log("data", data)
store.commit("SET_useData", data);
this.currentStep = this.currentStep + 1;
},
diff --git a/src/utils/Common.js b/src/utils/Common.js
index 7db98fd..4e8a214 100644
--- a/src/utils/Common.js
+++ b/src/utils/Common.js
@@ -5,7 +5,7 @@
* @company kiisoo
*/
-import roter from "../router";
+import roter from '../router'
// import store from '../store'
/**
@@ -15,19 +15,20 @@ import roter from "../router";
*/
export function goToLogin() {
// store.commit("LOGOUT");
- roter.push("/login");
+ roter.push('/login')
}
export function formatDate(dt) {
- dt = new Date(dt);
- let year = dt.getFullYear();
- let month = dt.getMonth() + 1;
- let day = dt.getDate();
- month = month < 10 ? "0" + month : month;
- day = day < 10 ? "0" + day : day;
- return year + "-" + month + "-" + day;
+ dt = new Date(dt)
+ let year = dt.getFullYear()
+ let month = dt.getMonth() + 1
+ let day = dt.getDate()
+ month = month < 10 ? '0' + month : month
+ day = day < 10 ? '0' + day : day
+ return year + '-' + month + '-' + day
}
export default {
goToLogin,
-};
+ formatDate,
+}