Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised

# Conflicts:
#	html/GT_activities.html

html/Rushbuy.html

@@ -281,7 +281,9 @@
                           'goBack':'1',
                           'cardInfo' : {
                             title : RushbuyTime.title,
-                            date : RushbuyTime.RushbuyTime,
+                            date : RushbuyTime.RushbuyTime, 
+                            userName:RushbuyTime.userName,
+                            shopName:RushbuyTime.shopName,
                           }
                       }
                   }