微信小程序1.5.0版本

添加脑环电量低于20%检测
修改邀请卡注册码的验证

src/components/banner.vue

@@ -1,13 +1,20 @@
 <template>
   <div id="banner_container">
     <img src="https://img.shuimuai.com/web/banner1.png" class="full_img main_banner" alt="">
-<!--    <button class="cu-btn bg-yellow text-white join_button">立即参与</button>-->
+    <button class="cu-btn bg-yellow text-white join_button" @click="to_none">关于水母星球</button>
   </div>
 </template>
 
 <script>
 export default {
-  name: "banner"
+  name: "banner",
+  methods:{
+    to_none() {
+      mpvue.navigateTo({
+        url: "/pages/none/main"
+      })
+    }
+  }
 }
 </script>
 
@@ -19,7 +26,7 @@ export default {
 }
 .join_button {
   position: absolute;
-  right: 50px;
+  right: 33px;
   top: 110px;
   z-index: 2;
 }

src/components/device/connected.vue

@@ -4,7 +4,9 @@
       <van-col span="5">
         <div class="device_bg flex flex-direction align-center justify-center">
           <img src="https://img.shuimuai.com/web/phone.png" alt="" class="device_phone">
-          <text class="text-gray device_text"> 我的手机</text>
+          <view>
+            <text class="text-gray device_text"> 我的手机</text>
+          </view>
         </div>
       </van-col>
       <van-col span="3" offset="1">
@@ -16,11 +18,13 @@
       </van-col>
       <van-col span="5" offset="0">
         <div class="device_bg flex flex-direction align-center justify-center">
-<!--          <text>{{ device_power }}%</text>-->
+          <!--          <text>{{ device_power }}%</text>-->
           <img src="https://img.shuimuai.com/web/sign_green.png" alt="" class="sign_green" v-if="device_bg == true">
           <img src="https://img.shuimuai.com/web/sign_red.png" class="sign_green" alt="" v-else>
           <img src="https://img.shuimuai.com/web/brain.png" alt="" class="device_brain">
-          <text class="text-gray device_text"> 水母智能脑环</text>
+          <view>
+            <text class="text-gray device_text second_device_text"> 水母智脑环</text>
+          </view>
         </div>
       </van-col>
     </van-row>
