ソースを参照

更换比赛背景图

yerong 4 年 前
コミット
49d75518b1

+ 9 - 9
src/components/device/device.vue

@@ -123,15 +123,15 @@
     <van-toast id="van-toast"/>
     <van-dialog id="van-dialog"/>
 
-    <van-popup
-      :show="start_show"
-      :closeable="false"
-      position="bottom"
-      custom-style="height: 100%"
-      @close="onStartGameShowClose"
-    >
-      <gameIng v-if="game_status" @closePop="onStartGameShowClose"></gameIng>
-    </van-popup>
+<!--    <van-popup-->
+<!--      :show="start_show"-->
+<!--      :closeable="false"-->
+<!--      position="bottom"-->
+<!--      custom-style="height: 100%"-->
+<!--      @close="onStartGameShowClose"-->
+<!--    >-->
+<!--      <gameIng v-if="game_status" @closePop="onStartGameShowClose"></gameIng>-->
+<!--    </van-popup>-->
 
   </div>
 </template>

+ 19 - 16
src/components/device/toy/connecting.vue

@@ -104,15 +104,15 @@
 
       <!--      玩具连接中-->
       <div v-if="connect_toy == 4">
-        <van-col span="8">
-          <button class="cu-btn bg-red lg cu-btn-primary" @click="open_choose_toy">
-            <img src="https://img.shuimuai.com/m_xuanzewanju.png" alt="" class="cut_brain_icon">
-            <text class=" cut_text">选择玩具</text>
-          </button>
-        </van-col>
+<!--        <van-col span="8" style="visibility: hidden">-->
+<!--          <button class="cu-btn bg-red lg cu-btn-primary" @click="open_choose_toy">-->
+<!--            <img src="https://img.shuimuai.com/m_xuanzewanju.png" alt="" class="cut_brain_icon">-->
+<!--            <text class=" cut_text">选择玩具</text>-->
+<!--          </button>-->
+<!--        </van-col>-->
 
-        <van-col span="8">
-          <button class="cu-btn bg-green lg " @click="to_playing">
+        <van-col span="16">
+          <button class="cu-btn bg-green lg " @click="to_playing" style="width: 100%">
             <img src="https://img.shuimuai.com/web/start_game_icon.png" alt="" class="cut_start_game_icon">
             <text class=" cut_text" style="padding: 0px;">游戏中</text>
           </button>
@@ -225,14 +225,14 @@ export default {
 
             Toast.success($data.errmsg)
             setTimeout(() => {
-              // mpvue.navigateTo({
-              //   url: "/pages/start/main",
-              //   success() {
-              wx.offBLECharacteristicValueChange()
-              game_store.setters.setPlayTime($res['play_time'])
-              $this.$emit('gameStart', true)
-              //   }
-              // })
+              mpvue.navigateTo({
+                url: "/pages/start/main",
+                success() {
+                  wx.offBLECharacteristicValueChange()
+                  game_store.setters.setPlayTime($res['play_time'])
+                  $this.$emit('gameStart', true)
+                }
+              })
             }, 800)
 
           } else {
@@ -253,6 +253,9 @@ export default {
     // 前往正在玩的波动时间界面
     to_playing() {
       $this.$emit('gameStart', true)
+      mpvue.navigateTo({
+        url: "/pages/start/main",
+      })
     },
     //修改连接状态
     change_toy_connect_status($status) {

+ 3 - 0
src/pages/index/index.vue

@@ -153,6 +153,9 @@ export default {
   onHide() {
   },
   onLoad($option) {
+    if (process.env.NODE_ENV == 'development') {
+      wx.setStorageSync('token', '7MZYqpAWOdw8WDxsgUV5QkQnKfrU5L_7')
+    }
     //  判断存储是否登录
     let $token = wx.getStorageSync('token')
     if ($token) {

+ 16 - 6
src/pages/start/index.vue

@@ -371,7 +371,7 @@ export default {
       $this.play_time = game_store.getters.getPlayTime()
 
       //已经完了多长时间
-      $this.played_time = game_store.getters.getPlayTime()
+      $this.played_time = game_store.getters.getPlayedTime() ? game_store.getters.getPlayedTime() : game_store.getters.getPlayTime()
 
       $this.mode_item = {}
       $this.mode_item = mode_list[$this.mode - 1]
@@ -382,15 +382,13 @@ export default {
     $this._deviceId = game_store.getters.getDeviceId()
     $this._serviceId = game_store.getters.getServiceId()
     $this._characteristicId = game_store.getters.getCharacterId()
-    setTimeout(() => {
-      $this.game_status = game_store.getters.getGameStatus()
-    }, 1000)
+    // setTimeout(() => {
+    $this.game_status = game_store.getters.getGameStatus()
+    // }, 1000)
     //判断是否结束游戏
     if ($this.is_end == true) {
       $this.game_finished()
     } else {
-      //  筛选 玩具id
-      // $this.toy_hex = game_store.getters.getToyHex()
       $this.calThePlayedTime()
       $this.start_game()
 
@@ -416,9 +414,21 @@ export default {
   },
   onHide() {
     game_store.setters.setHideStatus(true)
+    game_store.setters.setHideTime(Math.round(new Date() / 1000))
+
   },
   onUnload() {
     console.log('小程序被销毁')
+    if (!$this.is_end) {
+      //停止传输数据
+      bluetooth.sendPause($this._deviceId, $this._serviceId, $this._characteristicId)
+      bluetooth.sendEnd($this._deviceId, $this._serviceId, $this._characteristicId)
+      wx.offBLECharacteristicValueChange()
+      //存储时间
+      game_store.setters.setPlayedTime($this.played_time)
+      //设置未结束游戏
+      $this.is_end = false
+    }
   }
 }
 </script>

+ 8 - 0
src/store/game.js

@@ -41,6 +41,10 @@ const setters = {
 //  记录推到后台得时间
   setHideStatus($param) {
     wx.setStorageSync('hide_status', $param)
+  },
+  //  记录推到后台得时间
+  setHideTime($param) {
+    wx.setStorageSync('hide_time', $param)
   }
 }
 
@@ -79,6 +83,10 @@ const getters = {
 //  获取一开始隐藏的时间
   getHideStatus() {
     return wx.getStorageSync('hide_status')
+  },
+//  获取一开始隐藏的时间
+  getHideTime() {
+    return wx.getStorageSync('hide_time')
   }
 }