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

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

@@ -549,7 +549,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/static/js/shopping/confirm.js

@@ -424,6 +424,8 @@ var shoppingConfirm = new Vue({
                     CAIMEI.dialog('请输入银行账号');return false;
                 }
             }
+            // 禁用按钮
+            this.submitLoading = true;
             // 发票信息
             if(this.invoice.type*1 === 0){
                 this.invoice = Object.assign(this.invoice,'',{type:0});
@@ -466,7 +468,6 @@ var shoppingConfirm = new Vue({
                     payInfo: _payInfo,               // 订单信息
                     orderInvoice: this.invoice           // 发票信息
             };
-            this.submitLoading = true;
             OrderApi.ConfirmOrder({'params':JSON.stringify(params)},function (r) {
                 if(r.code === 0){
                     var _data = r.data;
@@ -485,11 +486,12 @@ var shoppingConfirm = new Vue({
                         CAIMEI.Storage.removeItem('confirmOrderInfo');
                         CAIMEI.Storage.setItem('confirmOrderInfo',JSON.stringify({data:data}));
                         window.location.href = '/pay/caimei-paycash.html?type=confirm&orderID='+_data.orderID;
-                        _self.submitLoading = false;
                     }
                 }else{
                     CAIMEI.Alert(r.msg,'确定',true, function(){
-                        _self.submitLoading = false;
+                        setTimeout(function(){
+                            _self.submitLoading = false;
+                        },500);
                     });
                 }
             });

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

@@ -130,13 +130,13 @@
                                     </div>
                                 </template>
                                 <template v-else>
-                                    <em>￥<i :class="'icon mIcon i'+p.p_price_grade"></i></em>
+                                    <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                 </template>
                             </template>
                         </template>
                         <template v-else>
-                            <em>￥<i :class="'icon mIcon i'+p.p_price_grade"></i></em>
+                            <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
                             <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                             <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">登录查看价格</a></div>
                         </template>