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

# Conflicts:
#	src/main/resources/config/dev/application-dev.yml

src/main/resources/config/dev/application-dev.yml

@@ -54,7 +54,6 @@ logging:
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   spiServer: https://spi-b.caimei365.com
-#  spiServer: http://192.168.2.68:8008
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

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

@@ -169,8 +169,8 @@ iframe{width:320px !important;height: 280px !important}
 .classifyBox .clsTab a{display:inline-block;height:100%;padding:0 10px 0 10px;font-size:15px;font-weight:bold;color:#2D3036;border-bottom:1px solid transparent;margin-right: 30px}
 .classifyBox .clsTab a:hover,.classifyBox .clsTab a.on{color:#E15616;border-color:#E15616}
 .classifyBox .clsCon{padding:20px 0;box-sizing: border-box;}
-.classifyBox .tabItem_lift{width: 127px;float: left;border-right: 1px solid #FFE6DC;}
-.classifyBox .tabItem_lift a{display:inline-block;width:100%;line-height:40px;box-sizing:border-box;color: #627386;padding:10px 0 10px 15px;float: left;transform: translateX(-3px);}
+.classifyBox .tabItem_lift{width: 175px;float: left;border-right: 1px solid #FFE6DC;}
+.classifyBox .tabItem_lift a{display:inline-block;width:100%;line-height:40px;box-sizing:border-box;color: #627386;padding:10px 0 10px 25px;float: left;transform: translateX(-3px);}
 .classifyBox .tabItem_lift .tabItem_lift_icon{width: 20px;height: 20px;display: block;float: left;margin-top: 10px;margin-right: 5px;}
 .classifyBox .tabItem_lift .tabItem_lift_p{float: left;margin-left: 8px;line-height: 20px;}
 .classifyBox .tabItem_lift a.on{background: #fef6f3;color: #E15616;border-color: #ffffff;transform: translateX(0);transition: all 0.8s;}
@@ -239,7 +239,7 @@ iframe{width:320px !important;height: 280px !important}
 .footContact .cellNumber{height:60px;line-height:60px;font-size:12px;color:#FFF;white-space:nowrap}
 .footContact .cellNumber span {margin: 0 12px;}
 .footContact .cellNumber a{color:#FFF;}
-.copyright{text-align:center;color:#FFF;font-size:12px;padding: 26px 0;}
+.copyright{text-align:left;color:#FFF;font-size:12px;padding: 26px 0;}
 .copyright .item{white-space:nowrap;padding-left:35px;position:relative;float:left;margin-left:50%;transform:translateX(-50%)}
 .copyright .item:before{position:absolute;left:0;width:32px;height:32px;background-position:0 -140px}
 .copyright p span{margin:0 5px}

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

@@ -64,8 +64,8 @@
     .brand{color: #9aa5b5;margin: 10px 8px;border: 1px solid #e3ebf7;display: inline-block;padding: 0 10px;border-radius: 2px}
     .item_icon{ width: 100%;height: 36px;padding: 12px 0 8px 0;}
     .item_icon img{width: 36px;height: 36px;display: block;margin: 0 auto;}
-    .productItem .price em{font-weight: normal;margin: 0;}
-    .productItem .price em.bold{font-weight: bold;margin: 0}
+    .productItem .price .price_grade{font-weight: normal;margin: 0;}
+    .productItem .price .price_grade .bold{font-weight: bold;margin: 0}
     .price .right-box{margin:12px 0 0 0}
 }
 

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

@@ -64,6 +64,7 @@ var productList = new Vue({
            var _self=this;
            ProductApi.GetSearchProduct(_self.params,function (res) {
                if( res.code==0){
+                     _self.listData=[];
                      var result = JSON.parse(res.data);
                       _self.listRecord = result.total;
                        var resultData = setSearchProductList(result.items, _self.userId, function(){
@@ -76,7 +77,6 @@ var productList = new Vue({
                         if(isPC){
                             _self.listData = resultData;
                         }else{
-                            _self.listData=[],
                             _self.listData = _self.listData.concat(resultData);
                         }
 
@@ -154,6 +154,7 @@ var productList = new Vue({
                     this.params.id = item.tinyTypeID;
                     break;
             }
+           this.listData=[];
            this.getproductList();
         },
     },

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

@@ -231,33 +231,6 @@ var myGoods = new Vue({
                         })
                     })
                 }
-            }else {
-            console.log(_this.checkList);
-             _this.checkList.map(function(el){
-                    if(el.validFlag != 2){ isValidFlag = true; }
-                });
-                 if(isValidFlag){
-                    CAIMEI.Alert('部分选中的商品暂未上架，不能进行下架操作','确定');
-                    return;
-                }else {
-                    CAIMEI.Modal('确定下架选中的商品吗？','取消','确定',function () {
-                          var shelProductsList='';
-                        _this.checkList.map(function(el){
-                            if(el.validFlag == 2){
-                                shelProductsList += el.productID+','
-                            }
-                        });
-                        SupplierApi.SupplierSoldOut({productIds:shelProductsList,},function (response) {
-                            if (response.code == 0){
-                                CAIMEI.dialog('下架成功！');
-                                _this.productsList = [];
-                                _this.GetMyproductDataInfo();
-                            }else{
-                                 CAIMEI.Alert(response.msg,'确定');
-                            }
-                        })
-                    })
-                }
             }
         },
         ItemDownshelf: function(pros){//下架商品

src/main/resources/templates/components/footer.html

@@ -69,7 +69,7 @@
                     <span>中华人民共和国增值电信业务经营许可证</span>
                     <span>
                         <!-- CNZZ统计 start -->
-                        <script type="text/javascript">document.write(unescape("%3Cspan id='cnzz_stat_icon_1279558759'%3E%3C/span%3E%3Cscript src='https://s9.cnzz.com/z_stat.php%3Fid%3D1279558759' type='text/javascript'%3E%3C/script%3E"));</script>
+                        <script type="text/javascript">document.write(unescape("%3Cspan id='cnzz_stat_icon_1279558759'%3E%3C/span%3E%3Cscript src='https://s9.cnzz.com/z_stat.php%3Fid%3D1279558759%26show%3Dpic' type='text/javascript'%3E%3C/script%3E"));</script>
                         <!-- CNZZ统计 start -->
                     </span>
                 </p>

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

@@ -79,25 +79,30 @@
                                                             </template>
                                                             <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                                 <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                    <p class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                                 </div>
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag" >
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
+                                                          <div class="price_text_tag"></div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                                                           <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag" >
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -144,25 +149,30 @@
                                                             </template>
                                                             <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                                 <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>
                                                                 </div>
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag"  v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>
+                                                                 </div>
+                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
+                                                          <div class="price_text_tag"></div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                                                           <div class="main_price_show"  v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -214,20 +224,25 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag ">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                              <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
+                                                          <div class="price_text_tag"></div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                                                           <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag ">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                       <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -280,20 +295,25 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
+                                                          <div class="price_text_tag"></div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                                                           <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em>￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag ">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -344,20 +364,25 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
+                                                          <div class="price_text_tag"></div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                                                           <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                       <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -407,20 +432,25 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                               <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
+                                                          <div class="price_text_tag"></div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                                                           <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -471,20 +501,25 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                               <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
+                                                          <div class="price_text_tag"></div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                                                           <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag">
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -534,20 +569,25 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
+                                                          <div class="price_text_tag"></div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                                                           <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <div class="price_text_tag" >
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                        </div>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>

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

@@ -144,18 +144,11 @@
                                 </li>
                                 <li>
                                     <div class="good-handle">
-                                        <a class="btn " href="javascript: void(0);"
-                                           v-if="['0','1','2','3','8','9'].indexOf(product.validFlag)!=-1"
-                                           @click="editGoodFn(product)">编辑</a>
-                                            <a class="btn primary" href="javascript: void(0);"
-                                           v-if="['1','2'].indexOf(product.validFlag)!=-1"
-                                           @click="pageLinkDetils(product)">预览商品</a>
-                                           <a class="btn " href="javascript: void(0);"
-                                           v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
-                                           <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured"
-                                           @click="DeletePushHotFn(product)">删除主页推荐</a>
-                                           <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured"
-                                           @click="AddPushHotFn(product)">添加主页推荐</a>
+                                        <a class="btn " href="javascript: void(0);" v-if="['0','1','2','3','8','9'].indexOf(product.validFlag)!=-1" @click="editGoodFn(product)">编辑</a>
+                                        <a class="btn primary" href="javascript: void(0);" v-if="['2'].indexOf(product.validFlag)!=-1" @click="pageLinkDetils(product)">预览商品</a>
+                                        <a class="btn " href="javascript: void(0);" v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
+                                        <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured" @click="DeletePushHotFn(product)">删除主页推荐</a>
+                                        <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured" @click="AddPushHotFn(product)">添加主页推荐</a>
                                     </div>
                                 </li>
                             </ul>
@@ -222,15 +215,10 @@
                                     </div>
                                 </div>
                                 <div class="good-handle">
-                                        <a class="btn down" href="javascript: void(0);"
-                                           v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
-                                        <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured"
-                                           @click="AddPushHotFn(product)">添加主页推荐</a>
-                                        <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured"
-                                           @click="DeletePushHotFn(product)">删除主页推荐</a>
-                                        <a class="btn primary" href="javascript: void(0);"
-                                           v-if="['1','2'].indexOf(product.validFlag)!=-1"
-                                           @click="pageLinkDetils(product)">预览商品</a>
+                                        <a class="btn down" href="javascript: void(0);" v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
+                                        <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured" @click="AddPushHotFn(product)">添加主页推荐</a>
+                                        <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured" @click="DeletePushHotFn(product)">删除主页推荐</a>
+                                        <a class="btn primary" href="javascript: void(0);" v-if="['1','2'].indexOf(product.validFlag)!=-1" @click="pageLinkDetils(product)">预览商品</a>
                                     </div>
                             </div>
                           </div>

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

@@ -35,9 +35,14 @@
                 <div class="preview-info-title">
                     <p class="info-p classly">
                         <span>所属分类:</span>
-                        <span>{{shopInfo.firstClassifyName}}</span> >
-                        <span v-if="shopInfo.threeClassifyName!=''">{{shopInfo.twoClassifyName}}</span> >
-                        <span v-else>{{shopInfo.twoClassifyName}}</span>
+                        <template>
+                            <span v-if="shopInfo.twoClassifyName!=''">{{shopInfo.firstClassifyName}}</span> >
+                            <span v-else>{{shopInfo.firstClassifyName}}</span>
+                        </template>
+                        <template>
+                            <span v-if="shopInfo.threeClassifyName!=''">{{shopInfo.twoClassifyName}}</span> >
+                            <span v-else>{{shopInfo.twoClassifyName}}</span>
+                        </template>
                         <span>{{shopInfo.threeClassifyName}}</span>
                     </p>
                     <p class="info-p name">{{shopInfo.aliasName}}</p>