From ef501759ecaff1839e8986c8f54e015677646068 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Wed, 15 Feb 2023 11:12:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BF=9E=E6=8E=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zscat/mallplus/sms/entity/SmsFlashPromotionSession.java | 5 +++++
 mallplusui-uniapp-app2/pages/index/index.vue                | 6 +++---
 mallplusui-uniapp-app2/pagesA/product/tag.vue               | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionSession.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionSession.java
index 8e0b685..e50b5a8 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionSession.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionSession.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zscat.mallplus.utils.BaseEntity;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -41,6 +42,8 @@ public class SmsFlashPromotionSession extends BaseEntity implements Serializable
      * 每日开始时间
      */
     @DateTimeFormat(pattern = "HH:mm:ss")
+//    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT")
     @TableField("start_time")
     private Date startTime;
 
@@ -48,6 +51,8 @@ public class SmsFlashPromotionSession extends BaseEntity implements Serializable
      * 每日结束时间
      */
     @DateTimeFormat(pattern = "HH:mm:ss")
+//    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT")
     @TableField("end_time")
     private Date endTime;
 
diff --git a/mallplusui-uniapp-app2/pages/index/index.vue b/mallplusui-uniapp-app2/pages/index/index.vue
index 3d6d8f0..1a025e6 100644
--- a/mallplusui-uniapp-app2/pages/index/index.vue
+++ b/mallplusui-uniapp-app2/pages/index/index.vue
@@ -33,15 +33,15 @@
 			</view>
 			<!-- 分类 -->
 			<view class="cate-section">
-				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isFenxiao=1')">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupActivityList')">
 					<image src="/static/temp//antFill-gift.png"></image>
 					<text>惠农套餐</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isVip=1')">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
 					<image src="/static/temp/fasfausers.png"></image>
 					<text>拼团特价</text>
 				</view>
-				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
+				<view class="cate-item" @click="navToTabPage('../../pages/index/secskill')">
 					<image src="/static/temp/fabfa-dropbox.png"></image>
 					<text>限时抢购</text>
 				</view>
diff --git a/mallplusui-uniapp-app2/pagesA/product/tag.vue b/mallplusui-uniapp-app2/pagesA/product/tag.vue
index 7b1a853..89612aa 100644
--- a/mallplusui-uniapp-app2/pagesA/product/tag.vue
+++ b/mallplusui-uniapp-app2/pagesA/product/tag.vue
@@ -9,7 +9,7 @@
 
 		</view>
 
-		<uni-section title="会员标签" type="line"></uni-section>
+<!-- 		<uni-section title="会员标签" type="line"></uni-section>
 		<view class="example-body" >
 			<view class="tag-view" v-for="(item, index) in memberTagList" :key="index" @click="navToList(item.id)">
 				<uni-tag :circle="true" :text="item.name" type="warning" />
@@ -21,7 +21,7 @@
 			<view class="tag-view" v-for="(item, index) in cmsTagList" :key="index" @click="navToList(item.id)">
 				<uni-tag :circle="true" :inverted="inverted" :text="item.name" type="primary" @click="setInverted" />
 			</view>
-		</view>
+		</view> -->
 
 
 	</view>