Merge branch 'developer' of http://git.caimei365.com/caimei365/caimei365-www into developerB

src/main/java/com/caimei/www/controller/RedirectController.java

@@ -129,6 +129,20 @@ public class RedirectController {
     public String activityTopics3(@PathVariable("id") Integer id) {
         return "redirect:/product/beauty-" + id + ".html";
     }
+    /**
+     * 快捷运营
+     */
+    @GetMapping("/cmpage/info-9-{id}.html")
+    public String activityTopics9(@PathVariable("id") Integer id) {
+        return "redirect:/product/beauty-" + id + ".html";
+    }
+    /**
+     * 快捷运营
+     */
+    @GetMapping("/quickOperation/operation-{id}.html")
+    public String quickOperation(@PathVariable("id") Integer id) {
+        return "redirect:/product/beauty-" + id + ".html";
+    }
 
     /**
      * 专题活动列表页【旧】

src/main/java/com/caimei/www/mapper/BaseDao.java

@@ -24,7 +24,7 @@ public interface BaseDao {
     /**
      * 获取头部菜单
      */
-    List<TopMenu> getTopMenus();
+    List<TopMenu> getTopMenus(@Param("type") Integer type);
 
     /**
      * 获取底部链接分类

src/main/java/com/caimei/www/service/page/impl/BaseServiceImpl.java

@@ -58,7 +58,7 @@ public class BaseServiceImpl implements BaseService {
     @Override
     @Cacheable(value = "getNavMenu", key="'www'", unless="#result == null")
     public List<TopMenu> getNavMenu() {
-        List<TopMenu> menuList = baseDao.getTopMenus();
+        List<TopMenu> menuList = baseDao.getTopMenus(0);
 //        menuList.forEach(item -> {
 //            String link = item.getLink();
 //            if (!StringUtils.isEmpty(link)) {

src/main/resources/mapper/BaseMapper.xml

@@ -18,6 +18,10 @@
             sort
 		from new_page_first_navigation
 		where wwwEnabledStatus='1' and delFlag = 0
+        <if test="type != null and type != ''">
+            <if test="type == 0 and type ==0">and (type = 0 or type is null )</if>
+            <if test="type != 0 and type !=0">and type = #{type}</if>
+        </if>
 		order by sort asc,createDate desc
 		limit 8
     </select>

src/main/resources/mapper/SinglePageMapper.xml

@@ -122,7 +122,7 @@
     <select id="getBeautyPageIdById" resultType="java.lang.Integer">
         select id
         from cm_page a
-        where a.type = 7
+        where (a.type = 7 or a.type = 9)
           and a.enabledStatus = 1
           and a.id = #{id}
     </select>

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

@@ -19,7 +19,7 @@
 .section_page .section_page_main.type_08{height:268px}
 .section_page .recommendBox-wrapperHot {overflow: visible !important;}
 .section_page .section_page_main.type_03{height:704px}
-.section_page  .page_main_item{width:164px;height:268px;float:left;margin-right:16px;margin-bottom:16px;background-color:#FFFFFF;transition:all 0.4s;display:block;position: relative;}
+.section_page  .page_main_item{width:164px;height:268px;float:left;margin-right:16px;margin-bottom:16px;background-color:#FFFFFF;transition:all 0.4s;display:block;position: relative;overflow: hidden;}
 .section_page  .page_main_item.hot{width:164px;height:268px;float:left;margin-right:10px;margin-bottom:16px;background-color:#FFFFFF;transition:all 0.4s;display:block;position: relative;}
 .section_page  .page_main_item.default{cursor:default}
 .section_page  .page_main_item.ad_04{border-radius:2px}
@@ -31,7 +31,8 @@
 .section_page_main.section_3 .page_main_item.ad_01,.section_page_main.section_4 .page_main_item.ad_01,.section_page_main.section_5 .page_main_item.ad_01,.section_page_main.section_6 .page_main_item.ad_01{width:884px;height:120px}
 .section_page_main.section_1 .page_main_item.ad_01,.section_page_main.section_2 .page_main_item.ad_01,.section_page_main.section_3 .page_main_item.ad_02,.section_page_main.section_4 .page_main_item.ad_02{width:524px}
 .section_page_main.section_2 .page_main_item.ad_02,.section_page_main.section_4 .page_main_item.ad_03{width:344px}
-.section_page .page_main_item_adv{width:100%;height:100%;display:block}
+.section_page .page_main_item_adv{width:100%;height:100%;display:block;transition:all .5s;-o-transition:all .5s;-webkit-transition:all .5s;}
+.section_page .page_main_item_adv:hover{ transform:scale(1.1);-ms-transform:scale(1.1);-webkit-transform:scale(1.1); }
 .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 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}
@@ -79,7 +80,7 @@
 .section_page .section_page_more .more:hover .icon:before{background-position:-153px 7px}
 /* 底部供应商 */
 .section_page .section_page_bottom{width:100%;float:left;height:auto}
-.section_page  .page_main_li{width:134px;height:166px;float:left;margin-right:16px;margin-bottom:16px;background-color:#FFFFFF;transition:all 0.4s;display:block}
+.section_page  .page_main_li{width:134px;height:166px;float:left;margin-right:16px;margin-bottom:16px;background-color:#FFFFFF;transition:all 0.4s;display:block;overflow: hidden;}
 .section_page .page_main_li.ad_01{width:884px;height:184px}
 .section_page  .page_main_li.ad_02:hover{transform:translateY(-5px);box-shadow:0 8px 8px rgba(102,102,102,0.05),0 10px 10px rgba(102,102,102,0.05),0 12px 12px rgba(102,102,102,0.05)}
 .section_page  .page_main_li.ad_02:hover .page_main_name{color:#FF5B00;font-weight:bold}

src/main/resources/static/css/index/index_new.pc.css

@@ -172,8 +172,9 @@ li{list-style:none;}
 .section_right .right_item_title a{display:inline-block;float:right;font-size:12px;color:#909090;text-align:right}
 .section_right .right_item_title a:hover{color:#FF5B00;text-decoration:underline}
 .section_right .right_item_main{width:100%;height:auto}
-.section_right .item_banner{width:252px;height:252px;display:block;float:left;position:relative;margin-bottom:10px}
-.section_right .item_banner img{width:252px;height:252px;display:block}
+.section_right .item_banner{width:252px;height:252px;display:block;float:left;position:relative;margin-bottom:10px;overflow: hidden;}
+.section_right .item_banner:hover img{transform:scale(1.1);-ms-transform:scale(1.1);-webkit-transform:scale(1.1);}
+.section_right .item_banner img{width:252px;height:252px;display:block;transition:all .5s;-o-transition:all .5s;-webkit-transition:all .5s;}
 .section_right .item_banner .name{width:100%;height:32px;position:absolute;bottom:0;background:rgba(0,0,0,0.4);line-height:32px;font-size:16px;color:#ffffff;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;padding:0 10px;box-sizing:border-box}
 .section_right .item_banner .statu{width:72px;height:22px;border-radius:11px;background:rgba(0,0,0,0.4);position:absolute;left:8px;top:8px}
 .section_right .item_banner .statu i{display:block;width:12px;height:12px;float:left;margin:6px 0 0 6px}

src/main/resources/static/css/product/instruement.css

@@ -13,7 +13,7 @@
     .instrue-left .top-category .normal-nav .nav-list {border:1px solid #fff;float: left;margin: 0 16px 16px 0;width: 132px;height: 88px;background: #fff;text-align: center;color: #4a4f58;font-size: 14px;cursor: pointer;transition: all 0.4s}
     .instrue-left .top-category .normal-nav .nav-list a{padding: 0 10px;text-align: center;display: block;line-height: 22px;}
     .instrue-left .top-category .normal-nav .nav-list.active {border: 1px solid #FF5B00;color: #FF5B00;}
-    .instrue-right {float: left;width: 252px;background: #fff;padding: 16px;margin-top: 10px;min-height: 343px;overflow: auto;}
+    .instrue-right {float: left;width: 252px;background: #fff;padding: 16px;margin-top: 0;min-height: 343px;overflow: auto;}
     .instrue-right .wrap_tittle{padding-bottom: 10px;color: #4a4f58;font-size: 16px;font-weight: bold;border-bottom: 1px solid #f5f5f5;position: relative;}
     .instrue-right .wrap_tittle .line{height: 2px;width: 16px;background: #FF5B00;display: block;position: absolute;bottom: 0}
     .instrue-right .hot-search{padding:24px 0px 0px 0px;}