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

WXD-SEASON\season
2 parents 5b1c7561 20e9c64b
Showing 3 changed files with 27 additions and 0 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageE/pages/cart/cart2_inte/cart2_inte.js
packageE/pages/cart/cart2_pt/cart2_pt.js
@@ -1241,6 +1241,15 @@ Page({
           // all_yck_arr.push(yck) //真实预存款抵扣金额
           // all_pre_json.push(good.pre_json)
           // all_prestore = parseFloat(all_prestore); //真实预存款抵扣金额总和
+        }else{
+          let atxt10 = "formData.prestore"; //预存金额
+          let atxt11 = "formData.pre_json"; //预存json
+          let atxt12 = "formData.all_yck_arr"; //预存真实抵扣列表
+          th.setData({
+            [atxt10]: 0,
+            [atxt11]: '',
+            [atxt12]: [],
+          })
         }
       }
     } else {
@@ -1125,6 +1125,15 @@ Page({
           // all_yck_arr.push(yck) //真实预存款抵扣金额
           // all_pre_json.push(good.pre_json)
           // all_prestore = parseFloat(all_prestore); //真实预存款抵扣金额总和
+        }else{
+          let atxt10 = "formData.prestore"; //预存金额
+          let atxt11 = "formData.pre_json"; //预存json
+          let atxt12 = "formData.all_yck_arr"; //预存真实抵扣列表
+          th.setData({
+            [atxt10]: 0,
+            [atxt11]: '',
+            [atxt12]: [],
+          })
         }
       }
     } else {
@@ -1282,6 +1282,15 @@ Page({
           // all_yck_arr.push(yck) //真实预存款抵扣金额
           // all_pre_json.push(good.pre_json)
           // all_prestore = parseFloat(all_prestore); //真实预存款抵扣金额总和
+        }else{
+          let atxt10 = "formData.prestore"; //预存金额
+          let atxt11 = "formData.pre_json"; //预存json
+          let atxt12 = "formData.all_yck_arr"; //预存真实抵扣列表
+          th.setData({
+            [atxt10]: 0,
+            [atxt11]: '',
+            [atxt12]: [],
+          })
         }
       }
     } else {