修改适配，直接把样式放进页面中即可

dist/wx

@@ -1 +1 @@
-Subproject commit 18ea23d3c5218154616bb925c8efe2f6ffd1845e
+Subproject commit c0a20e04f579c751a2022645ea9afa0423529c41

src/components/device/device.vue

@@ -1,16 +1,17 @@
 <template>
-  <div id="device_container" class="padding-lr">
-    <div class="device">
-      <div class="head flex justify-between">
-        <div>
-          <div class="line"></div>
-          <div class="title">我的设备</div>
-        </div>
-        <!--        <div class="my_msg" @click="get_toy_list">-->
-        <!--          <text class="cuIcon-mark"></text>-->
-        <!--          <text class="under_line">获取设备列表</text>-->
-        <!--        </div>-->
-      </div>
+  <div id="device_container">
+    <view>
+      <text class="cuIcon-titles text-primary"></text>
+      <text class="">我的设备</text>
+    </view>
+    <div class="device padding-lr">
+      <!--      <div class="head flex justify-between">-->
+
+      <!--        <div class="my_msg" @click="get_toy_list">-->
+      <!--          <text class="cuIcon-mark"></text>-->
+      <!--          <text class="under_line">获取设备列表</text>-->
+      <!--        </div>-->
+      <!--      </div>-->
       <div v-if="connect_toy == 0">
         <!--      未连接部分-->
         <div class="connect_box" v-if="status == 0">
@@ -97,6 +98,8 @@
       </div>
     </van-popup>
     <van-toast id="van-toast"/>
+    <van-dialog id="van-dialog"/>
+
   </div>
 </template>
 
@@ -114,7 +117,8 @@ import Toast from "../../../static/vant/toast/toast";
 import {game_devices} from "../../requests/game";
 import game_store from "@/store/game";
 import bluetooth from "@/utils/bluetooth";
