更新0603

src/components/banner.vue

@@ -63,6 +63,7 @@ export default {
     },
     getBanners() {
       getBannerList().then((res) => {
+        console.log("活动列表ID：", res);
         let $res = res.data;
         let $activities = $res.data;
         let $new_act = $activities.pop();

src/components/device/device.vue

@@ -220,25 +220,73 @@ export default {
             // 判断新的标识值
             $this.code = $code[1].toUpperCase();
             console.log("头环码", $code);
-            //打开蓝牙设备 
-            
-
-            wx.openBluetoothAdapter({
-              mode: "peripheral",
+            //打开蓝牙设备
+            wx.getSystemInfo({
               success(res) {
-                //判断已经打开连接了
-                if (res["errMsg"] == "openBluetoothAdapter:ok") {
-                  $this.startBluetoothDevicesDiscovery();
+                // 判断ios 和 安卓
+                if (res.platform == "ios") {
+                  wx.openBluetoothAdapter({
+                    //判断主机模式蓝牙是否打开
+                    mode: "central",
+                    success(res) {
+                      //判断已经打开连接了
+                      if (res["errMsg"] == "openBluetoothAdapter:ok") {
+                        // $this.startBluetoothDevicesDiscovery();
+                        wx.openBluetoothAdapter({
+                          //判断从机模式蓝牙是否打开
+                          mode: "peripheral",
+                          success(res) {
+                            if (res["errMsg"] == "openBluetoothAdapter:ok") {
+                              $this.startBluetoothDevicesDiscovery();
+                            }
+                          },
+                          fail(err) {
+                            let $msg = bluetooth.GetopenBluetoothAdapterError(
+                              err["errCode"]
+                            );
+                            setTimeout(() => {
+                              Toast.fail({
+                                message: $msg,
+                              });
+                            }, 3000);
+                          },
+                        });
+                      }
+                    },
+                    fail(err) {
+                      let $msg = bluetooth.GetopenBluetoothAdapterError(
+                        err["errCode"]
+                      );
+                      setTimeout(() => {
+                        Toast.fail({
+                          message: $msg,
+                        });
+                      }, 3000);
+                    },
+                  });
+                } else {
+                  // 安卓手机
+                  wx.openBluetoothAdapter({
+                    mode: "peripheral",
+                    success(res) {
+                      //判断已经打开连接了
+                      if (res["errMsg"] == "openBluetoothAdapter:ok") {
+                        $this.startBluetoothDevicesDiscovery();
+                      }
+                    },
+                    fail(err) {
+                      let $msg = bluetooth.GetopenBluetoothAdapterError(
+                        err["errCode"]
+                      );
+                      setTimeout(() => {
+                        Toast.fail({
+                          message: $msg,
+                        });
+                      }, 3000);
+                    },
+                  });
                 }
               },
-              fail(err) {
-                let $msg = bluetooth.GetopenBluetoothAdapterError(
-                  err["errCode"]
-                );
-                Toast.fail({
-                  message: $msg,
-                });
-              },
             });
 
             // wx.openBluetoothAdapter({
@@ -475,6 +523,8 @@ export default {
   onShow() {
     //判断是否游戏中
     let $game_status = game_store.getters.getGameStatus();
+    // 游戏过程中关闭脑环状态
+    let $game_close_status = game_store.getters.getGameCloseStatus();
     // console.log("游戏中：" + $game_status);
     if ($game_status == 3) {
       //不在游戏状态
@@ -487,24 +537,25 @@ export default {
       //   //断开蓝牙连接
       //   $this.change_device_status(0);
       // }
-      // 状态为0的时候重置为0 小乌龟
-    } else if ($game_status == 0) {
-      // 重置默认条件
-      $this.connect_toy = 0;
-      $this.connect_show = false;
-      $this.device_status = 0;
-      bluetooth.watch_bluetooth_status($this);
-      $this._deviceId = "";
+      // 状态为1的时候重置为1 小乌龟
+      if ($game_close_status == 1) {
+        // 重置默认条件
+        $this.connect_toy = 0;
+        $this.connect_show = false;
+        $this.device_status = 0;
+        bluetooth.watch_bluetooth_status($this);
+        $this._deviceId = "";
 
-      // 清空三个id值
-      let $deviceId = game_store.getters.getDeviceId();
-      let $serviceId = game_store.getters.getServiceId();
-      let $cid = game_store.getters.getCharacterId();
-      bluetooth.shutdownSendControl($deviceId, $serviceId, $cid);
-      // 清空链接的设备
-      game_store.setters.clearDeviceToy();
+        // 清空三个id值
+        let $deviceId = game_store.getters.getDeviceId();
+        let $serviceId = game_store.getters.getServiceId();
+        let $cid = game_store.getters.getCharacterId();
+        bluetooth.shutdownSendControl($deviceId, $serviceId, $cid);
+        // 清空链接的设备
+        game_store.setters.clearDeviceToy();
 
-      console.log("返回时出现,我触发了嘛", $deviceId, $serviceId, $cid);
+        console.log("返回时出现,我触发了嘛", $deviceId, $serviceId, $cid);
+      }
     }
   },
   onHide() {
@@ -514,6 +565,7 @@ export default {
       $this.device_status,
       game_store.getters.getGameStatus()
     );
+    // game_store.setters.setGameStatus(0);
   },
   onLoad(options) {
     // 原有的code

src/components/device/toy/connecting.vue

@@ -333,6 +333,8 @@ export default {
       };
       gameStart($params).then(
         (res) => {
+          // 重置断开脑环的状态
+          game_store.setters.setGameCloseStatus(0);
           let $data = res.data;
           let $res = $data.data;
           if ($data.code == 0) {

src/pages/index/index.vue

@@ -86,7 +86,7 @@ import personal_container from "@/components/index/personal";
 import device_container from "@/components/device/device";
 import Toast from "../../../static/vant/toast/toast";
 import Dialog from "../../../static/vant/dialog/dialog";
-import { userDetail , setUserLogin } from "../../requests/user";
+import { userDetail, setUserLogin } from "../../requests/user";
 import user_store from "../../store/index";
 import game_store from "../../store/game";
 import game_util, { post_data } from "../../utils/game";
@@ -230,12 +230,10 @@ export default {
       // wx.navigateTo({
       //   url: "/pages/payment/main",
       // });
-      // 存在token时候录入  
-    setUserLogin().then(
-      
-      (res)=>{console.log('录入',res)}
-      
-      )
+      // 存在token时候录入
+      setUserLogin().then((res) => {
+        console.log("录入", res);
+      });
     }
   },
   created() {

src/pages/report/index.vue

@@ -69,7 +69,7 @@
           <mpvue-echarts
             :echarts="echarts"
             :onInit="hight_att_charts"
-            canvasId="demo-canvas1"
+            canvasId="demo-canvas-interfere"
           />
         </view>
         <view class="left_content">
@@ -203,6 +203,32 @@
         </view>
       </view>
     </view>
+    <!-- 专注力变化看板 -->
+    <!-- <view class="absorbed_change">
+      <view class="interfere_title_wrap">
+        <view class="line"></view>
+        <view class="title">专注力变化分析</view>
+      </view> -->
+    <!-- 看板一 干扰 -->
+    <!-- <view class="interfere_wrap">
+        <view class="interfere">
+          <img
+            src="http://img.shuimuai.com/program_interfere_log.png"
+            alt=""
+            class="interfere_logo"
+          >
+          <view class="interfere_text">
+            受干扰次数:
+            <title class="interfere_text_num"> {{record.interfere}}</title>
+            次
+          </view>
+        </view>
+        <view class="interfere_footer">
+          <title class="interfere_footer_logo"></title>专注力干扰
+        </view>
+      </view>
+    </view> -->
+
     <van-toast id="van-toast" />
 
   </div>
@@ -726,4 +752,73 @@ image.boy {
   border-radius: 10px;
   box-shadow: 0px 6px 11px #dadada;
 }
+/* 专注力干扰看板 */
+.absorbed_change {
+  width: 100%;
+  padding: 0 7px;
+  box-sizing: border-box;
+  margin-top: 40px;
+}
+
+.absorbed_change .line {
+  width: 4px;
+  height: 15px;
+  background-color: #5d4db8;
+  margin-right: 7px;
+}
+
+.absorbed_change .title {
+  color: #010101;
+  font-size: 15px;
+}
+.interfere_title_wrap {
+  width: 100%;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  border-top: 1px solid #e5e5e5;
+}
+/* 干扰 标题*/
+.interfere {
+  display: flex;
+  margin-left: 8px;
+  height: 54px;
+  align-items: center;
+  margin-bottom: 14px;
+}
+.interfere .interfere_logo {
+  display: inline-block;
+  width: 19px;
+  height: 19px;
+  margin-right: 7px;
+}
+.interfere .interfere_text {
+  font-size: 15px;
+  color: #676767;
+}
+
+.interfere .interfere_text .interfere_text_num {
+  font-size: 18px;
+  font-weight: 900;
+}
+/* 干扰 echarts */
+/* 干扰 bottom */
+.interfere_footer {
+  width: 100%;
+  height: 26px;
+  font-size: 13px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #676767;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.interfere_footer .interfere_footer_logo {
+  display: inline-block;
+  width: 13px;
+  height: 13px;
+  background-color: #23cc92;
+  margin-right: 5px;
+}
 </style>

src/pages/user_center/recharge/index.vue

@@ -23,11 +23,24 @@
     </div>
 
     <!--    黄金会员-->
-    <div v-for="(item,index) in time_cards" :key="index">
-      <div class="vip" :class="item.bg" @click="changeCardShow(item.goods_id)">
+    <div
+      v-for="(item,index) in time_cards"
+      :key="index"
+    >
+      <div
+        class="vip"
+        :class="item.bg"
+        @click="changeCardShow(item.goods_id)"
+      >
         <van-row>
-          <van-col span="10" offset="6">
-            <div class="card_body" style="padding-top:14px;">
+          <van-col
+            span="10"
+            offset="6"
+          >
+            <div
+              class="card_body"
+              style="padding-top:14px;"
+            >
               <view>
                 <text class="mine_min  text-white">{{ item.play_time }}</text>
                 <text class="text-white">分钟</text>
@@ -39,22 +52,31 @@
             </div>
           </van-col>
 
-          <van-col span="6" offset="1">
+          <van-col
+            span="6"
+            offset="1"
+          >
             <div class="card_body">
 
               <view>
                 <text class="text-white text-sm">价格</text>
               </view>
               <view class="text-center">
-                  <text class="text-white mine_min">{{ item.price }} <text class="text-white text-sm">&yen;</text> </text>
+                <text class="text-white mine_min">{{ item.price }} <text class="text-white text-sm">&yen;</text> </text>
               </view>
               <view class="text-center">
-                <img src="https://img.shuimuai.com/web/btn_seedetil_1%402x.png"  class="check_detail" alt=""
-                   v-if="card_action_show == item.goods_id"
-              >
-              <img src="https://img.shuimuai.com/web/btn_seedetil_2.png" class="check_detail" alt=""
-                   v-else
-              >
+                <img
+                  src="https://img.shuimuai.com/web/btn_seedetil_1%402x.png"
+                  class="check_detail"
+                  alt=""
+                  v-if="card_action_show == item.goods_id"
+                >
+                <img
+                  src="https://img.shuimuai.com/web/btn_seedetil_2.png"
+                  class="check_detail"
+                  alt=""
+                  v-else
+                >
               </view>
 
             </div>
@@ -65,32 +87,47 @@
 
       <view v-if="card_action_show == item.goods_id">
 
-
         <!--    描述-->
-        <view class="desc" v-html="item.content">
+        <view
+          class="desc"
+          v-html="item.content"
+        >
 
         </view>
 
-
         <!--    购买按钮-->
         <div class="buy_button">
-          <button class="cu-btn lg bg-orange text-center margin " @click="open_order_confirm(item)">购买{{item.goods_name}}</button>
+          <button
+            class="cu-btn lg bg-orange text-center margin "
+            @click="open_order_confirm(item)"
+          >购买{{item.goods_name}}</button>
         </div>
       </view>
     </div>
 
-
     <div class="title flex padding align-center">
       <div class="line margin-right"></div>
       <text>体验次卡</text>
     </div>
     <!--  体验次卡-->
-    <div v-for="(item,index) in frequency_card" :key="index">
-
-      <div class="normal vip" @click="changeCardShow(item.goods_id)">
+    <div
+      v-for="(item,index) in frequency_card"
+      :key="index"
+    >
+
+      <div
+        class="normal vip"
+        @click="changeCardShow(item.goods_id)"
+      >
         <van-row>
-          <van-col span="10" offset="6">
-            <div class="card_body" style="padding-top:14px;">
+          <van-col
+            span="10"
+            offset="6"
+          >
+            <div
+              class="card_body"
+              style="padding-top:14px;"
+            >
               <view>
                 <text class="mine_min  text-white">{{ item.play_time }}</text>
                 <text class="text-white">次</text>
@@ -102,20 +139,29 @@
             </div>
           </van-col>
 
-          <van-col span="6" offset="1">
+          <van-col
+            span="6"
+            offset="1"
+          >
             <div class="card_body">
 
               <view>
                 <text class="text-white text-sm">价格</text>
               </view>
               <view class="text-center">
-                 <text class="text-white mine_min">{{ item.price }} <text class="text-white text-sm">&yen;</text> </text>
+                <text class="text-white mine_min">{{ item.price }} <text class="text-white text-sm">&yen;</text> </text>
               </view>
-              <img src="https://img.shuimuai.com/web/btn_seedetil_1%402x.png"  class="check_detail" alt=""
-                   v-if="card_action_show == item.goods_id"
+              <img
+                src="https://img.shuimuai.com/web/btn_seedetil_1%402x.png"
+                class="check_detail"
+                alt=""
+                v-if="card_action_show == item.goods_id"
               >
-              <img src="https://img.shuimuai.com/web/btn_seedetil_2.png" class="check_detail" alt=""
-                   v-else
+              <img
+                src="https://img.shuimuai.com/web/btn_seedetil_2.png"
+                class="check_detail"
+                alt=""
+                v-else
               >
 
             </div>
@@ -125,26 +171,34 @@
       </div>
       <view v-if="card_action_show == item.goods_id">
 
-
         <!--    描述-->
-        <view class="desc" v-html="item.content">
+        <view
+          class="desc"
+          v-html="item.content"
+        >
 
         </view>
 
-
         <!--    购买按钮-->
         <div class="buy_button">
-          <button class="cu-btn lg bg-orange text-center margin " @click="open_order_confirm(item)">购买{{
-              item.goods_name
+          <button
+            class="cu-btn lg bg-orange text-center margin "
+            @click="open_order_confirm(item)"
+          >购买{{
+            item.goods_name
             }}
           </button>
         </div>
       </view>
     </div>
 
-
     <!--    确认订单 弹窗-->
-    <van-popup :show="order_confirm" @close="close_order_confirm" round closeable>
+    <van-popup
+      :show="order_confirm"
+      @close="close_order_confirm"
+      round
+      closeable
+    >
       <div class="order_confirm padding">
         <view>
           <text class="text-sm text-gray">已选商品&emsp;水母星球-{{ selection_card.goods_name }}</text>
@@ -169,36 +223,68 @@
           <text class="text-sm text-gray">实付(元)&emsp;</text>
           <text class="mine_min">{{ selection_card.price * selection_card.discount }}</text>
         </view>
-        <button class="cu-btn bg-primary lg text-white recharge_button" @click="success_pay" :disabled="btn_disabled">立即充值</button>
+        <button
+          class="cu-btn bg-primary lg text-white recharge_button"
+          @click="success_pay"
+          :disabled="btn_disabled"
+        >立即充值</button>
       </div>
     </van-popup>
 
     <!--    充值失败-->
-    <van-popup :show="err_show" @close="close_err_pop" round :close-on-click-overlay="false">
+    <van-popup
+      :show="err_show"
+      @close="close_err_pop"
+      round
+      :close-on-click-overlay="false"
+    >
       <div class="err_container flex flex-direction align-center justify-around">
         <view>
           <text class="title">
             充值失败，请再次尝试
           </text>
         </view>
-        <img src="https://img.shuimuai.com/web/sign_notimeJfish.png" class="err_img" alt="">
+        <img
+          src="https://img.shuimuai.com/web/sign_notimeJfish.png"
+          class="err_img"
+          alt=""
+        >
         <div class="button_group flex justify-around">
-          <button class="cu-btn bg-gray text-white lg" @click="close_err_pop">取消支付</button>
-          <button class="cu-btn  bg-primary text-white lg" @click="repay" :disabled="btn_disabled">再次支付</button>
+          <button
+            class="cu-btn bg-gray text-white lg"
+            @click="close_err_pop"
+          >取消支付</button>
+          <button
+            class="cu-btn  bg-primary text-white lg"
+            @click="repay"
+            :disabled="btn_disabled"
+          >再次支付</button>
         </div>
       </div>
     </van-popup>
 
     <!--    充值成功-->
-    <van-popup :show="success_show" @close="close_success_pop" round :close-on-click-overlay="false">
+    <van-popup
+      :show="success_show"
+      @close="close_success_pop"
+      round
+      :close-on-click-overlay="false"
+    >
       <div class="err_container flex flex-direction align-center justify-around ext_container">
-        <img src="https://img.shuimuai.com/web/boyya.png" class="boy_logo" alt="">
+        <img
+          src="https://img.shuimuai.com/web/boyya.png"
+          class="boy_logo"
+          alt=""
+        >
         <view>
           <text class="title">
             充值成功
           </text>
         </view>
-        <view class="sub-title" v-if="selection_card.goods_id < 4">
+        <view
+          class="sub-title"
+          v-if="selection_card.goods_id < 4"
+        >
           <text class="text-gray">
             {{ selection_card.goods_name }},请到实体店店员处领取邀请卡
           </text>
@@ -206,7 +292,10 @@
         <div class="button_group flex justify-around">
           <!--          <button class="cu-btn bg-gray text-white lg" @click="close_success_pop">以后再填</button>-->
           <!--          <button class="cu-btn  bg-primary text-white lg" @click="to_write_address">填写地址</button>-->
-          <button class="cu-btn  bg-primary text-white lg" @click="to_index">充值成功</button>
+          <button
+            class="cu-btn  bg-primary text-white lg"
+            @click="to_index"
+          >充值成功</button>
         </div>
       </div>
     </van-popup>
@@ -214,11 +303,10 @@
 </template>
 
 <script>
+import { goodsCardList } from "../../../requests/goods";
+import { createOrder, deleteOrder } from "../../../requests/orders";
 
-import {goodsCardList} from "../../../requests/goods";
-import {createOrder, deleteOrder} from "../../../requests/orders";
-
-var $this
+var $this;
 export default {
   name: "uc_recharge_container",
   components: {},
@@ -241,46 +329,49 @@ export default {
       payment_info: {},
       //订单编号
       order_sn: "",
-      btn_disabled: false
-    }
+      btn_disabled: false,
+    };
   },
   watch: {},
   methods: {
     //弹出确认订单
     open_order_confirm($item) {
-      $this.order_confirm = true
-      $this.selection_card = $item
+      $this.order_confirm = true;
+      $this.selection_card = $item;
     },
     //关闭确认订单
     close_order_confirm() {
-      $this.order_confirm = false
+      $this.order_confirm = false;
     },
     //关闭充值失败窗口
     close_err_pop() {
-      $this.err_show = false
+      $this.err_show = false;
     },
     //取消充值
     cancel_recharge() {
-      $this.close_err_pop()
+      $this.close_err_pop();
 
-      deleteOrder($this.order_sn).then((res) => {
-        let $res = res.data
-      }, (err) => {
-        console.log("删除订单错误", err)
-      })
+      deleteOrder($this.order_sn).then(
+        (res) => {
+          let $res = res.data;
+        },
+        (err) => {
+          console.log("删除订单错误", err);
+        }
+      );
     },
     // 打开充值成功窗口
     open_success_window() {
-      $this.success_show = true
+      $this.success_show = true;
     },
     //关闭充值成功窗口
     close_success_pop() {
-      $this.success_show = false
+      $this.success_show = false;
     },
     //再次付款
     repay() {
-      $this.btn_disabled = true
-      let $payment = $this.payment_info
+      $this.btn_disabled = true;
+      let $payment = $this.payment_info;
       wx.requestPayment({
         timeStamp: $payment.timeStamp,
         nonceStr: $payment.nonceStr,
@@ -289,48 +380,51 @@ export default {
         paySign: $payment.sign,
         success(res) {
           //支付成功
-          console.log('success', res)
+          console.log("success支付成功调用:", res);
           //关闭确认订单窗口
-          $this.close_order_confirm()
-          $this.close_success_pop()
+          $this.close_order_confirm();
+          $this.close_success_pop();
           //打开成功充值窗口
-          $this.open_success_window()
+          $this.open_success_window();
         },
         fail(res) {
-          $this.cancel_recharge()
-          $this.close_order_confirm()
-          $this.err_show = true
+          console.log("success支付失败调用:", res);
+
+          $this.cancel_recharge();
+          $this.close_order_confirm();
+          $this.err_show = true;
         },
         complete() {
-          $this.btn_disabled = false
-        }
-      })
+          $this.btn_disabled = false;
+        },
+      });
     },
     to_index() {
       mpvue.reLaunch({
-        url: "/pages/index/main"
-      })
+        url: "/pages/index/main",
+      });
     },
     // 成功支付
     success_pay() {
-       $this.btn_disabled = true
+      $this.btn_disabled = true;
 
       // 支付成功后得回调方法
       let $params = {
         goods_id: $this.selection_card.goods_id,
-        buy_num: 1
-      }
+        buy_num: 1,
+      };
 
       wx.login({
         success(res1) {
           console.log("微信登陆", res1.code);
-          let $code = res1.code
-          $params['js_code'] = $code
-          createOrder($params).then((res) => {
-              let $data = res.data
-              let $payment = $data.data
-              $this.order_sn = $payment['sn']
-              $this.payment_info = $payment
+          let $code = res1.code;
+          $params["js_code"] = $code;
+          createOrder($params).then(
+            (res) => {
+              let $data = res.data;
+              let $payment = $data.data;
+              $this.order_sn = $payment["sn"];
+              $this.payment_info = $payment;
               wx.requestPayment({
                 timeStamp: $payment.timeStamp,
                 nonceStr: $payment.nonceStr,
@@ -339,87 +433,84 @@ export default {
                 paySign: $payment.sign,
                 success(res) {
                   //支付成功
-                  console.log('success', res)
+                  console.log("success", res);
                   //关闭确认订单窗口
-                  $this.close_order_confirm()
-                  $this.close_success_pop()
+                  $this.close_order_confirm();
+                  $this.close_success_pop();
                   //打开成功充值窗口
-                  $this.open_success_window()
+                  $this.open_success_window();
                 },
                 fail(res) {
-                  console.log('fail', res)
-                  $this.cancel_recharge()
-                  $this.close_order_confirm()
-                  $this.err_show = true
+                  console.log("fail", res);
+                  $this.cancel_recharge();
+                  $this.close_order_confirm();
+                  $this.err_show = true;
                 },
                 complete() {
-                  $this.btn_disabled = false
-                }
-              })
+                  $this.btn_disabled = false;
+                },
+              });
             },
             (err) => {
-              console.log(err)
+              console.log(err);
             }
-          )
-        }
-      })
-
+          );
+        },
+      });
 
       //  接收回调方法后弹出支付成功
     },
     //跳转填写地址
     to_write_address() {
       mpvue.navigateTo({
-        url: "/pages/user_center/address/list/main"
-      })
+        url: "/pages/user_center/address/list/main",
+      });
     },
     // 获取充值卡列表
     get_card_list() {
       goodsCardList().then((res) => {
-        let $data = res.data.data
-        $this.time_cards = $data.time_card
-        let $bg = ['gold', 'platina', 'diamond']
+        let $data = res.data.data;
+        $this.time_cards = $data.time_card;
+        let $bg = ["gold", "platina", "diamond"];
         $this.time_cards.forEach(($val, $index) => {
-          $this.time_cards[$index]['bg'] = $bg[$index]
-          $this.time_cards[$index]['price'] = Math.ceil($val['price'])
-        })
-        $this.frequency_card = $data.frequency_card
+          $this.time_cards[$index]["bg"] = $bg[$index];
+          $this.time_cards[$index]["price"] = Math.ceil($val["price"]);
+        });
+        $this.frequency_card = $data.frequency_card;
         $this.frequency_card.forEach(($val, $index) => {
-          $this.frequency_card[$index]['bg'] = 'normal'
-          $this.frequency_card[$index]['price'] = Math.round($val['price'])
-        })
-      })
+          $this.frequency_card[$index]["bg"] = "normal";
+          $this.frequency_card[$index]["price"] = Math.round($val["price"]);
+        });
+      });
     },
     to_orderlist() {
       mpvue.navigateTo({
-        url: "/pages/user_center/orders/main"
-      })
+        url: "/pages/user_center/orders/main",
+      });
     },
     //  切换显示
     changeCardShow($id) {
-      console.log($id)
+      console.log($id);
       if ($this.card_action_show == $id) {
-        $this.card_action_show = 0
+        $this.card_action_show = 0;
       } else {
-        $this.card_action_show = $id
+        $this.card_action_show = $id;
       }
-    }
-  }
-  ,
+    },
+  },
   mounted() {
-    $this.get_card_list()
-    $this.userinfo = wx.getStorageSync('userinfo')
+    $this.get_card_list();
+    $this.userinfo = wx.getStorageSync("userinfo");
   },
   created() {
     $this = this;
   },
