From 6969279a3b994065b5b5f7873ce4a5c22c632a58 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Mon, 13 May 2024 10:04:34 +0800
Subject: [PATCH] init

---
 .../activityShop/add-activity-shop-dialog.vue | 40 ++++++++++++++++---
 src/views/xq/activityShop/index.vue           | 12 ++++--
 2 files changed, 43 insertions(+), 9 deletions(-)

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 @@
       </el-form-item>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="开始时间" prop="startTime">
+          <el-form-item label="报名开始时间" prop="startTime" label-width="120px">
             <el-date-picker clearable
                             v-model="form.startTime"
                             type="datetime"
@@ -21,7 +21,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="结束时间" prop="endTime">
+          <el-form-item label="报名结束时间" prop="endTime" label-width="120px">
             <el-date-picker clearable
                             v-model="form.endTime"
                             type="datetime"
@@ -31,6 +31,28 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="活动开始时间" prop="activityStartTime" label-width="120px">
+            <el-date-picker clearable
+                            v-model="form.activityStartTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="请选择开始时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="活动结束时间" prop="activityEndTime" label-width="120px">
+            <el-date-picker clearable
+                            v-model="form.activityEndTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="请选择结束时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="城市" prop="cityCode">
@@ -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 @@
           <cai-dict-tag :options="openStatusList" :value="scope.row.openStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="活动编码" align="center" prop="activityCode" show-overflow-tooltip/>
-      <el-table-column label="活动标题" align="center" prop="activityTitle" show-overflow-tooltip/>
+      <el-table-column label="活动编码" align="center" prop="activityCode" width="120" />
+      <el-table-column label="活动标题" align="center" prop="activityTitle" width="170"/>
       <el-table-column label="活动展示图片" align="center" prop="activityBanner" >
         <template v-slot="scope">
           <image-preview :src="scope.row.activityBanner" :height="75" :width="120"/>
         </template>
       </el-table-column>
-      <el-table-column label="时间" align="center" prop="startTime" width="170" >
+      <el-table-column label="报名时间" align="center" prop="startTime" width="170" >
         <template v-slot="scope">
           <span>{{scope.row.startTime}}</span><br>
           <span>{{scope.row.endTime}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="活动时间" align="center" prop="activityStartTime" width="170" >
+        <template v-slot="scope">
+          <span>{{scope.row.activityStartTime}}</span><br>
+          <span>{{scope.row.activityEndTime}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="城市名称" align="center" prop="cityName" />
       <el-table-column label="详细地址" align="center" prop="address" show-overflow-tooltip/>
       <el-table-column label="人数" align="center" prop="womenMaxNum" width="300">