@@ -63,5 +67,8 @@ export default {
 </script>
 
 <style scoped>
-
+.cut_text {
+  padding: 0px 5px;
+  font-size: 11px;
+}
 </style>

src/components/device/device.vue

@@ -4,7 +4,7 @@
       <text class="cuIcon-titles text-primary"></text>
       <text class="">我的设备</text>
     </view>
-    <div class="device padding-lr">
+    <div class="device padding">
       <!--      <div class="head flex justify-between">-->
 
       <!--        <div class="my_msg" @click="get_toy_list">-->
@@ -159,7 +159,7 @@ export default {
       toy_id: 0,
 
       // 电量
-      device_power:100
+      device_power: 100
     };
   },
   watch: {
@@ -302,7 +302,13 @@ export default {
     onBluetoothDeviceFound() {
       console.log("打开蓝牙搜索")
       try {
-
+        setTimeout(() => {
+          if (!$this.device.deviceId) {
+            $this.stopBluetoothDevicesDiscovery();
+            $this.change_device_status(0)
+            Toast.fail("未连接到设备");
+          }
+        }, 7000);
         wx.onBluetoothDeviceFound((res) => {
           res.devices.forEach((device) => {
             if (!device.name && !device.localName) {
@@ -325,14 +331,6 @@ export default {
       } catch (e) {
         console.log('打开蓝牙error', e)
       }
-      setTimeout(() => {
-        if (!$this.device.deviceId) {
-          $this.stopBluetoothDevicesDiscovery();
-          $this.device_status = 0;
-          $this.connect_show = false;
-          Toast.fail("未连接到设备");
-        }
-      }, 7000);
     },
     // 停止蓝牙搜索
     stopBluetoothDevicesDiscovery() {
@@ -351,7 +349,7 @@ export default {
           bluetooth.watchingDevice($this)
         },
         fail(err) {
-          console.log("err", err);
+          console.log(err)
         },
       });
     },
@@ -415,6 +413,7 @@ export default {
       $this.change_toy_connect_status(0)
       $this.connect_show = true
       let $ble_status = ble_store.getters.getBluetoothLinkStatus()
+      bluetooth.watchingDevice($this)
       if ($ble_status == false) {
         //断开蓝牙连接
         $this.change_device_status(0)
@@ -440,6 +439,12 @@ export default {
 <!--共有样式-->
 <style>
 
+.second_device_text {
+  position: relative;
+  bottom: 5px;
+}
+
+
 .connect_img {
   width: 85px;
   height: 80px;
@@ -493,11 +498,13 @@ export default {
 .device_phone {
   width: 30px;
   height: 40px;
+  bottom: 5px;
 }
 
 .device_brain {
   width: 40px;
   height: 40px;
+  bottom: 10px;
 }
 
 .device_text {
@@ -536,7 +543,7 @@ export default {
 }
 
 .cut_text {
-  font-size: 12px;
+  font-size: 11px;
 }
 
 /*设备绿色信号灯*/
@@ -544,8 +551,8 @@ export default {
   width: 20px;
   height: 10px;
   position: relative;
-  top: 18px;
-  left: 1px;
+  top: 9px;
+  left: 0;
 }
 
 /*水母男孩*/
@@ -583,12 +590,6 @@ export default {
   z-index: 5;
 }
 
-/*玩具模块*/
-.uav_toy {
-  width: 40px;
-  height: 40px;
-}
-
 /*设备连接模块*/
 .device_bg {
   width: 90px;
@@ -599,7 +600,7 @@ export default {
 }
 
 .left {
-  line-height: 35px;
+  line-height: 32px;
 }
 </style>
 

src/components/device/toy/connecting.vue

@@ -19,7 +19,7 @@
           <img src="https://img.shuimuai.com/web/sign_green.png" alt="" class="sign_green" v-if="device_bg == true">
           <img src="https://img.shuimuai.com/web/sign_red.png" class="sign_green" alt="" v-else>
           <img src="https://img.shuimuai.com/web/brain.png" alt="" class="device_brain">
-          <text class="text-gray device_text"> 已连接</text>
+          <text class="text-gray device_text second_device_text"> 已连接</text>
         </div>
       </van-col>
       <van-col span="3" offset="1">
@@ -262,14 +262,19 @@ export default {
 </script>
 
 <style scoped>
+.uav_toy {
+  width: 47px;
+  height: 47px;
+}
+
 .cut_text {
   padding: 0px 5px;
-  font-size: 10px;
+  font-size: 11px;
 }
 
 .cut_start_game_icon {
-  width: 28px;
-  height: 30px;
+  width: 21px;
+  height: 23px;
 }
 
 /*消费类型窗口*/

src/components/device/unconnect.vue

@@ -11,7 +11,7 @@
         <img src="https://img.shuimuai.com/lanyashuimu.png" class="connect_img"/>
       </van-col>
     </van-row>
-    <button class="cu-btn lg cu-btn-primary text-white text-center scan_button margin-tb" @click="open_scan">扫码连接脑环
+    <button class="cu-btn lg cu-btn-primary text-white text-center scan_button margin-tb" @click="open_scan">扫码连接智脑环
     </button>
     <van-toast id="van-toast"/>
 

src/components/index/login.vue

@@ -3,19 +3,19 @@
     <view class=" text-xl padding text-center">
       <text class=" text-bold title_color">欢迎来到水母星球！</text>
     </view>
-    <view class="text-df text-center slogen">在此你将会体验到操控专注力的神奇感觉</view>
+    <view class="text-df text-center slogen">在此将会体验到操控专注力的神奇感觉</view>
     <div class="sub_slogen text-center">
-      现在，开始你的专注力旅程吧!
+      现在，开始您的专注力旅程吧!
     </div>
 
-    <div class="text-center padding">
+    <div class="text-center padding-lr padding-top">
       <button class="cu-btn lg cu-btn-primary text-white text-center" @click="to_regist(0)" v-if="is_scan">开始体验</button>
-      <button class="cu-btn lg cu-btn-primary text-white text-center" @click="to_none" v-else>关于水母星球</button>
+      <button class="cu-btn lg cu-btn-primary text-white text-center" @click="to_scan" v-else>扫一扫加入水母星球</button>
     </div>
-    <view class="text-center text-xs">
+    <view class="text-center slogen_title">
       <text class="text-gray">如果您在我们实体店，请在店员的指导下连接水母智脑环</text>
     </view>
-    <view class="text-center text-lg padding" @click="to_regist(1)">
+    <view class="text-center text-lg padding-lr" @click="to_regist(1)">
       <text class="text-gray under_line">账号登录</text>
     </view>
     <van-toast id="van-toast"/>
@@ -42,13 +42,10 @@ export default {
       this.$emit('changeTitle', $status)
     },
     to_scan() {
-      this.to_regist(1)
-    },
-    to_none() {
-      mpvue.navigateTo({
-        url: "/pages/none/main"
+      wx.scanCode({
+        onlyFromCamera: true,
       })
-    }
+    },
   },
   mounted() {
   },
@@ -68,7 +65,6 @@ export default {
           userCheckInvite($code, $js_code).then((res) => {
             let $res = res.data;
             if ($res.code == 0) {
-              // Toast.success($res.errmsg)
               user_store.setters.set_invite_code($code)
             } else {
               Toast.fail($res.errmsg)
@@ -92,7 +88,7 @@ export default {
       $this.is_scan = false
       Dialog.alert({
         transition: 'fade',
-        message: '如需体验水母星球产品，请通过水母星球店员或代理商的邀请卡是扫码申请水母会员',
+        message: '如需体验水母星球产品，请使用微信扫一扫水母星球邀请卡，注册水母星球会员',
         theme: 'round-button',
       })
     }
@@ -113,8 +109,13 @@ export default {
 
 /*扫码页*/
 .sub_slogen_sm {
-  font-size: 13px;
+  font-size: 15px;
   margin: 120px auto 0px;
   color: #4c4c4c;
 }
+
+.slogen_title {
+  font-size: 11px;
+  padding: 8px 0px;
+}
 </style>

src/components/index/personal.vue

@@ -69,14 +69,14 @@
 
       </van-row>
       <van-row>
-        <van-col span="6" offset="2">
+        <van-col span="6" offset="1">
           <div class="flex flex-direction align-center">
 
             <text class="text-xxl">{{ userinfo.play_time }}</text>
             <text class="font-sm">可用时长(分钟)</text>
           </div>
         </van-col>
-        <van-col span="6" offset="2" @click="to_coupons">
+        <van-col span="7" offset="2" @click="to_coupons">
           <div class="flex flex-direction align-center">
 
             <text class="text-xxl">{{ userinfo.coupon }}</text>

src/components/index/regist.vue

@@ -31,16 +31,16 @@
       </form>
     </div>
 
-    <div class="text-center padding">
+    <div class="text-center padding-lr padding-top">
       <button class="cu-btn lg cu-btn-primary text-white text-center" open-type="getUserInfo"
               @getuserinfo="get_Userinfo"
               :disabled="btn_disabled">
         {{ title }}
       </button>
     </div>
-    <view class="text-center text-xs">
+    <view class="text-center text-xs protocol_text">
       <!--      <text class="text-gray">如果您在我们实体店，请在店员的指导下连接水母智脑环</text>-->
-      <text class="text-gray">注册/登录前请阅读并知晓</text>
+      <text class="text-gray">注册/登录即表示同意</text>
       <text class="text-primary" @click="change_protocol_show(true)">《用户隐私协议》</text>
     </view>
     <van-toast id="van-toast"/>
@@ -51,16 +51,17 @@
     <van-popup :show="protocol_show" @close="change_protocol_show(false)" position="bottom" round>
       <div class="protocol_content padding-lr">
         <div><h1
-          style="font-size:22px; line-height:100%; margin:17pt 0pt 16.5pt; orphans:0; page-break-after:avoid; page-break-inside:avoid; text-align:center; widows:0">
+          style="font-size:22px; line-height:100%; margin:15px 0px; orphans:0; page-break-after:avoid; page-break-inside:avoid; text-align:center; widows:0">
           <span style="font-family:宋体; font-size:22px; font-weight:bold">隐私协议</span></h1>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
-            <span style="font-family:宋体; font-size:12px">&#xa0;</span></p>
+
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">欢迎您使用</span><span style="font-family:宋体; font-size:12px">水母智脑小程序</span><span
             style="font-family:宋体; font-size:12px">（以下简称：“本应用”）！</span><br/><span
             style="font-family:宋体; font-size:12px">本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。</span><span
-            style="font-family:宋体; font-size:12px">&#xa0;</span><span style="font-family:宋体; font-size:12px">您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。</span><br/><br/><span
-            style="font-family:宋体; font-size:12px">1.</span><span
+            style="font-family:宋体; font-size:12px">&#xa0;</span><span style="font-family:宋体; font-size:12px">您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。</span><br/><br/>
+            <view style="width: 100%;height: 10px;"></view>
+            <span
+            style="font-family:宋体; font-size:12px;">1.</span><span
             style="font-family:宋体; font-size:12px">&#xa0;</span><span style="font-family:宋体; font-size:12px">适用范围</span><br/><span
             style="font-family:宋体; font-size:12px">(a)</span><span
             style="font-family:宋体; font-size:12px">&#xa0;</span><span style="font-family:宋体; font-size:12px">在您注册本应用帐号时，您根据本应用要求提供的个人注册信息；</span><br/><span
@@ -124,14 +125,10 @@
             <br/><span style="font-family:宋体; font-size:12px">&#xa0;</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">&#xa0;</span></p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
-            <span style="font-family:宋体; font-size:12px">&#xa0;</span></p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
-            <span style="font-family:宋体; font-size:12px">&#xa0;</span></p>
           <h1
             style="font-size:22px; line-height:100%; margin:17pt 0pt 16.5pt; orphans:0; page-break-after:avoid; page-break-inside:avoid; text-align:center; widows:0">
             <span style="font-family:宋体; font-size:22px; font-weight:bold">服务协议</span></h1>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%;  orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">一、总则</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">此份协议是注册用户接受</span><span style="font-family:宋体; font-size:12px">深圳水母智脑科技有限公司</span><span
@@ -140,9 +137,9 @@
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">用户前或接受</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">的产品和服务之前，请您详细地阅读本注册用户协议的所有内容。</span>
           </p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%;  orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">1、注册用户了解并同意:</span></p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">只要注册用户点击“同意”按钮并完成注册，</span><span
             style="font-family:宋体; font-size:12px">水母智脑就视</span><span style="font-family:宋体; font-size:12px">注册用户已接受了本注册用户协议及</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">的各项服务规则(包括填写实名的联系方式等等），并愿意受其约束。如果发生纠纷，注册用户不得以未仔细阅读为由进行抗辩。</span>
@@ -169,7 +166,7 @@
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">提供的服务将完全按照其发布的服务条款和操作规则严格执行。注册用户必须完全同意所有服务条款并完成注册程序，才能成为</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">的注册用户。注册用户确认:本协议条款是处理双方权利义务的当然约定依据，除非违反国家强制性法律，否则始终有效。</span>
           </p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">二、服务简介</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">1、</span><span
@@ -198,22 +195,20 @@
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">的隐私声明为准。如果注册用户提供的资料包含有不正确的信息，</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">保留结束注册用户使用网络服务资格的权利。</span>
           </p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
-            <span style="font-family:宋体; font-size:12px">三、帐户密码和安全性</span></p>
+          <p style="font-size:12px; line-height:115%;  orphans:0; text-align:justify; widows:0">
+            <span style="font-family:宋体; font-size:12px">三、账户密码和安全性</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">注册用户一旦注册成功，成为</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">的合法的注册用户。您可随时根据需要改变您的密码。注册用户将对注册用户名和密码安全负全部责任。另外，每个注册用户都要对以其注册用户名进行的所有活动和事件负全责。注册用户若发现任何非法使用注册用户帐户或存在安全漏洞的情况，请立即通告</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">。</span></p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
-            <span style="font-family:宋体; font-size:12px">&#xa0;</span></p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%;  orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">四、拒绝提供担保</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">注册用户个人对网络服务的使用承担风险。</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">对此不作任何类型的担保，不论是明确的或隐含的，但是不对商业性的隐含担保、特定目的和不违反规定的适当担保作限制。</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">不担保服务一定能满足注册用户的要求，也不担保服务不会受中断，对服务的及时性，安全性，出错发生都不作担保。</span>
           </p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%;  orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">五、有限责任</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">对任何直接、间接、偶然、特殊及继起的损害不负责任，这些损害可能来自:不正当使用网络服务，在网上购买商品或进行同类型服务，在网上进行交易，非法使用网络服务或注册用户传送的信息有所变动。这些行为都有可能会导致</span><span
@@ -221,13 +216,13 @@
             style="font-family:宋体; font-size:12px">的形象受损，所以</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span
             style="font-family:宋体; font-size:12px">事先提出这种损害的可能性。</span></p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">六、通告</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">所有发给注册用户的通告都可通过重要页面的公告或电子邮件或常规的信件传送。</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">的活动信息也将定期通过页面公告及电子邮件方式向注册用户发送。注册用户协议条款的修改、服务变更、或其它重要事件的通告会以电子邮箱或者短信进行通知。</span>
           </p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%;  orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">七、注册用户的建议奖励</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">注册用户在他们发表的一些良好建议以及一些比较有价值的策划方案时，</span><span
@@ -235,7 +230,7 @@
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">会对一些比较好的注册用户反馈信息进行不等的产品奖励或者是积分奖励，但如出现用户策划与广告销售商之间的矛盾</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span
             style="font-family:宋体; font-size:12px">不承担任何责任。</span></p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%;  orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">八、责任限制</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">1、如因不可抗力或其他</span><span style="font-family:宋体; font-size:12px">水母智脑</span><span
@@ -251,7 +246,7 @@
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">、</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span style="font-family:宋体; font-size:12px">的董事、管理人员、雇员、代理或其它代表在任何情况下都不承担责任。</span>
           </p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%;  orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">九、法律管辖和适用</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">1、本协议的订立、执行和解释及争议的解决均应适用中国法律。</span></p>
@@ -265,7 +260,7 @@
             <span style="font-family:宋体; font-size:12px">4、如双方就本协议内容或其执行发生任何争议，双方应尽力友好协商解决;协商不成时，任何一方均可向</span><span
             style="font-family:宋体; font-size:12px">水母智脑</span><span
             style="font-family:宋体; font-size:12px">所在地的人民法院提起诉讼。</span></p>
-          <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
+          <p style="font-size:12px; line-height:115%;  orphans:0; text-align:justify; widows:0">
             <span style="font-family:宋体; font-size:12px">十、其他规定</span></p>
           <p style="font-size:12px; line-height:115%; margin:0pt 0pt 10pt; orphans:0; text-align:justify; widows:0">
             <span
@@ -504,4 +499,8 @@ export default {
   width: 100%;
   height: 500px;
 }
+.protocol_text{
+  font-size: 11px;
+  padding-top: 4px;
+}
 </style>

src/pages/index/index.vue

@@ -22,7 +22,7 @@
       <personal_container @change_login_status="change_login_status"></personal_container>
       <device_container></device_container>
     </div>
-    <div class="service margin-top-xl" :class="{'service_login_page':is_login==false}">
+    <div class="service" :class="{'service_login_page':is_login==false}">
       <view class="padding-tb">
         <text class="cuIcon-titles text-primary"></text>
         <text class="">功能服务</text>
@@ -146,7 +146,7 @@ export default {
 <style scoped>
 /*@import "index.css";*/
 .login_card {
-  height: 350px;
+  height: 335px;
   background-color: #ffffff;
   position: relative;
   z-index: 3;
@@ -162,7 +162,7 @@ export default {
 .service {
   position: absolute;
   width: 100%;
-  top: 550px;
+  top: 570px;
 }
 
 .service_login_page {

src/pages/start/index.vue

@@ -22,7 +22,7 @@
           </view>
           <button class="cu-btn bg-red text-white margin-top-sm" @click="game_finished">
             <img src="https://img.shuimuai.com/m_duankainaohuan.png" class="cut_brain_icon" alt="">
-            <text class="padding-lr cut_text text-sm">结束游玩</text>
+            <text class="padding-lr cut_text text-sm">结束游戏</text>
           </button>
         </van-col>
       </van-row>
@@ -135,7 +135,7 @@
       </div>
     </van-popup>
     <van-toast id="van-toast"/>
-
+    <van-dialog id="van-dialog"/>
   </div>
 </template>
 
@@ -146,6 +146,7 @@ import util, {formatSeconds} from '../../utils/index'
 import bluetooth from "../../utils/bluetooth";
 import game_store from "@/store/game";
 import Toast from '../../../static/vant/toast/toast';
+import Dialog from '../../../static/vant/dialog/dialog';
 import {gameAddLine, gameEnd} from "../../requests/game";
 
 var att_charts,
@@ -342,13 +343,12 @@ export default {
         if ($power) {
           $this.elc_power = $power
           //电量低于20就提示 电量不足
-          if ($power < 20 && $power > 0){
-            Toast.fail({
-              message:"脑环电量不足",
-              success(){
-                $this.game_finished()
-              }
-            })
+          if ($power < 20 && $power > 0) {
+            Dialog.alert({
+              message: '脑环电量不足',
+            }).then(() => {
+              $this.game_finished()
+            });
           }
         }
         bluetooth.sendControl($this._deviceId, $this._serviceId, $this._characteristicId)
@@ -419,6 +419,12 @@ export default {
         $this.played_time = 0
         //设置未结束游戏
         $this.is_end = false
+        $this.att_list = []
+        $this.med_list = []
+        $this.delta_list = []
+        $this.alpha_list = []
+        $this.theta_list = []
+        $this.beta_list = []
       })
     },
     //  处理游戏中数据的方法

src/pages/user_center/recharge/index.vue

@@ -27,7 +27,7 @@
       <div class="vip" :class="item.bg">
         <van-row>
           <van-col span="10" offset="6">
-            <div class="card_body">
+            <div class="card_body" style="padding-top:14px;">
               <view>
                 <text class="mine_min  text-white">{{ item.play_time }}</text>
                 <text class="text-white">分钟</text>
@@ -35,9 +35,7 @@
               <view>
                 <text class="text-white text-sm">{{ item.title1 }}</text>
               </view>
-              <view>
-                <text class="text-white text-sm">{{ item.title2 }}</text>
-              </view>
+
             </div>
           </van-col>
 
@@ -92,7 +90,7 @@
       <div class="normal vip">
         <van-row>
           <van-col span="10" offset="6">
-            <div class="card_body">
+            <div class="card_body" style="padding-top:14px;">
               <view>
                 <text class="mine_min  text-white">{{ item.play_time }}</text>
                 <text class="text-white">次</text>
@@ -100,9 +98,7 @@
               <view>
                 <text class="text-white text-sm">{{ item.title1 }}</text>
               </view>
-              <view>
-                <text class="text-white text-sm">{{ item.title2 }}</text>
-              </view>
+
             </div>
           </van-col>
 

src/store/index.js

@@ -25,8 +25,7 @@ const getters = {
 
   },
   get_invite_code() {
-    return wx.getStorageSync('invite_code')
-
+    return wx.getStorageSync('code')
   }
 }
 export default {