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

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

@@ -4,6 +4,7 @@ import com.caimei.www.mapper.ProductDao;
 import com.caimei.www.pojo.page.ProductDetail;
 import com.caimei.www.service.page.ProductService;
 import com.caimei.www.utils.ImageUtil;
+import com.caimei.www.utils.PriceUtil;
 import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -41,17 +42,7 @@ public class ProductServiceImpl implements ProductService {
             }
             product.setImage(ImageUtil.getImageURL("product", product.getImage(), 0, domain));
             // 价格等级
-            if (product.getPrice() > 50 * 5000) {
-                product.setPriceGrade(5);
-            } else if (product.getPrice() > 25 * 5000) {
-                product.setPriceGrade(4);
-            } else if (product.getPrice() > 10 * 5000) {
-                product.setPriceGrade(3);
-            } else if (product.getPrice() > 2.5 * 5000) {
-                product.setPriceGrade(2);
-            } else {
-                product.setPriceGrade(1);
-            }
+            product.setPriceGrade(PriceUtil.getpriceGrade(product.getPrice()));
         }
         return product;
     }

src/main/resources/static/js/base.js

@@ -585,7 +585,7 @@ function setSearchProductList(list, userId, callback) {//处理搜索
             unit: item.p_unit,
             brand: item.p_brand_name,
             priceFlag: item.p_price_flag,
-            priceGrade: item.p_price_flag,
+            priceGrade: item.p_price_grade,
             actStatus: 0,
             priceLoaded: false
         });

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

@@ -12,10 +12,9 @@
 <template th:replace="components/header"></template>
 
 <!-- 商品详情 -->
-<div id="productDetail" v-show="showProduct">
+<div id="productDetail">
     <input type="hidden" th:value="${productId}" id="productId">
     <input type="hidden" th:value="${product?.stock}" id="productStock">
-    <input type="hidden" th:value="${product?.visibility}" id="productVisibility">
     <div class="wrap">
         <div class="productBox clear">
             <div class="imageBox" id="imgShown">
@@ -50,7 +49,6 @@
                 <p class="tags">
                     <span th:each="tag: *{tagList}" th:text="${tag}"></span>
                 </p>
-                <p class="noprice" v-if="GLOBAL_USER_ID>0&&priceObj.priceFlag==1"><i class="icon mIcon"></i>商品未公开价格，请联系0755-22907771</p>
                 <div class="detail" v-if="!isNoneDisabled">
                     <div class="row price"><span class="l">采美价</span><i>：</i>
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
@@ -140,8 +138,8 @@
                     <div class="row" th:if="not${#strings.isEmpty(product.unit)}"><span class="l">包装规格</span><i>：</i><em th:text="*{unit}"></em></div>
                     <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 th:text="*{stock}"></em></div>
-                    <div class="row" th:if="not${#strings.isEmpty(product.minBuyNumber)}" v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0&&priceObj.priceFlag!=1"><span class="l">起批量</span><i>：</i><em th:text="*{minBuyNumber}"></em></div>
-                    <div v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0&&priceObj.priceFlag!=1" class="row"><span class="l">采购量</span><i>：</i>
+                    <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>
                         <span class="number">
                             <em class="sub" @click="numberSub()">-</em>
                             <input type="number" :value="number" v-model="number" maxlength='6' @change="numberChange()">