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

WXD-SEASON\season
2 parents d2a8aac5 cb6de0d9
Showing 6 changed files with 15 additions and 15 deletions
packageC/pages/presell/cart/cart2_pre.js
packageE/pages/cart/cart2/cart2.js
pages/cart/cart2_inte/cart2_inte.js
pages/cart/cart2_pt/cart2_pt.js
pages/goods/goodsInfo/goodsInfo.js
pages/index/index/index.js
@@ -814,7 +814,7 @@ Page({
         }
       })
     }
-    if(gg.groupchat_id){
+    if(gg.groupchat_id && gg.groupchat_id!='undefined'){
       goods.groupchat_id=gg.groupchat_id
       item.groupchat_ids=gg.groupchat_id
     }
@@ -1501,7 +1501,7 @@ Page({
                     t.data.data.guide_id = gg.guide_id;
                     t.data.data.guide_type = gg.guide_type;
                   }
-                  if(gg.groupchat_id){
+                  if(gg.groupchat_id && gg.groupchat_id!='undefined'){
                     t.data.data.groupchat_id=groupchat_id;
                   }
                   //搭配购如果原来就有勾选，不能直接赋值，旧的要保留
@@ -3630,7 +3630,7 @@ Page({
         df_goods[index].df_room_ids += room_id + ",";
       }
-      if(getApp().globalData.groupchat_id){
+      if(getApp().globalData.groupchat_id && getApp().globalData.groupchat_id!='undefined'){
           df_goods[index].groupchat_id=getApp().globalData.groupchat_id
       }
     } else {
@@ -3640,7 +3640,7 @@ Page({
         df_goods: []
       }
       if (room_id) e.df_room_ids = room_id + ','
-      if(getApp().globalData.groupchat_id){
+      if(getApp().globalData.groupchat_id && getApp().globalData.groupchat_id!='undefined'){
         e.groupchat_id=getApp().globalData.groupchat_id
       }
       e.df_goods.push(good);
@@ -3817,7 +3817,7 @@ Page({
       }
       //群id
-      if(gg.groupchat_id){
+      if(gg.groupchat_id && gg.groupchat_id!='undefined'){
         item.groupchat_ids=gg.groupchat_id;
       }
       var order_prom_list = {};
@@ -3916,7 +3916,7 @@ Page({
           }
         })
       }
-      if(gg.groupchat_id){
+      if(gg.groupchat_id && gg.groupchat_id!='undefined'){
         goods.groupchat_id=gg.groupchat_id
       }
@@ -4026,7 +4026,7 @@ Page({
               }
             })
           }
-          if(gg.groupchat_id){
+          if(gg.groupchat_id && gg.groupchat_id!='undefined'){
             g_goods.groupchat_id=gg.groupchat_id;
           }
           item.order_goods.push(g_goods);
@@ -4308,7 +4308,7 @@ Page({
             })
           }
-          if(g_item.groupchat_id){
+          if(g_item.groupchat_id && g_item.groupchat_id!='undefined'){
             goods.groupchat_id=g_item.groupchat_id;
             groupchat_ids.push(g_item.groupchat_id);
           }
@@ -4423,7 +4423,7 @@ Page({
             if (ddff_item.df_room_ids)
               df_item.room_ids = ut.sub_last(ddff_item.df_room_ids);
-            if (getApp().globalData.groupchat_id){
+            if (getApp().globalData.groupchat_id && getApp().globalData.groupchat_id!='undefined'){
               df_item.groupchat_ids = getApp().globalData.groupchat_id;
             }  
             df_item.order_goods = ddff_item.df_goods;
@@ -1127,7 +1127,7 @@ Page({
       if (gg.room_id && gg.room_id > 0) {
         item.room_ids = gg.room_id;
       }
-      if(gg.groupchat_id){
+      if(gg.groupchat_id && gg.groupchat_id!='undefined'){
         item.groupchat_ids=gg.groupchat_id
       }
@@ -1180,7 +1180,7 @@ Page({
           }
         })
       }
-      if(gg.groupchat_id){
+      if(gg.groupchat_id && gg.groupchat_id!='undefined'){
         goods.groupchat_id=gg.groupchat_id
       }
       //--商品的房间号--
@@ -1186,7 +1186,7 @@ Page({
         }
       })
     }
-    if(gg.groupchat_id){
+    if(gg.groupchat_id && gg.groupchat_id!='undefined'){
       goods.groupchat_id=gg.groupchat_id
       item.groupchat_ids=gg.groupchat_id
     }
@@ -285,7 +285,7 @@ Page({
       var share_openid = t.share_openid;
       //群id
-      if(t && t.groupchat_id){
+      if(t && t.groupchat_id && !t.groupchat_id!='undefined' && !t.groupchat_id!='null'){
         getApp().globalData.groupchat_id=t.groupchat_id
       }
@@ -3093,7 +3093,7 @@ Page({
     }
     //群id分享
-    if (getApp().globalData.groupchat_id) {
+    if (getApp().globalData.groupchat_id && getApp().globalData.groupchat_id!='undefined') {
       url+="&groupchat_id="+getApp().globalData.groupchat_id
     }
@@ -101,7 +101,7 @@ Page({
 		var th = this;
     var first_leader = tt.first_leader;
       //群id
-    if(tt && tt.groupchat_id){
+    if(tt && tt.groupchat_id && tt.groupchat_id!='undefined' && tt.groupchat_id!='null'){
       getApp().globalData.groupchat_id=tt.groupchat_id
     }
 		if (!first_leader && tt.scene) {