-  onLoad() {
-  },
+  onLoad() {},
   onUnload() {
-    $this.close_success_pop()
-    $this.close_err_pop()
-  }
-}
+    $this.close_success_pop();
+    $this.close_err_pop();
+  },
+};
 </script>
 
 <style scoped>
@@ -443,10 +534,9 @@ export default {
 .line {
   width: 4px;
   height: 16px;
-  background: #5D4DB8;
+  background: #5d4db8;
 }
 
-
 /*会员*/
 .vip {
   width: 345px;
@@ -486,14 +576,15 @@ export default {
   /*height: 128px;*/
   margin: 10px auto;
   font-size: 10px;
-  color: #6B6B6B;
+  color: #6b6b6b;
 }
 
 .buy_button {
   text-align: center;
 }
 
-.order_confirm, .err_container {
+.order_confirm,
+.err_container {
   width: 344px;
   height: 312px;
 }
@@ -513,7 +604,7 @@ export default {
 .err_container .title {
   font-size: 20px;
   font-weight: bold;
-  color: #4C4C4C;
+  color: #4c4c4c;
   line-height: 24px;
 }
 
@@ -526,13 +617,12 @@ export default {
   width: 100%;
 }
 
-
 /*子标题*/
 .err_container .sub-title {
   font-size: 12px;
   font-family: Microsoft YaHei;
   font-weight: 400;
-  color: #4B4B4B;
+  color: #4b4b4b;
   width: 200px;
 }
 
@@ -546,6 +636,6 @@ export default {
   /*background-image: url("https://img.shuimuai.com/web/boyya_bg.png");*/
   /*background-size: 100% 100%;*/
   /*background-position: center;*/
-  background-color: rgba(255, 255, 255, 0)
+  background-color: rgba(255, 255, 255, 0);
 }
 </style>

src/requests/game.js

@@ -21,7 +21,7 @@ export function gameEnd($params) {
 export function gameDetail($record_id) {
   let $params = {};
   $params["game_record_id"] = $record_id;
-    // $params["game_record_id"] = "9270";
+    // $params["game_record_id"] = "5484";
   $params["access_token"] = wx.getStorageSync("token");
   return fly.post("game/game-detail", $params);
 }

src/store/game.js

@@ -17,6 +17,9 @@ const setters = {
   setGameStatus(status) {
     wx.setStorageSync('game_status', status)
   },
+  setGameCloseStatus(status) {
+    wx.setStorageSync('game_close_status', status)
+  },
   setToyList(toy_list) {
     wx.setStorageSync('toy_list', toy_list)
   },
@@ -69,6 +72,10 @@ const getters = {
   getGameStatus() {
     return wx.getStorageSync('game_status')
   },
+  getGameCloseStatus() {
+    return wx.getStorageSync('game_close_status')
+  },
+  
   getToyList() {
     return wx.getStorageSync('toy_list')
   },

src/utils/bluetooth.js

@@ -447,7 +447,7 @@ export default {
             duration: 0,
             message: '智脑环已断开连接，请重新扫码智脑环'
           });
-          game_store.setters.setGameStatus(0);
+          game_store.setters.setGameCloseStatus(1);
 
 
         }

src/utils/index.js

@@ -529,6 +529,58 @@ export function filterPieData(datas) {
   });
   return { datas, legends };
 }
+// 受干扰次数 getInterfereChartsOption
+export function getInterfereChartsOption(interfere_datas) {
+  console.log('干扰初始化',interfere_datas)
+  if (interfere_datas) {
+    let option = {
+      // 标题
+      title: {
+        left: 1220,
+      },
+      // 提示
+      tooltip: {
+        trigger: "axis",
+        axisPointer: {
+          type: "shadow",
+        },
+      },
+   
+ 
+      // x轴数据显示
+      xAxis: {
+        show: true,
+
+        type: "category",
+        //  data: [1,2,3,4,5,6,7,8,9],
+        // splitNumber: 10,
+        silent: false,
+        splitLine: {
+          show: false,
+        },
+        splitArea: {
+          show: false,
+        },
+      },
+      // y轴坐标显示
+      yAxis: {
+        splitArea: {
+          show: false,
+        },
+      },
+      //数据配置项
+      series: [
+        {
+          type: "bar",
+          data: [1,2,3,4,5,6,7,8,9],
+          large: true,
+        },
+      ],
+    }
+    return option
+  }
+}
+
 
 // 时间戳转化成时间格式
 export function timestampToTimeS(timestamp) {

src/utils/user.js

@@ -9,7 +9,10 @@ export function reload_userinfo($this) {
   wx.showLoading({
     title: '加载中',
     mask:true
-  })
+  }),
+  setTimeout(function () {
+    wx.hideLoading()
+  }, 4000)
   let $errcode = [
     1001, 1002, 1011, 1012, 1021, 1031
   ]