-import ext from "../../utils/ext";
+import Dialog from '../../../static/vant/dialog/dialog';
+
 
 let $this;
 export default {
@@ -129,6 +133,8 @@ export default {
     return {
       //设备状态 0为未连接，1：连接中，2：已连接 3：连接失败
       status: 0,
+      connect_show: false,
+
       choose_toy_window: {
         show: false,
         // show: true,
@@ -136,10 +142,9 @@ export default {
       //'水柱音箱', '喷雾恐龙（大）', '喷雾恐龙（小）', '轨道车', '碰碰车', '小车（大）', '小车（中）', '小车（小）', '飞行器（大）', '飞行器（小）', '水母灯'
       toy_list: [],
       toy_action: 1,
-      connect_show: false,
       // connect_show: true,
       //连接玩具 0:未连接 1：连接中 2：已连接 3：连接失败 4:游戏中
-      connect_toy: 0,
+        connect_toy: 0,
       code: "jellyfish1234",
       device: {},
       _deviceId: "",
@@ -168,6 +173,10 @@ export default {
           if ($data.result) {
             let url = decodeURIComponent($data.result);
             let $code = url.match(/\?code=(.*)/)[1];
+            // 判断新的标识值
+            if (!$code) {
+              $code = url.match(/\?ring=(.*)/)[1];
+            }
             $this.code = $code;
             //打开蓝牙设备
             wx.openBluetoothAdapter({
@@ -230,16 +239,6 @@ export default {
 
       }, 1000)
 
-
-      //判断是否游戏中
-      // let $game_status = game_store.getters.getGameStatus;
-      // console.log("choose_ok_game_status", $game_status);
-      // if ($game_status == 1) {
-      //   $this.change_toy_connect_status(4)
-      //   mpvue.navigateTo({
-      //     url: "/pages/start/main",
-      //   });
-      // }
     },
     //修改玩具连接状态
     change_toy_connect_status($status = 0) {
@@ -261,15 +260,7 @@ export default {
           deviceId: $this._deviceId,
           success(res) {
             Toast.success({
-              message: "已成功断开",
-              onClose() {
-                let $game_status = game_store.getters.getGameStatus;
-                if ($game_status == 1) {
-                  mpvue.navigateTo({
-                    url: "/pages/start/main?end=1"
-                  })
-                }
-              }
+              message: "已成功断开"
             });
           },
 
@@ -383,10 +374,27 @@ export default {
   onShow() {
     //判断是否游戏中
     let $game_status = game_store.getters.getGameStatus;
-    console.log("游戏状态", $game_status)
-    if ($game_status == 0) {
-      $this.connect_show = true;
-      $this.connect_toy = 0;
+    if ($game_status == 1) {
+      Dialog.confirm({
+        title: '系统提示',
+        message: '确认要退出游戏了吗？',
+      }).then(() => {
+        // on confirm
+        mpvue.navigateTo({
+          url: "/pages/start/main?end=1",
+        });
+      }).catch(() => {
+        // on cancel
+        mpvue.navigateTo({
+          url: "/pages/start/main",
+        });
+      });
+      $this.change_toy_connect_status(4)
+    } else if ($game_status == 3) {
+      //不在游戏状态
+      $this.change_toy_connect_status(0)
+      $this.connect_show = true
+      bluetooth.watch_bluetooth_status($this)
     }
   },
   onLoad(options) {
@@ -405,6 +413,229 @@ export default {
 };
 </script>
 
+<!--共有样式-->
+<style>
+
+.connect_img {
+  width: 85px;
+  height: 80px;
+}
+
+/*玩具不同背景*/
+.toy_item_normal_bg {
+  background-image: url("https://img.shuimuai.com/web/toy_bg.png");
+  background-position: center;
+  background-size: 100% 100%;
+}
+
+/*玩具选中背景*/
+.toy_item_action_bg {
+  background-image: url("https://img.shuimuai.com/web/toy_bg_action.png");
+  background-position: center;
+  background-size: 100% 100%;
+}
+
+.ring_2 {
+  width: 199px;
+  height: 203px;
+  background: rgba(93, 77, 184, 0);
+  border: 2px solid #f7f7f7;
+  opacity: 0.43;
+  border-radius: 50%;
+}
+
+.ring_3 {
+  width: 158px;
+  height: 158px;
+  background: rgba(93, 77, 184, 0);
+  border: 3px solid #f6f6f6;
+  opacity: 0.54;
+  border-radius: 50%;
+}
+
+
+.dot_container {
+  height: 100px;
+}
+
+.dot_wait {
+  height: 5px;
+  width: 80px;
+  background-image: url("https://img.shuimuai.com/web/connect_line.png");
+  background-position: center;
+  background-size: 100% 100%;
+}
+
+.device_phone {
+  width: 30px;
+  height: 40px;
+}
+
+.device_brain {
+  width: 40px;
+  height: 40px;
+}
+
+.device_text {
+  padding: 3px;
+  font-size: 10px;
+}
+
+.moving_dot {
+  width: 18px;
+  height: 18px;
+  position: relative;
+  left: 15px;
+  bottom: 7px;
+}
+
+.moving {
+  animation: moving 2s linear infinite;
+}
+
+/*左右移动动画*/
+@keyframes moving {
+  0% {
+    left: 0px;
+  }
+  50% {
+    left: 35px;
+  }
+  100% {
+    left: 0px;
+  }
+}
+
+.cut_brain_icon {
+  width: 11px;
+  height: 11px;
+}
+
+.cut_text {
+  font-size: 12px;
+}
+
+/*设备绿色信号灯*/
+.sign_green {
+  width: 20px;
+  height: 10px;
+  position: relative;
+  top: 18px;
+  left: 1px;
+}
+
+/*水母男孩*/
+.connected_boy {
+  width: 110px;
+  height: 110px;
+  position: absolute;
+  right: -60px;
+  top: 63px;
+}
+
+.boy_session {
+  background-image: url("https://img.shuimuai.com/web/boy_session.png");
+  background-position: center;
+  background-size: 100% 100%;
+  width: 120px;
+  height: 100px;
+  position: absolute;
+  top: 18px;
+  right: 25px;
+  z-index: 4;
+}
+
+.boy_session_text {
+  font-size: 12px;
+  color: #6b6b6b;
+}
+
+.device_electric {
+  position: relative;
+  width: 16px;
+  height: 16px;
+  top: 0px;
+  right: 0px;
+  z-index: 5;
+}
+
+/*玩具模块*/
+.uav_toy {
+  width: 40px;
+  height: 40px;
+}
+
+/*设备连接模块*/
+.device_bg {
+  width: 90px;
+  height: 100px;
+  background-image: url("https://img.shuimuai.com/web/device_bg.png");
+  background-position: center;
+  background-size: 100% 100%;
+}
+
+.left {
+  line-height: 35px;
+}
+</style>
+
+<!--私有样式-->
 <style scoped>
-@import "../static/device.css";
+#device_container {
+  position: relative;
+  top: -65px;
+}
+
+.head .line {
+  width: 4px;
+  height: 14px;
+  background-color: #5d4db8;
+  margin-right: 7px;
+}
+
+.head view {
+  display: flex;
+  justify-self: start;
+  align-items: center;
+}
+
+/*玩具列表*/
+.toy_list {
+  overflow-x: scroll;
+}
+
+.toy_item {
+  width: 120px;
+  height: 130px;
+}
+
+
+/*玩具图片*/
+.toy_img {
+  width: 65px;
+  height: 65px;
+}
+
+.toy_text {
+  font-size: 12px;
+}
+
+.toy_action_text {
+  font-size: 11px;
+  width: 100%;
+}
+
+/* 选择玩具 */
+.toy_list {
+  width: 100%;
+  overflow-x: auto;
+}
+
+.toy_list_content {
+  width: 120%;
+  display: inline-block;
+  display: flex;
+  flex-wrap: wrap;
+}
+
 </style>

src/components/device/toy/connecting.vue

@@ -111,9 +111,9 @@
         </van-col>
 
         <van-col span="8">
-          <button class="cu-btn bg-green lg ">
+          <button class="cu-btn bg-green lg " @click="to_playing">
             <img src="https://img.shuimuai.com/web/start_game_icon.png" alt="" class="cut_start_game_icon">
-            <text class=" cut_text" style="padding: 0px;" @click="to_playing">游戏中</text>
+            <text class=" cut_text" style="padding: 0px;">游戏中</text>
           </button>
         </van-col>
 
@@ -252,5 +252,47 @@ export default {
 </script>
 
 <style scoped>
-@import url('../../static/connecting.css');
+.cut_text {
+  padding: 0px 5px;
+  font-size: 10px;
+}
+
+.cut_start_game_icon {
+  width: 28px;
+  height: 30px;
+}
+
+/*消费类型窗口*/
+.pay_type_window {
+  width: 95%;
+  height: 180px;
+  background-image: url("https://img.shuimuai.com/web/dialog.png");
+  background-position: center;
+  background-size: 100% 100%;
+  position: absolute;
+  bottom: 225px;
+  right: 10px;
+}
+
+.pay_type_title_text {
+  color: #6B6B6B;
+  font-size: 12px;
+}
+
+.pay_type_item {
+  width: 100%;
+  height: 100px;
+  background-image: url("https://img.shuimuai.com/web/pay_type_bg.png");
+  background-position: center;
+  background-size: 100% 100%;
+}
+
+.connected_boy2 {
+  width: 60px;
+  height: 82px;
+  position: absolute;
+  right: 0px;
+  bottom: 160px;
+}
+
 </style>

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" @click="open_scan">扫码连接脑环</button>
+    <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"/>
 
   </div>
@@ -37,5 +37,4 @@ export default {
 </script>
 
 <style scoped>
-
 </style>

src/components/index/login.vue

@@ -9,7 +9,8 @@
     </div>
 
     <div class="text-center padding">
-      <button class="cu-btn lg cu-btn-primary text-white text-center" @click="to_regist(0)">开始体验</button>
+      <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>
     </div>
     <view class="text-center text-xs">
       <text class="text-gray">如果您在我们的实体店，请在店员的指导下链接脑环</text>
@@ -18,14 +19,21 @@
       <text class="text-gray under_line">账号登录</text>
     </view>
     <van-toast id="van-toast"/>
-
+    <van-dialog id="van-dialog"/>
   </div>
 </template>
 <script>
 import Toast from '../../../static/vant/toast/toast';
+import Dialog from '../../../static/vant/dialog/dialog';
 
+var $this
 export default {
   name: "login_container",
+  data() {
+    return {
+      is_scan: false
+    }
+  },
   methods: {
     to_regist($status) {
       this.$emit('changeStatus', 'regist')
@@ -33,6 +41,11 @@ export default {
     },
     to_scan() {
       this.to_regist(1)
+    },
+    to_none() {
+      mpvue.navigateTo({
+        url: "/pages/none/main"
+      })
     }
   },
   onLoad(options) {
@@ -43,7 +56,7 @@ export default {
     if (options.q) {
       let url = decodeURIComponent(options.q)
       let $code = url.match(/\?code=(.*)/)[1];
-      wx.setStorageSync('is_scan', true)
+      $this.is_scan = true
 
       this.$store.commit('set_invite_code', $code)
       console.log('1---' + $_code, '2---' + $code)
@@ -58,12 +71,32 @@ export default {
     else {
       // 跳转到关于水母页面
       //设置是否扫码
-      wx.setStorageSync('is_scan', false)
-      this.to_scan()
+      $this.is_scan = false
+      Dialog.alert({
+        transition: 'fade',
+        message: '如需体验水母星球产品，请通过水母星球电源或代理商的邀请卡是扫码申请水母会员',
+        theme: 'round-button',
+      })
     }
+  },
+  created() {
+    $this = this
   }
 }
 </script>
 <style>
 
+
+.sub_slogen {
+  font-size: 22px;
+  margin-top: 110px;
+  color: #4c4c4c;
+}
+
+/*扫码页*/
+.sub_slogen_sm {
+  font-size: 13px;
+  margin: 120px auto 0px;
+  color: #4c4c4c;
+}
 </style>

src/components/index/regist.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="index_login_container" class="animation-slide-right">
     <view class="text-xl padding text-center">
-      <img class="back regist_back_btn" @click="goIndex" src="https://img.shuimuai.com/fanhui.png" v-if="is_scan"/>
+      <img class="back regist_back_btn" @click="goIndex" src="https://img.shuimuai.com/fanhui.png"/>
       <text class=" text-bold title_color">会员{{ title }}</text>
     </view>
     <view class="text-df text-center slogen">请输入手机号码，以便更好的享受我们的服务</view>
@@ -21,7 +21,7 @@
         </view>
         <view class="cu-form-group">
           <view class="title">验证码</view>
-          <input placeholder="输入验证码" name="input" v-model="verfiy_code" maxlength="6" @input="check_auth"/>
+          <input placeholder="输入验证码" name="input" v-model="verfiy_code" maxlength="6" @input="check_auth" clearable/>
           <button class='cu-btn bg-primary text-white shadow' :disabled="time_show" @click="get_verify_code">
             <van-count-down v-if="time_show" :auto-start="time_start" class="control-count-down" @finish="time_finished"
                             :time="time_count * 1000" format="ss"/>
@@ -71,8 +71,6 @@ export default {
       time_show: false,
       time_start: false,
       time_count: 60,
-      //判断是否扫码进来的
-      is_scan: false
     }
   },
   watch: {
@@ -209,7 +207,6 @@ export default {
         $this.js_code = $res.code
       }
     })
-    $this.is_scan = wx.getStorageSync('is_scan')
   },
   created() {
     $this = this
@@ -236,4 +233,25 @@ export default {
   position: absolute;
   left: 20px;;
 }
+
+
+.cu-form-group {
+  background-color: rgba(255, 255, 255, 0);
+}
+
+/*体验页面*/
+.slogen {
+  color: #4b4b4b;
+  font-size: 13px;
+}
+
+/*注册页面*/
+.register_form_container {
+  margin: 70px auto 0px;
+  width: 90%;
+  height: 108px;
+  background: rgba(242, 243, 255, 0.6);
+  box-shadow: 0px 3px 7px 0px rgba(159, 159, 159, 0.84);
+  border-radius: 11px;
+}
 </style>

src/components/static/connecting.css

@@ -1,42 +0,0 @@
-.cut_text {
-  padding: 0px 5px;
-  font-size: 10px;
-}
-
-.cut_start_game_icon {
-  width: 28px;
-  height: 30px;
-}
-
-/*消费类型窗口*/
-.pay_type_window {
-  width: 95%;
-  height: 180px;
-  background-image: url("https://img.shuimuai.com/web/dialog.png");
-  background-position: center;
-  background-size: 100% 100%;
-  position: absolute;
-  bottom: 225px;
-  right: 10px;
-}
-
-.pay_type_title_text {
-  color: #6B6B6B;
-  font-size: 12px;
-}
-
-.pay_type_item {
-  width: 100%;
-  height: 100px;
-  background-image: url("https://img.shuimuai.com/web/pay_type_bg.png");
-  background-position: center;
-  background-size: 100% 100%;
-}
-
-.connected_boy2 {
-  width: 60px;
-  height: 82px;
-  position: absolute;
-  right: 0px;
-  bottom: 160px;
-}

src/components/static/device.css

@@ -1,224 +0,0 @@
-#device_container {
-  position: relative;
-  top: -65px;
-}
-
-.head .line {
-  width: 4px;
-  height: 14px;
-  background-color: #5d4db8;
-  margin-right: 7px;
-}
-
-.head view {
-  display: flex;
-  justify-self: start;
-  align-items: center;
-}
-
-.ring_2 {
-  width: 199px;
-  height: 203px;
-  background: rgba(93, 77, 184, 0);
-  border: 2px solid #f7f7f7;
-  opacity: 0.43;
-  border-radius: 50%;
-}
-
-.ring_3 {
-  width: 158px;
-  height: 158px;
-  background: rgba(93, 77, 184, 0);
-  border: 3px solid #f6f6f6;
-  opacity: 0.54;
-  border-radius: 50%;
-}
-
-.connect_img {
-  width: 85px;
-  height: 80px;
-}
-
-.left {
-  line-height: 35px;
-}
-
-/*设备连接模块*/
-.device_bg {
-  width: 90px;
-  height: 100px;
-  background-image: url("https://img.shuimuai.com/web/device_bg.png");
-  background-position: center;
-  background-size: 100% 100%;
-}
-
-.dot_container {
-  height: 100px;
-}
-
-.dot_wait {
-  height: 5px;
-  width: 80px;
-  background-image: url("https://img.shuimuai.com/web/connect_line.png");
-  background-position: center;
-  background-size: 100% 100%;
-}
-
-.device_phone {
-  width: 30px;
-  height: 40px;
-}
-
-.device_brain {
-  width: 40px;
-  height: 40px;
-}
-
-.device_text {
-  padding: 3px;
-  font-size: 10px;
-}
-
-.moving_dot {
-  width: 18px;
-  height: 18px;
-  position: relative;
-  left: 15px;
-  bottom: 7px;
-}
-
-.moving {
-  animation: moving 2s linear infinite;
-}
-
-/*左右移动动画*/
-@keyframes moving {
-  0% {
-    left: 0px;
-  }
-  50% {
-    left: 35px;
-  }
-  100% {
-    left: 0px;
-  }
-}
-
-/*玩具列表*/
-.toy_list {
-  overflow-x: scroll;
-}
-
-.toy_item {
-  width: 120px;
-  height: 130px;
-}
-
-/*玩具不同背景*/
-.toy_item_normal_bg {
-  background-image: url("https://img.shuimuai.com/web/toy_bg.png");
-  background-position: center;
-  background-size: 100% 100%;
-}
-
-/*玩具选中背景*/
-.toy_item_action_bg {
-  background-image: url("https://img.shuimuai.com/web/toy_bg_action.png");
-  background-position: center;
-  background-size: 100% 100%;
-}
-
-/*玩具图片*/
-.toy_img {
-  width: 65px;
-  height: 65px;
-}
-
-.toy_text {
-  font-size: 12px;
-}
-
-.toy_action_text {
-  font-size: 11px;
-  width: 100%;
-}
-
-.cut_brain_icon {
-  width: 11px;
-  height: 11px;
-}
-
-.cut_text {
-  font-size: 12px;
-}
-
-/*设备绿色信号灯*/
-.sign_green {
-  width: 20px;
-  height: 10px;
-  position: relative;
-  top: 18px;
-  left: 1px;
-}
-
-/*水母男孩*/
-.connected_boy {
-  width: 110px;
-  height: 110px;
-  position: absolute;
-  right: -60px;
-  top: 63px;
-}
-
-.boy_session {
-  background-image: url("https://img.shuimuai.com/web/boy_session.png");
-  background-position: center;
-  background-size: 100% 100%;
-  width: 120px;
-  height: 100px;
-  position: absolute;
-  top: 18px;
-  right: 25px;
-  z-index: 4;
-}
-
-.boy_session_text {
-  font-size: 12px;
-  color: #6b6b6b;
-}
-
-.device_electric {
-  position: relative;
-  width: 16px;
-  height: 16px;
-  top: 0px;
-  right: 0px;
-  z-index: 5;
-}
-
-/*玩具模块*/
-.uav_toy {
-  width: 40px;
-  height: 40px;
-}
-/* 选择玩具 */
-.toy_list {
-  width: 100%;
-  overflow-x: auto;
-}
-.toy_list_content {
-  width: 120%;
-  display: inline-block;
-  display: flex;
-  flex-wrap: wrap;
-}
-
-/* 测试标签 */
-/* toy_item_action_bg   toy_item_normal_bg
-
-  toy_list_content
-
-
-
-
-*/

src/components/user_center/order_list.css

@@ -1,9 +0,0 @@
-.order_icon {
-  width: 37px;
-  height: 37px;
-}
-
-.thumb_container {
-  width: 100%;
-  text-align: center;
-}

src/components/user_center/order_list.vue

@@ -78,5 +78,13 @@ export default {
 </script>
 
 <style>
-@import "order_list.css";
+.order_icon {
+  width: 37px;
+  height: 37px;
+}
+
+.thumb_container {
+  width: 100%;
+  text-align: center;
+}
 </style>

src/pages/agent/customer/index.css

@@ -1,37 +0,0 @@
-.text-normal {
-  color: #6A6A6A;
-}
-
-.profit_container {
-  margin: 30px 0px 0px;
-}
-
-.bg_action {
-  width: 118px;
-  height: 77px;
-  background-image: url("https://img.shuimuai.com/web/frame_xuanzhongkehu.png");
-
-  font-size: 15px;
-  font-family: Microsoft YaHei;
-  font-weight: bold;
-  color: #FFFFFF;
-  line-height: 24px;
-}
-
-.bg_normal {
-  font-size: 15px;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #6C6C6C;
-  line-height: 24px;
-
-  width: 118px;
-  height: 68px;
-  background-image: url("https://img.shuimuai.com/web/frame_weixianzhongkehu.png");
-}
-
-.bg {
-  text-align: center;
-  background-size: 100% 100%;
-  background-position: center;
-}

src/pages/agent/customer/index.vue

@@ -200,5 +200,41 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.text-normal {
+  color: #6A6A6A;
+}
+
+.profit_container {
+  margin: 30px 0px 0px;
+}
+
+.bg_action {
+  width: 118px;
+  height: 77px;
+  background-image: url("https://img.shuimuai.com/web/frame_xuanzhongkehu.png");
+
+  font-size: 15px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: #FFFFFF;
+  line-height: 24px;
+}
+
+.bg_normal {
+  font-size: 15px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #6C6C6C;
+  line-height: 24px;
+
+  width: 118px;
+  height: 68px;
+  background-image: url("https://img.shuimuai.com/web/frame_weixianzhongkehu.png");
+}
+
+.bg {
+  text-align: center;
+  background-size: 100% 100%;
+  background-position: center;
+}
 </style>

src/pages/agent/extend/detail/index.css

@@ -1,7 +0,0 @@
-page{
-  background-color: #fff;
-}
-.not_show{
-  opacity: 0;
-}
-

src/pages/agent/extend/detail/index.vue

@@ -64,5 +64,11 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+page{
+  background-color: #fff;
+}
+.not_show{
+  opacity: 0;
+}
+
 </style>

src/pages/agent/extend/orders/index.css

@@ -1,6 +0,0 @@
-.text-normal{
-  color: #6A6A6A;
-}
-.profit_container{
-  margin: 30px 0px;
-}

src/pages/agent/extend/orders/index.vue

@@ -195,5 +195,10 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.text-normal{
+  color: #6A6A6A;
+}
+.profit_container{
+  margin: 30px 0px;
+}
 </style>

src/pages/agent/income_cal/index.css

@@ -1,6 +0,0 @@
-.text-normal{
-  color: #6A6A6A;
-}
-.profit_container{
-  margin: 30px 0px;
-}

src/pages/agent/income_cal/index.vue

@@ -192,5 +192,10 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.text-normal{
+  color: #6A6A6A;
+}
+.profit_container{
+  margin: 30px 0px;
+}
 </style>

src/pages/agent/index/index.css

@@ -1,27 +0,0 @@
-.header {
-  background-image: url("https://img.shuimuai.com/web/bg_dailishang.png");
-  background-position: center;
-  background-size: 100% 100%;
-  width: 100%;
-  height: 235px;
-}
-
-.text-normal {
-  color: #97B2DE;
-}
-
-.profit_detail_contaienr {
-}
-
-
-.withdraw_container {
-  background-image: url("https://img.shuimuai.com/web/frame_dailishang_tixian.png");
-  background-position: center;
-  background-size: 100% 100%;
-    width: 353px;
-    height: 65px;
-    margin: 10px auto;
-}
-.withdraw_money{
-  font-size: 24px;
-}

src/pages/agent/index/index.vue

@@ -174,5 +174,31 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.header {
+  background-image: url("https://img.shuimuai.com/web/bg_dailishang.png");
+  background-position: center;
+  background-size: 100% 100%;
+  width: 100%;
+  height: 235px;
+}
+
+.text-normal {
+  color: #97B2DE;
+}
+
+.profit_detail_contaienr {
+}
+
+
+.withdraw_container {
+  background-image: url("https://img.shuimuai.com/web/frame_dailishang_tixian.png");
+  background-position: center;
+  background-size: 100% 100%;
+    width: 353px;
+    height: 65px;
+    margin: 10px auto;
+}
+.withdraw_money{
+  font-size: 24px;
+}
 </style>

src/pages/agent/invite_card_inventory/index.css

@@ -1,17 +0,0 @@
-.list-item {
-  margin: 10px 0px;
-}
-
-.process_text {
-  font-size: 36px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #FF9C00;
-  line-height: 24px;
-}
-.color-primary{
-  color: #FF9C00;
-}
-.slot_text{
-  font-size: 9px;
-}

src/pages/agent/invite_card_inventory/index.vue

@@ -130,5 +130,21 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.list-item {
+  margin: 10px 0px;
+}
+
+.process_text {
+  font-size: 36px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #FF9C00;
+  line-height: 24px;
+}
+.color-primary{
+  color: #FF9C00;
+}
+.slot_text{
+  font-size: 9px;
+}
 </style>

src/pages/agent/settlement_center/index/index.css

@@ -1,24 +0,0 @@
-.header {
-  background-image: url("https://img.shuimuai.com/web/bg_dailishang.png");
-  background-position: center;
-  background-size: 100% 100%;
-  width: 100%;
-  height: 235px;
-}
-
-.main_icon {
-  width: 121px;
-  height: 126px;
-  margin: 10px auto;
-}
-
-.text-primary {
-  color: #4B3AB0;
-}
-
-.bottom_text {
-  width: 100%;
-  text-align: center;
-  position: absolute;
-  bottom: 50px;
-}

src/pages/agent/settlement_center/index/index.vue

@@ -84,5 +84,28 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.header {
+  background-image: url("https://img.shuimuai.com/web/bg_dailishang.png");
+  background-position: center;
+  background-size: 100% 100%;
+  width: 100%;
+  height: 235px;
+}
+
+.main_icon {
+  width: 121px;
+  height: 126px;
+  margin: 10px auto;
+}
+
+.text-primary {
+  color: #4B3AB0;
+}
+
+.bottom_text {
+  width: 100%;
+  text-align: center;
+  position: absolute;
+  bottom: 50px;
+}
 </style>

src/pages/agent/settlement_center/withdraw/detail/index.vue

@@ -21,5 +21,4 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
 </style>

src/pages/agent/settlement_center/withdraw/list/index.vue

@@ -21,5 +21,4 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
 </style>

src/pages/coupons/index.css

@@ -1,64 +0,0 @@
-
-.quan_container {
-  background-image: url("https://img.shuimuai.com/web/index_item_quan.png");
-  background-position: center;
-  background-size: 100% 100%;
-  width: 340px;
-  height: 115px;
-  margin: 10px auto;
-}
-
-.quan_container_gray {
-  background-image: url("https://img.shuimuai.com/web/quan_huise.png");
-  background-position: center;
-  background-size: 100% 100%;
-  width: 340px;
-  height: 115px;
-  margin: 10px auto;
-}
-
-/*标题*/
-.title {
-  font-size: 15px;
-  font-weight: 400;
-  color: #030000;
-  line-height: 24px;
-
-}
-
-/*子标题*/
-.sub-title {
-  font-size: 10px;
-  font-weight: 400;
-  color: #030000;
-  line-height: 24px;
-
-}
-
-/*分钟数*/
-.time {
-  font-size: 36px;
-  font-weight: 400;
-  color: #030000;
-  line-height: 24px;
-}
-
-/*分钟二字*/
-.time_text {
-  font-size: 12px;
-  font-weight: 400;
-  color: #030000;
-  line-height: 24px;
-}
-
-/*领取二字*/
-.get_ticket_text {
-  font-size: 18px;
-  font-weight: 400;
-  color: #FFFFFF;
-  line-height: 24px;
-  margin: 45px 0px;
-}
-
-.quan_list {
-}

src/pages/coupons/index.vue

@@ -130,5 +130,68 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+
+.quan_container {
+  background-image: url("https://img.shuimuai.com/web/index_item_quan.png");
+  background-position: center;
+  background-size: 100% 100%;
+  width: 340px;
+  height: 115px;
+  margin: 10px auto;
+}
+
+.quan_container_gray {
+  background-image: url("https://img.shuimuai.com/web/quan_huise.png");
+  background-position: center;
+  background-size: 100% 100%;
+  width: 340px;
+  height: 115px;
+  margin: 10px auto;
+}
+
+/*标题*/
+.title {
+  font-size: 15px;
+  font-weight: 400;
+  color: #030000;
+  line-height: 24px;
+
+}
+
+/*子标题*/
+.sub-title {
+  font-size: 10px;
+  font-weight: 400;
+  color: #030000;
+  line-height: 24px;
+
+}
+
+/*分钟数*/
+.time {
+  font-size: 36px;
+  font-weight: 400;
+  color: #030000;
+  line-height: 24px;
+}
+
+/*分钟二字*/
+.time_text {
+  font-size: 12px;
+  font-weight: 400;
+  color: #030000;
+  line-height: 24px;
+}
+
+/*领取二字*/
+.get_ticket_text {
+  font-size: 18px;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 24px;
+  margin: 45px 0px;
+}
+
+.quan_list {
+}
 </style>

src/pages/game_record/index.css

@@ -1,39 +0,0 @@
-.header {
-  width: 100%;
-  height: 100px;
-}
-
-.header .title {
-  font-size: 24px;
-  font-weight: 400;
-  color: #000000;
-  line-height: 24px;
-}
-
-.header .sub-title {
-  font-size: 12px;
-  font-weight: 400;
-  color: #6A6A6A;
-  line-height: 24px;
-
-}
-
-.line_container .title {
-  font-size: 10px;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #6C6C6C;
-  line-height: 24px;
-}
-
-.filter_date {
-  position: absolute;
-  bottom: 50px;
-  width: 100%;
-  background-color: rgba(255, 255, 255, 0);
-}
-
-.record_list {
-  height: 350px;
-  overflow-y: scroll;
-}

src/pages/game_record/index.vue

@@ -119,5 +119,43 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.header {
+  width: 100%;
+  height: 100px;
+}
+
+.header .title {
+  font-size: 24px;
+  font-weight: 400;
+  color: #000000;
+  line-height: 24px;
+}
+
+.header .sub-title {
+  font-size: 12px;
+  font-weight: 400;
+  color: #6A6A6A;
+  line-height: 24px;
+
+}
+
+.line_container .title {
+  font-size: 10px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #6C6C6C;
+  line-height: 24px;
+}
+
+.filter_date {
+  position: absolute;
+  bottom: 50px;
+  width: 100%;
+  background-color: rgba(255, 255, 255, 0);
+}
+
+.record_list {
+  height: 350px;
+  overflow-y: scroll;
+}
 </style>

src/pages/index/index.css

@@ -1,84 +0,0 @@
-.login_card {
-  height: 350px;
-  background-color: #ffffff;
-  position: relative;
-  z-index: 3;
-  top: -80px;
-  margin: 0px 10px;
-  background-image: url("https://img.shuimuai.com/shuimugongzhu.png");
-  background-position: center;
-  background-size: 100% 100%;
-  background-color: rgba(255, 255, 255, 0);
-}
-
-/*体验页面*/
-.slogen {
-  color: #4b4b4b;
-  font-size: 13px;
-}
-
-.sub_slogen {
-  font-size: 22px;
-  margin-top: 110px;
-  color: #4c4c4c;
-}
-
-/*扫码页*/
-.sub_slogen_sm {
-  font-size: 13px;
-  margin: 120px auto 0px;
-  color: #4c4c4c;
-}
-
-/*注册页面*/
-.register_form_container {
-  margin: 70px auto 0px;
-  width: 90%;
-  height: 108px;
-  background: rgba(242, 243, 255, 0.6);
-  box-shadow: 0px 3px 7px 0px rgba(159, 159, 159, 0.84);
-  border-radius: 11px;
-}
-
-/* 功能服务 */
-.service {
-  position: relative;
-  width: 100%;
-  padding: 5px 7px 35px;
-  /*margin-top: 20px;*/
-  /* top: 520px; */
-  /*top: 10px;*/
-}
-
-.service .content {
-  width: 100%;
-}
-
-.service .content image {
-  width: 186px;
-  height: 89px;
-}
-
-.head .line {
-  width: 4px;
-  height: 14px;
-  background-color: #5d4db8;
-  margin-right: 7px;
-}
-
-.head view {
-  display: flex;
-  justify-self: start;
-  align-items: center;
-}
-
-.cu-form-group {
-  background-color: rgba(255, 255, 255, 0);
-}
-
-
-.personal_card{
-  height: 300px;
-}
-/* 测试 元素标签名*/
-/* service */

src/pages/index/index.vue

@@ -1,5 +1,4 @@
 <template>
-
   <div id="container">
     <!--    banner模块-->
     <banner></banner>
@@ -23,14 +22,12 @@
       <personal_container></personal_container>
       <device_container></device_container>
     </div>
-    <div class="service">
-      <div class="head">
-        <div>
-          <div class="line"></div>
-          <div class="title">功能服务</div>
-        </div>
-      </div>
-      <div class="content">
+    <div class="service margin-top-xl" :class="{'service_login_page':is_login==false}">
+      <view class="padding-tb">
+        <text class="cuIcon-titles text-primary"></text>
+        <text class="">功能服务</text>
+      </view>
+      <div class="content padding-lr">
         <van-row>
           <van-col span="12">
             <img src="https://img.shuimuai.com/web/index_btn_chongzhizhongxin.png" @click="to_recharge"></img>
@@ -74,8 +71,8 @@ export default {
     return {
       // 三种状态 扫码scan 注册regist 登录login
       status: "login",
+      // is_login: false,
       is_login: false,
-      // is_login: true,
       regist_title: ""
     }
   },
@@ -141,5 +138,56 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+/*@import "index.css";*/
+.login_card {
+  height: 350px;
+  background-color: #ffffff;
+  position: relative;
+  z-index: 3;
+  top: -90px;
+  margin: 0px 10px;
+  background-image: url(https://img.shuimuai.com/shuimugongzhu.png);
+  background-position: center;
+  background-size: 100% 100%;
+  background-color: rgba(255, 255, 255, 0);
+}
+
+/* 功能服务 */
+.service {
+  position: absolute;
+  width: 100%;
+  top: 550px;
+}
+
+.service_login_page {
+  top: 500px !important;
+}
+
+.service .content {
+  width: 100%;
+}
+
+.service .content image {
+  width: 186px;
+  height: 89px;
+}
+
+.head .line {
+  width: 4px;
+  height: 14px;
+  background-color: #5d4db8;
+  margin-right: 7px;
+}
+
+.head view {
+  display: flex;
+  justify-self: start;
+  align-items: center;
+}
+
+.personal_card {
+  height: 300px;
+  position: relative;
+}
+
 </style>

src/pages/index/main.json

@@ -6,7 +6,7 @@
     "van-overlay": "../../../static/vant/overlay/index",
     "van-toast": "../../../static/vant/toast/index",
     "van-field": "../../../static/vant/field/index",
-        "van-count-down":"../../../static/vant/count-down/index"
-
+    "van-count-down": "../../../static/vant/count-down/index",
+    "van-dialog": "../../static/vant/dialog/index"
   }
 }

src/pages/none/index.vue

@@ -9,7 +9,11 @@ export default {
 }
 </script>
 <style scoped>
-.cover{
+#index_login_container{
+  height: 812px;
+  background-color: #31295B;
+}
+.cover {
   width: 100%;
   height: 667px;
 }

src/pages/report/index.css

@@ -1,180 +0,0 @@
-/* 头部椭圆 */
-.head {
-  width: 442px;
-  height: 385px;
-  background-color:#4b3ab0;
-  border-radius: 50%;
-  position: absolute;
-  left: -34px;
-  top: -252px;
-  z-index: -1;
-}
-/* 头部个人信息 */
-image.boy {
-  width: 110px;
-  height: 111px;
-  position: absolute;
-  left: 225px;
-  top: 45px;
-}
-
-.user {
-  width: 100%;
-}
-.user .up {
-  width: 100%;
-  height: 40px;
-  margin-top: 9px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  color: #fff;
-}
-.user .up .left {
-  height: 40px;
-  display: flex;
-  align-items: center;
-  justify-content: start;
-}
-.user .up .left image {
-  width: 40px;
-  height: 40px;
-  margin-left: 17px;
-  margin-right: 8px;
-}
-.user .up .left view {
-  height: 40px;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: space-between;
-}
-.user .up .left view text:first-child{
-  font-size: 15px;
-  font-weight: bold;
-}
-.user .up .left view text:last-child{
-  font-size: 13px;
-}
-.user .up .right {
-  height: 40px;
-
-}
-.user .up .right image {
-  width: 14px;
-  height: 15px;
-  vertical-align: middle;
-  margin-right: 4px;
-}
-.user .up .right text {
-  font-size: 12px;
-  text-decoration: underline;
-  margin-right: 10px;
-}
-.user .down {
-  width: 100%;
-  height: 82px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: start;
-}
-.user .down view:first-child{
-  font-size: 45px;
-  color: #FFD800;
-  font-weight: bold;
-}
-.user .down view:last-child{
-  font-size: 10px;
-  color: #C7C4D8;
-  margin-top: -5px;
-}
-/* 详细数据 */
-.detail {
-  width: 100%;
-  height: 102px;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-}
-.detail view {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-around;
-  color: #6C6C6C;
-  font-size: 10px;
-}
-.detail view view:first-child {
-  color: #000;
-  font-size: 30px;
-}
-/* 小标题 */
-.bar {
-  width: 100%;
-  height: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 7px;
-  box-sizing: border-box;
-  margin: 11px 0;
-}
-
-.bar view {
-  display: flex;
-  align-items: center;
-  justify-content: start;
-}
-.conclution {
-  width: 100%;
-  padding: 5px 19px 20px;
-  font-size: 10px;
-  color: #6C6C6C;
-  box-sizing: border-box;
-}
-.bar .line {
-  width: 4px;
-  height: 15px;
-  background-color: #5D4DB8;
-  margin-right: 7px;
-}
-
-.bar .title {
-  color: #010101;
-  font-size: 15px;
-}
-/* 图表 */
-#mychart-dom-multi-line {
-  width: 360px;
-  height: 193px;
-}
-.chart {
-  margin: 0 auto;
-  width: 360px;
-  height: 193px;
-  background: #f3f3f3;
-  opacity: 0.6;
-  border-radius: 10px;
-  box-shadow: 0px 6px 11px #dadada;
-}
-
-/* 核销详情 */
-.sheet {
-  color: #6D6D6D;
-  font-size: 10px;
-  display: flex;
-  padding: 0 16px;
-  box-sizing: border-box;
-}
-.sheet .left,
-.sheet .right {
-  height: 95px;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: space-between;
-}
-.sheet .left {
-  width: 195px;
-}

src/pages/report/index.vue

@@ -159,5 +159,184 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+/* 头部椭圆 */
+.head {
+  width: 442px;
+  height: 385px;
+  background-color:#4b3ab0;
+  border-radius: 50%;
+  position: absolute;
+  left: -34px;
+  top: -252px;
+  z-index: -1;
+}
+/* 头部个人信息 */
+image.boy {
+  width: 110px;
+  height: 111px;
+  position: absolute;
+  left: 225px;
+  top: 45px;
+}
+
+.user {
+  width: 100%;
+}
+.user .up {
+  width: 100%;
+  height: 40px;
+  margin-top: 9px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  color: #fff;
+}
+.user .up .left {
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: start;
+}
+.user .up .left image {
+  width: 40px;
+  height: 40px;
+  margin-left: 17px;
+  margin-right: 8px;
+}
+.user .up .left view {
+  height: 40px;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+.user .up .left view text:first-child{
+  font-size: 15px;
+  font-weight: bold;
+}
+.user .up .left view text:last-child{
+  font-size: 13px;
+}
+.user .up .right {
+  height: 40px;
+
+}
+.user .up .right image {
+  width: 14px;
+  height: 15px;
+  vertical-align: middle;
+  margin-right: 4px;
+}
+.user .up .right text {
+  font-size: 12px;
+  text-decoration: underline;
+  margin-right: 10px;
+}
+.user .down {
+  width: 100%;
+  height: 82px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: start;
+}
+.user .down view:first-child{
+  font-size: 45px;
+  color: #FFD800;
+  font-weight: bold;
+}
+.user .down view:last-child{
+  font-size: 10px;
+  color: #C7C4D8;
+  margin-top: -5px;
+}
+/* 详细数据 */
+.detail {
+  width: 100%;
+  height: 102px;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.detail view {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-around;
+  color: #6C6C6C;
+  font-size: 10px;
+}
+.detail view view:first-child {
+  color: #000;
+  font-size: 30px;
+}
+/* 小标题 */
+.bar {
+  width: 100%;
+  height: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 7px;
+  box-sizing: border-box;
+  margin: 11px 0;
+}
+
+.bar view {
+  display: flex;
+  align-items: center;
+  justify-content: start;
+}
+.conclution {
+  width: 100%;
+  padding: 5px 19px 20px;
+  font-size: 10px;
+  color: #6C6C6C;
+  box-sizing: border-box;
+}
+.bar .line {
+  width: 4px;
+  height: 15px;
+  background-color: #5D4DB8;
+  margin-right: 7px;
+}
+
+.bar .title {
+  color: #010101;
+  font-size: 15px;
+}
+/* 图表 */
+#mychart-dom-multi-line {
+  width: 360px;
+  height: 193px;
+}
+.chart {
+  margin: 0 auto;
+  width: 360px;
+  height: 193px;
+  background: #f3f3f3;
+  opacity: 0.6;
+  border-radius: 10px;
+  box-shadow: 0px 6px 11px #dadada;
+}
+
+/* 核销详情 */
+.sheet {
+  color: #6D6D6D;
+  font-size: 10px;
+  display: flex;
+  padding: 0 16px;
+  box-sizing: border-box;
+}
+.sheet .left,
+.sheet .right {
+  height: 95px;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+.sheet .left {
+  width: 195px;
+}
 </style>

src/pages/start/index.css

@@ -1,179 +0,0 @@
-#playing_container {
-  width: 100%;
-  background: linear-gradient(0deg, rgba(40, 157, 206, 0.51), rgba(135, 145, 226, 0.26));
-  background-color: #46425E;
-  padding: 5px;
-
-}
-
-.game_panel {
-  width: 100%;
-  height: 76px;
-  background: #46425E;
-  box-shadow: 0px 3px 4px 0px #302D43;
-  border-radius: 11px;
-  margin: 0px auto;
-}
-
-.game_panel .title {
-  color: #9A96B7;
-}
-
-.game_panel .type {
-  color: #FFFFFF;
-}
-
-.van-count-down {
-  font-weight: bold;
-  font-size: 30px !important;
-  color: white !important;
-}
-
-.cut_brain_icon {
-  width: 11px;
-  height: 11px;
-}
-
-.device_img {
-  width: 36px;
-  height: 36px;
-}
-
-.text-default {
-  color: #9A95B7;
-  font-size: 10px;
-}
-
-/*电量显示*/
-.elc_power_container {
-  width: 28px;
-  border: #9A95B7 3px solid;
-  border-radius: 5px;
-  height: 22px;
-}
-
-.device_elc {
-  height: 22px;
-  width: 4px;
-}
-
-/* 节标题  */
-.bar {
-  width: 100%;
-  height: 15px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 7px;
-  box-sizing: border-box;
-  margin: 11px 0;
-}
-
-.bar view {
-  display: flex;
-  align-items: center;
-  justify-content: start;
-}
-
-.bar .line {
-  width: 4px;
-  height: 15px;
-  background-color: #FFB400;
-  margin-right: 7px;
-}
-
-.bar .title {
-  color: #fff;
-  font-size: 15px;
-}
-
-.label {
-  color: #9A95B7;
-  font-size: 10px;
-}
-
-/*点图*/
-.dot {
-  width: 8px;
-  height: 8px;
-  border-radius: 50%;
-  margin-right: 4px;
-  margin-left: 15px;
-}
-
-.dot-orange {
-  background: #FFB400;
-}
-
-.dot-pink {
-
-  background: #D4327A;
-}
-
-.dot-blue {
-
-  background: #00CCFF;
-}
-
-.dot-green {
-
-  background: #0CDA2E;
-}
-
-.dot-yellow {
-
-  background: #D1D310;
-}
-
-.dot-orange-yellow {
-
-  background: #F8A117;
-}
-
-/* 图表 */
-#mychart-dom-multi-line {
-  width: 100%;
-  height: 175px;
-}
-
-#mychart-dom-multi-line-med {
-  width: 100%;
-  height: 100px;
-}
-
-.chart {
-  width: 360px;
-  height: 193px;
-  background: #302D43;
-  opacity: 0.6;
-  border-radius: 10px;
-}
-
-/*弹窗模块*/
-.err_container {
-  width: 260px;
-  height: 300px;
-  border-radius: 5px;
-}
-
-/*标题*/
-.err_container .title {
-  font-size: 20px;
-  font-weight: bold;
-  color: #4C4C4C;
-  line-height: 24px;
-}
-
-/*子标题*/
-.err_container .sub-title {
-  font-size: 12px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #4B4B4B;
-  line-height: 24px;
-}
-
-.err_img{
-  width: 73px;
-  height: 83px;
-}

src/pages/start/index.vue

@@ -134,8 +134,7 @@ import util from '../../utils/index'
 import bluetooth from "../../utils/bluetooth";
 import game_store from "@/store/game";
 import Toast from '../../../static/vant/toast/toast';
-import {game_devices, gameAddLine, gameEnd} from "../../requests/game";
-import ext from "../../utils/ext";
+import {gameAddLine, gameEnd} from "../../requests/game";
 
 var att_charts,
   med_charts,
@@ -221,7 +220,11 @@ export default {
       delta_list: [],
       alpha_list: [],
       beta_list: [],
-      theta_list: []
+      theta_list: [],
+      //判断是否结束游戏
+      is_end: false,
+      //  消耗的时间
+      played_time: 0
     }
   },
   methods: {
@@ -238,7 +241,9 @@ export default {
       wx.offBLECharacteristicValueChange()
       Toast.success('已成功断开')
       //设置游戏状态为 停止游戏
-      game_store.commit('setGameStatus', 0)
+      game_store.commit('setGameStatus', 3)
+      //游戏结束重置游戏时间
+      game_store.commit('setPlayTime', 0)
       //游戏结束传送一下数据
       $this.post_data()
       $this.game_over()
@@ -251,7 +256,6 @@ export default {
     // 时间到
     time_out() {
       $this.pop_show = true
-      $this.game_finished()
     },
     to_report() {
       mpvue.reLaunch({
@@ -317,7 +321,7 @@ export default {
       })
       // 操作之前先监听，保证第一时间获取数据
       wx.onBLECharacteristicValueChange((characteristic) => {
-        console.log("收到" + $this.ab2hex(characteristic.value));
+        // console.log("收到" + $this.ab2hex(characteristic.value));
         let hexStr = $this.ab2hex(characteristic.value)
         let $data = bluetooth.get_big_data(hexStr)
         if ($data) {
@@ -343,7 +347,6 @@ export default {
         }
 
         //连接玩具
-        console.log('玩具hexStr', hexStr)
         bluetooth.sendControl($this._deviceId, $this._serviceId, $this._characteristicId)
       })
     },
@@ -363,6 +366,9 @@ export default {
     watch_time(e) {
       let $datetime = e.mp.detail
       $this.timeData = $datetime
+      $this.played_time += 1
+      console.log("玩了:" + $this.played_time + "秒")
+
       //时间倒数
       if ($datetime.seconds == '00') {
         //  时间满一分钟 则提交一次数据
@@ -394,78 +400,261 @@ export default {
     },
     //  结束游戏
     game_over() {
-      let $current_time = $this.timeData.minutes * 60 + $this.timeData.seconds
-      let $play_time = $this.play_time - $current_time
-      if ($this.mode == 2) {
-        let $userinfo = wx.getStorageSync('userinfo')
-        $play_time = $userinfo['play_time'] * 60 - $current_time
-      }
+      // let $current_time = $this.timeData.minutes * 60 + $this.timeData.seconds
+      // let $play_time = $this.play_time - $current_time
+      // if ($this.mode == 2) {
+      //   let $userinfo = wx.getStorageSync('userinfo')
+      //   $play_time = $userinfo['play_time'] * 60 - $current_time
+      // }
       let $params = {
         game_record_id: game_store.getters.getGameRecordId,
         type: $this.mode,
-        play_time: $play_time
+        play_time: $this.played_time
       }
       console.log("结束游戏参数", $params)
       //
       gameEnd($params).then((res) => {
         let $data = res.data
+        $this.played_time = 0
+        //设置未结束游戏
+        $this.is_end = false
       })
     }
   }
   ,
   mounted() {
+    //判断是否结束游戏
+    if ($this.is_end == true) {
+      $this.game_finished()
+    } else {
+      $this._deviceId = game_store.getters.getDeviceId
+      $this.getBLEDeviceServices($this._deviceId)
+
+      //  筛选 玩具id
+      $this.toy_hex = game_store.getters.getToyHex
+      // bluetooth.sendConnect($this.toy_hex, $this._deviceId, $this._serviceId, $this._characteristicId)
+
+      //筛选模式
+      $this.mode = game_store.getters.getMode
+
+      //获取用户游玩时间
+      let $play_time = $this.play_time = game_store.getters.getPlayTime
+      $this.mode_list.forEach(($val, $index) => {
+        $val['time'] = $play_time * 1000
+        if ($val['id'] == $this.mode) {
+          $this.mode_item = $val
+        }
+      })
+      bluetooth.watch_bluetooth_status($this)
+    }
+
   },
   created() {
     $this = this;
   },
   onShow() {
-    $this._deviceId = game_store.getters.getDeviceId
-    $this.getBLEDeviceServices($this._deviceId)
-
-    //  筛选 玩具id
-    $this.toy_hex = game_store.getters.getToyHex
-    // bluetooth.sendConnect($this.toy_hex, $this._deviceId, $this._serviceId, $this._characteristicId)
-
-
-    //筛选模式
-    $this.mode = game_store.getters.getMode
-
-    //获取用户游玩时间
-    let $play_time = $this.play_time = game_store.getters.getPlayTime
-    $this.mode_list.forEach(($val, $index) => {
-      $val['time'] = $play_time * 1000
-      if ($val['id'] == $this.mode) {
-        $this.mode_item = $val
-      }
-    })
-
-    bluetooth.watch_bluetooth_status($this)
-
   },
   onLoad(options) {
-    let $game_status = game_store.getters.getGameStatus;
-    if ($game_status == 1) {
-      console.log("结束游戏跳转", options)
-      if (options.end) {
-        $this.game_finished()
-      }
+    if (options.end == 1) {
+      $this.is_end = true
     }
   },
   onUnload() {
     // 返回 的时候 暂停
     const countDown = $this.$mp.page.selectComponent('.control-count-down');
     countDown.pause();
-    // bluetooth.sendPause($this._deviceId, $this._serviceId, $this._characteristicId)
-    // bluetooth.sendEnd($this._deviceId, $this._serviceId, $this._characteristicId)
-
+    //停止传输数据
+    bluetooth.sendPause($this._deviceId, $this._serviceId, $this._characteristicId)
+    bluetooth.sendEnd($this._deviceId, $this._serviceId, $this._characteristicId)
+    wx.offBLECharacteristicValueChange()
+    //存储时间
     let $play_time = $this.timeData.minutes * 60 + $this.timeData.seconds
-    console.log($play_time)
     game_store.commit('setPlayTime', $play_time)
     this.pop_show = false
+    //设置未结束游戏
+    $this.is_end = false
   }
 }
 </script>
 
 <style scoped>
-@import "index.css";
+#playing_container {
+  width: 100%;
+  background: linear-gradient(0deg, rgba(40, 157, 206, 0.51), rgba(135, 145, 226, 0.26));
+  background-color: #46425E;
+  padding: 5px;
+
+}
+
+.game_panel {
+  width: 100%;
+  height: 76px;
+  background: #46425E;
+  box-shadow: 0px 3px 4px 0px #302D43;
+  border-radius: 11px;
+  margin: 0px auto;
+}
+
+.game_panel .title {
+  color: #9A96B7;
+}
+
+.game_panel .type {
+  color: #FFFFFF;
+}
+
+.van-count-down {
+  font-weight: bold;
+  font-size: 30px !important;
+  color: white !important;
+}
+
+.cut_brain_icon {
+  width: 11px;
+  height: 11px;
+}
+
+.device_img {
+  width: 36px;
+  height: 36px;
+}
+
+.text-default {
+  color: #9A95B7;
+  font-size: 10px;
+}
+
+/*电量显示*/
+.elc_power_container {
+  width: 28px;
+  border: #9A95B7 3px solid;
+  border-radius: 5px;
+  height: 22px;
+}
+
+.device_elc {
+  height: 22px;
+  width: 4px;
+}
+
+/* 节标题  */
+.bar {
+  width: 100%;
+  height: 15px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 7px;
+  box-sizing: border-box;
+  margin: 11px 0;
+}
+
+.bar view {
+  display: flex;
+  align-items: center;
+  justify-content: start;
+}
+
+.bar .line {
+  width: 4px;
+  height: 15px;
+  background-color: #FFB400;
+  margin-right: 7px;
+}
+
+.bar .title {
+  color: #fff;
+  font-size: 15px;
+}
+
+.label {
+  color: #9A95B7;
+  font-size: 10px;
+}
+
+/*点图*/
+.dot {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  margin-right: 4px;
+  margin-left: 15px;
+}
+
+.dot-orange {
+  background: #FFB400;
+}
+
+.dot-pink {
+
+  background: #D4327A;
+}
+
+.dot-blue {
+
+  background: #00CCFF;
+}
+
+.dot-green {
+
+  background: #0CDA2E;
+}
+
+.dot-yellow {
+
+  background: #D1D310;
+}
+
+.dot-orange-yellow {
+
+  background: #F8A117;
+}
+
+/* 图表 */
+#mychart-dom-multi-line {
+  width: 100%;
+  height: 175px;
+}
+
+#mychart-dom-multi-line-med {
+  width: 100%;
+  height: 100px;
+}
+
+.chart {
+  width: 360px;
+  height: 193px;
+  background: #302D43;
+  opacity: 0.6;
+  border-radius: 10px;
+}
+
+/*弹窗模块*/
+.err_container {
+  width: 260px;
+  height: 300px;
+  border-radius: 5px;
+}
+
+/*标题*/
+.err_container .title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #4C4C4C;
+  line-height: 24px;
+}
+
+/*子标题*/
+.err_container .sub-title {
+  font-size: 12px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #4B4B4B;
+  line-height: 24px;
+}
+
+.err_img{
+  width: 73px;
+  height: 83px;
+}
 </style>

src/pages/start/main.json

@@ -4,6 +4,7 @@
     "van-col": "../../static/vant/col/index",
     "van-toast": "../../static/vant/toast/index",
     "van-popup": "../../static/vant/popup/index",
-    "van-count-down": "../../static/vant/count-down/index"
+    "van-count-down": "../../static/vant/count-down/index",
+    "van-dialog": "../../static/vant/dialog/index"
   }
 }

src/pages/user_center/address/edit/index.css

@@ -1,7 +0,0 @@
-.button_container{
-  padding: 10px;
-  position: absolute;
-  bottom: 50px;
-  text-align: center;
-  width: 100%;
-}

src/pages/user_center/address/edit/index.vue

@@ -78,5 +78,12 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.button_container{
+  padding: 10px;
+  position: absolute;
+  bottom: 50px;
+  text-align: center;
+  width: 100%;
+}
+
 </style>

src/pages/user_center/address/list/index.vue

@@ -44,5 +44,4 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
 </style>

src/pages/user_center/edit/confirm_phone_finally/index.css

@@ -1,16 +0,0 @@
-/*头像*/
-.main_icon {
-  width: 96px;
-  height: 83px;
-  margin: 50px auto;
-}
-
-.main_content {
-  width: 100%;
-}
-
-.bottom_button{
-  position: absolute;
-  bottom: 50px;
-  width: 100%;
-}

src/pages/user_center/edit/confirm_phone_finally/index.vue

@@ -161,5 +161,20 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+/*头像*/
+.main_icon {
+  width: 96px;
+  height: 83px;
+  margin: 50px auto;
+}
+
+.main_content {
+  width: 100%;
+}
+
+.bottom_button{
+  position: absolute;
+  bottom: 50px;
+  width: 100%;
+}
 </style>

src/pages/user_center/edit/confirm_phone_first/index.css

@@ -1,16 +0,0 @@
-/*头像*/
-.main_icon {
-  width: 96px;
-  height: 83px;
-  margin: 50px auto;
-}
-
-.main_content {
-  width: 100%;
-}
-
-.bottom_button{
-  position: absolute;
-  bottom: 50px;
-  width: 100%;
-}

src/pages/user_center/edit/confirm_phone_first/index.vue

@@ -138,5 +138,20 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+/*头像*/
+.main_icon {
+  width: 96px;
+  height: 83px;
+  margin: 50px auto;
+}
+
+.main_content {
+  width: 100%;
+}
+
+.bottom_button{
+  position: absolute;
+  bottom: 50px;
+  width: 100%;
+}
 </style>

src/pages/user_center/edit/index.css

@@ -1,5 +0,0 @@
-/*头像*/
-.avatar {
-  width: 40px;
-  height: 40px;
-}

src/pages/user_center/edit/index.vue

@@ -133,5 +133,9 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+/*头像*/
+.avatar {
+  width: 40px;
+  height: 40px;
+}
 </style>

src/pages/user_center/index.css

@@ -1,179 +0,0 @@
-/* 头部椭圆 */
-.head {
-  width: 442px;
-  height: 285px;
-  background-color: #4b3ab0;
-  border-radius: 50%;
-  position: absolute;
-  left: -34px;
-  top: -155px;
-  z-index: -1;
-}
-
-.user {
-  width: 100%;
-}
-
-.user .up {
-  width: 100%;
-  height: 40px;
-  margin-top: 9px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  color: #fff;
-}
-
-.user .up .left {
-  height: 40px;
-  display: flex;
-  align-items: center;
-  justify-content: start;
-}
-
-.user .up .left image {
-  width: 40px;
-  height: 40px;
-  margin-left: 17px;
-  margin-right: 8px;
-}
-
-image.bianji {
-  width: 43px;
-  height: 18px;
-  position: absolute;
-  top: 9px;
-  left: 155px;
-}
-
-.user .up .left view {
-  height: 40px;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: space-between;
-}
-
-.user .up .left view text:first-child {
-  font-size: 15px;
-  font-weight: bold;
-}
-
-.user .up .left view text:last-child {
-  font-size: 13px;
-}
-
-.user .up .right {
-  height: 40px;
-
-}
-
-.user .up .right image {
-  width: 14px;
-  height: 15px;
-  vertical-align: middle;
-  margin-right: 4px;
-}
-
-.user .up .right text {
-  font-size: 12px;
-  text-decoration: underline;
-  margin-right: 10px;
-}
-
-.user .down {
-  width: 100%;
-  height: 82px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: start;
-}
-
-.user .down image {
-  width: 16px;
-  height: 16px;
-  vertical-align: middle;
-  margin-right: 2px;
-}
-
-.user .down view:first-child {
-  font-size: 36px;
-  color: #FFD800;
-  font-weight: bold;
-}
-
-.user .down view:last-child {
-  font-size: 15px;
-  color: #C7C4D8;
-  margin-top: -2px;
-}
-
-/* 详细数据 */
-.detail {
-  width: 100%;
-  height: 102px;
-  text-align: center;
-  margin: 10px auto;
-}
-
-.detail view {
-  color: #6C6C6C;
-  font-size: 10px;
-}
-
-.detail view view:first-child {
-  color: #000;
-  font-size: 30px;
-}
-
-.detail image {
-  width: 114px;
-  height: 83px;
-}
-
-/* 菜单 */
-.menu {
-  width: 100%;
-}
-
-.menu image:first-child {
-  width: 21px;
-  height: 21px;
-}
-
-.menu image:last-child {
-  width: 9px;
-  height: 16px;
-}
-
-.contact_button{
-  position: relative;
-  bottom: 45px;
-  opacity: 0;
-}
-
-.icon1{
-  width: 19px;
-  height: 20px;
-  padding:1px 2px;
-  margin: 0px 2px;
-}
-.icon2{
-  width: 20px;
-  height: 23px;
-  padding:1px 2px;
-  margin: 0px 2px;
-}
-.icon3{
-  width: 21px;
-  height: 21px;
-  padding:1px 2px;
-  margin: 0px 2px;
-}
-.icon4{
-  width: 17px;
-  height: 20px;
-  padding:1px 2px;
-  margin: 0px 2px;
-}

src/pages/user_center/index.vue

@@ -134,5 +134,183 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+/* 头部椭圆 */
+.head {
+  width: 442px;
+  height: 285px;
+  background-color: #4b3ab0;
+  border-radius: 50%;
+  position: absolute;
+  left: -34px;
+  top: -155px;
+  z-index: -1;
+}
+
+.user {
+  width: 100%;
+}
+
+.user .up {
+  width: 100%;
+  height: 40px;
+  margin-top: 9px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  color: #fff;
+}
+
+.user .up .left {
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: start;
+}
+
+.user .up .left image {
+  width: 40px;
+  height: 40px;
+  margin-left: 17px;
+  margin-right: 8px;
+}
+
+image.bianji {
+  width: 43px;
+  height: 18px;
+  position: absolute;
+  top: 9px;
+  left: 155px;
+}
+
+.user .up .left view {
+  height: 40px;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+
+.user .up .left view text:first-child {
+  font-size: 15px;
+  font-weight: bold;
+}
+
+.user .up .left view text:last-child {
+  font-size: 13px;
+}
+
+.user .up .right {
+  height: 40px;
+
+}
+
+.user .up .right image {
+  width: 14px;
+  height: 15px;
+  vertical-align: middle;
+  margin-right: 4px;
+}
+
+.user .up .right text {
+  font-size: 12px;
+  text-decoration: underline;
+  margin-right: 10px;
+}
+
+.user .down {
+  width: 100%;
+  height: 82px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: start;
+}
+
+.user .down image {
+  width: 16px;
+  height: 16px;
+  vertical-align: middle;
+  margin-right: 2px;
+}
+
+.user .down view:first-child {
+  font-size: 36px;
+  color: #FFD800;
+  font-weight: bold;
+}
+
+.user .down view:last-child {
+  font-size: 15px;
+  color: #C7C4D8;
+  margin-top: -2px;
+}
+
+/* 详细数据 */
+.detail {
+  width: 100%;
+  height: 102px;
+  text-align: center;
+  margin: 10px auto;
+}
+
+.detail view {
+  color: #6C6C6C;
+  font-size: 10px;
+}
+
+.detail view view:first-child {
+  color: #000;
+  font-size: 30px;
+}
+
+.detail image {
+  width: 114px;
+  height: 83px;
+}
+
+/* 菜单 */
+.menu {
+  width: 100%;
+}
+
+.menu image:first-child {
+  width: 21px;
+  height: 21px;
+}
+
+.menu image:last-child {
+  width: 9px;
+  height: 16px;
+}
+
+.contact_button{
+  position: relative;
+  bottom: 45px;
+  opacity: 0;
+}
+
+.icon1{
+  width: 19px;
+  height: 20px;
+  padding:1px 2px;
+  margin: 0px 2px;
+}
+.icon2{
+  width: 20px;
+  height: 23px;
+  padding:1px 2px;
+  margin: 0px 2px;
+}
+.icon3{
+  width: 21px;
+  height: 21px;
+  padding:1px 2px;
+  margin: 0px 2px;
+}
+.icon4{
+  width: 17px;
+  height: 20px;
+  padding:1px 2px;
+  margin: 0px 2px;
+}
 </style>

src/pages/user_center/recharge/index.css

@@ -1,124 +0,0 @@
-.uc_recharge_container {
-  padding: 0px 10px;
-}
-
-.mine {
-  width: 354px;
-  height: 93px;
-  background: rgba(242, 243, 255, 0.6);
-  box-shadow: 0px 3px 7px 0px rgba(159, 159, 159, 0.84);
-  border-radius: 0px 0px 11px 11px;
-  margin: 0px auto;
-}
-
-.mine_min {
-  font-size: 40px;
-}
-
-.line {
-  width: 4px;
-  height: 16px;
-  background: #5D4DB8;
-}
-
-
-/*会员*/
-.vip {
-  width: 345px;
-  height: 100px;
-  background-position: center;
-  background-size: 100% 100%;
-}
-
-.gold {
-  background-image: url("https://img.shuimuai.com/web/frame_huangjinhuiyuan.png");
-}
-
-.platina {
-  background-image: url("https://img.shuimuai.com/web/frame_baijinhuiyuan.png");
-}
-
-.diamond {
-  background-image: url("https://img.shuimuai.com/web/frame_zuanshihuiyuan.png");
-}
-
-.normal {
-  background-image: url("https://img.shuimuai.com/web/frame_cika.png");
-}
-
-.card_body {
-  padding: 5px 0px;
-}
-
-.check_detail {
-  width: 73px;
-  height: 22px;
-}
-
-.desc {
-  width: 324px;
-  /*height: 128px;*/
-  margin: 10px auto;
-  font-size: 10px;
-  color: #6B6B6B;
-}
-
-.buy_button {
-  text-align: center;
-}
-
-.order_confirm, .err_container {
-  width: 344px;
-  height: 312px;
-}
-
-.order_price_container {
-  margin-top: 110px;
-}
-
-/*充值按钮*/
-.recharge_button {
-  position: absolute;
-  bottom: 20px;
-  width: 90%;
-}
-
-/*标题*/
-.err_container .title {
-  font-size: 20px;
-  font-weight: bold;
-  color: #4C4C4C;
-  line-height: 24px;
-}
-
-.err_img {
-  width: 73px;
-  height: 83px;
-}
-
-.button_group {
-  width: 100%;
-}
-
-
-/*子标题*/
-.err_container .sub-title {
-  font-size: 12px;
-  font-family: Microsoft YaHei;
-  font-weight: 400;
-  color: #4B4B4B;
-  width: 200px;
-}
-
-.boy_logo {
-  width: 167px;
-  height: 184px;
-}
-
-.ext_container {
-  height: 320px;
-  /*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)
-}

src/pages/user_center/recharge/index.vue

@@ -26,7 +26,7 @@
     <div v-for="(item,index) in time_cards" :key="index">
       <div class="vip" :class="item.bg">
         <van-row>
-          <van-col span="8" offset="6">
+          <van-col span="10" offset="6">
             <div class="card_body">
               <view>
                 <text class="mine_min  text-white">{{ item.play_time }}</text>
@@ -41,17 +41,20 @@
             </div>
           </van-col>
 
-          <van-col span="5" offset="4">
+          <van-col span="6" offset="1">
             <div class="card_body">
 
               <view>
                 <text class="text-white text-sm">价格</text>
               </view>
-              <view>
+              <view class="text-center">
                 <text class="text-white mine_min">{{ item.price }}</text>
               </view>
-              <img src="https://img.shuimuai.com/web/btn_seedetil_2.png" class="check_detail" alt=""
-                   @click="card_action_show = item.goods_id">
+              <view class="text-center">
+                <img src="https://img.shuimuai.com/web/btn_seedetil_2.png" class="check_detail" alt=""
+                     @click="changeCardShow(item.goods_id)"
+                >
+              </view>
 
             </div>
           </van-col>
@@ -113,7 +116,8 @@
                 <text class="text-white mine_min">{{ item.price }}</text>
               </view>
               <img src="https://img.shuimuai.com/web/btn_seedetil_2.png" class="check_detail" alt=""
-                   @click="card_action_show = item.goods_id">
+                   @click="changeCardShow(item.goods_id)"
+              >
 
             </div>
           </van-col>
@@ -158,7 +162,7 @@
 
         </view>
 
-        <view v-if="selection_card.discount">
+        <view v-if="selection_card.discount < 1">
           <text class="text-sm text-gray">折扣&emsp;{{ selection_card.discount }}</text>
           <br>
         </view>
@@ -187,7 +191,7 @@
     </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="">
         <view>
@@ -195,7 +199,7 @@
             充值成功
           </text>
         </view>
-        <view class="sub-title">
+        <view class="sub-title" v-if="selection_card.discount < 1">
           <text class="text-gray">
             {{ selection_card.goods_name }},请到实体店店员处领取邀请卡
           </text>
@@ -223,7 +227,7 @@ export default {
     return {
       order: {},
       order_confirm: false,
-      card_action_show: 1,
+      card_action_show: 0,
       err_show: false,
       success_show: false,
       //时间卡列表
@@ -370,6 +374,11 @@ export default {
       mpvue.navigateTo({
         url: "/pages/user_center/orders/main"
       })
+    },
+    //  切换显示
+    changeCardShow($id) {
+      console.log($id)
+      $this.card_action_show = $id
     }
   }
   ,
@@ -390,5 +399,129 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.uc_recharge_container {
+  padding: 0px 10px;
+}
+
+.mine {
+  width: 354px;
+  height: 93px;
+  background: rgba(242, 243, 255, 0.6);
+  box-shadow: 0px 3px 7px 0px rgba(159, 159, 159, 0.84);
+  border-radius: 0px 0px 11px 11px;
+  margin: 0px auto;
+}
+
+.mine_min {
+  font-size: 40px;
+}
+
+.line {
+  width: 4px;
+  height: 16px;
+  background: #5D4DB8;
+}
+
+
+/*会员*/
+.vip {
+  width: 345px;
+  height: 103px;
+  background-position: center;
+  background-size: 100% 100%;
+  margin:0px auto;
+}
+
+.gold {
+  background-image: url("https://img.shuimuai.com/web/frame_huangjinhuiyuan.png");
+}
+
+.platina {
+  background-image: url("https://img.shuimuai.com/web/frame_baijinhuiyuan.png");
+}
+
+.diamond {
+  background-image: url("https://img.shuimuai.com/web/frame_zuanshihuiyuan.png");
+}
+
+.normal {
+  background-image: url("https://img.shuimuai.com/web/frame_cika.png");
+}
+
+.card_body {
+  padding: 5px 0px;
+}
+
+.check_detail {
+  width: 73px;
+  height: 22px;
+}
+
+.desc {
+  width: 324px;
+  /*height: 128px;*/
+  margin: 10px auto;
+  font-size: 10px;
+  color: #6B6B6B;
+}
+
+.buy_button {
+  text-align: center;
+}
+
+.order_confirm, .err_container {
+  width: 344px;
+  height: 312px;
+}
+
+.order_price_container {
+  margin-top: 110px;
+}
+
+/*充值按钮*/
+.recharge_button {
+  position: absolute;
+  bottom: 20px;
+  width: 90%;
+}
+
+/*标题*/
+.err_container .title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #4C4C4C;
+  line-height: 24px;
+}
+
+.err_img {
+  width: 73px;
+  height: 83px;
+}
+
+.button_group {
+  width: 100%;
+}
+
+
+/*子标题*/
+.err_container .sub-title {
+  font-size: 12px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #4B4B4B;
+  width: 200px;
+}
+
+.boy_logo {
+  width: 167px;
+  height: 184px;
+}
+
+.ext_container {
+  height: 320px;
+  /*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)
+}
 </style>

src/pages/user_center/vip/index.css

@@ -1,101 +0,0 @@
-.banner {
-  width: 100%;
-  height: 100px;
-  background-image: url("https://img.shuimuai.com/web/banner_huiyuan.png");
-  background-size: 100% 100%;
-  background-position: center;
-}
-
-.uc_vip_container .content {
-  padding: 10px;
-}
-
-.uc_vip_container .content .title {
-  font-size: 10px;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #6B6B6B;
-  line-height: 24px;
-
-}
-
-/*权益grid*/
-.benefit {
-  text-align: center;
-  margin-top: 20px;
-}
-
-.benefit .icon:first-child {
-  width: 44px;
-  height: 31px;
-}
-
-.benefit .title {
-  font-size: 14px;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #6B6B6B;
-  line-height: 20px;
-
-}
-
-.benefit .subtitle {
-  font-size: 10px;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #6B6B6B;
-}
-
-.desc {
-  margin: 30px 0px;
-  width: 355px;
-  height: 273px;
-  font-size: 10px;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #6B6B6B;
-  line-height: 20px;
-  padding: 15px;
-}
-
-.banner_text {
-  width: 100%;
-  height: 17px;
-  font-size: 18px;
-  font-family: Microsoft YaHei;
-  font-weight: bold;
-  color: #FFFFFF;
-  text-align: center;
-  padding-top: 60px;
-
-}
-
-.icon1 {
-  width: 44px;
-  height: 31px;
-}
-
-.icon2 {
-  width: 35px;
-  height: 37px;
-}
-
-.icon3 {
-  width: 45px;
-  height: 43px;
-}
-
-.icon4 {
-  width: 34px;
-  height: 39px;
-}
-
-.icon5 {
-  width: 37px;
-  height: 32px;
-}
-
-.icon6 {
-  width: 33px;
-  height: 36px;
-}

src/pages/user_center/vip/index.vue

@@ -128,5 +128,105 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.banner {
+  width: 100%;
+  height: 100px;
+  background-image: url("https://img.shuimuai.com/web/banner_huiyuan.png");
+  background-size: 100% 100%;
+  background-position: center;
+}
+
+.uc_vip_container .content {
+  padding: 10px;
+}
+
+.uc_vip_container .content .title {
+  font-size: 10px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #6B6B6B;
+  line-height: 24px;
+
+}
+
+/*权益grid*/
+.benefit {
+  text-align: center;
+  margin-top: 20px;
+}
+
+.benefit .icon:first-child {
+  width: 44px;
+  height: 31px;
+}
+
+.benefit .title {
+  font-size: 14px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #6B6B6B;
+  line-height: 20px;
+
+}
+
+.benefit .subtitle {
+  font-size: 10px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #6B6B6B;
+}
+
+.desc {
+  margin: 30px 0px;
+  width: 355px;
+  height: 273px;
+  font-size: 10px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #6B6B6B;
+  line-height: 20px;
+  padding: 15px;
+}
+
+.banner_text {
+  width: 100%;
+  height: 17px;
+  font-size: 18px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: #FFFFFF;
+  text-align: center;
+  padding-top: 60px;
+
+}
+
+.icon1 {
+  width: 44px;
+  height: 31px;
+}
+
+.icon2 {
+  width: 35px;
+  height: 37px;
+}
+
+.icon3 {
+  width: 45px;
+  height: 43px;
+}
+
+.icon4 {
+  width: 34px;
+  height: 39px;
+}
+
+.icon5 {
+  width: 37px;
+  height: 32px;
+}
+
+.icon6 {
+  width: 33px;
+  height: 36px;
+}
 </style>

src/pages/user_center/vip_code/index.css

@@ -1,68 +0,0 @@
-.uc_vip_code_container{
-  padding: 80px 0px;
-}
-
-.card {
-  width: 347px;
-  height: 403px;
-  background: #FFFFFF;
-  box-shadow: 0px 3px 7px 0px #A6A6A6;
-  border-radius: 11px;
-  margin: 0px auto;
-}
-
-.user {
-  width: 100%;
-}
-
-.user .up {
-  width: 100%;
-  height: 40px;
-  margin-top: 9px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.user .up .left {
-  height: 40px;
-  display: flex;
-  align-items: center;
-  justify-content: start;
-}
-
-.user .up .left image {
-  width: 40px;
-  height: 40px;
-  margin-left: 17px;
-  margin-right: 8px;
-}
-
-
-.user .up .left view {
-  height: 40px;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: space-between;
-}
-
-.user .up .left view text:first-child {
-  font-size: 15px;
-  font-weight: bold;
-}
-
-.user .up .left view text:last-child {
-  font-size: 13px;
-}
-
-.user .up .right {
-  height: 40px;
-
-}
-
-.qrcode{
-  width: 139px;
-height: 139px;
-
-}

src/pages/user_center/vip_code/index.vue

@@ -51,5 +51,72 @@ export default {
 </script>
 
 <style scoped>
-@import "index.css";
+.uc_vip_code_container{
+  padding: 80px 0px;
+}
+
+.card {
+  width: 347px;
+  height: 403px;
+  background: #FFFFFF;
+  box-shadow: 0px 3px 7px 0px #A6A6A6;
+  border-radius: 11px;
+  margin: 0px auto;
+}
+
+.user {
+  width: 100%;
+}
+
+.user .up {
+  width: 100%;
+  height: 40px;
+  margin-top: 9px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.user .up .left {
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: start;
+}
+
+.user .up .left image {
+  width: 40px;
+  height: 40px;
+  margin-left: 17px;
+  margin-right: 8px;
+}
+
+
+.user .up .left view {
+  height: 40px;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+
+.user .up .left view text:first-child {
+  font-size: 15px;
+  font-weight: bold;
+}
+
+.user .up .left view text:last-child {
+  font-size: 13px;
+}
+
+.user .up .right {
+  height: 40px;
+
+}
+
+.qrcode{
+  width: 139px;
+height: 139px;
+
+}
 </style>

src/utils/bluetooth.js

@@ -24,7 +24,7 @@ export default {
     dataView.setUint8(6, '0xff')
     dataView.setUint8(7, $CheckSum)
     // 向低功耗蓝牙设备特征值中写入二进制数据
-    console.log(buffer)
+
     wx.writeBLECharacteristicValue({
       deviceId: deviceId,
       serviceId: serviceId,
@@ -60,7 +60,7 @@ export default {
     dataView.setUint8(6, '0x07')
     dataView.setUint8(7, $CheckSum)
     // 向低功耗蓝牙设备特征值中写入二进制数据
-    console.log(buffer)
+
     wx.writeBLECharacteristicValue({
       deviceId: deviceId,
       serviceId: serviceId,
@@ -101,7 +101,7 @@ export default {
     dataView.setUint8(6, '0x0a')
     dataView.setUint8(7, $CheckSum)
     // 向低功耗蓝牙设备特征值中写入二进制数据
-    console.log(buffer)
+
     wx.writeBLECharacteristicValue({
       deviceId: deviceId,
       serviceId: serviceId,
@@ -125,7 +125,7 @@ export default {
       fail: function (err) {
         console.log('发送连接玩具指令失败')
         Toast.fail({
-          message:"玩具连接失败"
+          message: "玩具连接失败"
         })
         console.log(err)
       }
@@ -151,7 +151,7 @@ export default {
     dataView.setUint8(6, '0x09')
     dataView.setUint8(7, $CheckSum)
     // 向低功耗蓝牙设备特征值中写入二进制数据
-    console.log(buffer)
+
     wx.writeBLECharacteristicValue({
       deviceId: deviceId,
       serviceId: serviceId,
@@ -187,7 +187,7 @@ export default {
     dataView.setUint8(6, '0x00')
     dataView.setUint8(7, $CheckSum)
     // 向低功耗蓝牙设备特征值中写入二进制数据
-    console.log(buffer)
+
     wx.writeBLECharacteristicValue({
       deviceId: deviceId,
       serviceId: serviceId,
@@ -361,7 +361,6 @@ export default {
     //Beta数据
     let $beta = parseInt(($high_beta << 8) | $low_beta, 16)
 
-    console.log($att, $med, $delta, $theta, $alpha, $beta)
     return {
       att: $att,
       med: $med,
@@ -376,7 +375,9 @@ export default {
     if (hex.substr(0, 8) != '55550203') {
       return false
     }
-    let $power = parseInt(hex.substr(8, 2))
+    console.log("电量16进制：", hex.substr(8, 2))
+    let $power = parseInt("0x" + hex.substr(8, 2))
+    console.log("电量10进制：", $power)
     return $power
   },
 
@@ -385,10 +386,10 @@ export default {
     wx.onBLEConnectionStateChange((res) => {
       // 该方法回调中可以用于处理连接意外断开等异常情况
       if (res.connected == false) {
-        //断开蓝牙连接
-        $that.status = 0
         //断开玩具连接
-        $that.connect_toy = 0
+        $that.change_toy_connect_status(0)
+        //断开蓝牙连接
+        $that.change_device_status(0)
 
         //判断游戏是否游戏中
         let $game_status = game_store.getters.getGameStatus;
@@ -461,8 +462,7 @@ export default {
     })
   },
   //监听玩具得状态
-  watching_toy($this, deviceId, serviceId, Cid, Toast)
-  {
+  watching_toy($this, deviceId, serviceId, Cid, Toast) {
     Toast.clear()
     Toast.loading({
       duration: 0,
@@ -520,7 +520,7 @@ export default {
     dataView.setUint8(6, '0x06')
     dataView.setUint8(7, $CheckSum)
     // 向低功耗蓝牙设备特征值中写入二进制数据
-    console.log(buffer)
+
     wx.writeBLECharacteristicValue({
       deviceId: deviceId,
       serviceId: serviceId,
@@ -563,7 +563,7 @@ export default {
     dataView.setUint8(6, '0x0a')
     dataView.setUint8(7, $CheckSum)
     // 向低功耗蓝牙设备特征值中写入二进制数据
-    console.log(buffer)
+
     wx.writeBLECharacteristicValue({
       deviceId: deviceId,
       serviceId: serviceId,

src/utils/user.js

@@ -13,6 +13,8 @@ export function reload_userinfo($this) {
     $this.userinfo.birthday = formatBirthday($this.userinfo.birthday)
     $this.userinfo['validity_time'] = formatTime($this.userinfo['validity_time'])
     $this.userinfo['level_name'] = utils.get_level_name($this.userinfo['level'])
+    $this.invite_code = wx.getStorageSync('code') ? wx.getStorageSync('code') : $this.userinfo['invite_id']
+
     // $this.userinfo.play_time = Math.ceil($this.userinfo.play_time / 60)
     user_store.commit('set_userinfo', $this.userinfo)
   })