Merge remote-tracking branch 'origin/developer' into developerB

backup.sql

@@ -549,6 +549,13 @@ ALTER TABLE `cm_hehe_product`
     ADD COLUMN `bigTypeId` INT NULL COMMENT '一级分类id' AFTER `productId`,
     ADD COLUMN `smallTypeId` INT NULL COMMENT '二级分类id' AFTER `bigTypeId`;
 
+ALTER TABLE `cm_hehe_receive_coupon`
+    CHANGE COLUMN `source` `source` INT NULL DEFAULT NULL COMMENT '领取渠道：1小程序，2订单退回，3领券购买（取消订单时撤销领取）' ;
+
+ALTER TABLE `cm_hehe_coupon_share`
+    ADD COLUMN `orderId` INT NULL COMMENT '消费分享券的订单id' AFTER `receiveUserId`,
+    CHANGE COLUMN `type` `type` INT NULL DEFAULT NULL COMMENT '优惠券类型：1好友分享券，2好友消费券，3消费分享券' ;
+
 -- =================================== 2022年3月 呵呵商城版本 end =========================================
 -- =================================== 2022年4月 认证通ldm版本 start =========================================
 CREATE TABLE `ldm_latest_club_id` (

src/main/resources/static/css/article/article.css

@@ -34,6 +34,10 @@ dl,dd,dt{zoom:1}
 .loadData{position:fixed;left:0;top:0;width:100%;height:100%;display:-webkit-box;-webkit-box-pack:center;-webkit-box-align:center}
 .light-grey{width:50px;height:36px;border:1px solid #ddd;color:#666;border-radius:5px;vertical-align:1px}
 .article img{max-width:100% !important;height:auto !important}
+
+@-webkit-keyframes pointerFlashing {from{opacity: 1} to{opacity: 0.1}}
+@keyframes pointerFlashing {from{opacity: 1} to{opacity: 0.1}}
+
 @media screen and (min-width:768px){.header .h5-head{display:none}
 	.icon:before{content:'';display:inline-block;background:url(/img/base/icon.png) no-repeat;font-size:0}
 	/* 分享，回到顶部 */
@@ -151,9 +155,14 @@ dl,dd,dt{zoom:1}
 	.new-list .serachBox .keyword{width:696px;height:50px;line-height:50px;padding-left:40px;border:1px solid #ddd;border-right:none;border-radius:12px 0 0 12px;color:#777;font-size:14px;background:url(/img/info/search1.png) no-repeat 10px 12px}
 	.new-list .serachBox .keyword:focus{border:1px solid #ddd;border-right:none;outline:medium}
 	.new-list .serachBox .searchBtn{position:absolute;top:0px;right:1px;display:block;width:100px;height:50px;line-height:50px;text-align:center;border-radius:0 12px 12px 0;color:#fff;background-color:#e15616;background-image:none;font-size:20px}
-	.new-list .search-tip{ font-size: 14px; }
+	.new-list .search-tip{ font-size: 16px; color: #333; font-weight: bold; position: relative;line-height: 32px}
 	.new-list .search-tip b{color:#E15616;font-weight:bold;}
 	.new-list .search-tip a{ color:#E15616; text-decoration: underline; }
+	.new-list .search-tip::after {content: ""; display: inline-block;/* position: absolute; left: 0;top: 50%; transform: translateY(-50%);*/ width: 30px; height: 30px; background: url(/img/base/icon-pointer-right.png) no-repeat center; background-size: 30px; height: 30px;
+		-webkit-animation: ease pointerFlashing infinite 0.3s;
+		animation: ease pointerFlashing infinite 0.3s; -webkit-transform: rotateY(180deg); transform: rotateY(180deg);vertical-align: -8px;
+		-webkit-filter: invert(54%) sepia(57%) saturate(5587%) hue-rotate(352deg) brightness(90%) contrast(96%);filter: invert(54%) sepia(57%) saturate(5587%) hue-rotate(352deg) brightness(90%) contrast(96%);
+	}
 	.search .result b{color:#e15616}
 	.no-result{width:860px;height:500px;text-align:center;padding-top:100px}
 	.no-result .nofound{color:#333;font-size:18px;margin-top:20px}
@@ -209,9 +218,15 @@ dl,dd,dt{zoom:1}
 	/*.tip-bar{display: flex;justify-content: space-between;align-items: center;flex-direction: row-reverse}*/
 	.tip-bar{ padding: 2vw 0 }
 	.tip,.bar,.classify{height:6vw;line-height:6vw;font-size:3.1vw;overflow:hidden;color:#93979F;padding:0 2vw}
-	.classify.search-tip{ font-size: 3.2vw; }
+	.classify.search-tip{ font-size: 3.2vw; font-weight: bold; }
 	.classify.search-tip em{color:#E15616;font-weight:bold;}
 	.classify.search-tip a{ color:#E15616; text-decoration: underline; }
+	.classify.search-tip::after {content: ""; display: inline-block;width: 6.2vw; height: 6.2vw;
+		background: url(/img/base/icon-pointer-right.png) no-repeat center; background-size: 6.2vw 6.2vw;
+		-webkit-animation: ease pointerFlashing infinite 0.3s;
+		animation: ease pointerFlashing infinite 0.3s; -webkit-transform: rotateY(180deg); transform: rotateY(180deg);vertical-align: -1.6vw;
+		-webkit-filter: invert(54%) sepia(57%) saturate(5587%) hue-rotate(352deg) brightness(90%) contrast(96%);filter: invert(54%) sepia(57%) saturate(5587%) hue-rotate(352deg) brightness(90%) contrast(96%);
+	}
 	.mainData{min-height:68vh}
 	.new-list{background:#FFF;}
 	.dataRousce{width:100%;background:#FFF;overflow:hidden}

src/main/resources/static/css/base/floor.css

@@ -26,10 +26,10 @@
 .section_page .page_main_item_adv{width:100%;height:100%;display:block}
 .section_page .page_main_image{width:164px;height:164px;display:block;float:left;border-radius:2px 2px 0 0}
 .section_page .page_main_type{width: 34px;height: 34px;text-align: justify;box-sizing: border-box;padding: 5px;border-radius: 0 0 8px 8px;background-color: #33CCBF;font-size: 12px;color: #FFFFFF;line-height: 13px;position: absolute;top: 0;right: 10px;}
-.section_page .page_main_text{width:100%;height:42px;float:left;box-sizing:border-box;margin-top:10px;padding:0 4px;white-space:normal;word-break:break-all;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;line-height:21px}
+.section_page .page_main_text{width:100%;height:42px;float:left;box-sizing:border-box;margin-top:10px;padding:0 8px;white-space:normal;word-break:break-all;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;line-height:21px}
 .section_page .page_main_tag{width:100%;height:24px;float:left;margin-top:16px;padding:0 8px}
 .section_page .page_main_tag p{display:block;padding:0 4px;height:24px;box-sizing:border-box;border:1px solid #e3ebf7;border-radius:2px;float:left;font-size:12px;line-height:22px;text-align:center;color:#9aa5b5}
-.section_page .page_main_price{width:100%;height:54px;float:left;box-sizing:border-box;padding:0 4px}
+.section_page .page_main_price{width:100%;height:54px;float:left;box-sizing:border-box;padding:0 8px}
 .section_page .page_main_price .main_price_text{width:100%;height:54px;float:left;box-sizing:border-box}
 .section_page .page_main_price .main_price_unde{width:100%;height:31px;line-height:31px;font-size:14px;color:#4a4f58;text-align:left;float:left}
 .section_page .page_main_price .main_price_show{width:100%;height:30px;line-height:30px;font-size:14px;color:#f94b4b;text-align:left;float:left}