Merge remote-tracking branch 'refs/remotes/origin/jiaoneiqunuan' into jiaoneiqunuan

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -669,6 +669,7 @@ Page({
     let avatar4 = this.data.avatar4;
     let othername = this.data.othername;
     let overequest = this.data.overequest;
+    let { linvite, ltool, lfollow, lsign, lcollect, lbrowseGoods } = this.data;
 
 
     let ntime = Date.now();
@@ -688,6 +689,12 @@ Page({
         othername: othername,
         overequest: overequest,
         hidetime: ntime,
+        linvite: linvite,
+        ltool: ltool,
+        lfollow: lfollow,
+        lsign: lsign,
+        lcollect: lcollect,
+        lbrowseGoods: lbrowseGoods
       }
     })
   },
@@ -1429,7 +1436,7 @@ Page({
   async lastgameover(lgamedata, nowTime) {
     console.log("直接结束========》");
     let {
-      roomdata, roomnums, tooltime, canwin, step, startime, endtime, avatar2, avatar3, avatar4, othername, overequest, hidetime
+      roomdata, roomnums, tooltime, canwin, step, startime, endtime, avatar2, avatar3, avatar4, othername, overequest, hidetime, linvite, ltool, lfollow, lsign, lcollect, lbrowseGoods
     } = lgamedata;
     this.setData({
       avatar1: app.avatar,
@@ -1446,6 +1453,12 @@ Page({
       showtooltime: this.changeshowtime(tooltime),
       startime: Number(startime),
       endtime: Number(endtime),
+      linvite: linvite,
+      ltool: ltool,
+      lfollow: lfollow,
+      lsign: lsign,
+      lcollect: lcollect,
+      lbrowseGoods: lbrowseGoods
     });
     this.updateActInfo("last");
     this.updateAiInfo();
@@ -1455,7 +1468,7 @@ Page({
   //恢复上局游戏
   async lastgamereset(lgamedata, nowTime) {
     let {
-      roomdata, roomnums, tooltime, canwin, step, startime, endtime, avatar2, avatar3, avatar4, othername, toolcd, overequest, hidetime
+      roomdata, roomnums, tooltime, canwin, step, startime, endtime, avatar2, avatar3, avatar4, othername, toolcd, overequest, hidetime, linvite, ltool, lfollow, lsign, lcollect, lbrowseGoods
     } = lgamedata;
 
     let gameatime = Math.floor((Number(endtime) - Number(nowTime)) / 1000);
@@ -1477,7 +1490,13 @@ Page({
       endtime: Number(endtime),
       othername: othername,
       overequest: overequest,
-      hidetime: hidetime
+      hidetime: hidetime,
+      linvite: linvite,
+      ltool: ltool,
+      lfollow: lfollow,
+      lsign: lsign,
+      lcollect: lcollect,
+      lbrowseGoods: lbrowseGoods
     });
 
     this.updateActInfo("last");