完成代理商接口对接，未完成代理商页面确认

dist/wx

@@ -1 +1 @@
-Subproject commit 9dac92edb2074eef8003c6928bea5a2e26e07c38
+Subproject commit 577446b07fc8e2578028ab49d3bc5cfcd256e1aa

src/components/device/device.vue

@@ -75,7 +75,7 @@
                   : 'toy_item_normal_bg'
               "
             >
-              <img :src="toy.img" alt="" class="toy_img" />
+              <img :src="toy.img" alt="" class="toy_img"/>
               <text class="toy_text padding-top">{{ toy.name }}</text>
             </div>
           </van-col>
@@ -84,7 +84,8 @@
       <!-- 结尾 -->
       <div class="toy_actions padding text-center">
         <view class="text-gray toy_action_text padding"
-          >选择你最感兴趣的项目，点击“选好了”以后将会自动连接</view
+        >选择你最感兴趣的项目，点击“选好了”以后将会自动连接
+        </view
         >
         <button
           class="cu-btn lg cu-btn-primary text-white text-center padding"
@@ -94,7 +95,7 @@
         </button>
       </div>
     </van-popup>
-    <van-toast id="van-toast" />
+    <van-toast id="van-toast"/>
   </div>
 </template>
 
@@ -109,7 +110,7 @@ import device_connected from "@/components/device/connected";
 import toy_connecting from "@/components/device/toy/connecting";
 //获取个人信息
 import Toast from "../../../static/vant/toast/toast";
-import { game_devices } from "../../requests/game";
+import {game_devices} from "../../requests/game";
 import game_store from "@/store/game";
 import bluetooth from "@/utils/bluetooth";
 
@@ -187,13 +188,8 @@ export default {
               fail(err) {
                 if (err["errCode"] == 10001) {
                   Toast.fail({
-<<<<<<< HEAD
-                    message: "请连接蓝牙",
-                  });
-=======
                     message: "请打开手机蓝牙，并启动脑环！"
                   })
->>>>>>> f832f7345814f153ecaa4b08bee96a4b1c3d10bf
                 } else {
                   Toast.fail({
                     message: "蓝牙连接失败",

src/components/index/personal.vue

@@ -23,7 +23,7 @@
                   黄金会员
                 </template>
                 <template v-if="userinfo.level == 3">
-                  普通会员
+                  白金会员
                 </template>
                 <template v-if="userinfo.level == 4">
                   钻石会员
@@ -209,7 +209,6 @@ export default {
     } else if ($this.userinfo.play_time == 0) {
       $this.pop_show = true
     }
-    $this.userinfo.play_time = Math.ceil($this.userinfo.play_time / 60)
   }
   ,
   onShow() {

src/pages/start/index.vue

@@ -429,7 +429,7 @@ export default {
     //获取用户游玩时间
     let $play_time = $this.play_time = game_store.getters.getPlayTime
     $this.mode_list.forEach(($val, $index) => {
-      $val['time'] = $play_time * 60 * 1000
+      $val['time'] = $play_time  * 1000
       if ($val['id'] == $this.mode) {
         $this.mode_item = $val
       }

src/pages/user_center/recharge/index.vue

@@ -203,7 +203,7 @@
         <div class="button_group flex justify-around">
           <!--          <button class="cu-btn bg-gray text-white lg" @click="close_success_pop">以后再填</button>-->
           <!--          <button class="cu-btn  bg-primary text-white lg" @click="to_write_address">填写地址</button>-->
-          <button class="cu-btn  bg-primary text-white lg" @click="to_orderlist">充值成功</button>
+          <button class="cu-btn  bg-primary text-white lg" @click="to_index">充值成功</button>
         </div>
       </div>
     </van-popup>

src/utils/user.js

@@ -10,7 +10,7 @@ export function reload_userinfo($this) {
     $this.userinfo = $data.data;
     $this.userinfo.birthday = formatBirthday($this.userinfo.birthday)
     $this.userinfo['validity_time'] = formatTime($this.userinfo['validity_time'])
-    $this.userinfo.play_time = Math.ceil($this.userinfo.play_time / 60)
+    // $this.userinfo.play_time = Math.ceil($this.userinfo.play_time / 60)
     user_store.commit('set_userinfo', $this.userinfo)
   })
 }