From ea966e084bfc9fc3b1c933748a1058caaed9b7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Wed, 13 Mar 2024 17:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventMarketing/storeOilBlock/index.vue    | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index 317cc7c06..286bf7b04 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -97,17 +97,13 @@
           </el-table-column>
           <el-table-column
             prop="type"
-            label="限制时间"
+            label="到期时间"
             width="350"
           >
             <template slot-scope="scope">
-              <div style="display: flex;align-items: center" v-if="scope.row.stipulateTimeS">
-                <div>{{scope.row.stipulateTimeS}}</div>
-                <div> --- </div>
-                <div>{{scope.row.stipulateTimeE}}</div>
+              <div style="display: flex;align-items: center" v-if="scope.row.expireTime">
+                <div>{{scope.row.expireTime}}</div>
               </div>
-
-              <!--              <el-tag>{{scope.row.type}}</el-tag>-->
             </template>
           </el-table-column>
 <!--          <el-table-column-->
@@ -217,7 +213,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <div style="margin-left: 10px" v-if="oilPrice&&gbPrice">今日油价：<span style="color: red">{{oilPrice || ''}}</span> 元/L   国标油价：<span style="color: red">{{oilPrice || ''}}</span>元/L  </div>
+              <div style="margin-left: 10px" v-if="oilPrice&&gbPrice">今日油价：<span style="color: red">{{oilPrice || ''}}</span> 元/L   国标油价：<span style="color: red">{{gbPrice || ''}}</span>元/L  </div>
             </div>
 
 
@@ -276,6 +272,22 @@
 
 
           </el-form-item>
+
+          <el-form-item label="到期时间" prop="expireTime">
+            <div style="width: 100%;display: flex;align-items: center ">
+              <div style="width: 45%">
+                <el-date-picker
+                  v-model="ruleForm.expireTime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetime"
+                  placeholder="到期时间">
+                </el-date-picker>
+              </div>
+            </div>
+
+
+          </el-form-item>
+
           <el-form-item label="活动状态" prop="resource">
             <el-radio-group v-model="ruleForm.activeStatus">
               <el-radio label="1">启用</el-radio>