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

src/main/java/com/caimei/www/controller/unlimited/HomeController.java

@@ -64,16 +64,6 @@ public class HomeController extends BaseController {
         return SEARCH_CHILDREN;
     }
 
-    /**
-     * 首页轮播图列表
-     * @return
-     */
-    @GetMapping("/home/banner")
-    @ResponseBody
-    public JsonModel<List<ImageLink>> getHomeBanners() {
-        return homeService.getHomeBanners();
-    }
-
     /**
      * 首页推荐专区
      * @return

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

@@ -24,10 +24,6 @@ public interface HomeDao {
      * 大专题二级楼层
      */
     List<PageFloor> getHomeBigTopicFloor();
-    /**
-     * 首页轮播图
-     */
-    List<ImageLink> getHomeBanners();
     /**
      * 首页左侧广告图
      */

src/main/java/com/caimei/www/service/page/HomeService.java

@@ -15,10 +15,6 @@ import java.util.Map;
  * @date : 2020/6/22
  */
 public interface HomeService {
-    /**
-     * 首页轮播图
-     */
-    JsonModel<List<ImageLink>> getHomeBanners();
     /**
      * 首页推荐专区
      */

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

@@ -30,16 +30,6 @@ public class HomeServiceImpl implements HomeService {
     @Value("${caimei.wwwDomain}")
     private String domain;
 
-    /**
-     * 首页轮播图
-     */
-    @Override
-    @Cacheable(value = "getHomeBanners", key="'www'", unless="#result == null")
-    public JsonModel<List<ImageLink>> getHomeBanners() {
-        List<ImageLink> list = homeDao.getHomeBanners();
-        return JsonModel.success(list);
-    }
-
     /**
      * 首页推荐专区商品
      */

src/main/resources/mapper/HomeMapper.xml

@@ -13,12 +13,6 @@
 		where delFlag = 0 and enabledStatus = '1'
 		order by sort
 	</select>
-    <select id="getHomeBanners" resultType="com.caimei.www.pojo.page.ImageLink">
-		select id, title, link, image
-		from new_page_homeimage
-		where wwwEnabledStatus = 1
-		order by sort desc, createDate desc
-    </select>
 	<select id="getAdvertising" resultType="com.caimei.www.pojo.page.ImageLink">
 		select id, adTitle as title, link, adImage as image
 		from new_page_advertising

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

@@ -17,7 +17,7 @@
     .crumbs-nav >div{display: inline-block}
     .crumbs-nav-item{display: inline-block;padding: 0 12px;border: 1px solid #cccccc;line-height: 24px;margin-right: 16px;color: #909090;border-radius: 2px;cursor: pointer;}
     .crumbs-nav-item.on{color: #e15616;border: 1px solid #e15616;}
-    .sortBox .on{background:#ffe6dc }
+    .sortBox div.on{background:#ffe6dc;color: #e15616 }
     .list-container{margin-top: 32px;width: 1200px;}
     .list-container ul li.productItem {width: 184px;height: 288px;float: left;background: #fff;position: relative;margin: 0 16px 16px 0;overflow: hidden;float: left;}
     .list-container ul li img {width: 100%;height: 184px;}
@@ -49,7 +49,7 @@
     .sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
     .list-container ul{margin: 3.2vw auto;width: 97vw;}
     .list-container ul li{width: 45.6vw;height: 68vw;overflow: hidden;margin: 0 1.3vw 2.6vw 1.3vw;background: #fff;text-align: left;}
-    .productItem .price em {display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;font-weight: bold;float: left;}
+    .productItem .price em {display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;float: left;}
     .productItem .price .mIcon:before{width:15.8vw;height: 5vw}
     .productItem .price .mIcon.i5:before {background-position: -84vw -97.5vw;}
     .productItem .price .mIcon.i1:before {background-position: -84vw -69.5vw;}

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

@@ -68,12 +68,12 @@
 
 
 @media screen and (max-width:768px) {
-    .instrue-right{position: absolute;top: 27vw;width: 100%;background: #fff;padding: 3.2vw 0;}
-    .instrue-right .wrap_tittle{padding: 0 3.2vw;}
-.instrue-right .hot-search{padding: 2.7vw;overflow: hidden;height: 3vw;background: #fff;border-radius: 0 0 1.6vw 1.6vw;}
+    .instrue-right{width: 100%;background: #fff;padding: 3.2vw 0;}
+    .instrue-right .wrap_tittle{padding: 0 3.2vw;color: #909090; font-size: 3.4vw;}
+    .instrue-right .hot-search{padding: 2.7vw;overflow: hidden;height: 3vw;background: #fff;border-radius: 0 0 1.6vw 1.6vw;}
     .instrue-right .hot-search ul .hot-list{display: inline-block;background: #f7f7f7;color: #4a4f58;font-size: 3.2vw;padding: .7vw 2vw;margin: 0 2.4vw 3.1vw 0;position: relative;}
-    .instrue-left{margin-top: 23vw;}
-    .top-category{background: #fff;height: 44.2vw}
+    .instrue-left{margin-top: 3vw;}
+    .top-category{background: #fff;}
     .top-category .nav-list{display: inline-block;width: 25%;height: 21vw;text-align: center;}
     .floorTit {padding: 4.8vw 0 2.4vw 3.2vw;position: relative;}
     .floorTit h2, .floorTit h3 {font-weight: bold;color: #4a4f58;font-size:4.8vw;line-height: 9.7vw}

src/main/resources/static/css/product/produce-list.css

@@ -124,7 +124,7 @@
     .sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
     .list-container ul{margin: 3.2vw auto;width: 97vw;}
     .list-container ul li{width: 45.6vw;height: 68vw;overflow: hidden;margin: 0 1.3vw 2.6vw 1.3vw;background: #fff;text-align: left;}
-    .productItem .price em {display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;font-weight: bold;float: left;}
+    .productItem .price em {display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;float: left;}
     .productItem .price .mIcon:before{width:15.8vw;height: 5vw}
     .productItem .price .mIcon.i5:before {background-position: -84vw -97.5vw;}
     .productItem .price .mIcon.i1:before {background-position: -84vw -69.5vw;}

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

@@ -430,11 +430,12 @@
         top: 27vw;
         width: 100%;
         background: #fff;
+        padding: 3.2vw 0;
     }
     .search_hotlist_main .title{
         color: #909090;
         font-size: 3.4vw;
-        padding: 2.7vw 3.2vw;
+        padding: 0 3.2vw;
     }
     .search_hotlist_item{
         display: inline-block;
@@ -468,7 +469,7 @@
         background-position: -51vw 0px;
     }
     .section_container_left{
-        margin-top: 31vw;
+        margin-top: 22vw;
     }
     .section_container_nav{
         background: #fff;
@@ -551,7 +552,7 @@
     .section_page .page_main_price{
         width: 100%;
         box-sizing: border-box;
-        padding: 2.7vw 3.2vw;
+        padding: 0 3.2vw;
     }
     .section_page .page_main_price .price_text_tag{
         width: 100%;
@@ -665,7 +666,7 @@
     .hot-search{
         padding: 2.7vw 3.2vw;
         overflow: hidden;
-        height: 6vw;
+        height: 3vw;
         background: #fff;
         border-radius: 0 0 1.6vw 1.6vw;
     }

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

@@ -18,14 +18,23 @@
          userId:0,
          moreflag:true,
          showflag:false,
+    },
+    computed:{
+
     },
     methods:{
         closeup:function(){
             this.showflag = false;
+            document.body.style.overflow='';
         },
         showNav:function(){
         var _this = this;
         _this.showflag = !_this.showflag;
+            if (_this.showflag){
+                 document.body.style.overflow='hidden';
+            }else {
+                document.body.style.overflow='';
+            }
         },
         toserch:function(item){
         window.location.href='/product/instruelist.html?bigTypeID='+item.bigTypeID
@@ -60,10 +69,10 @@
                             });
                         } else {
                             var swiper = new Swiper('#recommendBox', {
-                                slidesPerView: 2,
-                                slidesPerColumn: 2,
+                                slidesPerView: 4,
+                                slidesPerColumn: 4,
                                 spaceBetween: 0,
-                                slidesPerGroup: 2,
+                                slidesPerGroup: 4,
                                 autoplay: {
                                     delay: 3000,
                                     disableOnInteraction: false
@@ -100,5 +109,4 @@
         }
     this.getClassify();
     },
-
  })

src/main/resources/static/js/product/produce.js

@@ -2,14 +2,14 @@
     el:'#produceContainer',
     data:{
         classlyList:[
-            {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
-            {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
-            {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
-            {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
-            {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
-            {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
-            {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
-            {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'}
+            // {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
+            // {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
+            // {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
+            // {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
+            // {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
+            // {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
+            // {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'},
+            // {name:'中胚层产品',icon:'https://m.360buyimg.com/babel/jfs/t1/60778/37/9838/3066/5d7739faEd3b7dbb9/dd4d9ef7ce8fc169.png',keyword:'/product/produce-list.html'}
             ],
         hotlist:[
             {name:'玻尿酸',type:'1',keyword:''},
@@ -1170,11 +1170,27 @@
          },
      },
     methods:{
+        getClassify: function() {
+            var _self = this;
+            PublicApi.GetProductClassify({typeSort: 1, source: 'www'}, function (res) {
+                if (res.code == 0) {
+                    _self.classlyList = res.data;
+                } else {
+                    CAIMEI.Alert(res.msg, '确定', false);
+                }
+            })
+        },
         closeup:function(){
             this.showflag = false;
+            document.body.style.overflow='';
         },
         showNav:function(){
             this.showflag = !this.showflag;
+            if (this.showflag){
+                 document.body.style.overflow='hidden';
+            }else {
+                document.body.style.overflow='';
+            }
         },
         PromotionsFormat:function(promo){//促销活动类型数据处理
             if(promo!=null){
@@ -1195,5 +1211,6 @@
         if(userInfo){
             this.userId = JSON.parse(userInfo).userId;
         }
+        this.getClassify();
     }
  });

src/main/resources/static/js/supplier-center/shop/release.js

@@ -183,6 +183,7 @@ var releaseContainer = new Vue({
                     _this.releaseParams.twoClassifyName = data.smallTypeName;
                     _this.releaseParams.threeClassifyName = data.tinyTypeName;
                     _this.releaseParams.brandName = data.brandName;
+                     _this.releaseParams.commodityType =data.commodityType;
                     _this.GoodsImagesList = _this.EchoGoodsImagesListFn(data.imageList);
                     if(data.searchKey != null){
                         _this.setSearchKeyArray(data.searchKey);
@@ -640,7 +641,7 @@ var releaseContainer = new Vue({
                 },2000);
                 return;
             }
-            if(_this.releaseParams.tinyTypeID == ''){
+            if(_this.releaseParams.smallTypeID == ''){
                 _this.vShow_TinyTypeID = true;
                 _this.fromMessage = '请选择商品分类';
                 _this.scrollIntoView();

src/main/resources/templates/product/instrument.html

@@ -6,11 +6,32 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/product/instruement.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
-<body>
+<body >
     <!-- 引用头部 -->
     <template th:replace="components/header"></template>
     <div id="container">
-        <div id="instrueMent">
+        <div id="instrueMent" >
+            <div class="instrue-right">
+                <div class="wrap_tittle"> 大家都在搜<span class="line"></span></div>
+                <template v-if="isPC">
+                    <div class="hot-search">
+                       <ul>
+                           <li class="hot-list" v-for="(item,index) in hotlist"><i class="icon mIcon hot"></i>{{item.name}}</li>
+                       </ul>
+                    </div>
+                </template>
+                <template  v-else>
+                    <div class="hot-search" :style="showflag?'height:auto':''">
+                       <ul>
+                           <li class="hot-list" v-for="(item,index) in hotlist"><i class="icon mIcon hot"></i>{{item.name}}</li>
+                       </ul>
+                       <div  @click="showNav">
+                          <span class="mIcon" :class="showflag?'close':'open'"></span>
+                       </div>
+                    </div>
+                </template>
+                <div :class="showflag?'bg':''" @click="closeup"></div>
+           </div>
             <div class="instrue-left">
                 <div class="top-category">
                     <ul class="normal-nav clearfix">
@@ -365,27 +386,6 @@
                  </div>
             </template>
             </div>
-            <div class="instrue-right">
-                <div class="wrap_tittle"> 大家都在搜<span class="line"></span></div>
-                <template v-if="isPC">
-                    <div class="hot-search">
-                       <ul>
-                           <li class="hot-list" v-for="(item,index) in hotlist"><i class="icon mIcon hot"></i>{{item.name}}</li>
-                       </ul>
-                    </div>
-                </template>
-                <template  v-else>
-                    <div class="hot-search" :style="showflag?'height:auto':''">
-                       <ul>
-                           <li class="hot-list" v-for="(item,index) in hotlist"><i class="icon mIcon hot"></i>{{item.name}}</li>
-                       </ul>
-                       <div  @click="showNav">
-                          <span class="mIcon" :class="showflag?'close':'open'"></span>
-                       </div>
-                    </div>
-                </template>
-                <div :class="showflag?'bg':''" @click="closeup"></div>
-           </div>
         </div>
     </div>
 

src/main/resources/templates/product/produce.html

@@ -14,7 +14,7 @@
         <div class="section_container_left">
             <div class="section_container_nav">
                 <a :href="item.keyword" class="container_nav_item" v-for="(item,index) in classlyList">
-                    <div class="item_icon"><img :src="item.icon" alt=""></div>
+                    <div class="item_icon"><img :src="item.wwwIcon" alt=""></div>
                     <div class="item_text">{{ item.name }}</div>
                 </a>
             </div>

src/main/resources/templates/supplier-center/shop/release.html

@@ -65,8 +65,8 @@
                                  <div class="release-label"><span class="star">*</span>商品属性:</div>
                                     <div class="release-input">
                                         <div class="release-props">
-                                            <label class="release-radio" @click="getclass(1)"><input type="radio" name="includedTax" v-model="releaseParams.commodityType" value="1" ><i class="icon mIcon">产品</i></label>
-                                            <label class="release-radio" @click="getclass(2)"><input type="radio" name="includedTax" v-model="releaseParams.commodityType" value="2" checked><i class="icon mIcon">仪器</i></label>
+                                            <label class="release-radio" @click="getclass(1)"><input type="radio" name="commodityType" v-model="releaseParams.commodityType" value="1"><i class="icon mIcon">产品</i></label>
+                                            <label class="release-radio" @click="getclass(2)"><input type="radio" name="commodityType" v-model="releaseParams.commodityType" value="2" checked><i class="icon mIcon">仪器</i></label>
                                         </div>
                                 </div>
                                 <div class="release-tips" v-show="vShow_attribute">{{fromMessage}}</div>