Commit c703bfffb2a5c3019c33a1513fe55dc56b4b1ffe

Authored by season
2 parents 6947c843 43955d0d

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

packageE/pages/cart/cart2_inte/cart2_inte.js
... ... @@ -1230,7 +1230,6 @@ Page({
1230 1230 return false;
1231 1231 }
1232 1232  
1233   -
1234 1233 var integrals = 0;
1235 1234 var get_datas = {
1236 1235 user_id: getApp().globalData.user_id, store_id: os.stoid,
... ... @@ -1244,9 +1243,10 @@ Page({
1244 1243 })
1245 1244  
1246 1245 //判断积分的情况
1247   - if (th.data.formData.integral && parseFloat(th.data.formData.integral) < parseFloat(integrals)) {
  1246 + if (th.data.formData.integral && parseFloat(th.data.formData.integral) > parseFloat(integrals)) {
1248 1247 getApp().my_warnning("积分不足", 0, th);
1249 1248 th.data.is_summit_ing = 0;
  1249 + this.setData({submit:0})
1250 1250 return false;
1251 1251 }
1252 1252  
... ...