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

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -115,10 +115,14 @@ Page({
     hidetime: 0,
     othername: [],
     overequest: false,
-    laststat: ""
+    laststat: "",
+    firstin: true,
   },
   onLoad(query) {
     console.log("onLoad========>", query);
+    this.setData({
+      fistin: true
+    });
     if (query && query.laststat) {
       let laststat = query.laststat;
       this.setData({
@@ -272,7 +276,7 @@ Page({
     this.addAttionTxt(attiontxt1);
     this.updateAct();
     setTimeout(() => {
-      this.newAiControl("task", 1,2);
+      this.newAiControl("task", 1, 2);
       this.hideSetData();
     }, 4000);
   },
@@ -583,7 +587,8 @@ Page({
   },
   onShow() {
     let laststat = this.data.laststat;
-    if (laststat == "normal") {
+    let firstin = this.data.firstin;
+    if (!firstin) {//laststat == "normal"
       let ntime = Date.now();
       let hidetime = this.data.hidetime;
       if (hidetime) {
@@ -606,6 +611,9 @@ Page({
         })
       }
     }
+    this.setData({
+      firstin: false
+    });
 
     let ngametime = this.data.gametime;
     if ((this.data.isnew > 0 && this.data.isnew < 7) || this.data.show_v != 2 || ngametime <= 0) {
@@ -615,6 +623,7 @@ Page({
   },
   onHide() {
     this.hideSetData();
+    let ntime = Date.now();
     this.setData({
       hidetime: ntime
     });