bugfix2

src/main/resources/static/css/product/detail.h5.css

@@ -21,7 +21,6 @@ li{list-style:none}
 .productBox .detailBox .row>em.p{font-weight:bold;}
 .productBox .detailBox .row>em.ser{color:#93979F;display:inline-block;margin-right:4vw}
 .productBox .detailBox .row>em.ser:before{content:'\2713';display:inline-block;width:3.4vw;height:3.4vw;text-align:center;line-height:3.4vw;font-size:3.4vw;background:#E15616;border-radius:1.7vw;color:#FFF;margin-right:1.4vw}
-.productBox .detailBox .price{height:21vw}
 .productBox .detailBox .price .icon{display:inline-block;font-size:0;height:5vw;line-height:5vw;vertical-align:text-bottom;}
 .productBox .detailBox .price .icon:before{width:11vw;height:5vw;}
 .productBox .detailBox .price .icon.i0:before{background-position:0 -23.2vw}

src/main/resources/static/css/product/detail.pc.css

@@ -36,7 +36,7 @@ li{list-style:none;}
 .productBox .detailBox .price{height:24px}
 .productBox .detailBox .price .rmb{font-weight:bold;}
 .productBox .detailBox .price .icon{display:inline-block;font-size:0;height:24px;line-height:24px;vertical-align:text-top;}
-.productBox .detailBox .price .icon:before{width:80px;height:24px;}
+.productBox .detailBox .price .icon:before{width:80px;height:24px;margin-top:-4px;}
 .productBox .detailBox .price .icon.i0:before{background-position:-295px -140px}
 .productBox .detailBox .price .icon.i1:before{background-position:-295px -140px}
 .productBox .detailBox .price .icon.i2:before{background-position:-295px -174px}

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

@@ -50,7 +50,7 @@
                     <span th:each="tag: *{tagList}" th:text="${tag}"></span>
                 </p>
                 <div class="detail">
-                    <div class="row"><span class="l">采美价</span><i>：</i>
+                    <div class="row price"><span class="l">采美价</span><i>：</i>
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <em v-if="priceObj.priceFlag==1">￥价格未公开</em>
@@ -61,9 +61,9 @@
                                 </em>
                                 <em v-else class="p" v-text="'￥'+parseFloat(priceObj.price).toFixed(2)"></em>
                             </template>
-                            <em v-else>￥<i :class="'icon mIcon i'+priceObj.priceGrade"></i></em>
+                            <em v-else>￥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
                         </template>
-                        <em v-else>￥<i :class="'icon mIcon i'+priceObj.priceGrade"></i></em>
+                        <em v-else>￥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
                     </div>
                     <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.normalPrice>0 && (priceObj.priceFlag==0 || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID))">
                         <div class="row"> <span class="l">市场价</span><i>：</i>
@@ -129,12 +129,12 @@
                             </div>
                         </template>
                     </div>
-                    <div class="row"><span class="l">品牌</span><i>：</i><em th:text="*{brandName}"></em></div>
+                    <div th:if="not${#strings.isEmpty(product.brandName)}" class="row"><span class="l">品牌</span><i>：</i><em th:text="*{brandName}"></em></div>
                     <div class="row"><span class="l">包装规格</span><i>：</i><em th:text="*{unit}"></em></div>
                     <div class="row"><span class="l">商品编码</span><i>：</i><em th:text="*{productCode}"></em></div>
                     <div class="row"><span class="l">库存</span><i>：</i><em th:text="*{stock}"></em></div>
                     <div class="row"><span class="l">起批量</span><i>：</i><em th:text="*{minBuyNumber}"></em></div>
-                    <div class="row"><span class="l">采购量</span><i>：</i>
+                    <div v-show="GLOBAL_USER_ID && GLOBAL_USER_ID>0" class="row"><span class="l">采购量</span><i>：</i>
                         <span class="number">
                             <em class="sub" @click="numberSub()">-</em>
                             <input type="number" :value="number" v-model="number" maxlength='6' @change="numberChange()">