瀏覽代碼

Merge branch 'master' of lhm/kmall-haikong into master

lhm 3 年之前
父節點
當前提交
d98f3520c5

+ 3 - 3
kmall-admin/src/main/webapp/js/sale/sale.js

@@ -35,7 +35,7 @@ function calculateGoodsPrice(r){
     var brand = r.goodsDetails.brand;
     console.log(rMap);
 
-    if(rMap.yhq){
+    /*if(rMap.yhq){
         for(var i in rMap.yhq){
             vm.coupons.set(i,rMap.yhq[i]);
         }
@@ -81,7 +81,7 @@ function calculateGoodsPrice(r){
             vm.halfPrice.set(rMap.drjbj.barcode,1);
         }
 
-    }
+    }*/
 
 
     // if(rMap.zhjsp){
@@ -1921,7 +1921,7 @@ function handle(goodsDetails,operatorType){
         vm.goodsList.push(data);
         vm.index = vm.index + 1;
     }
-    vm.totalPrice = (vm.totalPrice + data.retailPrice);
+    vm.totalPrice = new BigNumber(vm.totalPrice).add(new BigNumber(data.retailPrice));
 
     if("minus" == operatorType){
         vm.totalCount = vm.totalCount - 1;

+ 1 - 1
kmall-manager/src/main/resources/conf/redis.properties

@@ -1,7 +1,7 @@
 ########## redis \u914D\u7F6E ##########
 
 # [dev, prod]
-redis.env=prod
+redis.env=dev
 
 # \u5F00\u53D1\u73AF\u5883
 redis.dev.keyPrefix=platform