pref: 小程序添加静默登录

src/App.vue

@@ -1,13 +1,28 @@
 <script setup>
-import { watch } from "vue";
-import { onShow, onHide } from "@dcloudio/uni-app";
+	import {
+		watch
+	} from "vue";
+	import {
+		onShow,
+		onHide
+	} from "@dcloudio/uni-app";
 	import websocket from "@/websocket";
-import { getDeviceBatteryAPI } from "@/apis";
+	import {
+		getDeviceBatteryAPI
+	} from "@/apis";
 	import useStore from "@/store";
-import { storeToRefs } from "pinia";
+	import {
+		storeToRefs
+	} from "pinia";
+	import audioManager from "./audioManager";
 	const store = useStore();
-const { user } = storeToRefs(store);
-const { updateUser, updateOnline } = store;
+	const {
+		user
+	} = storeToRefs(store);
+	const {
+		updateUser,
+		updateOnline
+	} = store;
 
 	watch(
 		() => user.value.id,
@@ -16,15 +31,12 @@ watch(
 				`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
 			);
 			if (newVal && token) {
-      websocket.createWebSocket(token, (content) => {
-        uni.$emit("socket-inbox", content);
-      });
+				websocket.createWebSocket(token, onShootWsMsg);
 			}
 			if (!newVal) {
 				websocket.closeWebSocket();
 			}
-  },
-  {
+		}, {
 			deep: false, // 如果 user 是一个对象或数组，建议开启
 			immediate: false, // 若想在初始化时立即执行一次回调，可开启。
 		}
@@ -39,6 +51,17 @@ async function emitUpdateOnline() {
 		updateOnline(data.online);
 	}
 
+	function onDeviceShoot() {
+		audioManager.play("射箭声音")
+	}
+
+	function onShootWsMsg(content) {
+		if(content.type === 'shoot-trigger'){
+			onDeviceShoot()
+		}
+		uni.$emit("socket-inbox", content);
+	}
+
 	onShow(() => {
 		uni.$on("update-user", emitUpdateUser);
 		uni.$on("update-online", emitUpdateOnline);
@@ -47,9 +70,7 @@ onShow(() => {
 		);
 		if (user.value.id && token) {
 			console.log("回到前台，重新连接 websocket");
-    websocket.createWebSocket(token, (content) => {
-      uni.$emit("socket-inbox", content);
-    });
+			websocket.createWebSocket(token, onShootWsMsg);
 		}
 	});
 
@@ -93,9 +114,11 @@ button::after {
 		flex-direction: column;
 		font-size: 28rpx;
 	}
+
 	.guide-tips>text:first-child {
 		color: #fed847;
 	}
+
 	.guide-tips>text:nth-child(2) {
 		font-size: 24rpx;
 	}
@@ -105,13 +128,16 @@ button::after {
 			transform: translateY(20px);
 			opacity: 0;
 		}
+
 		30% {
 			transform: translateY(0);
 			opacity: 1;
 		}
+
 		80% {
 			opacity: 1;
 		}
+
 		100% {
 			opacity: 0;
 		}
@@ -126,6 +152,7 @@ button::after {
 			transform: translateY(0);
 			opacity: 1;
 		}
+
 		to {
 			transform: translateY(20px);
 			opacity: 0;
@@ -141,6 +168,7 @@ button::after {
 			transform: scale(0);
 			opacity: 0;
 		}
+
 		to {
 			transform: scale(1);
 			opacity: 1;
@@ -157,6 +185,7 @@ button::after {
 			transform: scale(1);
 			opacity: 1;
 		}
+
 		to {
 			transform: scale(0);
 			opacity: 0;
@@ -172,6 +201,7 @@ button::after {
 		from {
 			transform: rotate(0deg);
 		}
+
 		to {
 			transform: rotate(360deg);
 		}
@@ -181,6 +211,7 @@ button::after {
 		from {
 			transform: scale(2);
 		}
+
 		to {
 			transform: scale(1);
 		}
@@ -212,6 +243,7 @@ button::after {
 		align-items: center;
 		justify-content: center;
 	}
+
 	.user-row {
 		display: flex;
 		align-items: center;
@@ -220,6 +252,7 @@ button::after {
 		padding-top: 7px;
 		position: relative;
 	}
+
 	.half-time-tip {
 		width: 100%;
 		display: flex;
@@ -227,28 +260,31 @@ button::after {
 		justify-content: center;
 		align-items: center;
 	}
+
 	.half-time-tip>text:last-child {
 		margin-top: 20px;
 		color: #fff9;
 	}
+
 	.see-more {
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		margin-top: 20rpx;
 	}
+
 	.see-more>text {
 		color: #39a8ff;
 		font-size: 13px;
 	}
+
 	.see-more>image {
 		width: 15px;
 	}
 
 	@font-face {
 		font-family: "DINCondensed";
-  src: url("https://static.shelingxingqiu.com/font/DIN-Condensed-Bold-2.ttf")
-    format("truetype");
+		src: url("https://static.shelingxingqiu.com/font/DIN-Condensed-Bold-2.ttf") format("truetype");
 		font-weight: 700;
 		font-style: normal;
 		font-display: swap;

src/apis.js

@@ -6,8 +6,8 @@ try {
 
     switch (envVersion) {
         case "develop": // 开发版
-      // BASE_URL = "http://192.168.1.30:8000/api/shoot";
-      BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            BASE_URL = "http://localhost:8000/api/shoot";
+            // BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
             break;
         case "trial": // 体验版
             BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
@@ -179,12 +179,39 @@ export const loginAPI = async (phone, nickName, avatarData, code) => {
     return result;
 };
 
+export const silentLoginAPI = async (code) => {
+    const result = await request("POST", "/index/code", {
+        appName: "shoot",
+        appId: "wxa8f5989dcd45cc23",
+        code,
+    });
+    uni.setStorageSync(
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
+        result.token
+    );
+    return result;
+};
+
+export const checkUserBindAPI = async (code) => {
+    return request("POST", "/index/checkBind", {
+        appName: "shoot",
+        appId: "wxa8f5989dcd45cc23",
+        code,
+    });
+};
+
 export const bindDeviceAPI = (device) => {
     return request("POST", "/user/device/bindDevice", {
         device,
     });
 };
 
+export const bindDeviceAPIV2 = (token) => {
+    return request("POST", "/user/device/bindDevice/v2", {
+        token: token,
+    });
+};
+
 export const unbindDeviceAPI = (deviceId) => {
     return request("POST", "/user/device/unbindDevice", {
         deviceId,
@@ -196,10 +223,11 @@ export const getMyDevicesAPI = () => {
     return request("GET", "/user/device/getBindings");
 };
 
-export const createPractiseAPI = (arrows, time) => {
+export const createPractiseAPI = (arrows, time, target) => {
     return request("POST", "/user/practice/create", {
         shootNumber: arrows,
         shootTime: time,
+        targetType: target * 20,
     });
 };
 
@@ -215,10 +243,11 @@ export const getPractiseAPI = async (id) => {
     return request("GET", `/user/practice/get?id=${id}`);
 };
 
-export const createRoomAPI = (gameType, teamSize) => {
+export const createRoomAPI = (gameType, teamSize, targetType) => {
     return request("POST", "/user/createroom", {
         gameType,
         teamSize,
+        targetType,
     });
 };
 
@@ -260,7 +289,8 @@ export const matchGameAPI = (match, gameType, teamSize) => {
         match,
         gameType,
         teamSize,
-    readyTime: 1.5,
+        readyTime: 15,
+        targetType: 20,
     });
 };
 

src/audioManager.js

@@ -40,26 +40,26 @@ export const audioFils = {
   未上靶:
     "https://static.shelingxingqiu.com/attachment/2025-11-12/de6n45o3tsm1v4unam.mp3",
   "1环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin1aq7gxjih5l.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/1.mp3",
   "2环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin64tdgx2s4at.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/2.mp3",
   "3环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxinlmf87vt8z65.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/3.mp3",
   "4环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxinniv97sx0q9u.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/4.mp3",
   "5环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin7j01kknpb7k.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/5.mp3",
   "6环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin4syy1015rtq.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/6.mp3",
   "7环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin3iz3dvmjdai.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/7.mp3",
   "8环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxinnjd42lhpfiw.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/8.mp3",
   "9环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin69nj1xh7yfz.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/9.mp3",
   "10环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxinnvsx0tt7ksa.mp3",
-  X环: "https://static.shelingxingqiu.com/attachment/2026-02-09/dga8puwekpe2gmtbu4.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/10.mp3",
+  X环: "https://static.shelingxingqiu.com/shootaudio/v4/v4/X%E7%8E%AF.mp3",
   向上调整:
     "https://static.shelingxingqiu.com/attachment/2025-11-12/de6ellf5pfvu3l8dhr.mp3",
   向右上调整:
@@ -80,6 +80,10 @@ export const audioFils = {
     "https://static.shelingxingqiu.com/attachment/2025-11-13/de7kzzllq0futwynso.mp3",
   练习开始:
     "https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3",
+  射箭声音:
+	"https://static.shelingxingqiu.com/shootaudio/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3",
+  命中:
+	"https://static.shelingxingqiu.com/shootaudio/%E5%91%BD%E4%B8%AD.mp3"
 };
 
 // 版本控制日志函数

src/components/Container.vue

@@ -5,7 +5,7 @@ import AppBackground from "@/components/AppBackground.vue";
 import Header from "@/components/Header.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import BackToGame from "@/components/BackToGame.vue";
-import { laserAimAPI, getBattleAPI } from "@/apis";
+import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
 import { capsuleHeight, debounce } from "@/util";
 import AudioManager from "@/audioManager";
 const props = defineProps({
@@ -135,6 +135,10 @@ const goBack = () => {
   uni.navigateBack();
 };
 
+const cancelMatching = async () => {
+  uni.$emit("cancelMatching");
+}
+
 const goCalibration = async () => {
   await laserAimAPI();
   uni.navigateTo({
@@ -202,7 +206,7 @@ const goCalibration = async () => {
           <button hover-class="none" @click="() => (showHint = false)">
             取消
           </button>
-          <button hover-class="none" @click="goBack">确认</button>
+          <button hover-class="none" @click="cancelMatching">确认</button>
         </view>
       </view>
       <view v-if="hintType === 4" class="tip-content">

src/components/CreateRoom.vue

@@ -18,6 +18,7 @@ const props = defineProps({
 });
 
 const battleMode = ref(1);
+const targetMode = ref(1);
 const loading = ref(false);
 const roomNumber = ref("");
 
@@ -35,13 +36,14 @@ const createRoom = debounce(async () => {
   try {
     const result = await createRoomAPI(
       battleMode.value === 2 ? 2 : 1,
-      battleMode.value === 2 ? 10 : size
+      battleMode.value === 2 ? 10 : size,
+        targetMode.value*20,
     );
     if (result.number) {
       props.onConfirm();
       await joinRoomAPI(result.number);
       uni.navigateTo({
-        url: "/pages/battle-room?roomNumber=" + result.number,
+        url: "/pages/battle-room?roomNumber=" + result.number + "&target=" + targetMode.value,
       });
     }
   } catch (error) {
@@ -53,7 +55,11 @@ const createRoom = debounce(async () => {
 </script>
 <template>
   <view class="container">
-    <image src="../static/choose-battle-mode.png" mode="widthFix" />
+    <view class="target-options-header">
+      <view class="target-options-header-line-left"></view>
+      <image class="target-options-header-title-img" src="../static/choose-battle-mode.png" mode="widthFix" />
+      <view class="target-options-header-line-right"></view>
+    </view>
     <view class="create-options">
       <view
         :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 1 }"
@@ -80,6 +86,25 @@ const createRoom = debounce(async () => {
         <text>乱斗模式（3-10人）</text>
       </view>
     </view>
+    <view class="target-options-header">
+      <view class="target-options-header-line-left"></view>
+      <view class="target-options-header-title">选择靶纸</view>
+      <view class="target-options-header-line-right"></view>
+    </view>
+    <view class="target-options">
+      <view
+        :class="{ 'battle-btn': true, 'battle-choosen': targetMode === 1 }"
+        @click="() => (targetMode = 1)"
+      >
+        <text>20厘米全环靶</text>
+      </view>
+      <view
+        :class="{ 'battle-btn': true, 'battle-choosen': targetMode === 2 }"
+        @click="() => (targetMode = 2)"
+      >
+        <text>40厘米全环靶</text>
+      </view>
+    </view>
     <SButton :onClick="createRoom">创建房间</SButton>
   </view>
 </template>
@@ -91,6 +116,7 @@ const createRoom = debounce(async () => {
   display: flex;
   flex-direction: column;
   align-items: center;
+  padding-top: 44rpx;
 }
 .container > image:first-child {
   width: 45%;
@@ -105,6 +131,50 @@ const createRoom = debounce(async () => {
   justify-content: center;
   margin-bottom: 15px;
 }
+.target-options-header{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 24rpx;
+}
+.target-options-header-title-img{
+  width: 196rpx;
+  height: 40rpx;
+}
+.target-options-header-title{
+  width: 112rpx;
+  height: 40rpx;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  text-align: center;
+  font-style: normal;
+  text-transform: none;
+  color: #FFEFBA;
+  margin: 0 18rpx;
+}
+.target-options-header-line-left{
+  width: 214rpx;
+  height: 0rpx;
+  border-radius: 0rpx 0rpx 0rpx 0rpx;
+  border: 1rpx solid;
+  border-image: linear-gradient(90deg, rgba(133, 119, 96, 0), rgba(133, 119, 96, 1)) 1 1;
+}
+.target-options-header-line-right{
+  width: 214rpx;
+  height: 0rpx;
+  border-radius: 0rpx 0rpx 0rpx 0rpx;
+  border: 1rpx solid;
+  border-image: linear-gradient(90deg, rgba(133, 119, 96, 1), rgba(133, 119, 96, 0)) 1 1;
+}
+.target-options {
+  width: 100%;
+  padding: 0 10px;
+  display: flex;
+  gap: 12px;
+  justify-content: center;
+  margin-bottom: 15px;
+}
 .battle-btn {
   width: 45%;
   height: 55px;

src/components/SModal.vue

@@ -88,6 +88,7 @@ watch(
   transform: translateY(100%);
   transition: all 0.3s ease;
   position: relative;
+  background-color: #372E1D;
 }
 .modal-content > image:first-child {
   width: 100%;

src/components/Signin.vue

@@ -86,18 +86,17 @@ const handleLogin = async () => {
       icon: "none",
     });
   }
+  await doLogin();
+};
+
+async function doLogin() {
   loading.value = true;
   try {
     const wxResult = await wxLogin();
     const fileManager = uni.getFileSystemManager();
     const avatarBase64 = fileManager.readFileSync(avatarUrl.value, "base64");
     const base64Url = `data:image/png;base64,${avatarBase64}`;
-    const result = await loginAPI(
-      phone.value,
-      nickName.value,
-      base64Url,
-      wxResult.code
-    );
+    await loginAPI(phone.value, nickName.value, base64Url, wxResult.code);
     const data = await getHomeData();
     if (data.user) updateUser(data.user);
     const devices = await getMyDevicesAPI();
@@ -139,6 +138,10 @@ const openPrivacyLink = () => {
 
 onShow(() => {
   loading.value = false;
+  agree.value = false;
+  phone.value = "";
+  avatarUrl.value = "";
+  nickName.value = "";
 });
 </script>
 

src/components/TargetPicker.vue

@@ -0,0 +1,197 @@
+<script setup>
+import { ref, watch } from "vue";
+import SButton from "@/components/SButton.vue";
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  onClose: {
+    type: Function,
+    default: () => {},
+  },
+  onConfirm: {
+    type: Function,
+    default: () => {},
+  },
+});
+
+const selectedTarget = ref(2);
+const showContainer = ref(false);
+const showContent = ref(false);
+
+watch(
+  () => props.show,
+  (newValue) => {
+    if (newValue) {
+      showContainer.value = true;
+      setTimeout(() => {
+        showContent.value = true;
+      }, 100);
+    } else {
+      showContent.value = false;
+      setTimeout(() => {
+        showContainer.value = false;
+      }, 100);
+    }
+  },
+  {}
+);
+
+const handleConfirm = () => {
+  props.onConfirm(selectedTarget.value);
+  props.onClose();
+};
+</script>
+
+<template>
+  <view
+    class="container"
+    v-if="showContainer"
+    :class="{ 'container-show': showContent }"
+    @click="onClose"
+  >
+    <view
+      class="modal-content"
+      :class="{ 'modal-show': showContent }"
+      @click.stop=""
+    >
+      <view class="header">
+        <view class="header-title">
+          <view class="header-title-line-left"></view>
+          <text>选择靶型</text>
+          <view class="header-title-line-right"></view>
+        </view>
+        <view class="close-btn" @click="onClose">
+          <image src="../static/close-yellow.png" mode="widthFix" />
+        </view>
+      </view>
+      <view class="target-options">
+        <view
+          :class="{ 'target-btn': true, 'target-choosen': selectedTarget === 1 }"
+          @click="() => (selectedTarget = 1)"
+        >
+          <text>20厘米全环靶</text>
+        </view>
+        <view style="width: 30rpx"></view>
+        <view
+          :class="{ 'target-btn': true, 'target-choosen': selectedTarget === 2 }"
+          @click="() => (selectedTarget = 2)"
+        >
+          <text>40厘米全环靶</text>
+        </view>
+      </view>
+      <SButton width="694rpx" :onClick="handleConfirm">确定</SButton>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: #00000099;
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+  align-items: center;
+  opacity: 0;
+  transition: all 0.3s ease;
+  z-index: 999;
+}
+.container-show {
+  opacity: 1;
+}
+.modal-content {
+  width: 100%;
+  transform: translateY(100%);
+  transition: all 0.3s ease;
+  background: url("https://static.shelingxingqiu.com/attachment/2025-12-04/dep11770wzxg6o2alo.png")
+    no-repeat center top;
+  background-size: 100% auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  box-sizing: border-box;
+  padding-bottom: 68rpx;
+  padding-top: 44rpx;
+}
+.modal-show {
+  transform: translateY(0%);
+}
+.header {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  margin-bottom: 44rpx;
+}
+.header-title{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.header-title text{
+  width: 196rpx;
+  height: 40rpx;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  text-align: center;
+  font-style: normal;
+  text-transform: none;
+  color: #FFEFBA;
+}
+.header-title-line-left{
+  width: 214rpx;
+  height: 0rpx;
+  border-radius: 0rpx 0rpx 0rpx 0rpx;
+  border: 1rpx solid;
+  border-image: linear-gradient(90deg, rgba(133, 119, 96, 1), rgba(133, 119, 96, 0)) 1 1;
+}
+.header-title-line-right{
+  width: 214rpx;
+  height: 0rpx;
+  border-radius: 0rpx 0rpx 0rpx 0rpx;
+  border: 1rpx solid;
+  border-image: linear-gradient(90deg, rgba(133, 119, 96, 1), rgba(133, 119, 96, 0)) 1 1;
+ }
+.close-btn {
+  position: absolute;
+  right: 0;
+  top: -10px;
+}
+.close-btn > image {
+  width: 40px;
+  height: 40px;
+}
+.target-options {
+  width: 750rpx;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  margin-bottom: 38rpx;
+}
+.target-btn {
+  width: 332rpx;
+  height: 92rpx;
+  text-align: center;
+  border-radius: 10px;
+  border: 2rpx solid #fff3;
+  box-sizing: border-box;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.target-choosen {
+  color: #fed847;
+  border: 4rpx solid #fed847;
+}
+</style>

src/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "shoot-miniprograms",
-  "appid": "",
+    "appid" : "__UNI__B03E251",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -40,7 +40,9 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-      "ios": {},
+            "ios" : {
+                "dSYMs" : false
+            },
             "sdkConfigs" : {}
         }
     },

src/pages/friend-battle.vue

@@ -169,7 +169,7 @@ onLoad(async (options) => {
       <SModal
         :show="showModal"
         :onClose="() => (showModal = false)"
-        height="520rpx"
+        height="716rpx"
       >
         <view v-if="warnning" class="warnning">
           {{ warnning }}

src/pages/index.vue

@@ -1,25 +1,26 @@
 <script setup>
-import { ref, onMounted } from "vue";
-import { onShow, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app";
+import {onMounted, ref} from "vue";
+import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import AppFooter from "@/components/AppFooter.vue";
-import AppBackground from "@/components/AppBackground.vue";
 import UserHeader from "@/components/UserHeader.vue";
 import Signin from "@/components/Signin.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
 
 import {
+  checkUserBindAPI,
   getAppConfig,
-  getRankListAPI,
+  getDeviceBatteryAPI,
   getHomeData,
   getMyDevicesAPI,
-  getDeviceBatteryAPI,
+  getRankListAPI,
+  silentLoginAPI,
 } from "@/apis";
 import {topThreeColors} from "@/constants";
-import { canEenter } from "@/util";
 
 import useStore from "@/store";
 import {storeToRefs} from "pinia";
+
 const store = useStore();
 const {
   updateConfig,
@@ -27,6 +28,7 @@ const {
   updateDevice,
   updateRank,
   getLvlName,
+  getLvlNameByScore,
   updateOnline,
 } = store;
 const {user, device, rankData, online, game} = storeToRefs(store);
@@ -54,12 +56,36 @@ const toRankListPage = () => {
 };
 
 onShow(async () => {
-  const token = uni.getStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+  const env = uni.getAccountInfoSync().miniProgram.envVersion;
+  const token = uni.getStorageSync(`${env}_token`);
+
+  if (!user.value.id && !token) {
+    try {
+      const wxResult = await uni.login({provider: "weixin"});
+      const bindResult = await checkUserBindAPI(wxResult.code);
+      if (bindResult.binded) {
+        const newResult = await uni.login({provider: "weixin"});
+        const silentResult = await silentLoginAPI(newResult.code);
+        if (silentResult.user) updateUser(silentResult.user);
+        const devices = await getMyDevicesAPI();
+        if (devices.bindings && devices.bindings.length) {
+          updateDevice(
+              devices.bindings[0].deviceId,
+              devices.bindings[0].deviceName
           );
+          const data = await getDeviceBatteryAPI();
+          updateOnline(data.online);
+        }
+      } else {
+        showModal.value = true;
+      }
+    } catch (e) {
+      console.log("检查绑定状态失败", e);
+    }
+  }
 
   const promises = [getRankListAPI()];
-  if (token) {
+  if (token || user.value.id) {
     promises.push(getHomeData());
   }
 
@@ -221,8 +247,9 @@ onShareTimeline(() => {
               <view>
                 <text>段位</text>
                 <text>{{
-                  user.rankLvl ? getLvlName(user.rankLvl) : "暂无"
-                }}</text>
+                    user.lvlName || "暂无"
+                  }}
+                </text>
               </view>
               <view>
                 <text>赛季平均环数</text>
@@ -234,7 +261,8 @@ onShareTimeline(() => {
                     user.avg_win
                         ? Number((user.avg_win * 100).toFixed(2)) + "%"
                         : "暂无"
-                }}</text>
+                  }}
+                </text>
               </view>
             </view>
           </view>
@@ -363,6 +391,7 @@ onShareTimeline(() => {
   width: 32rpx;
   height: 32rpx;
 }
+
 .player-avatar > view:first-child {
   border-radius: 50%;
   background: #777777;
@@ -373,6 +402,7 @@ onShareTimeline(() => {
   height: 18px;
   color: #fff;
 }
+
 .player-avatar > image:last-child {
   width: 100%;
   height: 100%;
@@ -391,18 +421,22 @@ onShareTimeline(() => {
   margin-left: 2px;
   color: #fff;
 }
+
 .my-data {
   display: flex;
   margin-top: 20px;
   justify-content: space-between;
 }
+
 .my-data > view:first-child {
   width: 28%;
 }
+
 .my-data > view:first-child > image {
   width: 100%;
   transform: translateX(-8px);
 }
+
 .my-data > view:nth-child(2) {
   width: 68%;
   font-size: 12px;
@@ -410,9 +444,11 @@ onShareTimeline(() => {
   display: flex;
   justify-content: space-between;
 }
+
 .my-data > view:nth-child(2) > view:nth-child(2) {
   width: 38%;
 }
+
 .my-data > view:nth-child(2) > view {
   width: 28%;
   border-radius: 10px;
@@ -422,11 +458,13 @@ onShareTimeline(() => {
   align-items: center;
   justify-content: center;
 }
+
 .my-data > view:nth-child(2) > view > text:last-child {
   color: #fff;
   line-height: 25px;
   font-weight: 500;
 }
+
 .top-theme {
   position: absolute;
   display: flex;
@@ -436,6 +474,7 @@ onShareTimeline(() => {
   height: 60px;
   z-index: -1;
 }
+
 .top-theme > image {
   width: 300rpx;
   transform: translate(-4%, -14%);

src/pages/match-page.vue

@@ -3,8 +3,6 @@ import { ref, onMounted, onBeforeUnmount } from "vue";
 import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Matching from "@/components/Matching.vue";
-import RoundEndTip from "@/components/RoundEndTip.vue";
-import TestDistance from "@/components/TestDistance.vue";
 import { matchGameAPI } from "@/apis";
 import { MESSAGETYPESV2 } from "@/constants";
 
@@ -17,6 +15,13 @@ async function stopMatch() {
   uni.$showHint(3);
 }
 
+async function cancelMatch() {
+  if (gameType.value && teamSize.value) {
+    await matchGameAPI(false, gameType.value, teamSize.value);
+  }
+  uni.navigateBack()
+}
+
 async function onReceiveMessage(msg) {
   if (msg.type === MESSAGETYPESV2.MatchSuccess) {
     matchSuccess.value = true;
@@ -46,6 +51,7 @@ onMounted(() => {
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("cancelMatching", cancelMatch);
 });
 
 onBeforeUnmount(() => {
@@ -53,9 +59,7 @@ onBeforeUnmount(() => {
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
-  if (gameType.value && teamSize.value && !matchSuccess.value) {
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
+  uni.$off("cancelMatching", cancelMatch);
 });
 
 onShow(async () => {
@@ -65,9 +69,7 @@ onShow(async () => {
 });
 
 onHide(() => {
-  if (gameType.value && teamSize.value && !matchSuccess.value) {
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
+
 });
 </script>
 

src/pages/my-device.vue

@@ -8,7 +8,7 @@ import {
   bindDeviceAPI,
   getMyDevicesAPI,
   unbindDeviceAPI,
-  laserAimAPI,
+  laserAimAPI, bindDeviceAPIV2,
 } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -20,6 +20,7 @@ const { updateDevice } = store;
 const { user, device } = storeToRefs(store);
 const justBind = ref(false);
 const calibration = ref(false);
+const token = ref(null);
 
 // 扫描二维码方法
 const handleScan = () => {
@@ -30,13 +31,14 @@ const handleScan = () => {
     scanType: ["qrCode"],
     success: async (res) => {
       try {
-        const base64Decode = (str) => {
-          // 将 base64 转换为 utf8 字符串
-          const bytes = wx.base64ToArrayBuffer(str);
-          return String.fromCharCode.apply(null, new Uint8Array(bytes));
-        };
-
-        addDevice.value = JSON.parse(base64Decode(res.result));
+        // const base64Decode = (str) => {
+        //   // 将 base64 转换为 utf8 字符串
+        //   const bytes = wx.base64ToArrayBuffer(str);
+        //   return String.fromCharCode.apply(null, new Uint8Array(bytes));
+        // };
+        //
+        // addDevice.value = JSON.parse(base64Decode(res.result));
+        token.value = res.result;
         confirmBindTip.value = true;
       } catch (err) {
         uni.showToast({
@@ -57,8 +59,8 @@ const handleScan = () => {
 };
 
 const confirmBind = async () => {
-  if (!justBind.value && addDevice.value.id) {
-    const result = await bindDeviceAPI(addDevice.value);
+  if (!justBind.value && token.value) {
+    const result = await bindDeviceAPIV2(token.value);
     confirmBindTip.value = false;
     if (result.binded) {
       return uni.showToast({
@@ -66,7 +68,7 @@ const confirmBind = async () => {
         icon: "none",
       });
     }
-    updateDevice(addDevice.value.id, addDevice.value.name);
+    updateDevice(result.deviceId, result.name);
     justBind.value = true;
     uni.showToast({
       title: "绑定成功",

src/pages/practise-one.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, onMounted, onBeforeUnmount } from "vue";
-import { onShow } from "@dcloudio/uni-app";
+import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -35,6 +35,13 @@ const practiseResult = ref({});
 const practiseId = ref("");
 const showGuide = ref(false);
 const tips = ref("");
+const targetType = ref(1);
+
+onLoad((options) => {
+  if (options.target) {
+    targetType.value = Number(options.target);
+  }
+});
 
 const onReady = async () => {
   await startPractiseAPI();
@@ -84,7 +91,7 @@ onMounted(async () => {
   });
   uni.$on("socket-inbox", onReceiveMessage);
   uni.$on("share-image", onClickShare);
-  const result = await createPractiseAPI(total, 120);
+  const result = await createPractiseAPI(total, 120, targetType.value);
   if (result) practiseId.value = result.id;
 });
 

src/pages/practise-two.vue

@@ -24,6 +24,7 @@ import { MESSAGETYPESV2 } from "@/constants";
 
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
+import {onLoad} from "@dcloudio/uni-app";
 const store = useStore();
 const { user } = storeToRefs(store);
 
@@ -33,6 +34,13 @@ const total = 36;
 const practiseResult = ref({});
 const practiseId = ref("");
 const showGuide = ref(false);
+const targetType = ref(1);
+
+onLoad((options) => {
+  if (options.target) {
+    targetType.value = Number(options.target);
+  }
+});
 
 const onReady = async () => {
   await startPractiseAPI();
@@ -97,7 +105,7 @@ onMounted(async () => {
   });
   uni.$on("socket-inbox", onReceiveMessage);
   uni.$on("share-image", onClickShare);
-  const result = await createPractiseAPI(total, 360);
+  const result = await createPractiseAPI(total, 360, targetType.value);
   if (result) practiseId.value = result.id;
 });
 

src/pages/practise.vue

@@ -4,6 +4,7 @@ import { onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Guide from "@/components/Guide.vue";
 import Avatar from "@/components/Avatar.vue";
+import TargetPicker from "@/components/TargetPicker.vue";
 import { getPractiseDataAPI } from "@/apis";
 import { canEenter } from "@/util";
 
@@ -12,12 +13,20 @@ import { storeToRefs } from "pinia";
 const store = useStore();
 const { user, device, online } = storeToRefs(store);
 const data = ref({});
+const showTargetPicker = ref(false);
+const pendingPractiseType = ref("");
 
 const goPractise = async (type) => {
   if (!canEenter(user.value, device.value, online.value)) return;
-  // await uni.$checkAudio();
+  pendingPractiseType.value = type;
+  showTargetPicker.value = true;
+};
+
+const handleTargetConfirm = (target) => {
+  showTargetPicker.value = false;
+  const type = pendingPractiseType.value;
   uni.navigateTo({
-    url: `/pages/practise-${type}`,
+    url: `/pages/practise-${type}?target=${target}`,
   });
 };
 
@@ -88,6 +97,11 @@ onShow(async () => {
         />
       </view>
     </view>
+    <TargetPicker
+      :show="showTargetPicker"
+      :onClose="() => (showTargetPicker = false)"
+      :onConfirm="handleTargetConfirm"
+    />
   </Container>
 </template>
 

src/store.js

@@ -22,6 +22,19 @@ const getLvlName = (rankLvl, rankList = []) => {
   return lvlName;
 };
 
+const getLvlNameByScore = (score, rankList = []) => {
+  if (!rankList) return;
+  let lvlName = "";
+  rankList.some((r, index) => {
+    if (r.upgrade_scores && r.upgrade_scores < score) {
+      lvlName = rankList[index].name;
+      return true;
+    }
+    return false;
+  });
+  return lvlName;
+};
+
 const getLvlImage = (rankLvl, rankList = []) => {
   if (!rankList) return;
   let lvlImage = "";
@@ -35,6 +48,19 @@ const getLvlImage = (rankLvl, rankList = []) => {
   return lvlImage;
 };
 
+const getLvlImageByScore = (score, rankList = []) => {
+  if (!rankList) return;
+  let lvlImage = "";
+  rankList.some((r, index) => {
+    if (r.upgrade_scores && r.upgrade_scores < score) {
+      lvlImage = rankList[index].icoin;
+      return true;
+    }
+    return false;
+  });
+  return lvlImage;
+};
+
 // 定义游戏相关的 store
 export default defineStore("store", {
   // 状态
@@ -65,6 +91,9 @@ export default defineStore("store", {
 
   // 方法
   actions: {
+    getLvlNameByScore(score) {
+      return getLvlNameByScore(score, this.config.randInfos);
+    },
     getLvlName(rankLvl) {
       return getLvlName(rankLvl, this.config.randInfos);
     },
@@ -79,14 +108,9 @@ export default defineStore("store", {
     },
     async updateUser(user = {}) {
       this.user = { ...defaultUser, ...user };
-      if (this.user.rankLvl !== undefined) {
-        this.user.lvlName = getLvlName(
-          this.user.rankLvl,
-          this.config.randInfos
-        );
-      }
-      this.user.lvlImage = getLvlImage(
-        this.user.rankLvl,
+      this.user.lvlName = getLvlNameByScore(this.user.scores, this.config.randInfos)
+      this.user.lvlImage = getLvlImageByScore(
+        this.user.scores,
         this.config.randInfos
       );
     },

src/websocket.js

@@ -14,8 +14,8 @@ function createWebSocket(token, onMessage) {
 
     switch (envVersion) {
       case "develop": // 开发版
-        // url = "ws://192.168.1.30:8000/socket";
-        url = "wss://apitest.shelingxingqiu.com/socket";
+        url = "ws://localhost:8000/socket";
+        // url = "wss://apitest.shelingxingqiu.com/socket";
         break;
       case "trial": // 体验版
         url = "wss://apitest.shelingxingqiu.com/socket";