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

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

@@ -1020,9 +1020,6 @@ let vm = new Vue({
                 alert("请选择商品");
                 return;
             }
-            vm.calActivityFlag = true;
-
-            vm.clickFlag = false;
             $("#calculateOrderPriceDialog").modal('show');
 
             this.couponBarCodeChangeFocus();
@@ -2187,6 +2184,9 @@ calculateOrderPrice = function() {
                 vm.afterScore = r.data.afterScore;
                 vm.userInfo.customPhone = r.data.memberPhone;
                 vm.$refs.customPhone.value = r.data.memberPhone;
+                vm.calActivityFlag = true;
+
+                vm.clickFlag = false;
                 // console.log("memberPhone===>" + r.data.memberPhone);
                 // console.log("this.userInfo.customPhone===>" + vm.userInfo.customPhone);
                 // console.log("vm.$refs.customPhone.value===>" + vm.$refs.customPhone.value);