Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents f568de4e 1a1af4af
Showing 1 changed file with 2 additions and 2 deletions
packageE/pages/cart/cart2_inte/cart2_inte.js
@@ -1230,7 +1230,6 @@ Page({
           return false;
         }
-
       var integrals = 0;
       var get_datas = {
         user_id: getApp().globalData.user_id, store_id: os.stoid,
@@ -1244,9 +1243,10 @@ Page({
       })
       //判断积分的情况
-      if (th.data.formData.integral && parseFloat(th.data.formData.integral) < parseFloat(integrals)) {
+      if (th.data.formData.integral && parseFloat(th.data.formData.integral) > parseFloat(integrals)) {
         getApp().my_warnning("积分不足", 0, th);
         th.data.is_summit_ing = 0;
+        this.setData({submit:0})
         return false;
       }