pref: 小程序添加静默登录

src/App.vue

@@ -1,256 +1,292 @@
 <script setup>
-import { watch } from "vue";
+	import {
-import { onShow, onHide } from "@dcloudio/uni-app";
+		watch
-import websocket from "@/websocket";
+	} from "vue";
-import { getDeviceBatteryAPI } from "@/apis";
+	import {
-import useStore from "@/store";
+		onShow,
-import { storeToRefs } from "pinia";
+		onHide
-const store = useStore();
+	} from "@dcloudio/uni-app";
-const { user } = storeToRefs(store);
+	import websocket from "@/websocket";
-const { updateUser, updateOnline } = store;
+	import {
+		getDeviceBatteryAPI
+	} from "@/apis";
+	import useStore from "@/store";
+	import {
+		storeToRefs
+	} from "pinia";
+	import audioManager from "./audioManager";
+	const store = useStore();
+	const {
+		user
+	} = storeToRefs(store);
+	const {
+		updateUser,
+		updateOnline
+	} = store;
 
-watch(
+	watch(
-  () => user.value.id,
+		() => user.value.id,
-  (newVal) => {
+		(newVal) => {
-    const token = uni.getStorageSync(
+			const token = uni.getStorageSync(
-      `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+				`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-    );
+			);
-    if (newVal && token) {
+			if (newVal && token) {
-      websocket.createWebSocket(token, (content) => {
+				websocket.createWebSocket(token, onShootWsMsg);
-        uni.$emit("socket-inbox", content);
+			}
-      });
+			if (!newVal) {
-    }
+				websocket.closeWebSocket();
-    if (!newVal) {
+			}
-      websocket.closeWebSocket();
+		}, {
-    }
+			deep: false, // 如果 user 是一个对象或数组，建议开启
-  },
+			immediate: false, // 若想在初始化时立即执行一次回调，可开启。
-  {
+		}
-    deep: false, // 如果 user 是一个对象或数组，建议开启
+	);
-    immediate: false, // 若想在初始化时立即执行一次回调，可开启。
-  }
-);
 
-function emitUpdateUser(value) {
+	function emitUpdateUser(value) {
-  updateUser(value);
+		updateUser(value);
-}
+	}
 
-async function emitUpdateOnline() {
+	async function emitUpdateOnline() {
-  const data = await getDeviceBatteryAPI();
+		const data = await getDeviceBatteryAPI();
-  updateOnline(data.online);
+		updateOnline(data.online);
-}
+	}
 
-onShow(() => {
+	function onDeviceShoot() {
-  uni.$on("update-user", emitUpdateUser);
+		audioManager.play("射箭声音")
-  uni.$on("update-online", emitUpdateOnline);
+	}
-  const token = uni.getStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-  );
-  if (user.value.id && token) {
-    console.log("回到前台，重新连接 websocket");
-    websocket.createWebSocket(token, (content) => {
-      uni.$emit("socket-inbox", content);
-    });
-  }
-});
 
