Merge branch 'master' of gitee.com:sh_13808852820/program

src/app.json

@@ -26,7 +26,6 @@
     "pages/agent/settlement_center/index/main",
     "pages/agent/settlement_center/withdraw/detail/main",
     "pages/agent/settlement_center/withdraw/list/main",
-    "pages/test/main",
     "pages/competition/main",
     "pages/payment/main",
     "pages/user_center/confirmPay/main",

src/pages/start/index.vue

@@ -486,9 +486,13 @@ export default {
         $this.delta_list
       );
 
+      // 专注值和放松度 只显示50个
       if ($this.att_list.length > 50) {
         $this.att_list.shift();
         $this.med_list.shift();
+      }
+      //四个基础脑波值 显示30个
+       if ($this.delta_list.length > 30) {
         $this.delta_list.shift();
         $this.alpha_list.shift();
         $this.theta_list.shift();

src/pages/test/index.vue

@@ -1,66 +0,0 @@
-<template>
-  <div>
-    <h1>Hello WOrld</h1>
-  </div>
-</template>
-<script type="text/javascript">
-export default {
-  name: "TestContainer",
-  data() {
-    return {}
-  },
-  methods: {
-    test() {
-      // let CheckSum = ((0x03 + 0x00 + 0x00 + 0x00 + 0xff) ^ 0xffffffff) & 0xff;
-      // let $CheckSum = "0x" + CheckSum.toString(16);
-
-      // let buffer = new ArrayBuffer(8);
-      // let dataView = new DataView(buffer);
-      // dataView.setUint8(0, "0xaa");
-      // dataView.setUint8(1, "0xcc");
-      // dataView.setUint8(2, "0x03");
-      // dataView.setUint8(3, "0x00");
-      // dataView.setUint8(4, "0x00");
-      // dataView.setUint8(5, "0x00");
-      // dataView.setUint8(6, "0xff");
-      // dataView.setUint8(7, $CheckSum);
-      let $ff = "ff";
-      let $5f = "ffffffff"
-      let $hex_header = "aa cc ";
-      let $hex = "03 00 01 00 0a";
-
-      let $hex_sum = 0;
-      let $hex_ary = $hex.split(" ");
-      $hex_ary.forEach(($val, $index) => {
-        $hex_sum += parseInt($val, 16);
-      })
-
-      let $checksum = ($hex_sum ^ parseInt($5f,16)) & parseInt($ff,16);
-
-      $hex = $hex_header + $hex + " "+$checksum.toString(16);
-      let buffer = new ArrayBuffer(8);
-      let dataView = new DataView(buffer);
-      $hex_ary = $hex.split(" ");
-      $hex_ary.forEach(($val,$index)=>{
-        dataView.setUint8($index,$val)
-      })
-
-      // dataView.setUint8(0, "0xaa");
-      // dataView.setUint8(1, "0xcc");
-      // dataView.setUint8(2, "0x03");
-      // dataView.setUint8(3, "0x00");
-      // dataView.setUint8(4, "0x00");
-      // dataView.setUint8(5, "0x00");
-      // dataView.setUint8(6, "0xff");
-      // dataView.setUint8(7, $CheckSum);
-
-
-
-
-    }
-  },
-  mounted() {
-    this.test();
-  }
-}
-</script>

src/pages/test/main.js

@@ -1,12 +0,0 @@
-import Vue from 'vue'
-import App from './index'
-
-// add this to handle exception
-Vue.config.errorHandler = function (err) {
-  if (console && console.error) {
-    console.error(err)
-  }
-}
-
-const app = new Vue(App)
-app.$mount()

src/pages/test/main.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {
-  }
-}