diff --git a/src/views/xq/activityShop/add-activity-shop-dialog.vue b/src/views/xq/activityShop/add-activity-shop-dialog.vue
index 8b65f11..4875f95 100644
--- a/src/views/xq/activityShop/add-activity-shop-dialog.vue
+++ b/src/views/xq/activityShop/add-activity-shop-dialog.vue
@@ -11,7 +11,7 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -137,8 +159,8 @@ export default {
mustVip: undefined,
mustAuth: undefined,
priceText: undefined,
- createTime: undefined,
- updateTime: undefined
+ activityEndTime: undefined,
+ activityStartTime: undefined
},
// 表单校验
rules: {
@@ -152,10 +174,16 @@ export default {
{ required: true, message: "活动展示图片不能为空", trigger: "blur" }
],
startTime: [
- { required: true, message: "开始时间不能为空", trigger: "blur" }
+ { required: true, message: "报名开始时间不能为空", trigger: "blur" }
],
endTime: [
- { required: true, message: "结束时间不能为空", trigger: "blur" }
+ { required: true, message: "报名结束时间不能为空", trigger: "blur" }
+ ],
+ activityStartTime: [
+ { required: true, message: "活动结束时间不能为空", trigger: "blur" }
+ ],
+ activityEndTime: [
+ { required: true, message: "活动结束时间不能为空", trigger: "blur" }
],
cityName: [
{ required: true, message: "城市名称不能为空", trigger: "blur" }
diff --git a/src/views/xq/activityShop/index.vue b/src/views/xq/activityShop/index.vue
index b0878eb..96b9590 100644
--- a/src/views/xq/activityShop/index.vue
+++ b/src/views/xq/activityShop/index.vue
@@ -77,19 +77,25 @@
-
-
+
+
-
+
{{scope.row.startTime}}
{{scope.row.endTime}}
+
+
+ {{scope.row.activityStartTime}}
+ {{scope.row.activityEndTime}}
+
+