zhengjinyi 2 years ago
parent
commit
a3c7409e67

+ 1 - 1
src/main/resources/static/css/product/detail.pc.css

@@ -35,7 +35,7 @@ li{list-style:none;}
 .productBox .detailBox .detail hr{border:none;border-top:1px dashed #E2E7EF;margin:12px 0}
 .productBox .detailBox .row{padding:3px 0 3px 80px;line-height:24px;}
 .productBox .detailBox .row.actStatus{position: relative}
-.productBox .detailBox .row .l{display:inline-block;min-width:56px;height:24px;text-align:justify;vertical-align:top;margin-left:-80px;}
+.productBox .detailBox .row .l{display:inline-block;min-width:70px;height:24px;text-align:justify;vertical-align:top;margin-left:-80px;}
 .productBox .detailBox .row .l:after{content:'';display:inline-block;width:100%}
 .productBox .detailBox .row>i{font-style:normal;}
 .productBox .detailBox .row>em{font-style:normal;color:#333333;margin-left: 15px}

+ 12 - 13
src/main/resources/templates/product/detail.html

@@ -70,7 +70,7 @@
                         <div class="WechatBg"><img src="/img/base/Wecha.png">
                             <p>扫码添加采美微信客服咨询更快捷</p></div>
                     </div>
-                    <div class="row price"><span class="l">会员价</span><i>:</i>
+                    <div class="row price"><span class="l">会员价</span>
                         <!--登录-->
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
@@ -113,7 +113,7 @@
                     </div>
                     <template
                             v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.normalPrice>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.priceFlag==3 && GLOBAL_CLUB_TYPE==1) || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID || GLOBAL_VIP_FLAG === 1))">
-                        <div class="row"><span class="l">市场价</span><i>:</i>
+                        <div class="row"><span class="l">市场价</span>
                             <em>
                                 <del v-text="'¥'+priceObj.normalPrice.toFixed(2)"></del>
                             </em>
@@ -121,7 +121,7 @@
                     </template>
                     <div class="row actStatus"
                          v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.actStatus==1 || ladderList.length >0">
-                        <span class="l">促销</span><i>:</i>
+                        <span class="l">促销</span>
                         <template
                                 v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.priceFlag==3 && GLOBAL_CLUB_TYPE==1) || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID || GLOBAL_VIP_FLAG === 1))">
                             <!-- 阶梯价 -->
@@ -204,19 +204,18 @@
                         </template>
                     </div>
                     <div class="row" v-if="productCoupon.length>0">
-                        <span class="l">优惠券</span>
-                        <i>:</i>
+                        <span class="l">优惠券:</span>
                         <span class="coupon-tags">
                             <em class="couponTag" v-for="(coupon, index) in productCoupon" :key="index"
                                 v-text="'满'+coupon.touchPrice+'减'+coupon.couponAmount"></em>
                             <em class="couponTag-more" @click="showPopup">更多></em>
                         </span>
                     </div>
-                    <div th:if="not${#strings.isEmpty(product.brandName)}" class="row"><span class="l">品牌</span><i>:</i><em
+                    <div th:if="not${#strings.isEmpty(product.brandName)}" class="row"><span class="l">品牌</span><em
                             th:text="*{brandName}"></em></div>
                     <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <div class="row">
-                            <span class="l">包装规格</span> <i>:</i>
+                            <span class="l">包装规格</span>
                             <div class="unit-tags">
                                 <span class="unitTags" @click="handleChoisSku(sku,index)" v-for="(sku, index) in priceObj.skus" :key="index" :class="skuIndex === index ? 'active':''">
                                     {{ sku.unit }}
@@ -227,7 +226,7 @@
                     </template>
                     <template v-else>
                         <div class="row">
-                            <span class="l">包装规格</span> <i>:</i>
+                            <span class="l">包装规格</span>
                             <div class="unit-tags">
                                 <span class="unitTags" th:attr="data-grade=${sku.priceGrade}" th:each="sku,skuStat:*{skus}" th:if="${not #strings.isEmpty(product.skus)}">
                                     <span th:text="${sku.unit}"></span>
@@ -237,12 +236,12 @@
                         </div>
                     </template>
                     <div class="row" th:if="not${#strings.isEmpty(product.productCode)}"><span
-                            class="l">商品编码</span><i>:</i><em th:text="*{productCode}"></em></div>
-                    <div class="row" th:if="not${#strings.isEmpty(product.stock)}"><span class="l">库存</span><i>:</i><em
+                            class="l">商品编码</span><em th:text="*{productCode}"></em></div>
+                    <div class="row" th:if="not${#strings.isEmpty(product.stock)}"><span class="l">库存</span><em
                             th:text="*{stock}"></em></div>
                     <div class="row" th:if="not${#strings.isEmpty(product.minBuyNumber)}"><span
-                            class="l">起订量</span><i>:</i><em th:text="*{minBuyNumber}"></em></div>
-                    <div v-show="GLOBAL_USER_ID && GLOBAL_USER_ID>0" class="row"><span class="l">采购量</span><i>:</i>
+                            class="l">起订量</span><em th:text="*{minBuyNumber}"></em></div>
+                    <div v-show="GLOBAL_USER_ID && GLOBAL_USER_ID>0" class="row"><span class="l">采购量</span>
                         <span class="number">
                             <em class="sub" @click="numberSub()">-</em>
                             <input type="number" :value="number" v-model="number" maxlength='6'
@@ -252,7 +251,7 @@
                         <input type="hidden" th:value="*{step}">
                     </div>
                     <hr>
-                    <div class="row"><span class="l">服务</span><i>:</i>
+                    <div class="row"><span class="l">服务</span>
                         <em class="ser icon mIcon">无忧退货</em>
                         <em class="ser icon mIcon">快速退款</em>
                         <em class="ser icon mIcon">正品保证</em>