-onHide(() => {
+	function onShootWsMsg(content) {
-  uni.$off("update-user", emitUpdateUser);
+		if(content.type === 'shoot-trigger'){
-  uni.$off("update-online", emitUpdateOnline);
+			onDeviceShoot()
-  websocket.closeWebSocket();
+		}
-});
+		uni.$emit("socket-inbox", content);
+	}
+
+	onShow(() => {
+		uni.$on("update-user", emitUpdateUser);
+		uni.$on("update-online", emitUpdateOnline);
+		const token = uni.getStorageSync(
+			`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+		);
+		if (user.value.id && token) {
+			console.log("回到前台，重新连接 websocket");
+			websocket.createWebSocket(token, onShootWsMsg);
+		}
+	});
+
+	onHide(() => {
+		uni.$off("update-user", emitUpdateUser);
+		uni.$off("update-online", emitUpdateOnline);
+		websocket.closeWebSocket();
+	});
 </script>
 
 <style>
-page {
+	page {
-  -webkit-touch-callout: none;
+		-webkit-touch-callout: none;
-  -webkit-user-select: none;
+		-webkit-user-select: none;
-  user-select: none;
+		user-select: none;
-  background-color: #000;
+		background-color: #000;
-}
+	}
 
-button {
+	button {
-  margin: 0;
+		margin: 0;
-  padding: 0;
+		padding: 0;
-  border: none;
+		border: none;
-  background: none;
+		background: none;
-  line-height: 1;
+		line-height: 1;
-  outline: none;
+		outline: none;
-  box-sizing: border-box;
+		box-sizing: border-box;
-}
+	}
 
-view::-webkit-scrollbar {
+	view::-webkit-scrollbar {
-  width: 0;
+		width: 0;
-  height: 0;
+		height: 0;
-  color: transparent;
+		color: transparent;
-}
+	}
 
-button::after {
+	button::after {
-  border: none;
+		border: none;
-}
+	}
 
-.guide-tips {
+	.guide-tips {
-  display: flex;
+		display: flex;
-  flex-direction: column;
+		flex-direction: column;
-  font-size: 28rpx;
+		font-size: 28rpx;
-}
+	}
-.guide-tips > text:first-child {
-  color: #fed847;
-}
-.guide-tips > text:nth-child(2) {
-  font-size: 24rpx;
-}
 
-@keyframes fadeInOut {
+	.guide-tips>text:first-child {
-  0% {
+		color: #fed847;
-    transform: translateY(20px);
+	}
-    opacity: 0;
-  }
-  30% {
-    transform: translateY(0);
-    opacity: 1;
-  }
-  80% {
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
-}
 
-.fade-in-out {
+	.guide-tips>text:nth-child(2) {
-  animation: fadeInOut 1.2s ease forwards;
+		font-size: 24rpx;
-}
+	}
 
-@keyframes fadeOut {
+	@keyframes fadeInOut {
-  from {
+		0% {
-    transform: translateY(0);
+			transform: translateY(20px);
-    opacity: 1;
+			opacity: 0;
-  }
+		}
-  to {
-    transform: translateY(20px);
-    opacity: 0;
-  }
-}
 
-.fade-out {
+		30% {
-  animation: fadeOut 0.3s ease forwards;
+			transform: translateY(0);
-}
+			opacity: 1;
+		}
 
-@keyframes scaleIn {
+		80% {
-  from {
+			opacity: 1;
-    transform: scale(0);
+		}
-    opacity: 0;
-  }
-  to {
-    transform: scale(1);
-    opacity: 1;
-  }
-}
 
-.scale-in {
+		100% {
-  animation: scaleIn 0.3s ease-out forwards;
+			opacity: 0;
-  transform-origin: center center;
+		}
-}
+	}
 
-@keyframes scaleOut {
+	.fade-in-out {
-  from {
+		animation: fadeInOut 1.2s ease forwards;
-    transform: scale(1);
+	}
-    opacity: 1;
-  }
-  to {
-    transform: scale(0);
-    opacity: 0;
-  }
-}
 
-.scale-out {
+	@keyframes fadeOut {
-  animation: scaleOut 0.3s ease-out forwards;
+		from {
-  transform-origin: center center;
+			transform: translateY(0);
-}
+			opacity: 1;
+		}
 
-@keyframes rotate {
+		to {
-  from {
+			transform: translateY(20px);
-    transform: rotate(0deg);
+			opacity: 0;
-  }
+		}
-  to {
+	}
-    transform: rotate(360deg);
-  }
-}
 
-@keyframes pumpIn {
+	.fade-out {
-  from {
+		animation: fadeOut 0.3s ease forwards;
-    transform: scale(2);
+	}
-  }
-  to {
-    transform: scale(1);
-  }
-}
 
-.pump-in {
+	@keyframes scaleIn {
-  animation: pumpIn 0.3s ease-out forwards;
+		from {
-  transform-origin: center center;
+			transform: scale(0);
-}
+			opacity: 0;
+		}
 
-.share-canvas {
+		to {
-  width: 300px;
+			transform: scale(1);
-  height: 530px;
+			opacity: 1;
-  position: absolute;
+		}
-  top: -1000px;
+	}
-  left: 0;
-}
 
-.truncate {
+	.scale-in {
-  white-space: nowrap;
+		animation: scaleIn 0.3s ease-out forwards;
-  overflow: hidden;
+		transform-origin: center center;
-  text-overflow: ellipsis;
+	}
-}
 
-.modal {
+	@keyframes scaleOut {
-  height: 100%;
+		from {
-  display: flex;
+			transform: scale(1);
-  flex-direction: column;
+			opacity: 1;
-  align-items: center;
+		}
-  justify-content: center;
-}
-.user-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 15px;
-  padding-top: 7px;
-  position: relative;
-}
-.half-time-tip {
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  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 {
+		to {
-  font-family: "DINCondensed";
+			transform: scale(0);
-  src: url("https://static.shelingxingqiu.com/font/DIN-Condensed-Bold-2.ttf")
+			opacity: 0;
-    format("truetype");
+		}
-  font-weight: 700;
+	}
-  font-style: normal;
+
-  font-display: swap;
+	.scale-out {
-}
+		animation: scaleOut 0.3s ease-out forwards;
+		transform-origin: center center;
+	}
+
+	@keyframes rotate {
+		from {
+			transform: rotate(0deg);
+		}
+
+		to {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes pumpIn {
+		from {
+			transform: scale(2);
+		}
+
+		to {
+			transform: scale(1);
+		}
+	}
+
+	.pump-in {
+		animation: pumpIn 0.3s ease-out forwards;
+		transform-origin: center center;
+	}
+
+	.share-canvas {
+		width: 300px;
+		height: 530px;
+		position: absolute;
+		top: -1000px;
+		left: 0;
+	}
+
+	.truncate {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.modal {
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.user-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+		padding-top: 7px;
+		position: relative;
+	}
+
+	.half-time-tip {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		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");
+		font-weight: 700;
+		font-style: normal;
+		font-display: swap;
+	}
 </style>

src/apis.js

@@ -1,468 +1,498 @@
 let BASE_URL = "https://api.shelingxingqiu.com/api/shoot"; // 默认正式版
 
 try {
-  const accountInfo = uni.getAccountInfoSync();
+    const accountInfo = uni.getAccountInfoSync();
-  const envVersion = accountInfo.miniProgram.envVersion;
+    const envVersion = accountInfo.miniProgram.envVersion;
 
-  switch (envVersion) {
+    switch (envVersion) {
-    case "develop": // 开发版
+        case "develop": // 开发版
-      // BASE_URL = "http://192.168.1.30:8000/api/shoot";
+            BASE_URL = "http://localhost:8000/api/shoot";
-      BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            // BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
-      break;
+            break;
-    case "trial": // 体验版
+        case "trial": // 体验版
-      BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
-      break;
+            break;
-    case "release": // 正式版
+        case "release": // 正式版
-      BASE_URL = "https://api.shelingxingqiu.com/api/shoot";
+            BASE_URL = "https://api.shelingxingqiu.com/api/shoot";
-      break;
+            break;
-    default:
+        default:
-      // 保持默认值
+            // 保持默认值
-      break;
+            break;
-  }
+    }
 } catch (e) {
-  console.error("获取环境信息失败，使用默认正式环境", e);
+    console.error("获取环境信息失败，使用默认正式环境", e);
 }
 
 function request(method, url, data = {}) {
-  const token = uni.getStorageSync(
+    const token = uni.getStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-  );
+    );
-  const header = {};
+    const header = {};
-  if (token) header.Authorization = `Bearer ${token || ""}`;
+    if (token) header.Authorization = `Bearer ${token || ""}`;
-  return new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
-    uni.request({
+        uni.request({
-      url: `${BASE_URL}${url}`,
+            url: `${BASE_URL}${url}`,
-      method,
+            method,
-      header,
+            header,
-      data,
+            data,
-      timeout: 10000,
+            timeout: 10000,
-      success: (res) => {
+            success: (res) => {
-        if (res.data) {
+                if (res.data) {
-          const { code, data, message } = res.data;
+                    const {code, data, message} = res.data;
-          if (code === 0) resolve(data);
+                    if (code === 0) resolve(data);
-          else if (message) {
+                    else if (message) {
-            if (message.indexOf("登录身份已失效") !== -1) {
+                        if (message.indexOf("登录身份已失效") !== -1) {
-              uni.removeStorageSync(
+                            uni.removeStorageSync(
-                `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+                                `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-              );
+                            );
-              uni.$emit("update-user");
+                            uni.$emit("update-user");
-            }
+                        }
-            if (message === "ROOM_FULL") {
+                        if (message === "ROOM_FULL") {
-              resolve({ full: true });
+                            resolve({full: true});
-              return;
+                            return;
-            }
+                        }
-            if (message === "ERROR_ROOM_GAME_START") {
+                        if (message === "ERROR_ROOM_GAME_START") {
-              resolve({ started: true });
+                            resolve({started: true});
-              return;
+                            return;
-            }
+                        }
-            if (url.indexOf("/user/room") !== -1 && method === "GET") {
+                        if (url.indexOf("/user/room") !== -1 && method === "GET") {
-              resolve({});
+                            resolve({});
-              return;
+                            return;
-            }
+                        }
-            if (message === "ERROR_BATTLE_GAMING") {
+                        if (message === "ERROR_BATTLE_GAMING") {
-              resolve({});
+                            resolve({});
-              return;
+                            return;
-            }
+                        }
-            if (message === "BIND_DEVICE") {
+                        if (message === "BIND_DEVICE") {
-              resolve({ binded: true });
+                            resolve({binded: true});
-              return;
+                            return;
-            }
+                        }
-            if (message === "ERROR_ORDER_UNPAY") {
+                        if (message === "ERROR_ORDER_UNPAY") {
-              uni.showToast({
+                            uni.showToast({
-                title: "当前有未支付订单",
+                                title: "当前有未支付订单",
-                icon: "none",
+                                icon: "none",
-              });
+                            });
-              resolve({});
+                            resolve({});
-              return;
+                            return;
-            }
+                        }
-            if (message === "ROOM_EMPTY") {
+                        if (message === "ROOM_EMPTY") {
-              return uni.showToast({
+                            return uni.showToast({
-                title: "房间已过期",
+                                title: "房间已过期",
-                icon: "none",
+                                icon: "none",
-              });
+                            });
-            }
+                        }
-            uni.showToast({
+                        uni.showToast({
-              title: message,
+                            title: message,
-              icon: "none",
+                            icon: "none",
-            });
+                        });
-          }
+                    }
-          reject("");
+                    reject("");
-        }
+                }
-      },
+            },
-      fail: (err) => {
+            fail: (err) => {
-        handleRequestError(err, url);
+                handleRequestError(err, url);
-        reject(err);
+                reject(err);
-      },
+            },
+        });
     });
-  });
 }
 
 // 统一的错误处理函数
 function handleRequestError(err, url) {
-  console.log("请求失败:", { err, url });
+    console.log("请求失败:", {err, url});
 
-  // 根据错误类型显示不同提示
+    // 根据错误类型显示不同提示
-  if (err.errMsg) {
+    if (err.errMsg) {
-    if (err.errMsg.includes("timeout")) {
+        if (err.errMsg.includes("timeout")) {
-      showCustomToast("请求超时，请稍后重试", "timeout");
+            showCustomToast("请求超时，请稍后重试", "timeout");
-    } else if (err.errMsg.includes("fail")) {
+        } else if (err.errMsg.includes("fail")) {
-      // 检查网络状态
+            // 检查网络状态
-      uni.getNetworkType({
+            uni.getNetworkType({
-        success: (res) => {
+                success: (res) => {
-          if (res.networkType === "none") {
+                    if (res.networkType === "none") {
-            showCustomToast("网络连接已断开，请检查网络设置", "network");
+                        showCustomToast("网络连接已断开，请检查网络设置", "network");
-          } else {
+                    } else {
-            showCustomToast("服务器连接失败，请稍后重试", "server");
+                        showCustomToast("服务器连接失败，请稍后重试", "server");
-          }
+                    }
-        },
+                },
-        fail: () => {
+                fail: () => {
-          showCustomToast("网络异常，请检查网络连接", "unknown");
+                    showCustomToast("网络异常，请检查网络连接", "unknown");
-        },
+                },
-      });
+            });
+        } else {
+            showCustomToast("请求失败，请稍后重试", "general");
+        }
     } else {
-      showCustomToast("请求失败，请稍后重试", "general");
+        showCustomToast("网络异常，请稍后重试", "unknown");
     }
-  } else {
-    showCustomToast("网络异常，请稍后重试", "unknown");
-  }
 }
 
 // 自定义提示函数
 function showCustomToast(message, type) {
-  const config = {
+    const config = {
-    title: message,
+        title: message,
-    icon: "none",
+        icon: "none",
-    duration: 3000,
+        duration: 3000,
-  };
+    };
 
-  // 根据错误类型可以添加不同的处理逻辑
+    // 根据错误类型可以添加不同的处理逻辑
-  switch (type) {
+    switch (type) {
-    case "timeout":
+        case "timeout":
-      config.duration = 4000; // 超时提示显示更久
+            config.duration = 4000; // 超时提示显示更久
-      break;
+            break;
-    case "network":
+        case "network":
-      config.duration = 5000; // 网络问题提示显示更久
+            config.duration = 5000; // 网络问题提示显示更久
-      break;
+            break;
-    default:
+        default:
-      break;
+            break;
-  }
+    }
 
-  uni.showToast(config);
+    uni.showToast(config);
 }
 
 // 获取全局配置
 export const getAppConfig = () => {
-  return request("GET", "/index/appConfig");
+    return request("GET", "/index/appConfig");
 };
 
 export const getHomeData = (seasonId) => {
-  return request("GET", `/user/myHome?seasonId=${seasonId}`);
+    return request("GET", `/user/myHome?seasonId=${seasonId}`);
 };
 
 export const getProvinceData = () => {
-  return request("GET", "/index/provinces/list");
+    return request("GET", "/index/provinces/list");
 };
 
 export const loginAPI = async (phone, nickName, avatarData, code) => {
-  const result = await request("POST", "/index/code", {
+    const result = await request("POST", "/index/code", {
-    appName: "shoot",
+        appName: "shoot",
-    appId: "wxa8f5989dcd45cc23",
+        appId: "wxa8f5989dcd45cc23",
-    nickName,
+        nickName,
-    avatarData,
+        avatarData,
-    code,
+        code,
-    phone,
+        phone,
-  });
+    });
-  uni.setStorageSync(
+    uni.setStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
-    result.token
+        result.token
-  );
+    );
-  return result;
+    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", {
+    return request("POST", "/user/device/bindDevice", {
-    device,
+        device,
-  });
+    });
+};
+
+export const bindDeviceAPIV2 = (token) => {
+    return request("POST", "/user/device/bindDevice/v2", {
+        token: token,
+    });
 };
 
 export const unbindDeviceAPI = (deviceId) => {
-  return request("POST", "/user/device/unbindDevice", {
+    return request("POST", "/user/device/unbindDevice", {
-    deviceId,
+        deviceId,
-  });
+    });
 };
 
 export const getMyDevicesAPI = () => {
-  // "/user/device/getBinding?deviceId=9ZF9oVXs"
+    // "/user/device/getBinding?deviceId=9ZF9oVXs"
-  return request("GET", "/user/device/getBindings");
+    return request("GET", "/user/device/getBindings");
 };
 
-export const createPractiseAPI = (arrows, time) => {
+export const createPractiseAPI = (arrows, time, target) => {
-  return request("POST", "/user/practice/create", {
+    return request("POST", "/user/practice/create", {
-    shootNumber: arrows,
+        shootNumber: arrows,
-    shootTime: time,
+        shootTime: time,
-  });
+        targetType: target * 20,
+    });
 };
 
 export const startPractiseAPI = () => {
-  return request("POST", "/user/practice/begin");
+    return request("POST", "/user/practice/begin");
 };
 
 export const endPractiseAPI = () => {
-  return request("POST", "/user/practice/stop");
+    return request("POST", "/user/practice/stop");
 };
 
 export const getPractiseAPI = async (id) => {
-  return request("GET", `/user/practice/get?id=${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", {
+    return request("POST", "/user/createroom", {
-    gameType,
+        gameType,
-    teamSize,
+        teamSize,
-  });
+        targetType,
+    });
 };
 
 export const getRoomAPI = (number) => {
-  return request("GET", `/user/room?number=${number}`);
+    return request("GET", `/user/room?number=${number}`);
 };
 
 export const joinRoomAPI = (number) => {
-  return request("POST", `/user/room/join`, { number });
+    return request("POST", `/user/room/join`, {number});
 };
 
 export const destroyRoomAPI = (roomNumber) => {
-  return request("POST", "/user/room/destroyRoom", {
+    return request("POST", "/user/room/destroyRoom", {
-    roomNumber,
+        roomNumber,
-  });
+    });
 };
 
 export const exitRoomAPI = (number, userId) => {
-  return request("POST", "/user/room/exitRoom", {
+    return request("POST", "/user/room/exitRoom", {
-    number,
+        number,
-    userId,
+        userId,
-  });
+    });
 };
 
 export const startRoomAPI = (number) => {
-  return request("POST", "/user/room/start", { number });
+    return request("POST", "/user/room/start", {number});
 };
 
 export const getPractiseResultListAPI = async (page = 1, page_size = 15) => {
-  const reuslt = await request(
+    const reuslt = await request(
-    "GET",
+        "GET",
-    `/user/practice/list?page=${page}&page_size=${page_size}`
+        `/user/practice/list?page=${page}&page_size=${page_size}`
-  );
+    );
-  return reuslt.list;
+    return reuslt.list;
 };
 
 export const matchGameAPI = (match, gameType, teamSize) => {
-  return request("POST", "/user/game/match", {
+    return request("POST", "/user/game/match", {
-    match,
+        match,
-    gameType,
+        gameType,
-    teamSize,
+        teamSize,
-    readyTime: 1.5,
+        readyTime: 15,
-  });
+        targetType: 20,
+    });
 };
 
 export const readyGameAPI = (battleId) => {
-  return request("POST", "/user/game/prepare", {
+    return request("POST", "/user/game/prepare", {
-    battleId,
+        battleId,
-  });
+    });
 };
 
 export const simulShootAPI = (device_id, x, y) => {
-  const data = {
+    const data = {
-    device_id,
+        device_id,
-  };
+    };
-  if (x !== undefined && y !== undefined) {
+    if (x !== undefined && y !== undefined) {
-    data.x = x;
+        data.x = x;
-    data.y = y;
+        data.y = y;
-  }
+    }
-  return request("POST", "/index/arrow", data);
+    return request("POST", "/index/arrow", data);
 };
 
 export const getBattleListAPI = async (page, battleType) => {
-  const result = await request("POST", "/user/battle/details/list", {
+    const result = await request("POST", "/user/battle/details/list", {
-    page,
+        page,
-    pageSize: 10,
+        pageSize: 10,
-    battleType,
+        battleType,
-  });
+    });
-  return result.list;
+    return result.list;
 };
 
 export const getRankListAPI = () => {
-  return request("GET", "/index/ranklist");
+    return request("GET", "/index/ranklist");
 };
 
 export const createOrderAPI = (vipId) => {
-  return request("POST", "/user/order/create", {
+    return request("POST", "/user/order/create", {
-    vipId,
+        vipId,
-    quanity: 1,
+        quanity: 1,
-    tradeType: "mini",
+        tradeType: "mini",
-    payType: "wxpay",
+        payType: "wxpay",
-  });
+    });
 };
 
 export const payOrderAPI = (id) => {
-  return request("POST", "/user/order/pay", {
+    return request("POST", "/user/order/pay", {
-    id,
+        id,
-    tradeType: "mini",
+        tradeType: "mini",
-    payType: "wxpay",
+        payType: "wxpay",
-  });
+    });
 };
 
 export const getOrderListAPI = async (page) => {
-  const reuslt = await request("GET", `/user/order/list?page=${page}`);
+    const reuslt = await request("GET", `/user/order/list?page=${page}`);
-  return reuslt.items || [];
+    return reuslt.items || [];
 };
 
 export const cancelOrderListAPI = async (id) => {
-  return request("POST", "/user/order/cancelOrder", { id });
+    return request("POST", "/user/order/cancelOrder", {id});
 };
 
 export const getUserGameState = () => {
-  return request("GET", "/user/state");
+    return request("GET", "/user/state");
 };
 
 export const getPointBookConfigAPI = async () => {
-  return request("GET", "/user/score/sheet/option");
+    return request("GET", "/user/score/sheet/option");
 };
 
 export const savePointBookAPI = async (
-  bowType,
-  distance,
-  targetType,
-  groups,
-  arrows,
-  data = []
-) => {
-  return request("POST", "/user/score/sheet/report", {
     bowType,
     distance,
     targetType,
     groups,
     arrows,
-    group_data: data.map((item) =>
+    data = []
-      item.map((i) => ({
+) => {
-        ...i,
+    return request("POST", "/user/score/sheet/report", {
-        ring: i.ring === "M" ? -1 : i.ring === "X" ? 0 : Number(i.ring),
+        bowType,
-      }))
+        distance,
-    ),
+        targetType,
-  });
+        groups,
+        arrows,
+        group_data: data.map((item) =>
+            item.map((i) => ({
+                ...i,
+                ring: i.ring === "M" ? -1 : i.ring === "X" ? 0 : Number(i.ring),
+            }))
+        ),
+    });
 };
 
 export const getPointBookListAPI = async (
-  page = 1,
+    page = 1,
-  bowType,
+    bowType,
-  distance,
+    distance,
-  targetType
+    targetType
 ) => {
-  let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
+    let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
-  if (bowType) url += `&bowType=${bowType}`;
+    if (bowType) url += `&bowType=${bowType}`;
-  if (distance) url += `&distance=${distance}`;
+    if (distance) url += `&distance=${distance}`;
-  if (targetType) url += `&targetType=${targetType}`;
+    if (targetType) url += `&targetType=${targetType}`;
-  const result = await request("GET", url);
+    const result = await request("GET", url);
-  return result.list || [];
+    return result.list || [];
 };
 
 export const getPointBookDetailAPI = async (id) => {
-  return request("GET", `/user/score/sheet/detail?id=${id}`);
+    return request("GET", `/user/score/sheet/detail?id=${id}`);
 };
 
 export const getPointBookDataAPI = async () => {
-  return request("GET", "/user/score/sheet/statistics");
+    return request("GET", "/user/score/sheet/statistics");
 };
 
 export const getPractiseDataAPI = async () => {
-  return request("GET", "/user/practice/statistics");
+    return request("GET", "/user/practice/statistics");
 };
 
 export const getBattleDataAPI = async () => {
-  return request("GET", "/user/fight/statistics");
+    return request("GET", "/user/fight/statistics");
 };
 
 export const chooseTeamAPI = async (number, group) => {
-  return request("POST", "/user/room/group", { number, group });
+    return request("POST", "/user/room/group", {number, group});
 };
 
 export const getVIPDescAPI = async () => {
-  return request("GET", "/index/memberVipDescribe");
+    return request("GET", "/index/memberVipDescribe");
 };
 
 export const getPointBookStatisticsAPI = async () => {
-  return request("GET", `/v2/user/score/sheet/statistics`);
+    return request("GET", `/v2/user/score/sheet/statistics`);
 };
 
 export const donateAPI = async (amount, name, phone, organizer, advice) => {
-  return request("POST", `/user/donate`, {
+    return request("POST", `/user/donate`, {
-    amount,
+        amount,
-    name,
+        name,
-    phone,
+        phone,
-    organizer,
+        organizer,
-    advice,
+        advice,
-  });
+    });
 };
 
 export const laserAimAPI = async () => {
-  return request("POST", "/user/device/laserAim");
+    return request("POST", "/user/device/laserAim");
 };
 
 export const laserCloseAPI = async () => {
-  return request("POST", "/user/device/closeAim");
+    return request("POST", "/user/device/closeAim");
 };
 
 export const getDeviceBatteryAPI = async () => {
-  return request("GET", "/user/device/battery");
+    return request("GET", "/user/device/battery");
 };
 
 export const addNoteAPI = async (id, remark) => {
-  return request("POST", "/user/score/sheet/remark", { id, remark });
+    return request("POST", "/user/score/sheet/remark", {id, remark});
 };
 
 export const removePointRecord = async (id) => {
-  return request("DELETE", `/user/score/sheet/delete?id=${id}`);
+    return request("DELETE", `/user/score/sheet/delete?id=${id}`);
 };
 
 export const getPhoneNumberAPI = (data) => {
-  return request("POST", "/index/getPhone", data);
+    return request("POST", "/index/getPhone", data);
 };
 
 export const getPointBookRankListAPI = (page = 1) => {
-  return request(
+    return request(
-    "GET",
+        "GET",
-    `/user/score/sheet/week/shoot/rank/list?pageNum=${page}&pageSize=100`
+        `/user/score/sheet/week/shoot/rank/list?pageNum=${page}&pageSize=100`
-  );
+    );
 };
 
 export const clickLikeAPI = (userId, ifLike) => {
-  return request("POST", "/user/score/sheet/week/shoot/rank/like", {
+    return request("POST", "/user/score/sheet/week/shoot/rank/like", {
-    userId,
+        userId,
-    ifLike,
+        ifLike,
-  });
+    });
 };
 
 export const getMyLikeList = (page = 1, pageSize = 10) => {
-  return request(
+    return request(
-    "GET",
+        "GET",
-    `/user/score/sheet/week/shoot/rank/like/list?pageNum=${page}&pageSize=${pageSize}`
+        `/user/score/sheet/week/shoot/rank/like/list?pageNum=${page}&pageSize=${pageSize}`
-  );
+    );
 };
 
 export const getReadyAPI = (roomId) => {
-  return request("POST", `/user/room/ready`, {
+    return request("POST", `/user/room/ready`, {
-    roomId,
+        roomId,
-  });
+    });
 };
 
 export const getBattleAPI = async (battleId) => {
-  return request("POST", "/user/match/info", {
+    return request("POST", "/user/match/info", {
-    id: battleId,
+        id: battleId,
-  });
+    });
 };
 
 export const kickPlayerAPI = (number, userId) => {
-  return request("POST", "/user/room/kicking", {
+    return request("POST", "/user/room/kicking", {
-    number,
+        number,
-    userId,
+        userId,
-  });
+    });
 };

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",
+    "https://static.shelingxingqiu.com/shootaudio/v3/10.mp3",
-  X环: "https://static.shelingxingqiu.com/attachment/2026-02-09/dga8puwekpe2gmtbu4.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(
+    await loginAPI(phone.value, nickName.value, base64Url, wxResult.code);
-      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,68 +1,70 @@
 {
-  "name": "shoot-miniprograms",
+    "name" : "shoot-miniprograms",
-  "appid": "",
+    "appid" : "__UNI__B03E251",
-  "description": "",
+    "description" : "",
-  "versionName": "1.0.0",
+    "versionName" : "1.0.0",
-  "versionCode": "100",
+    "versionCode" : "100",
-  "transformPx": false,
+    "transformPx" : false,
-  "uniStatistics": {
+    "uniStatistics" : {
-    "enable": false
+        "enable" : false
-  },
-  "app-plus": {
-    "bounce": "none",
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
     },
-    "modules": {},
+    "app-plus" : {
-    "distribute": {
+        "bounce" : "none",
-      "android": {
+        "usingComponents" : true,
-        "permissions": [
+        "nvueStyleCompiler" : "uni-app",
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+        "compilerVersion" : 3,
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+        "splashscreen" : {
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+            "alwaysShowBeforeRender" : true,
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+            "waiting" : true,
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+            "autoclose" : true,
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+            "delay" : 0
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+        },
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+        "modules" : {},
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+        "distribute" : {
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+            "android" : {
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                "permissions" : [
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-        ]
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-      },
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-      "ios": {},
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-      "sdkConfigs": {}
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {
+                "dSYMs" : false
+            },
+            "sdkConfigs" : {}
+        }
+    },
+    "h5" : {
+        "darkmode" : true,
+        "themeLocation" : "theme.json"
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wxa8f5989dcd45cc23",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "uglifyFileName" : true,
+            "useCompilerModule" : true,
+            "useIsolateContext" : true
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        "usingComponents" : true,
+        "darkmode" : true,
+        "themeLocation" : "theme.json",
+        "permission" : {},
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     }
-  },
-  "h5": {
-    "darkmode": true,
-    "themeLocation": "theme.json"
-  },
-  "quickapp": {},
-  "mp-weixin": {
-    "appid": "wxa8f5989dcd45cc23",
-    "setting": {
-      "urlCheck": false,
-      "minified": true,
-      "uglifyFileName": true,
-      "useCompilerModule": true,
-      "useIsolateContext": true
-    },
-    "lazyCodeLoading": "requiredComponents",
-    "usingComponents": true,
-    "darkmode": true,
-    "themeLocation": "theme.json",
-    "permission": {},
-    "requiredPrivateInfos": ["getLocation", "chooseLocation"]
-  }
 }

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 {onMounted, ref} from "vue";
-import { onShow, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app";
+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 {topThreeColors} from "@/constants";
-import { canEenter } from "@/util";
 
 import useStore from "@/store";
-import { storeToRefs } from "pinia";
+import {storeToRefs} from "pinia";
+
 const store = useStore();
 const {
   updateConfig,
@@ -27,9 +28,10 @@ const {
   updateDevice,
   updateRank,
   getLvlName,
+  getLvlNameByScore,
   updateOnline,
 } = store;
-const { user, device, rankData, online, game } = storeToRefs(store);
+const {user, device, rankData, online, game} = storeToRefs(store);
 
 const showModal = ref(false);
 const showGuide = ref(false);
@@ -44,7 +46,7 @@ const toPage = async (path) => {
   //   await uni.$checkAudio();
   // }
   // }
-  uni.navigateTo({ url: path });
+  uni.navigateTo({url: path});
 };
 
 const toRankListPage = () => {
@@ -54,12 +56,36 @@ const toRankListPage = () => {
 };
 
 onShow(async () => {
-  const token = uni.getStorageSync(
+  const env = uni.getAccountInfoSync().miniProgram.envVersion;
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+  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());
   }
 
@@ -87,8 +113,8 @@ onShow(async () => {
       const devices = await getMyDevicesAPI();
       if (devices.bindings && devices.bindings.length) {
         updateDevice(
-          devices.bindings[0].deviceId,
+            devices.bindings[0].deviceId,
-          devices.bindings[0].deviceName
+            devices.bindings[0].deviceName
         );
         const data = await getDeviceBatteryAPI();
         updateOnline(data.online);
@@ -108,7 +134,7 @@ onShareAppMessage(() => {
     title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！", // 分享卡片的标题
     path: "/pages/index", // 用户点击分享卡片后跳转的页面路径
     imageUrl:
-      "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享卡片的配图，可以是本地或网络图片
+        "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享卡片的配图，可以是本地或网络图片
   };
 });
 onShareTimeline(() => {
@@ -116,7 +142,7 @@ onShareTimeline(() => {
     title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！", // 分享到朋友圈的标题
     query: "from=timeline", // 用户通过朋友圈点击后，在页面 onShow 的 options 中可以获取到的参数
     imageUrl:
-      "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享到朋友圈的配图
+        "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享到朋友圈的配图
   };
 });
 </script>
@@ -126,25 +152,25 @@ onShareTimeline(() => {
     <view class="container">
       <view class="top-theme">
         <image
-          src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrq4xn7e6y2pp.png"
+            src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrq4xn7e6y2pp.png"
-          mode="widthFix"
+            mode="widthFix"
         />
       </view>
-      <UserHeader showRank :onSignin="() => (showModal = true)" />
+      <UserHeader showRank :onSignin="() => (showModal = true)"/>
       <view :style="{ padding: '12px 10px' }">
         <view class="feature-grid">
           <view class="bow-card">
             <image
-              v-if="online"
+                v-if="online"
-              src="https://static.shelingxingqiu.com/attachment/2025-08-07/dbvt1o6dvhr2rop3kn.webp"
+                src="https://static.shelingxingqiu.com/attachment/2025-08-07/dbvt1o6dvhr2rop3kn.webp"
-              mode="widthFix"
+                mode="widthFix"
-              @click="() => toPage('/pages/my-device')"
+                @click="() => toPage('/pages/my-device')"
             />
             <image
-              v-else
+                v-else
-              src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
+                src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
-              mode="widthFix"
+                mode="widthFix"
-              @click="() => toPage('/pages/my-device')"
+                @click="() => toPage('/pages/my-device')"
             />
             <block v-if="user.id">
               <text v-if="!device.deviceId">绑定我的智能弓</text>
@@ -152,9 +178,9 @@ onShareTimeline(() => {
               <text v-else-if="online">设备在线</text>
             </block>
             <image
-              src="../static/first-try.png"
+                src="../static/first-try.png"
-              mode="widthFix"
+                mode="widthFix"
-              @click="() => toPage('/pages/first-try')"
+                @click="() => toPage('/pages/first-try')"
             />
             <BubbleTip v-if="showGuide" :location="{ top: '60%', left: '47%' }">
               <text>新人必刷！</text>
@@ -163,49 +189,49 @@ onShareTimeline(() => {
           </view>
           <view class="play-card">
             <view @click="() => toPage('/pages/practise')">
-              <image src="../static/my-practise.png" mode="widthFix" />
+              <image src="../static/my-practise.png" mode="widthFix"/>
             </view>
             <view @click="() => toPage('/pages/friend-battle')">
-              <image src="../static/friend-battle.png" mode="widthFix" />
+              <image src="../static/friend-battle.png" mode="widthFix"/>
             </view>
           </view>
         </view>
         <view class="ranking-section">
           <image
-            src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9ci9v7frcrsxhj.png"
+              src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9ci9v7frcrsxhj.png"
-            mode="widthFix"
+              mode="widthFix"
           />
           <button
-            class="into-btn"
+              class="into-btn"
-            @click="() => toPage('/pages/ranking')"
+              @click="() => toPage('/pages/ranking')"
-            hover-class="none"
+              hover-class="none"
           ></button>
           <view class="ranking-players" @click="toRankListPage">
-            <img src="../static/juezhanbang.png" mode="widthFix" />
+            <img src="../static/juezhanbang.png" mode="widthFix"/>
             <view class="divide-line"></view>
             <view class="player-avatars">
               <view
-                v-for="i in 6"
+                  v-for="i in 6"
-                :key="i"
+                  :key="i"
-                class="player-avatar"
+                  class="player-avatar"
-                :style="{
+                  :style="{
                   zIndex: 8 - i,
                   borderColor: rankData.rank[i - 1]
                     ? topThreeColors[i - 1] || '#000'
                     : '#000',
                 }"
               >
-                <image v-if="i === 1" src="../static/champ1.png" />
+                <image v-if="i === 1" src="../static/champ1.png"/>
-                <image v-if="i === 2" src="../static/champ2.png" />
+                <image v-if="i === 2" src="../static/champ2.png"/>
-                <image v-if="i === 3" src="../static/champ3.png" />
+                <image v-if="i === 3" src="../static/champ3.png"/>
                 <view v-if="i > 3">{{ i }}</view>
                 <image
-                  :src="
+                    :src="
                     rankData.rank[i - 1]
                       ? rankData.rank[i - 1].avatar
                       : '../static/user-icon-dark.png'
                   "
-                  mode="aspectFill"
+                    mode="aspectFill"
                 />
               </view>
               <view class="more-players">
@@ -215,14 +241,15 @@ onShareTimeline(() => {
           </view>
           <view class="my-data">
             <view @click="() => toPage('/pages/my-growth')">
-              <image src="../static/my-growth.png" mode="widthFix" />
+              <image src="../static/my-growth.png" mode="widthFix"/>
             </view>
             <view @click="() => toPage('/pages/ranking')">
               <view>
                 <text>段位</text>
                 <text>{{
-                  user.rankLvl ? getLvlName(user.rankLvl) : "暂无"
+                    user.lvlName || "暂无"
-                }}</text>
+                  }}
+                </text>
               </view>
               <view>
                 <text>赛季平均环数</text>
@@ -231,18 +258,19 @@ onShareTimeline(() => {
               <view>
                 <text>赛季胜率</text>
                 <text>{{
-                  user.avg_win
+                    user.avg_win
-                    ? Number((user.avg_win * 100).toFixed(2)) + "%"
+                        ? Number((user.avg_win * 100).toFixed(2)) + "%"
-                    : "暂无"
+                        : "暂无"
-                }}</text>
+                  }}
+                </text>
               </view>
             </view>
           </view>
         </view>
       </view>
-      <Signin :show="showModal" :onClose="() => (showModal = false)" />
+      <Signin :show="showModal" :onClose="() => (showModal = false)"/>
     </view>
-    <AppFooter />
+    <AppFooter/>
   </Container>
 </template>
 
@@ -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) {
+  uni.$off("cancelMatching", cancelMatch);
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
 });
 
 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) => {
+        // const base64Decode = (str) => {
-          // 将 base64 转换为 utf8 字符串
+        //   // 将 base64 转换为 utf8 字符串
-          const bytes = wx.base64ToArrayBuffer(str);
+        //   const bytes = wx.base64ToArrayBuffer(str);
-          return String.fromCharCode.apply(null, new Uint8Array(bytes));
+        //   return String.fromCharCode.apply(null, new Uint8Array(bytes));
-        };
+        // };
-
+        //
-        addDevice.value = JSON.parse(base64Decode(res.result));
+        // 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) {
+  if (!justBind.value && token.value) {
-    const result = await bindDeviceAPI(addDevice.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 = getLvlNameByScore(this.user.scores, this.config.randInfos)
-        this.user.lvlName = getLvlName(
+      this.user.lvlImage = getLvlImageByScore(
-          this.user.rankLvl,
+        this.user.scores,
-          this.config.randInfos
-        );
-      }
-      this.user.lvlImage = getLvlImage(
-        this.user.rankLvl,
         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 = "ws://localhost:8000/socket";
-        url = "wss://apitest.shelingxingqiu.com/socket";
+        // url = "wss://apitest.shelingxingqiu.com/socket";
         break;
       case "trial": // 体验版
         url = "wss://apitest.shelingxingqiu.com/socket";