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

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -139,11 +139,12 @@ Page({
     gameatime = Math.floor((Number(end) - Number(start)) / 1000);
     gtoolcd = Number(toolcd);
     let sucgl = Number(gl);
-    let nranksuc = Math.random() * 100;
+    let nranksuc = Math.random();
     let canwin = false;
     if (nranksuc < sucgl) {//能赢
       canwin = true;
     }
+    console.log("onload====>",query,canwin,nranksuc,canwin);
     let roomnums = [2, 3, 4][step - 1];
     let txkeys = Object.keys(gavatars);
     let othername = ["你"];
@@ -522,9 +523,17 @@ Page({
       if (gametime < 0) {
         gametime = 0;
       }
+      
+
+      let tooltime1 = this.data.tooltime;
+      tooltime1 -= passtime/1000;
+      if(tooltime1<0){
+        tooltime1 = 0;
+      }
       this.setData({
-        gametime: gametime
-      });
+        gametime: gametime,
+        tooltime:tooltime1
+      })
     }
     let ngametime = this.data.gametime;
     if ((this.data.isnew > 0 && this.data.isnew < 7) || this.data.show_v != 2 || ngametime <= 0) {