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

WXD-SEASON\season
2 parents d920adcd eb16625e
Showing 3 changed files with 15 additions and 3 deletions
packageA/pages/hongBao/hongBao.js
packageG/pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -266,7 +266,10 @@ Page({
 				self.setData({
 					result: res.data,
 					qiangHongBao: true,
-				});
+        });
+        
+        self.data.qianging = false;
+
 			})
 		}
@@ -2195,8 +2195,8 @@ Page({
 		  var err_text="";		
 		  var ok_num=0;
-        var zh_prom_id_err=[];
-        var zh_prom_id_err_goods=[];
+          var zh_prom_id_err=[];
+          var zh_prom_id_err_goods=[];
 		  for(var i in back_goods_arr){
 			  //商品ID
@@ -2298,6 +2298,10 @@ Page({
                       updata.prom_id = newd.prom_id;
                   }
+                  if(newd['zh_prom_id']){
+                    updata.zh_prom_id=newd['zh_prom_id'];
+                  }
+
                   //如果购物车中商品zh_prom_id不一致的话，要进行提示
                   if(is_has.zh_prom_id>0 && is_has.zh_prom_id!= newd['zh_prom_id'] ){
                       zh_prom_id_err.push(newd.goods_name+ '已在购物车\n');
@@ -2625,6 +2625,11 @@ Page({
           updata.prom_id = newd.prom_id;
         }
+        if(newd['zh_prom_id']){
+          updata.zh_prom_id=newd['zh_prom_id'];
+        }
+
+
         //如果购物车中商品zh_prom_id不一致的话，要进行提示
         if(is_has.zh_prom_id>0 && is_has.zh_prom_id!= newd['zh_prom_id'] ){
           zh_prom_id_err.push(newd.goods_name+ '已在购物车\n');