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

html/GT_activities.html

@@ -360,9 +360,10 @@
                             $('.use_o').html('暂无登录');
                         } else {
                             $('.use_o').html(res.data.contact);
+                            $('.use_t').html(res.data.customerName);
+
                         }
 
-                        $('.use_t').html(res.data.customerName);
 
                         let activityStartDate = new Date(res.data.activityStartDate.replace('T', ' ').replace(/-/g, '/')).getTime(); //活动开始时间
                         let activityEndDate = new Date(res.data.activityEndDate.replace('T', ' ').replace(/-/g, '/')).getTime(); //活动结束时间
@@ -487,6 +488,8 @@
                         let RushbuyTime = {
                             RushbuyTime: expirationDate,
                             title: title,
+                            userName:res.data.contact,
+                            shopName:res.data.customerName,
                         }
                         localStorage.RushbuyTime = JSON.stringify(RushbuyTime)
                         $('.img_bg_p2').html('有效期截止：' + expirationDate)
@@ -720,9 +723,10 @@
                              $('.use_o').html('暂无登录');
                          } else {
                              $('.use_o').html(res.data.contact);
+                             $('.use_t').html(res.data.customerName);
+
                          }
 
-                         $('.use_t').html(res.data.customerName);
 
                          let activityStartDate = new Date(res.data.activityStartDate.replace('T', ' ').replace(/-/g, '/')).getTime(); //活动开始时间
                          let activityEndDate = new Date(res.data.activityEndDate.replace('T', ' ').replace(/-/g, '/')).getTime(); //活动结束时间
@@ -847,6 +851,8 @@
                          let RushbuyTime = {
                              RushbuyTime: expirationDate,
                              title: title,
+                             userName:res.data.contact,
+                             shopName:res.data.customerName,
                          }
                          localStorage.RushbuyTime = JSON.stringify(RushbuyTime)
                          $('.img_bg_p2').html('有效期截止：' + expirationDate)

html/Rushbuy.html

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