init

src/components/banner.vue

@@ -51,7 +51,7 @@ export default {
           id: 2,
           src: "https://img.shuimuai.com/mp/banners/banner3%402x.png",
           url: "/pages/competition/main",
-          button_text: "比赛详情",
+          button_text: "参加比赛",
         },
         {
           id: 3,
@@ -90,15 +90,6 @@ export default {
       });
     },
 
-    // jointBanner(){
-    //   getJointBanner().then((res) => {
-    //     console.log("banner活动", res.data.data)
-    //     let $banner_img = res.data.data
-
-    //     $this.banners[0].src = $banner_img[0].img
-    //     $this.banners[2].src = $banner_img[1].img
-    //   });
-    // }
   },
   mounted() {
     $this.getBanners();

src/components/index/regist.vue

@@ -321,16 +321,6 @@ export default {
     time_finished() {
       $this.time_start = $this.time_show = false;
     },
-    //  获取用户信息
-    // get_Userinfo(e) {
-    //   console.log("获取到的用户信息为:", e);
-    //   if (e.mp.detail.errMsg == "getUserInfo:fail auth deny") {
-    //     Toast.fail("请进行授权登录");
-    //   } else {
-    //     $this._userinfo = e.mp.detail.userInfo;
-    //     $this.wechat_login();
-    //   }
-    // },
     get_user_info() {
       wx.getUserProfile({
         desc: "获取你的昵称、头像、地区及性别",

src/pages/competition/index.vue

@@ -1011,7 +1011,8 @@ page {
   /* background: url("https://img.shuimuai.com//mp/pk/background_3%402x.png");  小乌龟 */
   /* background: url("https://img.shuimuai.com/mppkbackground_june_23_2.png"); */
   /* background: url("https://img.shuimuai.com/bg_game.png"); */
-  background: url("https://img.shuimuai.com/bg_game_11.png");
+  /*background: url("https://img.shuimuai.com/bg_game_11.png");*/
+  background: url("https://img.shuimuai.com/PK%2F5PK.png");
 
   background-size: 100% 100%;
   background-position: center;

src/pages/index/index.vue

@@ -184,10 +184,6 @@ export default {
   onHide() {
   },
   onLoad($option) {
-    if (process.env.NODE_ENV == "development") {
-      wx.setStorageSync("token", "ogsti72oUSkbPl4OL7gl9woLTxR6fk4V");
-    }
-
     if (game_store.getters.getGameStatus() == 1) {
       Dialog.alert({
         title: "系统提示",

src/pages/report/index.vue

@@ -85,6 +85,11 @@
           <view class="right_text">专注力平均值</view>
         </view>
 
+        <view class="margin_right ">
+          <view class="right_num">{{ record.average_med }}</view>
+          <view class="right_text">放松度平均值</view>
+        </view>
+
       </view>
 
       <view class="bar">

src/pages/start/index.vue

@@ -419,6 +419,11 @@ export default {
       // setTimeout(() => {
         $this.$bluetooth.sendToyPower()
       // }, 2000)
+      // let $timeout = setInterval(()=>{
+      //   $this.played_time -= 1;
+      //       game_store.setters.setPlayedTime($this.played_time)
+      //       $this.played_time_text = that.formatPlaySeconds($this.played_time);
+      // },1000)
     },
 
     // ArrayBuffer转16进度字符串示例

src/utils/bluetooth.js

@@ -350,7 +350,15 @@ export default {
         console.log("getBLEDeviceCharacteristics success", res.characteristics);
         for (let i = 0; i < res.characteristics.length; i++) {
           let item = res.characteristics[i];
-          if (item.properties.write) {
+
+          let writeState = null;
+          if(serviceId.indexOf("FFF0")!=-1){
+            writeState = item.properties.write && item.uuid.indexOf("FFF2") != -1;
+          }else{
+            writeState = item.properties.write;
+          }
+          if (writeState) {
+          // if (item.properties.write) {
             $this.deviceId = deviceId;
             $this.serviceId = serviceId;
             $this.cid = item.uuid;

src/utils/user.js

@@ -49,7 +49,7 @@ export function reload_userinfo($this) {
       $this.userinfo.isActive = true
       $this.userinfo.isntActive = false
     }
- 
+
     // $this.userinfo['validity_time'] = formatTime($this.userinfo['validity_time'])
     $this.userinfo['free_time'] = formatSeconds($this.userinfo['free_time'])
     //设置邀请码
@@ -59,6 +59,8 @@ export function reload_userinfo($this) {
     //停止下拉刷新
     wx.stopPullDownRefresh()
     wx.hideLoading()
+  }).catch((err)=>{
+    do_logout($this);
   })
 }