80 Commits
Author SHA1 Message Date
zhangyi 419cefd00e update:优化精准训练描边 2026-11-04 16:06:34 +08:00
zhangyi 14f9ccd1ef Merge branch 'feat-shebei' 2026-10-29 16:49:46 +08:00
zhangyi 899a222e3f update:优化 2026-10-29 16:49:08 +08:00
zhangyi ca727ec1f7 update:优化wifi反馈 2026-10-29 16:28:03 +08:00
zhangyi cc8f997600 Merge branch 'feat-shebei' 2026-10-29 16:12:55 +08:00
zhangyi bac84536c7 update:优化样式 2026-10-29 16:11:58 +08:00
zhangyi a81494973c Merge branch 'feat-shebei' 2026-10-29 15:08:27 +08:00
zhangyi 94c46bb7df update:隐藏新人礼 2026-10-29 15:07:47 +08:00
zhangyi f3fab17687 update:过滤图片 2026-10-29 14:54:00 +08:00
zhangyi d22d958215 Merge branch 'feat-mendian' 2026-10-29 10:05:02 +08:00
zhangyi b4ed13d2b5 Merge branch 'feat-training' 2026-10-29 09:57:48 +08:00
zhangyi b8b0ab4005 Merge branch 'feat-shebei' 2026-10-29 09:57:07 +08:00
zhangyi 05f73acf47 update:优化节奏训练计数 2026-10-23 14:50:15 +08:00
zhangyi eca15178f4 update:优化语音和训练文案 2026-10-23 11:55:02 +08:00
zhangyi 9eb6ef7cf1 update:优化图片地址 2026-10-21 15:49:43 +08:00
zhangyi 00f84fc3e4 update:新增门店vip相关 2026-10-21 15:27:31 +08:00
zhangyi 5bb9df8a03 update:优化节奏训练文案 2026-10-12 16:12:24 +08:00
zhangyi bad336c7d4 update:更新训练的说明文案 2026-10-12 14:57:11 +08:00
zhangyi cee09cd7fa update:隐藏会员入口 2026-10-08 14:34:09 +08:00
zhangyi ae3ba60191 update:优化 2026-09-24 17:10:10 +08:00
zhangyi f4b37fba00 update:优化ota 2026-09-24 15:16:14 +08:00
zhangyi f8bf9fdb63 update:新增扫码绑定失败界面 2026-09-24 14:23:42 +08:00
zhangyi 21ed8066aa update:优化稳定训练提示 2026-09-24 10:23:38 +08:00
zhangyi 78fd64c697 update:优化wifi 2026-09-23 18:33:12 +08:00
zhangyi 169e2e4a51 update:修复bug 2026-09-23 15:36:39 +08:00
zhangyi 19a4631df3 update:优化 2026-09-23 14:16:00 +08:00
zhangyi 9ad2c5e12e update:优化稳定训练 2026-09-23 10:35:11 +08:00
zhangyi 9de435a369 update:优化稳定训练 2026-09-22 17:36:06 +08:00
zhangyi 5357f131de update:优化精准稳定 2026-09-22 15:15:16 +08:00
zhangyi 7093d3e4e5 update:替换网络图片 2026-09-22 10:00:26 +08:00
zhangyi e98e5129d2 update:优化特效 2026-09-22 09:37:37 +08:00
zhangyi 01e8f6c6da update:优化ota状态共享 2026-09-21 16:22:05 +08:00
zhangyi 4bd7599cc0 update:新增ota 2026-09-21 14:56:43 +08:00
zhangyi b060d8f987 update:提交我的设备改版 2026-09-17 18:23:41 +08:00
zhangyi 46cbd37102 Merge branch 'test' into feat-shebei 2026-09-15 18:15:12 +08:00
zhangyi d4d690cb8e update:更新protocol 2026-09-15 18:12:39 +08:00
zhangyi b51813dd33 update:优化设备页 2026-09-15 17:56:36 +08:00
zhangyi a11e7f7532 Merge branch 'fix-audio' into feat-shebei 2026-09-15 15:49:26 +08:00
zhangyi 88febb92e5 update:更换语音 2026-09-15 15:44:14 +08:00
zhangyi 03fa2f4d48 update:代码备份 2026-09-15 15:39:46 +08:00
zhangyi c8533de5cf update:优化测距展示 2026-09-03 10:35:16 +08:00
zhangyi 74bfd7a327 update:优化赏金赛记录 2026-08-31 16:14:57 +08:00
zhangyi bbfa35e871 update:优化个人训练 2026-08-28 11:12:28 +08:00
zhangyi 469487ba73 update:优化新手教程 2026-08-27 17:24:25 +08:00
zhangyi b9bbaba77f update:优化新版个人训练 2026-08-26 17:23:36 +08:00
zhangyi 11eeb98b74 update:图片更新 2026-08-26 15:36:45 +08:00
zhangyi 96b64e4187 update:新增稳定训练 2026-08-26 15:23:02 +08:00
zhangyi 45bc324f70 update:优化节奏训练结算 2026-08-25 18:00:14 +08:00
zhangyi 2eba5f87d7 update:优化记录 2026-08-25 17:49:44 +08:00
zhangyi 9a06dcf942 update:对接节奏训练 2026-08-25 17:36:54 +08:00
zhangyi 35e0ee3ca0 update:优化节奏训练 2026-08-24 16:35:56 +08:00
zhangyi 59fa317c5a update: 优化个人训练 2026-08-21 15:38:01 +08:00
zhangyi 09756ae165 Merge branch 'feat-scene' into test 2026-08-20 18:09:06 +08:00
zhangyi b89c003313 update: 新增回到首页按钮 2026-08-20 18:08:49 +08:00
zhangyi 9dda58b19c Merge branch 'feat-yuyin' into test 2026-08-20 17:57:33 +08:00
zhangyi 962596e510 update:优化精准射箭语音 2026-08-20 17:57:22 +08:00
zhangyi 8a2fbb0780 Merge branch 'feat-scene' into test 2026-08-20 17:14:11 +08:00
zhangyi 0c0a00f742 update: 优化机构金币相关 2026-08-20 17:13:36 +08:00
zhangyi 66fc7fa8eb Merge branch 'feat-yuyin' into test 2026-08-20 16:56:47 +08:00
zhangyi 6363dda204 update: 语音优化 2026-08-20 16:56:34 +08:00
zhangyi 9f4fbbe4c9 Merge branch 'feat-scene' into test 2026-08-20 16:10:48 +08:00
zhangyi 45957d04b1 update:优化金币 2026-08-20 16:10:17 +08:00
zhangyi 42cfb5c3d8 update: 优化图片 2026-08-20 14:43:28 +08:00
zhangyi 844f72489e Merge branch 'feat-scene' into test 2026-08-20 14:37:47 +08:00
zhangyi d2571854bc update: 对接金币相关 2026-08-20 14:37:08 +08:00
zhangyi bb224c9f29 update:语音优化 2026-08-19 14:04:12 +08:00
zhangyi 82c360f1b1 Merge branch 'test' into feat-scene 2026-08-19 10:17:38 +08:00
zhangyi 63f3cada0f update:暂存金币相关 2026-08-19 10:14:17 +08:00
chenlimao 75cfcd66ee fix: OTA轮询次数改为15次 2026-08-18 13:57:49 +08:00
chenlimao 7955b37ec5 fix: 修复首页更新卡在更新中弹窗问题 2026-08-18 11:48:20 +08:00
chenlimao 9e6ad4cf50 feat: OTA 首页弹窗优化 2026-08-18 10:30:16 +08:00
chenlimao 6c55d32f90 chore: 依赖锁提交 2026-08-17 18:02:12 +08:00
zhangyi d60c32506f update:优化机构扫码页 2026-08-17 14:05:52 +08:00
zhangyi 63fb4ae85a update:优化性能问题 2026-08-17 10:11:28 +08:00
zhangyi 2628a17b3f update: 新增设备充电通知 2026-08-14 17:59:11 +08:00
zhangyi e7f073ed7c update:个人训练优化 2026-08-14 17:13:23 +08:00
zhangyi d662db9465 Merge branch 'test' into feat-scene 2026-08-10 11:56:37 +08:00
zhangyi fbb2076a77 Merge branch 'main' into feat-scene 2026-08-06 14:24:17 +08:00
zhangyi 360da2a1d7 update:本地域名优化 2026-08-03 14:26:00 +08:00
zhangyi f34800798d update:新增机构扫码登录页 2026-07-31 09:42:59 +08:00
240 changed files with 12684 additions and 5556 deletions
+8
View File
@@ -243,6 +243,14 @@
{ {
"type": "folder", "type": "folder",
"value": "static/training-difficulty-design" "value": "static/training-difficulty-design"
},
{
"type": "folder",
"value": "static/coin"
},
{
"type": "folder",
"value": "static/home-device"
} }
], ],
"include": [] "include": []
-5
View File
@@ -264,11 +264,6 @@ function buildSchema({ messageName, definition, messages, enumNames }) {
} }
const repeated = rule === "repeated"; const repeated = rule === "repeated";
if (repeated && !isMessage && !["string", "bytes"].includes(kind)) {
throw new Error(
`${messageName}.${fieldKey} 是 packed scalar repeated,当前通用解码器尚不支持`
);
}
const field = isMessage const field = isMessage
? { name: fieldName, kind: "message", type: typeName } ? { name: fieldName, kind: "message", type: typeName }
+29 -10
View File
@@ -8,9 +8,6 @@
} from "@dcloudio/uni-app"; } from "@dcloudio/uni-app";
import websocket from "@/websocket"; import websocket from "@/websocket";
import matchWebsocket from "@/matchWebsocket"; import matchWebsocket from "@/matchWebsocket";
import {
getDeviceBatteryAPI
} from "@/apis";
import { import {
MESSAGETYPES MESSAGETYPES
} from "@/constants"; } from "@/constants";
@@ -27,7 +24,10 @@
} = storeToRefs(store); } = storeToRefs(store);
const { const {
updateUser, updateUser,
updateOnline, updateDeviceStatus,
setDeviceOnline,
clearDeviceStatus,
showDeviceChargingDialog,
clearSessionState, clearSessionState,
clearDevice clearDevice
} = store; } = store;
@@ -68,13 +68,19 @@
}); });
} }
async function emitUpdateOnline() { function emitUpdateOnline(nextOnline) {
const data = await getDeviceBatteryAPI();
const wasOnline = Boolean(online.value); const wasOnline = Boolean(online.value);
const nextOnline = Boolean(data.online); setDeviceOnline(nextOnline === true);
updateOnline(nextOnline); if (!device.value.deviceId || wasOnline === (nextOnline === true)) return;
if (!device.value.deviceId || wasOnline === nextOnline) return; audioManager.play(nextOnline === true ? "设备已连接" : "设备连接已断开");
audioManager.play(nextOnline ? "设备已连接" : "设备连接已断开"); }
function onDeviceStatusPush(status) {
updateDeviceStatus(status);
}
function onShootSocketDisconnected() {
clearDeviceStatus();
} }
function onDeviceBindInvalid() { function onDeviceBindInvalid() {
@@ -82,6 +88,10 @@
uni.setStorageSync("calibration", false); uni.setStorageSync("calibration", false);
} }
function onDeviceCharging() {
showDeviceChargingDialog();
}
function onDeviceShoot() { function onDeviceShoot() {
// audioManager.play("射箭声音") // audioManager.play("射箭声音")
} }
@@ -106,6 +116,10 @@
} }
function onShootWsMsg(content) { function onShootWsMsg(content) {
if (content?.event === "/addons/shoot/battery") {
onDeviceStatusPush(content.data);
return;
}
if(content.type === 'shoot-trigger'){ if(content.type === 'shoot-trigger'){
onDeviceShoot() onDeviceShoot()
} }
@@ -117,8 +131,10 @@
void audioManager.warmButton(); void audioManager.warmButton();
uni.$on("update-user", emitUpdateUser); uni.$on("update-user", emitUpdateUser);
uni.$on("update-online", emitUpdateOnline); uni.$on("update-online", emitUpdateOnline);
uni.$on("shoot-socket-disconnected", onShootSocketDisconnected);
uni.$on("session-kicked-out", onSessionKickedOut); uni.$on("session-kicked-out", onSessionKickedOut);
uni.$on("device-bind-invalid", onDeviceBindInvalid); uni.$on("device-bind-invalid", onDeviceBindInvalid);
uni.$on("device-charging", onDeviceCharging);
if (typeof uni.offNetworkStatusChange === "function") { if (typeof uni.offNetworkStatusChange === "function") {
uni.offNetworkStatusChange(onNetworkStatusChange); uni.offNetworkStatusChange(onNetworkStatusChange);
} }
@@ -142,14 +158,17 @@
onHide(() => { onHide(() => {
uni.$off("update-user", emitUpdateUser); uni.$off("update-user", emitUpdateUser);
uni.$off("update-online", emitUpdateOnline); uni.$off("update-online", emitUpdateOnline);
uni.$off("shoot-socket-disconnected", onShootSocketDisconnected);
uni.$off("session-kicked-out", onSessionKickedOut); uni.$off("session-kicked-out", onSessionKickedOut);
uni.$off("device-bind-invalid", onDeviceBindInvalid); uni.$off("device-bind-invalid", onDeviceBindInvalid);
uni.$off("device-charging", onDeviceCharging);
if (typeof uni.offNetworkStatusChange === "function") { if (typeof uni.offNetworkStatusChange === "function") {
uni.offNetworkStatusChange(onNetworkStatusChange); uni.offNetworkStatusChange(onNetworkStatusChange);
} }
matchWebsocket.closeMatchWebSocket({ matchWebsocket.closeMatchWebSocket({
reason: "app-hide" reason: "app-hide"
}); });
clearDeviceStatus();
websocket.closeWebSocket(); websocket.closeWebSocket();
}); });
</script> </script>
+155 -28
View File
@@ -26,8 +26,10 @@ try {
} }
const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot"); const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot");
const API_ROOT_URL = BASE_URL.replace(/\/api\/shoot$/, "");
// 统一处理业务接口请求,包含登录态、业务错误和特定接口空响应兼容。 // 统一处理业务接口请求,包含登录态、业务错误和特定接口空响应兼容。
function request(method, url, data = {}, baseUrl = BASE_URL) { function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0], options = {}) {
const {timeout = 10000, showErrorToast = true} = options;
const token = uni.getStorageSync( const token = uni.getStorageSync(
`${uni.getAccountInfoSync().miniProgram.envVersion}_token` `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
); );
@@ -39,8 +41,16 @@ function request(method, url, data = {}, baseUrl = BASE_URL) {
method, method,
header, header,
data, data,
timeout: 10000, timeout,
success: (res) => { success: (res) => {
if (
url === "/user/hardwareBox/connectWifi" &&
res.statusCode === 200 &&
typeof res.data?.success === "boolean"
) {
resolve(res.data);
return;
}
const acceptsEmptyResponse = [ const acceptsEmptyResponse = [
"/user/hardwareBox/connectWifi", "/user/hardwareBox/connectWifi",
"/user/device/unbindByQrcodeId", "/user/device/unbindByQrcodeId",
@@ -51,7 +61,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL) {
} }
if (res.data) { if (res.data) {
const {code, data, message} = res.data; const {code, data, message} = res.data;
if (code === 0) resolve(data); if (successCodes.includes(code)) resolve(data);
else if (message) { else if (message) {
const error = {code, data, message}; const error = {code, data, message};
if (message.indexOf("登录身份已失效") !== -1) { if (message.indexOf("登录身份已失效") !== -1) {
@@ -110,10 +120,12 @@ function request(method, url, data = {}, baseUrl = BASE_URL) {
icon: "none", icon: "none",
}); });
} }
uni.showToast({ if (showErrorToast) {
title: message, uni.showToast({
icon: "none", title: message,
}); icon: "none",
});
}
reject(error); reject(error);
return; return;
} }
@@ -121,7 +133,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL) {
} }
}, },
fail: (err) => { fail: (err) => {
handleRequestError(err, url); if (showErrorToast) handleRequestError(err, url);
reject(err); reject(err);
}, },
}); });
@@ -246,6 +258,12 @@ export const checkUserBindAPI = async (code) => {
}); });
}; };
export const tempBindOrgAPI = (scene) => {
return request("POST", "/user/org/device/tempBind", {
scene,
});
};
export const bindDeviceAPI = (device) => { export const bindDeviceAPI = (device) => {
return request("POST", "/user/device/bindDevice", { return request("POST", "/user/device/bindDevice", {
device, device,
@@ -274,6 +292,14 @@ export const getMyDevicesAPI = () => {
return request("GET", "/user/device/getBindings"); return request("GET", "/user/device/getBindings");
}; };
export const getDeviceDetailAPI = (deviceId) => {
return request("GET", `/user/device/getDetail?deviceId=${encodeURIComponent(deviceId)}`);
};
export const updateDeviceAliasAPI = (deviceId, alias) => {
return request("POST", "/user/device/updateAlias", {deviceId, alias});
};
export const createPractiseAPI = (arrows, time, target) => { export const createPractiseAPI = (arrows, time, target) => {
return request("POST", "/user/practice/create", { return request("POST", "/user/practice/create", {
shootNumber: arrows, shootNumber: arrows,
@@ -305,6 +331,13 @@ export const getPractiseAPI = async (id) => {
return request("GET", `/user/practice/get?id=${id}`); return request("GET", `/user/practice/get?id=${id}`);
}; };
export const getPractiseDetailAPI = async (id) => {
return request(
"GET",
`/user/practice/detail?id=${encodeURIComponent(id)}`
);
};
export const createRoomAPI = (gameType, teamSize, targetType) => { export const createRoomAPI = (gameType, teamSize, targetType) => {
return request("POST", "/user/createroom", { return request("POST", "/user/createroom", {
gameType, gameType,
@@ -338,12 +371,12 @@ 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) => { export const getPractiseResultListAPI = async (page = 1, pageSize = 15) => {
const reuslt = await request( const result = await request(
"GET", "GET",
`/user/practice/list?page=${page}&page_size=${page_size}` `/user/practice/mylist?page=${page}&pageSize=${pageSize}&status=0`
); );
return reuslt.list; return Array.isArray(result?.list) ? result.list : [];
}; };
export const matchGameAPI = (match, gameType, teamSize) => { export const matchGameAPI = (match, gameType, teamSize) => {
@@ -362,9 +395,11 @@ export const readyGameAPI = (battleId) => {
}); });
}; };
export const simulShootAPI = (device_id, x, y) => { export const simulShootAPI = (device_id, x, y, targetType = 40) => {
const data = { const data = {
device_id, device_id,
// 模拟射箭仅支持 20cm、40cm 靶纸,未传或传入无效值时默认使用 40cm。
targetType: Number(targetType) === 20 ? 20 : 40,
}; };
if (x !== undefined && y !== undefined) { if (x !== undefined && y !== undefined) {
data.x = x; data.x = x;
@@ -545,28 +580,32 @@ 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");
};
// 设备连接指定 WiFi,只下发 WiFi 凭证,不触发 OTA 升级。 // 设备连接指定 WiFi,只下发 WiFi 凭证,不触发 OTA 升级。
export const connectDeviceWifiAPI = async (ssid, password) => { export const connectDeviceWifiAPI = async (ssid, password) => {
return request("POST", "/user/hardwareBox/connectWifi", {ssid, password}); return request(
"POST",
"/user/hardwareBox/connectWifi",
{ssid, password},
BASE_URL,
[0],
{timeout: 20000, showErrorToast: false}
);
}; };
// 获取硬件盒子版本信息,用于判断当前设备是否需要 OTA 升级。 // 查询设备当前联网类型及已连接的 WiFi 名称。
export const getHardwareBoxVersionAPI = async () => { export const getDeviceWifiStatusAPI = async () => {
return request("GET", "/user/hardwareBox/version"); return request("GET", "/user/device/wifiStatus", {}, BASE_URL, [0], {
showErrorToast: false,
});
}; };
// 发送硬件盒子 OTA 更新指令,服务端会返回后续轮询使用的任务 ID。 // 发送硬件盒子 OTA 更新指令,服务端会返回后续轮询使用的任务 ID。
export const sendHardwareBoxUpdateAPI = async (data) => { export const sendHardwareBoxUpdateAPI = async ({versionNumber, wifiSsid, wifiPassword}) => {
return request("POST", "/user/hardwareBox/sendUpdate", data); return request("POST", "/user/hardwareBox/sendUpdate", {
}; versionNumber,
wifiSsid,
// 根据任务 ID 获取硬件盒子 OTA 更新状态。 wifiPassword,
export const getHardwareBoxTaskStatusAPI = async (taskId) => { });
return request("GET", `/user/hardwareBox/taskStatus?taskId=${taskId}`);
}; };
export const addNoteAPI = async (id, remark) => { export const addNoteAPI = async (id, remark) => {
@@ -685,3 +724,91 @@ export const getMyTenRingRank = (seasonId) => {
if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId; if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
return request("GET", "/index/myTenRingRank", data); return request("GET", "/index/myTenRingRank", data);
}; };
// 获取当前用户的金币统计,可按门店查询。
export const getMyGoldAPI = (storeId) => {
const data = {};
if (storeId !== undefined && storeId !== null) data.storeId = storeId;
return request("GET", "/index/gold/my", data);
};
// 分页获取当前用户的金币流水,type:1=获得,2=兑换。
export const getGoldLogAPI = ({page = 1, pageSize = 20, type, storeId} = {}) => {
const data = {page, pageSize};
if (type !== undefined && type !== null) data.type = type;
if (storeId !== undefined && storeId !== null) data.storeId = storeId;
return request("GET", "/index/gold/log", data);
};
// 前台礼品接口位于站点根路径,并使用 code=200 表示成功。
export const getGiftListAPI = ({
page = 1,
pageSize = 20,
sort = "coin_desc",
storeId,
} = {}) => {
const data = {page, page_size: pageSize, sort};
if (storeId !== undefined && storeId !== null && storeId !== "") {
data.store_id = storeId;
}
return request(
"GET",
"/gin/api/v1/gift/list",
data,
API_ROOT_URL,
[0, 200]
);
};
export const getGiftDetailAPI = (id) => {
return request(
"GET",
`/gin/api/v1/gift/${id}`,
{},
API_ROOT_URL,
[0, 200]
);
};
// 分页获取启用门店及当前用户在各店的会员状态。
export const getStoreVipListAPI = ({page = 1, pageSize = 20} = {}) => {
return request("GET", "/store/list", {page, pageSize});
};
// 查询当前用户在指定门店的会员状态及权益剩余次数。
export const getStoreBenefitAPI = (storeId) => {
return request("GET", "/store/benefit", {storeId});
};
// 获取体验中心 VIP 介绍纯文本,无需登录。
export const getStoreVipIntroAPI = () => {
return request("GET", "/store/vip-intro");
};
// 根据用户定位分页获取附近门店。
export const getNearbyStoresAPI = ({
longitude,
latitude,
radius = 65535,
page = 1,
pageSize = 20,
} = {}) => {
return request("GET", "/store/nearby", {
longitude,
latitude,
radius,
page,
pageSize,
});
};
// 分页获取指定门店的公开金币规则。
export const getStoreGoldRuleListAPI = ({storeId, page = 1, pageSize = 20} = {}) => {
return request(
"GET",
`/gin/api/v1/super-admin/gold-rule/store/${storeId}/list`,
{page, page_size: pageSize},
API_ROOT_URL,
[0, 200]
);
};
+243 -24
View File
@@ -1,5 +1,65 @@
export const AUDIO_INTERRUPTION_BEGIN_EVENT = "audio-interruption-begin"; export const AUDIO_INTERRUPTION_BEGIN_EVENT = "audio-interruption-begin";
export const AUDIO_INTERRUPTION_END_EVENT = "audio-interruption-end"; export const AUDIO_INTERRUPTION_END_EVENT = "audio-interruption-end";
export const RHYTHM_SHOOT_WINDOW_AUDIO_KEY = "请射箭";
export const STABILITY_START_AUDIO_KEY =
"请在计时结束时能量条达到标记区域";
export const STABILITY_ENERGY_50_AUDIO_KEY = "加油!到达50%啦";
export const STABILITY_ENERGY_70_AUDIO_KEY =
"70%啦!还差一点,胜利就在眼前";
const TRAINING_START_AUDIO_KEY_MAP = Object.freeze({
base: "请于计时前完成指定环数对应箭量",
endurance: "请于计时前完成累计环数和箭量",
precision: "请射箭命中高亮区域",
rhythm: "请在读条推进到标记区间内射箭",
stability: STABILITY_START_AUDIO_KEY,
});
export const getTrainingStartAudioKey = (trainingType, fallback = "") =>
TRAINING_START_AUDIO_KEY_MAP[trainingType] || fallback;
// 与服务端通关判定保持一致,proto3 省略的 false 同样按失败处理。
export const getTrainingEndAudioKey = (completed) =>
completed === true ? "通关成功" : "通关失败";
export const getPrecisionShotAudioKeys = (shootData, directionText = "") => {
if (!shootData || typeof shootData !== "object") return [];
const ring = Number(shootData.ring);
const directionAudioKey =
shootData.angle !== null &&
shootData.angle !== undefined &&
directionText
? `向${directionText}调整`
: "";
if (!Number.isFinite(ring) || ring <= 0) {
return ["未上靶", directionAudioKey].filter(Boolean);
}
// protobuf 的 false 可能不编码;只要不是明确命中,本箭就反馈未命中。
const hitAudioKey = shootData.ok === true ? "Bingo命中目标" : "未命中";
return [directionAudioKey, hitAudioKey].filter(Boolean);
};
export const getRhythmShotAudioKeys = (shootData) => {
if (!shootData || typeof shootData !== "object") return [];
const ring = Number(shootData.ring);
const ringAudioKey =
Number.isFinite(ring) && ring > 0
? `${shootData.ringX ? "X" : ring}环`
: "未上靶";
// 节奏训练是否达标完全由服务端 ok 字段决定,前端不根据环数复算。
return [ringAudioKey, shootData.ok === true ? "Perfect" : "miss"];
};
export const getStabilityShotAudioKeys = (shootData) => {
if (!shootData || typeof shootData !== "object") return [];
const ring = Number(shootData.ring);
const ringAudioKey =
Number.isFinite(ring) && ring > 0
? `${shootData.ringX ? "X" : ring}环`
: "未上靶";
return [ringAudioKey];
};
export const audioFils = { export const audioFils = {
tententen: "https://static.shelingxingqiu.com/shootmini/static/audio/tententen.mp3", tententen: "https://static.shelingxingqiu.com/shootmini/static/audio/tententen.mp3",
@@ -20,6 +80,22 @@ export const audioFils = {
"https://static.shelingxingqiu.com/attachment/2025-09-17/dcutwrda0amn5kqr4j.mp3", "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutwrda0amn5kqr4j.mp3",
距离不足: 距离不足:
"https://static.shelingxingqiu.com/attachment/2025-11-12/de6hr2faw28t0ianh0.mp3", "https://static.shelingxingqiu.com/attachment/2025-11-12/de6hr2faw28t0ianh0.mp3",
"靶纸不符!请更换靶纸":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E9%9D%B6%E7%BA%B8%E4%B8%8D%E7%AC%A6%EF%BC%81%E8%AF%B7%E6%9B%B4%E6%8D%A2%E9%9D%B6%E7%BA%B8.MP3",
"站距与靶纸合格":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E7%AB%99%E8%B7%9D%E4%B8%8E%E9%9D%B6%E7%BA%B8%E5%90%88%E6%A0%BC.MP3",
"请射箭!测试站距与靶纸":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E8%AF%B7%E5%B0%84%E7%AE%AD%EF%BC%81%E6%B5%8B%E8%AF%95%E7%AB%99%E8%B7%9D%E4%B8%8E%E9%9D%B6%E7%BA%B8.MP3",
"站距过近,靶纸正确":
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E7%AB%99%E8%B7%9D%E8%BF%87%E8%BF%91%EF%BC%8C%E9%9D%B6%E7%BA%B8%E6%AD%A3%E7%A1%AE.MP3",
"站距过近,靶纸错误":
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E7%AB%99%E8%B7%9D%E8%BF%87%E8%BF%91%EF%BC%8C%E9%9D%B6%E7%BA%B8%E9%94%99%E8%AF%AF.MP3",
"站距合格,靶纸正确":
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E7%AB%99%E8%B7%9D%E5%90%88%E6%A0%BC%EF%BC%8C%E9%9D%B6%E7%BA%B8%E6%AD%A3%E7%A1%AE.MP3",
"站距合格,靶纸错误":
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E7%AB%99%E8%B7%9D%E5%90%88%E6%A0%BC%EF%BC%8C%E9%9D%B6%E7%BA%B8%E9%94%99%E8%AF%AF.MP3",
"未识别到靶纸,请瞄准靶纸射箭":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E6%9C%AA%E8%AF%86%E5%88%AB%E5%88%B0%E9%9D%B6%E7%BA%B8%EF%BC%8C%E8%AF%B7%E7%9E%84%E5%87%86%E9%9D%B6%E7%BA%B8%E5%B0%84%E7%AE%AD.MP3",
"未发现靶纸,请瞄准靶纸射箭": "未发现靶纸,请瞄准靶纸射箭":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E6%9C%AA%E5%8F%91%E7%8E%B0%E9%9D%B6%E7%BA%B8%EF%BC%8C%E8%AF%B7%E7%9E%84%E5%87%86%E9%9D%B6%E7%BA%B8%E5%B0%84%E7%AE%AD.MP3", "https://static.shelingxingqiu.com/shootmini/static/audio/%E6%9C%AA%E5%8F%91%E7%8E%B0%E9%9D%B6%E7%BA%B8%EF%BC%8C%E8%AF%B7%E7%9E%84%E5%87%86%E9%9D%B6%E7%BA%B8%E5%B0%84%E7%AE%AD.MP3",
轮到你了: 轮到你了:
@@ -52,6 +128,14 @@ export const audioFils = {
"https://static.shelingxingqiu.com/attachment/2025-09-17/dcutzdrl5u0iromqhf.mp3", "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutzdrl5u0iromqhf.mp3",
射击无效: 射击无效:
"https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%E6%A3%80%E6%9F%A5%E8%B7%9D%E7%A6%BB%E5%92%8C%E9%9D%B6%E7%BA%B8.mp3", "https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%E6%A3%80%E6%9F%A5%E8%B7%9D%E7%A6%BB%E5%92%8C%E9%9D%B6%E7%BA%B8.mp3",
"射箭无效,距离不足":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E8%B7%9D%E7%A6%BB%E4%B8%8D%E8%B6%B3.MP3",
"射箭无效,距离不足且靶纸错误":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E8%B7%9D%E7%A6%BB%E4%B8%8D%E8%B6%B3%E4%B8%94%E9%9D%B6%E7%BA%B8%E9%94%99%E8%AF%AF.MP3",
"射箭无效,未识别到靶纸":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E6%9C%AA%E8%AF%86%E5%88%AB%E5%88%B0%E9%9D%B6%E7%BA%B8.MP3",
"射箭无效,靶纸错误":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E9%9D%B6%E7%BA%B8%E9%94%99%E8%AF%AF.mp3.MP3",
未上靶: 未上靶:
"https://static.shelingxingqiu.com/attachment/2025-11-12/de6n45o3tsm1v4unam.mp3", "https://static.shelingxingqiu.com/attachment/2025-11-12/de6n45o3tsm1v4unam.mp3",
"1环": "1环":
@@ -95,8 +179,36 @@ export const audioFils = {
"https://static.shelingxingqiu.com/attachment/2025-11-13/de7kzzllq0futwynso.mp3", "https://static.shelingxingqiu.com/attachment/2025-11-13/de7kzzllq0futwynso.mp3",
练习开始: 练习开始:
"https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3", "https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3",
[STABILITY_START_AUDIO_KEY]:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E5%9C%A8%E8%AE%A1%E6%97%B6%E7%BB%93%E6%9D%9F%E6%97%B6%E8%83%BD%E9%87%8F%E6%9D%A1%E8%BE%BE%E5%88%B0%E6%A0%87%E8%AE%B0%E5%8C%BA%E5%9F%9F.MP3",
[STABILITY_ENERGY_50_AUDIO_KEY]:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E5%8A%A0%E6%B2%B9%EF%BC%81%E5%88%B0%E8%BE%BE50%25%E5%95%A6.MP3",
[STABILITY_ENERGY_70_AUDIO_KEY]:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/70%25%E5%95%A6%EF%BC%81%E8%BF%98%E5%B7%AE%E4%B8%80%E7%82%B9%EF%BC%8C%E8%83%9C%E5%88%A9%E5%B0%B1%E5%9C%A8%E7%9C%BC%E5%89%8D.MP3",
请于计时前完成指定环数对应箭量:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E4%BA%8E%E8%AE%A1%E6%97%B6%E5%89%8D%E5%AE%8C%E6%88%90%E6%8C%87%E5%AE%9A%E7%8E%AF%E6%95%B0%E5%AF%B9%E5%BA%94%E7%AE%AD%E9%87%8F.MP3",
请于计时前完成累计环数和箭量:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E4%BA%8E%E8%AE%A1%E6%97%B6%E5%89%8D%E5%AE%8C%E6%88%90%E7%B4%AF%E8%AE%A1%E7%8E%AF%E6%95%B0%E5%92%8C%E7%AE%AD%E9%87%8F.MP3",
请射箭命中高亮区域:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E5%B0%84%E7%AE%AD%E5%91%BD%E4%B8%AD%E9%AB%98%E4%BA%AE%E5%8C%BA%E5%9F%9F.MP3",
请在读条推进到标记区间内射箭:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E5%9C%A8%E8%AF%BB%E6%9D%A1%E6%8E%A8%E8%BF%9B%E5%88%B0%E6%A0%87%E8%AE%B0%E5%8C%BA%E9%97%B4%E5%86%85%E5%B0%84%E7%AE%AD.MP3",
[RHYTHM_SHOOT_WINDOW_AUDIO_KEY]:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E5%B0%84%E7%AE%AD.MP3",
Perfect:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/Perfect.MP3",
miss:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/miss.MP3",
Bingo命中目标:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/Bingo%E5%91%BD%E4%B8%AD%E7%9B%AE%E6%A0%87.MP3",
未命中:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E6%9C%AA%E5%91%BD%E4%B8%AD.MP3",
练习结束: 练习结束:
"https://static.shelingxingqiu.com/shootmini/static/audio/%E7%BB%83%E4%B9%A0%E7%BB%93%E6%9D%9F.mp3", "https://static.shelingxingqiu.com/shootmini/static/audio/%E7%BB%83%E4%B9%A0%E7%BB%93%E6%9D%9F.mp3",
通关成功:
"https://static.shelingxingqiu.com/shootaudio/%E9%80%9A%E5%85%B3%E6%88%90%E5%8A%9F.mp3",
通关失败:
"https://static.shelingxingqiu.com/shootaudio/%E9%80%9A%E5%85%B3%E5%A4%B1%E8%B4%A5.mp3",
射箭声音: 射箭声音:
"https://static.shelingxingqiu.com/shootaudio/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3", "https://static.shelingxingqiu.com/shootaudio/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3",
命中: 命中:
@@ -106,6 +218,8 @@ export const audioFils = {
const AUDIO_LOAD_TIMEOUT_MS = 5000; const AUDIO_LOAD_TIMEOUT_MS = 5000;
const AUDIO_WARM_CONCURRENCY = 3; const AUDIO_WARM_CONCURRENCY = 3;
const AUDIO_WARM_RETRIES = 1; const AUDIO_WARM_RETRIES = 1;
const AUDIO_INSTANCE_LIMIT = 24;
const AUDIO_QUEUE_COMPACT_THRESHOLD = 12;
const AUDIO_WARM_PRIORITY_KEYS = [ const AUDIO_WARM_PRIORITY_KEYS = [
"点击按钮", "点击按钮",
"设备连接已断开", "设备连接已断开",
@@ -117,14 +231,22 @@ const AUDIO_WARM_PRIORITY_KEYS = [
"轮到你了", "轮到你了",
"比赛结束", "比赛结束",
"射击无效", "射击无效",
"射箭无效,距离不足",
"射箭无效,距离不足且靶纸错误",
"射箭无效,未识别到靶纸",
"射箭无效,靶纸错误",
"请射箭!测试站距与靶纸",
"站距过近,靶纸正确",
"站距过近,靶纸错误",
"站距合格,靶纸正确",
"站距合格,靶纸错误",
"未识别到靶纸,请瞄准靶纸射箭",
"中场休息", "中场休息",
"下半场开始", "下半场开始",
"决金箭轮", "决金箭轮",
"请蓝方射箭", "请蓝方射箭",
"请红方射箭", "请红方射箭",
"距离合格", "距离合格",
"距离不足",
"未发现靶纸,请瞄准靶纸射箭",
"未上靶", "未上靶",
"X环", "X环",
]; ];
@@ -153,6 +275,8 @@ class AudioManager {
this.loadingKeyPromises = new Map(); this.loadingKeyPromises = new Map();
this.pendingPlayKeys = new Set(); this.pendingPlayKeys = new Set();
this.cacheWritePromises = new Map(); this.cacheWritePromises = new Map();
this.audioLastUsedAt = new Map();
this.warmPriorityPromise = null;
this.warmAllPromise = null; this.warmAllPromise = null;
// 连续播放队列相关属性 // 连续播放队列相关属性
@@ -244,14 +368,74 @@ class AudioManager {
} }
getWarmupKeys() { getWarmupKeys() {
return Array.from( return Array.from(new Set(AUDIO_WARM_PRIORITY_KEYS));
new Set([...AUDIO_WARM_PRIORITY_KEYS, ...Object.keys(audioFils)]) }
);
getAllAudioKeys() {
return Object.keys(audioFils);
}
touchAudioKey(key) {
this.audioLastUsedAt.set(key, Date.now());
}
destroyAudioInstance(key) {
const audio = this.audioMap.get(key);
if (!audio) return false;
this.clearPlayWatchdog(key);
this.audioMap.delete(key);
this.readyMap.delete(key);
this.allowPlayMap.delete(key);
this.audioLastUsedAt.delete(key);
try {
audio.destroy();
} catch (_) {}
// destroy 可能同步触发 onStop,最后再清一次对应状态。
this.allowPlayMap.delete(key);
return true;
}
pruneAudioInstances(preserveKey) {
while (this.audioMap.size >= AUDIO_INSTANCE_LIMIT) {
const candidate = Array.from(this.audioMap.keys())
.filter(
(key) =>
key !== preserveKey &&
key !== this.currentPlayingKey &&
!this.loadingKeyPromises.has(key)
)
.sort(
(left, right) =>
(this.audioLastUsedAt.get(left) || 0) -
(this.audioLastUsedAt.get(right) || 0)
)[0];
if (!candidate || !this.destroyAudioInstance(candidate)) return;
}
}
compactSequenceQueue(force = false) {
if (!this.isSequenceRunning || this.sequenceIndex <= 0) return;
if (!force && this.sequenceIndex < AUDIO_QUEUE_COMPACT_THRESHOLD) return;
this.sequenceQueue = this.sequenceQueue.slice(this.sequenceIndex);
this.sequenceIndex = 0;
}
getRuntimeStats() {
return {
audioInstanceCount: this.audioMap.size,
loadingAudioCount: this.loadingKeyPromises.size,
pendingPlayCount: this.pendingPlayKeys.size,
sequenceQueueLength: this.isSequenceRunning
? Math.max(this.sequenceQueue.length - this.sequenceIndex, 0)
: 0,
};
} }
ensureAudio(key) { ensureAudio(key) {
if (!audioFils[key]) return Promise.resolve(false); if (!audioFils[key]) return Promise.resolve(false);
if (this.readyMap.get(key) && this.audioMap.has(key)) { if (this.readyMap.get(key) && this.audioMap.has(key)) {
this.touchAudioKey(key);
return Promise.resolve(true); return Promise.resolve(true);
} }
@@ -303,23 +487,39 @@ class AudioManager {
return this.warmKeys(["点击按钮"], { concurrency: 1, retries: 1 }); return this.warmKeys(["点击按钮"], { concurrency: 1, retries: 1 });
} }
warmAll() { warmCommon() {
if (this.warmAllPromise) return this.warmAllPromise; if (this.warmPriorityPromise) return this.warmPriorityPromise;
debugLog("开始后台分级预热全部语音"); debugLog("开始后台预热常用语音");
this.isLoading = true; this.isLoading = true;
this.warmAllPromise = this.warmKeys(this.getWarmupKeys()) this.warmPriorityPromise = this.warmKeys(this.getWarmupKeys())
.catch((error) => { .catch((error) => {
debugLog("后台语音预热异常", error); debugLog("常用语音预热异常", error);
}) })
.finally(() => { .finally(() => {
this.isLoading = false; this.isLoading = false;
debugLog("后台语音预热结束", this.getLoadProgress()); debugLog("常用语音预热结束", this.getRuntimeStats());
});
return this.warmPriorityPromise;
}
warmAll() {
if (this.warmAllPromise) return this.warmAllPromise;
debugLog("音频测试页开始遍历全部语音");
this.isLoading = true;
this.warmAllPromise = this.warmKeys(this.getAllAudioKeys())
.catch((error) => {
debugLog("全部语音遍历异常", error);
})
.finally(() => {
this.isLoading = false;
debugLog("全部语音遍历结束", this.getRuntimeStats());
}); });
return this.warmAllPromise; return this.warmAllPromise;
} }
// 保留旧入口兼容测试页或其他历史调用,实际行为改为非阻塞后台预热。 // 音频测试页保留全量遍历;实例池会及时淘汰旧实例,避免同时常驻全部语音。
initAudios() { initAudios() {
return this.warmAll(); return this.warmAll();
} }
@@ -357,6 +557,7 @@ class AudioManager {
return; return;
} }
this.pruneAudioInstances(key);
const audio = uni.createInnerAudioContext(); const audio = uni.createInnerAudioContext();
audio.autoplay = false; audio.autoplay = false;
try { try {
@@ -368,6 +569,7 @@ class AudioManager {
} catch (_) {} } catch (_) {}
this.allowPlayMap.set(key, false); this.allowPlayMap.set(key, false);
audio.onPlay(() => { audio.onPlay(() => {
if (this.audioMap.get(key) !== audio) return;
if (!this.allowPlayMap.get(key)) { if (!this.allowPlayMap.get(key)) {
try { try {
audio.stop(); audio.stop();
@@ -405,6 +607,7 @@ class AudioManager {
} }
this.readyMap.set(key, false); this.readyMap.set(key, false);
this.audioMap.delete(key); this.audioMap.delete(key);
this.audioLastUsedAt.delete(key);
try { try {
audio.destroy(); audio.destroy();
} catch (_) {} } catch (_) {}
@@ -437,6 +640,7 @@ class AudioManager {
if (!isCurrentGeneration()) { if (!isCurrentGeneration()) {
clearLoadTimeout(); clearLoadTimeout();
this.audioMap.delete(key); this.audioMap.delete(key);
this.audioLastUsedAt.delete(key);
try { try {
audio.destroy(); audio.destroy();
} catch (_) {} } catch (_) {}
@@ -471,6 +675,7 @@ class AudioManager {
}); });
audio.onEnded(() => { audio.onEnded(() => {
if (this.audioMap.get(key) !== audio) return;
this.finishPlayback(key, { this.finishPlayback(key, {
advanceSequence: true, advanceSequence: true,
emitEnded: true, emitEnded: true,
@@ -478,10 +683,12 @@ class AudioManager {
}); });
audio.onStop(() => { audio.onStop(() => {
if (this.audioMap.get(key) !== audio) return;
this.finishPlayback(key); this.finishPlayback(key);
}); });
this.audioMap.set(key, audio); this.audioMap.set(key, audio);
this.touchAudioKey(key);
audio.src = realSrc; audio.src = realSrc;
}; };
@@ -691,14 +898,7 @@ class AudioManager {
const loadingPromise = this.loadingKeyPromises.get(key); const loadingPromise = this.loadingKeyPromises.get(key);
if (loadingPromise) return loadingPromise; if (loadingPromise) return loadingPromise;
this.clearPlayWatchdog(key); this.destroyAudioInstance(key);
const oldAudio = this.audioMap.get(key);
if (oldAudio) {
try {
oldAudio.destroy();
} catch (_) {}
}
this.audioMap.delete(key);
this.readyMap.set(key, false); this.readyMap.set(key, false);
return this.ensureAudio(key); return this.ensureAudio(key);
} }
@@ -745,7 +945,8 @@ class AudioManager {
// 不打断当前播放:把新的队列加入到序列中,等待当前播放结束后衔接 // 不打断当前播放:把新的队列加入到序列中,等待当前播放结束后衔接
if (this.currentPlayingKey) { if (this.currentPlayingKey) {
if (this.isSequenceRunning) { if (this.isSequenceRunning) {
// 已有序列在跑:直接追加 // 已有序列在跑:先移除已消费前缀,再追加待播语音。
this.compactSequenceQueue(true);
this.sequenceQueue = this.sequenceQueue.concat(queue); this.sequenceQueue = this.sequenceQueue.concat(queue);
} else { } else {
// 没有序列但当前有正在播放的:以当前为序列的起点 // 没有序列但当前有正在播放的:以当前为序列的起点
@@ -754,6 +955,17 @@ class AudioManager {
this.sequenceIndex = 0; this.sequenceIndex = 0;
// 不触发 _playSingle,等待当前音频自然结束后由 onAudioEnded 接管 // 不触发 _playSingle,等待当前音频自然结束后由 onAudioEnded 接管
} }
} else if (
this.isSequenceRunning &&
this.sequenceQueue[this.sequenceIndex]
) {
// 当前队首正在按需加载时只追加,不能覆盖已经排队的语音。
this.compactSequenceQueue(true);
this.sequenceQueue = this.sequenceQueue.concat(queue);
const pendingKey = this.sequenceQueue[this.sequenceIndex];
if (!this.pendingPlayKeys.has(pendingKey)) {
this._playSingle(pendingKey, false);
}
} else { } else {
// 当前没有播放:直接启动新的序列 // 当前没有播放:直接启动新的序列
this.sequenceQueue = queue; this.sequenceQueue = queue;
@@ -860,6 +1072,7 @@ class AudioManager {
this.currentPlayingKey = key; this.currentPlayingKey = key;
this.lastPlayKey = key; this.lastPlayKey = key;
this.lastPlayAt = Date.now(); this.lastPlayAt = Date.now();
this.touchAudioKey(key);
this.startPlayWatchdog(key); this.startPlayWatchdog(key);
} else { } else {
debugLog(`音频 ${key} 尚未就绪,按需加载后播放...`); debugLog(`音频 ${key} 尚未就绪,按需加载后播放...`);
@@ -876,7 +1089,8 @@ class AudioManager {
const nextIndex = this.sequenceIndex + 1; const nextIndex = this.sequenceIndex + 1;
if (nextIndex < this.sequenceQueue.length) { if (nextIndex < this.sequenceQueue.length) {
this.sequenceIndex = nextIndex; this.sequenceIndex = nextIndex;
const nextKey = this.sequenceQueue[nextIndex]; this.compactSequenceQueue();
const nextKey = this.sequenceQueue[this.sequenceIndex];
this._playSingle(nextKey, false); this._playSingle(nextKey, false);
} else { } else {
// 队列播放完成 // 队列播放完成
@@ -960,6 +1174,7 @@ class AudioManager {
reloadAll() { reloadAll() {
debugLog("执行 reloadAll: 重置音频实例并后台恢复"); debugLog("执行 reloadAll: 重置音频实例并后台恢复");
const shouldWarmAll = this.warmAllPromise !== null; const shouldWarmAll = this.warmAllPromise !== null;
const shouldWarmPriority = this.warmPriorityPromise !== null;
this.loadGeneration += 1; this.loadGeneration += 1;
// 1. 停止所有播放 // 1. 停止所有播放
@@ -972,6 +1187,7 @@ class AudioManager {
} catch (_) {} } catch (_) {}
} }
this.audioMap.clear(); this.audioMap.clear();
this.audioLastUsedAt.clear();
// 3. 重置状态 // 3. 重置状态
this.readyMap.clear(); this.readyMap.clear();
@@ -990,10 +1206,13 @@ class AudioManager {
// 4. 重置后台预热状态 // 4. 重置后台预热状态
this.isLoading = false; this.isLoading = false;
this.warmPriorityPromise = null;
this.warmAllPromise = null; this.warmAllPromise = null;
// 5. 之前已启动过全量预热则继续全量恢复,否则只恢复按钮音效。 // 5. 按中断前使用范围恢复,产品页不再全量创建语音实例。
return shouldWarmAll ? this.warmAll() : this.warmButton(); if (shouldWarmAll) return this.warmAll();
if (shouldWarmPriority) return this.warmCommon();
return this.warmButton();
} }
} }
+10 -13
View File
@@ -451,7 +451,7 @@ export const generateShareImage = async (canvasId, data) => {
hasPoint ? 756 : 402 hasPoint ? 756 : 402
); );
renderText(ctx, "扫码打卡", 13, "#FFA118", 142, hasPoint ? 777 : 422); renderText(ctx, "扫码打卡", 13, "#FFA118", 142, hasPoint ? 777 : 422);
const pointImg = await loadCanvasImage(canvas, "../static/point.png"); const pointImg = await loadCanvasImage(canvas, "https://static.shelingxingqiu.com/shootmini/static/point.png");
ctx.drawImage(pointImg, 120, hasPoint ? 765 : 410, 18, 14); ctx.drawImage(pointImg, 120, hasPoint ? 765 : 410, 18, 14);
// 2D 即时绘制,无需 ctx.draw() // 2D 即时绘制,无需 ctx.draw()
} catch (e) { } catch (e) {
@@ -635,7 +635,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
); );
} else { } else {
ctx.drawImage( ctx.drawImage(
"/static/score-bg.png", "https://static.shelingxingqiu.com/shootmini/static/score-bg.png",
16 + (i % 9) * 30, 16 + (i % 9) * 30,
290 + Math.ceil((i + 1) / 9) * 30, 290 + Math.ceil((i + 1) / 9) * 30,
27, 27,
@@ -657,7 +657,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
ctx.drawImage(bgImg, 24 + rowIndex * 42, i > 5 ? 362 : 320, 38, 38); ctx.drawImage(bgImg, 24 + rowIndex * 42, i > 5 ? 362 : 320, 38, 38);
} else { } else {
ctx.drawImage( ctx.drawImage(
"/static/score-bg.png", "https://static.shelingxingqiu.com/shootmini/static/score-bg.png",
24 + rowIndex * 42, 24 + rowIndex * 42,
i > 5 ? 362 : 320, i > 5 ? 362 : 320,
38, 38,
@@ -708,10 +708,7 @@ export async function sharePractiseData(canvasId, type, user, data) {
// 头像与段位框属于装饰图片,缺失时使用兜底或跳过,避免阻断分享。 // 头像与段位框属于装饰图片,缺失时使用兜底或跳过,避免阻断分享。
const loadProfileImage = async (src, fallbackSrc = "", label = "") => { const loadProfileImage = async (src, fallbackSrc = "", label = "") => {
const normalizedSrc = const normalizedSrc = typeof src === "string" ? src : "";
typeof src === "string" && src.startsWith("../static/")
? src.slice(2)
: src;
if (normalizedSrc) { if (normalizedSrc) {
try { try {
const path = await loadImage(normalizedSrc); const path = await loadImage(normalizedSrc);
@@ -725,20 +722,20 @@ export async function sharePractiseData(canvasId, type, user, data) {
const avatarImgPromise = loadProfileImage( const avatarImgPromise = loadProfileImage(
user?.avatar, user?.avatar,
"/static/user-icon.png", "https://static.shelingxingqiu.com/shootmini/static/user-icon.png",
"avatar" "avatar"
); );
const lvlImgPromise = loadProfileImage(user?.lvlImage, "", "level"); const lvlImgPromise = loadProfileImage(user?.lvlImage, "", "level");
let titleImageSrc = "/static/first-try-title.png"; let titleImageSrc = "https://static.shelingxingqiu.com/shootmini/static/first-try-title.png";
if (type == 2) { if (type == 2) {
titleImageSrc = "/static/practise-one-title.png"; titleImageSrc = "https://static.shelingxingqiu.com/shootmini/static/practise-one-title.png";
} else if (type == 3) { } else if (type == 3) {
titleImageSrc = "/static/practise-two-title.png"; titleImageSrc = "https://static.shelingxingqiu.com/shootmini/static/practise-two-title.png";
} }
const titleImgPromise = loadCanvasImage(canvas, titleImageSrc); const titleImgPromise = loadCanvasImage(canvas, titleImageSrc);
const scoreBgImgPromise = loadCanvasImage(canvas, "/static/score-bg.png"); const scoreBgImgPromise = loadCanvasImage(canvas, "https://static.shelingxingqiu.com/shootmini/static/score-bg.png");
const qrCodeImgPromise = loadCanvasImage(canvas, "/static/qr-code.png"); const qrCodeImgPromise = loadCanvasImage(canvas, "https://static.shelingxingqiu.com/shootmini/static/qr-code.png");
const [avatarImg, lvlImg, titleImg, scoreBgImg, qrCodeImg] = const [avatarImg, lvlImg, titleImg, scoreBgImg, qrCodeImg] =
await Promise.all([ await Promise.all([
+7
View File
@@ -81,6 +81,13 @@ const props = defineProps({
src="https://static.shelingxingqiu.com/shootmini/static/app-bg9.png" src="https://static.shelingxingqiu.com/shootmini/static/app-bg9.png"
mode="widthFix" mode="widthFix"
/> />
<!-- 我的设备未绑定/绑定成功页面背景 -->
<image
class="bg-image"
v-if="type === 12"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/my-device-unbound-background.png"
mode="widthFix"
/>
<image <image
class="bg-image" class="bg-image"
v-if="type === 10" v-if="type === 10"
+8 -4
View File
@@ -1,15 +1,19 @@
<script setup> <script setup>
const tabs = [ const tabs = [
{ image: "../static/tab-vip.png" }, { image: "https://static.shelingxingqiu.com/shootmini/static/tab-vip.png" },
{ image: "https://static.shelingxingqiu.com/shootmini/static/tab-point-book.png" }, { image: "https://static.shelingxingqiu.com/shootmini/static/tab-point-book.png" },
{ image: "https://static.shelingxingqiu.com/shootmini/static/tab-mall.png" }, { image: "https://static.shelingxingqiu.com/shootmini/static/tab-mall.png" },
]; ];
function handleTabClick(index) { function handleTabClick(index) {
if (index === 0) { if (index === 0) {
uni.navigateTo({ uni.showToast({
url: "/pages/member/be-vip", title: "功能尚未开启",
icon: "none",
}); });
// uni.navigateTo({
// url: "/pages/member/be-vip",
// });
} }
if (index === 1) { if (index === 1) {
uni.navigateTo({ uni.navigateTo({
@@ -18,7 +22,7 @@ function handleTabClick(index) {
} }
if (index === 2) { if (index === 2) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/device-intro", url: "/pages/device/device-intro",
}); });
} }
} }
+4 -4
View File
@@ -77,25 +77,25 @@ watch(
/> />
<image <image
v-if="rank === 1" v-if="rank === 1"
src="../static/champ1.png" src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<image <image
v-if="rank === 2" v-if="rank === 2"
src="../static/champ2.png" src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<image <image
v-if="rank === 3" v-if="rank === 3"
src="../static/champ3.png" src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<view v-if="rank > 3" class="rank-view">{{ rank }}</view> <view v-if="rank > 3" class="rank-view">{{ rank }}</view>
<image <image
:src="src || '../static/user-icon.png'" :src="src || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
:mode="imageMode" :mode="imageMode"
:style="avatarImageStyle" :style="avatarImageStyle"
class="avatar-image" class="avatar-image"
+1 -1
View File
@@ -104,7 +104,7 @@ onBeforeUnmount(() => {
<block v-else-if="game.roomID"> <block v-else-if="game.roomID">
<text>返回房间</text> <text>返回房间</text>
</block> </block>
<image src="../static/back.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view> </view>
</template> </template>
+2 -2
View File
@@ -72,7 +72,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
</view> </view>
<image <image
v-if="winner === 1" v-if="winner === 1"
src="../static/winner-badge.png" src="https://static.shelingxingqiu.com/shootmini/static/winner-badge.png"
mode="widthFix" mode="widthFix"
class="left-winner-badge" class="left-winner-badge"
/> />
@@ -100,7 +100,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
</view> </view>
<image <image
v-if="winner === 2" v-if="winner === 2"
src="../static/winner-badge.png" src="https://static.shelingxingqiu.com/shootmini/static/winner-badge.png"
mode="widthFix" mode="widthFix"
class="right-winner-badge" class="right-winner-badge"
/> />
+1 -1
View File
@@ -58,7 +58,7 @@ const props = defineProps({
</view> </view>
</view> </view>
<view @click="onClose"> <view @click="onClose">
<image src="../static/close-white.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</view> </view>
</view> </view>
<view :style="{ width: '100%', marginBottom: '20px' }"> <view :style="{ width: '100%', marginBottom: '20px' }">
+6 -19
View File
@@ -1,28 +1,15 @@
<script setup> <script setup>
import { ref, onMounted, onBeforeUnmount } from "vue"; import useStore from "@/store";
import { getDeviceBatteryAPI } from "@/apis"; import { storeToRefs } from "pinia";
const power = ref(0); const store = useStore();
const timer = ref(null); const { deviceBattery: power } = storeToRefs(store);
onMounted(async () => {
const data = await getDeviceBatteryAPI();
power.value = data.battery;
timer.value = setInterval(async () => {
const data = await getDeviceBatteryAPI();
power.value = data.battery;
}, 1000 * 10);
});
onBeforeUnmount(() => {
clearInterval(timer.value);
});
</script> </script>
<template> <template>
<view class="container"> <view class="container">
<image src="../static/b-power.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/b-power.png" mode="widthFix" />
<view>电量{{ power || 1 }}%</view> <view>{{ power === null ? "电量--" : `电量${power}%` }}</view>
</view> </view>
</template> </template>
+29 -8
View File
@@ -51,6 +51,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
targetType: {
type: [Number, String],
default: 40,
},
targetRadius: { targetRadius: {
type: Number, type: Number,
default: 20, default: 20,
@@ -67,6 +71,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
enableShotEffect: {
type: Boolean,
default: true,
},
}); });
const pMode = ref(true); const pMode = ref(true);
@@ -113,7 +121,13 @@ function hasShotPoint(shot) {
} }
function shouldPlayShotEffect(shot) { function shouldPlayShotEffect(shot) {
return props.isSvip && !!shot && Number(shot.ring) > 0 && hasShotPoint(shot); return (
props.enableShotEffect &&
props.isSvip &&
!!shot &&
Number(shot.ring) > 0 &&
hasShotPoint(shot)
);
} }
function clearTipTimer() { function clearTipTimer() {
@@ -276,7 +290,7 @@ watch(
const latestShot = props.scores[newLen - 1]; const latestShot = props.scores[newLen - 1];
if (shouldPlayShotEffect(latestShot)) { if (shouldPlayShotEffect(latestShot)) {
void prepareShotEffect("red", latestShot, newLen - 1); void prepareShotEffect("red", latestShot, newLen - 1);
} else { } else if (props.enableShotEffect) {
shotEffectRequestGeneration += 1; shotEffectRequestGeneration += 1;
pendingShotEffect.value = null; pendingShotEffect.value = null;
showShotTip("red", latestShot); showShotTip("red", latestShot);
@@ -301,7 +315,7 @@ watch(
const latestShot = props.blueScores[newLen - 1]; const latestShot = props.blueScores[newLen - 1];
if (shouldPlayShotEffect(latestShot)) { if (shouldPlayShotEffect(latestShot)) {
void prepareShotEffect("blue", latestShot, newLen - 1); void prepareShotEffect("blue", latestShot, newLen - 1);
} else { } else if (props.enableShotEffect) {
shotEffectRequestGeneration += 1; shotEffectRequestGeneration += 1;
pendingShotEffect.value = null; pendingShotEffect.value = null;
showShotTip("blue", latestShot); showShotTip("blue", latestShot);
@@ -416,12 +430,19 @@ function getExperienceTipStyle(shot) {
); );
} }
const simulShoot = async () => { const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId); if (device.value.deviceId) {
await simulShootAPI(
device.value.deviceId,
undefined,
undefined,
props.targetType
);
}
}; };
const simulShoot2 = async () => { const simulShoot2 = async () => {
if (device.value.deviceId) { if (device.value.deviceId) {
const r1 = Math.random() > 0.5 ? 0.01 : 0.02; const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
await simulShootAPI(device.value.deviceId, r1, r1); await simulShootAPI(device.value.deviceId, r1, r1, props.targetType);
} }
}; };
@@ -506,7 +527,7 @@ onBeforeUnmount(() => {
<view :class="['target', { 'target--shake': targetShaking }]"> <view :class="['target', { 'target--shake': targetShaking }]">
<view v-if="angle !== null" class="arrow-dir" :style="arrowStyle"> <view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
<view :style="{ background: circleColor }"> <view :style="{ background: circleColor }">
<image src="../static/dot-circle.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/dot-circle.png" mode="widthFix" />
</view> </view>
</view> </view>
<view v-if="stop" class="stop-sign">中场休息</view> <view v-if="stop" class="stop-sign">中场休息</view>
@@ -544,7 +565,7 @@ onBeforeUnmount(() => {
<image <image
v-if="pMode && isSvip && bow.ring > 0 && !shouldHideRedHit(index)" v-if="pMode && isSvip && bow.ring > 0 && !shouldHideRedHit(index)"
class="svip-hit-bg" class="svip-hit-bg"
src="../static/vip/svip-xuan.png" src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-xuan.png"
:style="getSvipHitBgStyle(bow)" :style="getSvipHitBgStyle(bow)"
mode="aspectFit" mode="aspectFit"
/> />
@@ -564,7 +585,7 @@ onBeforeUnmount(() => {
<image <image
v-if="pMode && isSvip && bow.ring > 0 && !shouldHideBlueHit(index)" v-if="pMode && isSvip && bow.ring > 0 && !shouldHideBlueHit(index)"
class="svip-hit-bg" class="svip-hit-bg"
src="../static/vip/svip-xuan.png" src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-xuan.png"
:style="getSvipHitBgStyle(bow)" :style="getSvipHitBgStyle(bow)"
mode="aspectFit" mode="aspectFit"
/> />
+3 -3
View File
@@ -266,16 +266,16 @@ onBeforeUnmount(() => {
@touchstart.stop="confirmAdd" @touchstart.stop="confirmAdd"
:style="{ ...getNewPos() }" :style="{ ...getNewPos() }"
> >
<image src="../static/arrow-edit-save.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/arrow-edit-save.png" mode="widthFix" />
</view> </view>
<view class="edit-btn delete-btn" @touchstart.stop="deleteArrow"> <view class="edit-btn delete-btn" @touchstart.stop="deleteArrow">
<image src="../static/arrow-edit-delete.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/arrow-edit-delete.png" mode="widthFix" />
</view> </view>
<view <view
class="edit-btn drag-btn" class="edit-btn drag-btn"
@touchstart.stop="startDrag($event)" @touchstart.stop="startDrag($event)"
> >
<image src="../static/arrow-edit-move.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/arrow-edit-move.png" mode="widthFix" />
</view> </view>
</view> </view>
</view> </view>
+4 -4
View File
@@ -29,14 +29,14 @@ const props = defineProps({
font-size: 24rpx; font-size: 24rpx;
} }
.normal { .normal {
background-image: url("../static/bubble-tip.png"); background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip.png");
width: 157rpx; width: 157rpx;
height: 105rpx; height: 105rpx;
padding-top: 10px; padding-top: 10px;
padding-left: 30rpx; padding-left: 30rpx;
} }
.normal2 { .normal2 {
background-image: url("../static/bubble-tip4.png"); background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip4.png");
width: 190rpx; width: 190rpx;
height: 105rpx; height: 105rpx;
padding-top: 10px; padding-top: 10px;
@@ -46,14 +46,14 @@ const props = defineProps({
z-index: 1; z-index: 1;
} }
.long { .long {
background-image: url("../static/bubble-tip2.png"); background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip2.png");
width: 370rpx; width: 370rpx;
height: 70rpx; height: 70rpx;
top: -50%; top: -50%;
left: 49%; left: 49%;
} }
.short { .short {
background-image: url("../static/bubble-tip3.png"); background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip3.png");
width: 300rpx; width: 300rpx;
height: 70rpx; height: 70rpx;
top: -50%; top: -50%;
+9 -3
View File
@@ -5,9 +5,11 @@ import AppBackground from "@/components/AppBackground.vue";
import Header from "@/components/Header.vue"; import Header from "@/components/Header.vue";
import ScreenHint from "@/components/ScreenHint.vue"; import ScreenHint from "@/components/ScreenHint.vue";
import BackToGame from "@/components/BackToGame.vue"; import BackToGame from "@/components/BackToGame.vue";
import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis"; import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
import { capsuleHeight, debounce } from "@/util"; import { capsuleHeight, debounce } from "@/util";
import { returnToBattle } from "@/utils/matchReturn"; import { returnToBattle } from "@/utils/matchReturn";
const emit = defineEmits(["scrolltolower"]);
const props = defineProps({ const props = defineProps({
title: { title: {
type: String, type: String,
@@ -122,7 +124,7 @@ const cancelMatching = async () => {
const goCalibration = async () => { const goCalibration = async () => {
await laserAimAPI(); await laserAimAPI();
uni.navigateTo({ uni.navigateTo({
url: "/pages/calibration", url: "/pages/device/calibration",
}); });
}; };
</script> </script>
@@ -130,8 +132,9 @@ const goCalibration = async () => {
<template> <template>
<view :style="{ paddingTop: capsuleHeight + 'px' }"> <view :style="{ paddingTop: capsuleHeight + 'px' }">
<AppBackground :type="bgType" :bgColor="bgColor" /> <AppBackground :type="bgType" :bgColor="bgColor" />
<slot v-if="$slots.header" name="header"></slot>
<Header <Header
v-if="!isHome" v-else-if="!isHome"
:class="headerClass" :class="headerClass"
:title="title" :title="title"
:onBack="onBack" :onBack="onBack"
@@ -157,8 +160,10 @@ const goCalibration = async () => {
:enhanced="true" :enhanced="true"
:bounces="false" :bounces="false"
:show-scrollbar="false" :show-scrollbar="false"
:lower-threshold="120"
@scrolltolower="emit('scrolltolower')"
:style="{ :style="{
height: `calc(100vh - ${capsuleHeight + (isHome ? 0 : 50)}px - ${ height: `calc(100vh - ${capsuleHeight + (($slots.header || !isHome) ? 50 : 0)}px - ${
$slots.bottom && showBottom ? (isIOS ? '75px' : '65px') : '0px' $slots.bottom && showBottom ? (isIOS ? '75px' : '65px') : '0px'
})`, })`,
}" }"
@@ -226,6 +231,7 @@ const goCalibration = async () => {
<text>{{ loadingText || "加载中..." }}</text> <text>{{ loadingText || "加载中..." }}</text>
</view> </view>
</view> </view>
<DeviceChargingDialog />
</view> </view>
</template> </template>
+22
View File
@@ -0,0 +1,22 @@
<script setup>
import { storeToRefs } from "pinia";
import ModalDialog from "@/components/ModalDialog.vue";
import useStore from "@/store";
const chargingNotice =
"检测到智能弓箭已开始充电,为保护电池,设备即将自动关机。\n(注意:此时拔出充电线将会重启设备。)";
const store = useStore();
const { deviceChargingDialogVisible } = storeToRefs(store);
const { hideDeviceChargingDialog } = store;
</script>
<template>
<ModalDialog
:show="deviceChargingDialogVisible"
:content="chargingNotice"
:show-cancel="false"
confirm-text="我知道了"
:on-confirm="hideDeviceChargingDialog"
/>
</template>
+399
View File
@@ -0,0 +1,399 @@
<script setup>
import { computed } from "vue";
const props = defineProps({
variant: {
type: String,
default: "home",
validator: (value) => ["home", "detail"].includes(value),
},
});
// 固定粒子分布营造随机感,避免每次进入页面时因运行时随机数产生位置跳变。
const sparkSeeds = [
[1, "dot", 18, 98, -28, 5, 5, 2.3, 0.4],
[2, "streak", 23, 90, -38, 4, 18, 2, 1.1, true],
[3, "dot", 28, 112, -17, 6, 6, 2.8, 1.9, true],
[4, "dot", 32, 104, -12, 12, 12, 2.6, 0.7, true, true],
[5, "dot", 36, 88, -24, 4, 4, 1.8, 1.4],
[6, "streak", 40, 116, -8, 4, 20, 2.4, 2.2, true],
[7, "dot", 44, 96, -16, 7, 7, 2.1, 0.2],
[8, "dot", 48, 120, -4, 5, 5, 2.9, 1.3, true],
[9, "dot", 51, 110, 3, 14, 14, 3, 2.7, true, true],
[10, "streak", 54, 92, 8, 4, 22, 1.9, 0.8],
[11, "dot", 58, 105, 14, 6, 6, 2.5, 1.6, true],
[12, "dot", 62, 86, 21, 4, 4, 2, 0.5],
[13, "dot", 66, 114, 10, 7, 7, 2.7, 2.1, true],
[14, "streak", 70, 96, 28, 4, 18, 2.2, 1],
[15, "dot", 74, 108, 20, 11, 11, 2.8, 2.4, true, true],
[16, "dot", 80, 90, 35, 5, 5, 2.3, 0.3, true],
[17, "dot", 21, 118, -8, 4, 4, 2.6, 1.7],
[18, "streak", 27, 84, -31, 3, 16, 1.8, 0.6, true],
[19, "dot", 34, 122, -3, 6, 6, 2.9, 2.3, true],
[20, "dot", 42, 102, 5, 5, 5, 2.2, 0.9],
[21, "dot", 47, 88, -10, 13, 13, 2.7, 1.5, true, true],
[22, "streak", 56, 120, 16, 4, 21, 2.5, 2.6, true],
[23, "dot", 64, 100, 24, 7, 7, 2.4, 0.1],
[24, "dot", 72, 84, 38, 5, 5, 2, 1.2, true],
[25, "dot", 82, 116, 12, 4, 4, 2.8, 2],
[26, "dot", 68, 124, 7, 10, 10, 3.1, 2.9, true, true],
[27, "streak", 77, 98, 33, 4, 19, 2.1, 0.7, true],
[28, "dot", 29, 94, -20, 7, 7, 2.5, 1.4],
[29, "dot", 53, 126, 0, 5, 5, 2.3, 2.2, true],
[30, "dot", 60, 108, 18, 6, 6, 2.6, 0.4],
];
const deviceSparks = computed(() => {
const isDetail = props.variant === "detail";
const sizeScale = isDetail ? 1.25 : 1;
const bottomOffset = isDetail ? 120 : 0;
return sparkSeeds.map(([
id,
type,
left,
bottom,
angle,
width,
height,
duration,
delay,
long = false,
large = false,
]) => ({
id,
type,
long,
large,
trackStyle: {
left: `${left}%`,
bottom: `${bottom + bottomOffset}rpx`,
transform: `rotate(${angle}deg)`,
},
sparkStyle: {
width: `${width * sizeScale}rpx`,
height: `${height * sizeScale}rpx`,
marginLeft: `${-(width * sizeScale) / 2}rpx`,
animationDuration: `${duration}s`,
animationDelay: `-${delay}s`,
},
}));
});
</script>
<template>
<view
class="device-online-effects"
:class="`device-online-effects--${variant}`"
>
<view class="device-online-rays-stage">
<view class="device-online-rays-orbit">
<view class="device-online-ray device-online-ray--1" />
<view class="device-online-ray device-online-ray--2" />
<view class="device-online-ray device-online-ray--3" />
<view class="device-online-ray device-online-ray--4" />
<view class="device-online-ray device-online-ray--5" />
<view class="device-online-ray device-online-ray--6" />
<view class="device-online-ray device-online-ray--7" />
</view>
</view>
<view class="device-online-particles">
<view
v-for="spark in deviceSparks"
:key="spark.id"
class="device-online-spark-track"
:style="spark.trackStyle"
>
<view
class="device-online-spark"
:class="[
`device-online-spark--${spark.type}`,
{
'device-online-spark--long': spark.long,
'device-online-spark--large': spark.large,
}
]"
:style="spark.sparkStyle"
/>
</view>
</view>
</view>
</template>
<style scoped lang="scss">
.device-online-effects {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 3;
overflow: hidden;
pointer-events: none;
}
/* 光束沿底座椭圆轨迹扫动,用位移、明暗和横向缩放表达前后纵深。 */
.device-online-rays-stage {
position: absolute;
left: 0;
bottom: 112rpx;
width: 100%;
height: 140rpx;
overflow: hidden;
transform-origin: 50% 100%;
}
.device-online-rays-orbit {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
transform-origin: 50% 100%;
animation: device-rays-rotate 6s ease-in-out infinite;
}
.device-online-ray {
position: absolute;
bottom: 0;
left: 50%;
width: 48rpx;
height: 132rpx;
margin-left: -24rpx;
transform-origin: 50% 100%;
border-radius: 50% 50% 12% 12%;
background: linear-gradient(
180deg,
rgba(255, 255, 244, 0) 0%,
rgba(255, 254, 239, 0.1) 36%,
rgba(255, 248, 215, 0.22) 72%,
rgba(255, 232, 151, 0.36) 100%
);
}
.device-online-ray--1 {
opacity: 0.55;
transform: rotate(-55deg);
}
.device-online-ray--2 {
width: 68rpx;
margin-left: -34rpx;
opacity: 0.72;
transform: rotate(-36deg);
}
.device-online-ray--3 {
width: 42rpx;
margin-left: -21rpx;
opacity: 0.6;
transform: rotate(-18deg);
}
.device-online-ray--4 {
width: 76rpx;
margin-left: -38rpx;
opacity: 0.82;
}
.device-online-ray--5 {
width: 46rpx;
margin-left: -23rpx;
opacity: 0.64;
transform: rotate(19deg);
}
.device-online-ray--6 {
width: 64rpx;
margin-left: -32rpx;
opacity: 0.7;
transform: rotate(38deg);
}
.device-online-ray--7 {
width: 44rpx;
margin-left: -22rpx;
opacity: 0.56;
transform: rotate(56deg);
}
.device-online-particles {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
.device-online-spark-track {
position: absolute;
width: 0;
height: 0;
transform-origin: center bottom;
}
.device-online-spark {
position: absolute;
bottom: 0;
left: 0;
background: #fff6bd;
box-shadow: 0 0 6rpx rgba(255, 225, 112, 0.65);
animation: device-spark-rise 2.4s linear infinite;
}
.device-online-spark--dot {
border-radius: 50%;
}
.device-online-spark--streak {
border-radius: 50%;
background: linear-gradient(
180deg,
rgba(255, 255, 235, 0) 0%,
rgba(255, 250, 205, 0.75) 45%,
#ffe379 100%
);
}
.device-online-spark--long {
animation-name: device-spark-rise-long;
}
.device-online-spark--large {
background: #fffbdc;
box-shadow:
0 0 10rpx rgba(255, 243, 174, 0.95),
0 0 20rpx rgba(255, 207, 74, 0.72);
}
.device-online-effects--detail .device-online-rays-stage {
bottom: 215rpx;
height: 190rpx;
transform: scaleX(1.35);
}
.device-online-effects--detail .device-online-ray {
height: 180rpx;
}
.device-online-effects--detail .device-online-rays-orbit {
animation-name: device-rays-rotate-detail;
}
.device-online-effects--detail .device-online-spark {
animation-name: device-spark-rise-detail;
}
.device-online-effects--detail .device-online-spark--long {
animation-name: device-spark-rise-detail-long;
}
@keyframes device-spark-rise {
0% {
opacity: 0;
transform: translateY(8rpx) scale(0.45);
}
16% {
opacity: 1;
}
72% {
opacity: 0.62;
}
100% {
opacity: 0;
transform: translateY(-148rpx) scale(1);
}
}
@keyframes device-spark-rise-long {
0% {
opacity: 0;
transform: translateY(8rpx) scale(0.4);
}
16% {
opacity: 1;
}
72% {
opacity: 0.55;
}
100% {
opacity: 0;
transform: translateY(-176rpx) scale(1);
}
}
@keyframes device-spark-rise-detail {
0% {
opacity: 0;
transform: translateY(12rpx) scale(0.45);
}
16% {
opacity: 1;
}
72% {
opacity: 0.62;
}
100% {
opacity: 0;
transform: translateY(-225rpx) scale(1);
}
}
@keyframes device-spark-rise-detail-long {
0% {
opacity: 0;
transform: translateY(12rpx) scale(0.4);
}
16% {
opacity: 1;
}
72% {
opacity: 0.55;
}
100% {
opacity: 0;
transform: translateY(-270rpx) scale(1);
}
}
@keyframes device-rays-rotate {
0%,
100% {
opacity: 0.48;
transform: translate(-42rpx, 4rpx) skewX(-8deg) scaleX(0.82);
}
25% {
opacity: 0.88;
transform: translate(0, 0) skewX(0deg) scaleX(1.05);
}
50% {
opacity: 0.48;
transform: translate(42rpx, 4rpx) skewX(8deg) scaleX(0.82);
}
75% {
opacity: 0.24;
transform: translate(0, 10rpx) skewX(0deg) scaleX(0.68);
}
}
@keyframes device-rays-rotate-detail {
0%,
100% {
opacity: 0.48;
transform: translate(-62rpx, 6rpx) skewX(-8deg) scaleX(0.82);
}
25% {
opacity: 0.88;
transform: translate(0, 0) skewX(0deg) scaleX(1.05);
}
50% {
opacity: 0.48;
transform: translate(62rpx, 6rpx) skewX(8deg) scaleX(0.82);
}
75% {
opacity: 0.24;
transform: translate(0, 14rpx) skewX(0deg) scaleX(0.68);
}
}
</style>
+1 -1
View File
@@ -203,7 +203,7 @@ onMounted(async () => {
<button hover-class="none"> <button hover-class="none">
<image <image
v-if="!noArrow" v-if="!noArrow"
src="../static/arrow-grey.png" src="https://static.shelingxingqiu.com/shootmini/static/arrow-grey.png"
mode="widthFix" mode="widthFix"
:style="{ transform: expand ? 'rotateX(180deg)' : 'rotateX(0deg)' }" :style="{ transform: expand ? 'rotateX(180deg)' : 'rotateX(0deg)' }"
/> />
+2 -2
View File
@@ -10,8 +10,8 @@ defineProps({
}, },
}); });
const bubbleTypes = [ const bubbleTypes = [
"../static/long-bubble.png", "https://static.shelingxingqiu.com/shootmini/static/long-bubble.png",
"../static/long-bubble-middle.png", "https://static.shelingxingqiu.com/shootmini/static/long-bubble-middle.png",
"https://static.shelingxingqiu.com/shootmini/static/long-bubble-tall.png", "https://static.shelingxingqiu.com/shootmini/static/long-bubble-tall.png",
]; ];
</script> </script>
+8 -5
View File
@@ -115,16 +115,18 @@ onBeforeUnmount(() => {
<template> <template>
<view class="container"> <view class="container">
<view class="back-btn" @click="onClick"> <view class="back-btn" @click="onClick">
<image v-if="whiteBackArrow" src="../static/back.png" mode="widthFix" /> <image v-if="whiteBackArrow" src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
<image <image
v-if="!whiteBackArrow" v-if="!whiteBackArrow"
src="../static/back-black.png" src="https://static.shelingxingqiu.com/shootmini/static/back-black.png"
mode="widthFix" mode="widthFix"
/> />
</view> </view>
<view <view
:style="[{ color: whiteBackArrow ? '#fff' : '#000' }, titleStyle]" :style="[{ color: whiteBackArrow ? '#fff' : '#000' }, titleStyle]"
> >
<slot v-if="$slots.title" name="title"></slot>
<template v-else>
<view <view
v-if="currentPage === 'pages/point-book'" v-if="currentPage === 'pages/point-book'"
class="user-header" class="user-header"
@@ -154,12 +156,12 @@ onBeforeUnmount(() => {
<text v-else class="truncate">{{ user.nickName }}</text> <text v-else class="truncate">{{ user.nickName }}</text>
<image <image
v-if="heat" v-if="heat"
:src="`../static/hot${heat}.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/hot${heat}.png`"
mode="widthFix" mode="widthFix"
/> />
</block> </block>
<block v-else> <block v-else>
<image src="../static/user-icon.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/user-icon.png" mode="widthFix" />
<text>新来的弓箭手你好呀~</text> <text>新来的弓箭手你好呀~</text>
</block> </block>
</view> </view>
@@ -190,6 +192,7 @@ onBeforeUnmount(() => {
> >
</view> </view>
</block> </block>
</template>
</view> </view>
<view v-if="pointBook" class="point-book-info"> <view v-if="pointBook" class="point-book-info">
<text>{{ pointBook.bowType.name }}</text> <text>{{ pointBook.bowType.name }}</text>
@@ -226,7 +229,7 @@ onBeforeUnmount(() => {
:style="battleRoomBtnStyle" :style="battleRoomBtnStyle"
> >
<text class="battle-room-number__text">房号: {{ game.roomNumber }}</text> <text class="battle-room-number__text">房号: {{ game.roomNumber }}</text>
<image src="../static/share2.png" mode="widthFix" class="battle-room-number__icon" /> <image src="https://static.shelingxingqiu.com/shootmini/static/share2.png" mode="widthFix" class="battle-room-number__icon" />
</button> </button>
</view> </view>
</template> </template>
+8 -4
View File
@@ -2,7 +2,11 @@
import { ref, watch, onMounted, onBeforeUnmount } from "vue"; import { ref, watch, onMounted, onBeforeUnmount } from "vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText } from "@/util"; import {
getDirectionText,
getInvalidShotAudioKey,
getInvalidShotText,
} from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -88,10 +92,10 @@ async function onReceiveMessage(message) {
currentRoundEnded.value = true; currentRoundEnded.value = true;
} else if (type === MESSAGETYPESV2.InvalidShot) { } else if (type === MESSAGETYPESV2.InvalidShot) {
uni.showToast({ uni.showToast({
title: "距离不足,无效", title: getInvalidShotText(shootData),
icon: "none", icon: "none",
}); });
audioManager.play("射击无效"); audioManager.play(getInvalidShotAudioKey(shootData));
} }
} }
@@ -142,7 +146,7 @@ onBeforeUnmount(() => {
<text>{{ (tips || "").replace(/你/g, "").replace(/重回/g, "") }}</text> <text>{{ (tips || "").replace(/你/g, "").replace(/重回/g, "") }}</text>
<text v-if="totalShot > 0"> ({{ currentShot }}/{{ totalShot }}) </text> <text v-if="totalShot > 0"> ({{ currentShot }}/{{ totalShot }}) </text>
<button v-if="!!tips" hover-class="none" @click="updateSound"> <button v-if="!!tips" hover-class="none" @click="updateSound">
<image :src="`../static/sound${sound ? '' : '-off'}-yellow.png`" mode="widthFix" /> <image :src="`https://static.shelingxingqiu.com/shootmini/static/sound${sound ? '' : '-off'}-yellow.png`" mode="widthFix" />
</button> </button>
</view> </view>
</template> </template>
+37
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import IconButton from "./IconButton.vue";
const props = defineProps({ const props = defineProps({
show: { show: {
type: Boolean, type: Boolean,
@@ -28,6 +30,14 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
confirmDisabled: {
type: Boolean,
default: false,
},
showClose: {
type: Boolean,
default: false,
},
onCancel: { onCancel: {
type: Function, type: Function,
default: null, default: null,
@@ -36,6 +46,10 @@ const props = defineProps({
type: Function, type: Function,
default: null, default: null,
}, },
onClose: {
type: Function,
default: null,
},
}); });
const handleCancel = () => { const handleCancel = () => {
@@ -43,8 +57,13 @@ const handleCancel = () => {
}; };
const handleConfirm = () => { const handleConfirm = () => {
if (props.confirmDisabled) return;
props.onConfirm?.(); props.onConfirm?.();
}; };
const handleClose = () => {
props.onClose?.();
};
</script> </script>
<template> <template>
@@ -89,6 +108,7 @@ const handleConfirm = () => {
<view <view
v-if="showConfirm" v-if="showConfirm"
class="dialog-button confirm" class="dialog-button confirm"
:class="{ disabled: confirmDisabled }"
@click="handleConfirm" @click="handleConfirm"
> >
<text>{{ confirmText }}</text> <text>{{ confirmText }}</text>
@@ -96,6 +116,13 @@ const handleConfirm = () => {
</view> </view>
</view> </view>
<view v-if="showClose" class="dialog-close">
<IconButton
src="https://static.shelingxingqiu.com/shootmini/static/close-gold-outline.png"
:width="30"
:onClick="handleClose"
/>
</view>
</view> </view>
</view> </view>
</template> </template>
@@ -108,6 +135,7 @@ const handleConfirm = () => {
top: 0; top: 0;
left: 0; left: 0;
background-color: rgba(0, 0, 0, 0.62); background-color: rgba(0, 0, 0, 0.62);
flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
z-index: 999; z-index: 999;
@@ -116,6 +144,7 @@ const handleConfirm = () => {
.modal-wrap { .modal-wrap {
position: relative; position: relative;
display: flex; display: flex;
flex-direction: column;
width: 549rpx; width: 549rpx;
min-height: 318rpx;; min-height: 318rpx;;
padding-top: 168rpx; padding-top: 168rpx;
@@ -222,6 +251,14 @@ const handleConfirm = () => {
background-color: #ffda3f; background-color: #ffda3f;
} }
.dialog-button.confirm.disabled {
opacity: 0.62;
}
.dialog-close {
margin-top: 28rpx;
}
@keyframes rotateLight { @keyframes rotateLight {
from { from {
transform: translateX(-50%) rotate(0deg); transform: translateX(-50%) rotate(0deg);
+57 -28
View File
@@ -1,10 +1,11 @@
<script setup> <script setup>
import { computed } from "vue"; import { computed } from "vue";
import { getDeviceBatteryAPI } from "@/apis"; import useStore from "@/store";
import { storeToRefs } from "pinia";
const OTA_MIN_BATTERY = 50;
const OTA_LOW_BATTERY_TEXT = "电量不足 50%,暂不支持 OTA 升级";
const OTA_OFFLINE_TEXT = "请先开启智能弓"; const OTA_OFFLINE_TEXT = "请先开启智能弓";
const store = useStore();
const { deviceStatus } = storeToRefs(store);
const props = defineProps({ const props = defineProps({
visible: { visible: {
@@ -23,6 +24,10 @@ const props = defineProps({
type: Number, type: Number,
default: 40, default: 40,
}, },
phase: {
type: String,
default: "",
},
// 副标题:如“新版本将优化智能弓体验” // 副标题:如“新版本将优化智能弓体验”
description: { description: {
type: String, type: String,
@@ -47,28 +52,22 @@ const isSuccess = computed(() => props.state === "update_success");
const isFailure = computed(() => props.state === "update_failure"); const isFailure = computed(() => props.state === "update_failure");
// Clamp progress to keep the progress bar width within its container. // Clamp progress to keep the progress bar width within its container.
const progressValue = computed(() => Math.min(100, Math.max(0, Number(props.progress) || 0))); const progressValue = computed(() => Math.min(100, Math.max(0, Number(props.progress) || 0)));
const progressPhaseText = computed(() => {
const phaseText = {
started: "正在准备固件更新",
downloading: "正在下载固件",
installing: "正在安装固件",
};
return phaseText[props.phase] || "正在进行固件更新";
});
// 点击立即更新前先校验设备在线状态,再校验设备电量。 // 点击立即更新前先校验设备在线状态。
const handleUpdateClick = async () => { const handleUpdateClick = () => {
try { if (deviceStatus.value?.online !== true) {
const deviceStatus = await getDeviceBatteryAPI(); uni.showToast({
if (deviceStatus?.online !== true) { title: OTA_OFFLINE_TEXT,
uni.showToast({ icon: "none",
title: OTA_OFFLINE_TEXT, });
icon: "none",
});
return;
}
if (Number(deviceStatus?.battery) <= OTA_MIN_BATTERY) {
uni.showToast({
title: OTA_LOW_BATTERY_TEXT,
icon: "none",
});
return;
}
} catch (err) {
emit("update");
return; return;
} }
emit("update"); emit("update");
@@ -140,10 +139,10 @@ const handleUpdateClick = async () => {
<!-- 更新成功:图片左边距 34rpx,文案左边距 44rpx,按钮浮动底部居中 --> <!-- 更新成功:图片左边距 34rpx,文案左边距 44rpx,按钮浮动底部居中 -->
<block v-else-if="isSuccess"> <block v-else-if="isSuccess">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-ok.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" /> <image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-ok.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
<text class="dialog-desc">请关机并重启智能弓</text> <text class="dialog-desc">固件更新已完成</text>
<view class="btn-group-result"> <view class="btn-group-result">
<view class="primary-btn" @click="emit('done')"> <view class="primary-btn" @click="emit('done')">
<text class="primary-btn-text">完成</text> <text class="primary-btn-text">关闭</text>
</view> </view>
</view> </view>
</block> </block>
@@ -152,9 +151,14 @@ const handleUpdateClick = async () => {
<block v-else-if="isProgress"> <block v-else-if="isProgress">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update_progress.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" /> <image src="https://static.shelingxingqiu.com/shootmini/static/ota/update_progress.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
<view class="progress-wrap"> <view class="progress-wrap">
<view class="progress-meta">
<text class="progress-phase">{{ progressPhaseText }}</text>
<text class="progress-value">{{ Math.floor(progressValue) }}%</text>
</view>
<view class="progress-track"> <view class="progress-track">
<view class="progress-fill" :style="{ width: `${progressValue}%` }"></view> <view class="progress-fill" :style="{ width: `${progressValue}%` }"></view>
</view> </view>
<text class="progress-warning">请勿离开当前页面!</text>
</view> </view>
</block> </block>
@@ -181,7 +185,7 @@ const handleUpdateClick = async () => {
class="ota-close-below" class="ota-close-below"
@click="emit('close')" @click="emit('close')"
> >
<image src="../static/sicon/close.png" mode="aspectFit" style="width: 56rpx; height: 56rpx;" /> <image src="https://static.shelingxingqiu.com/shootmini/static/sicon/close.png" mode="aspectFit" style="width: 56rpx; height: 56rpx;" />
</view> </view>
</view> </view>
</template> </template>
@@ -404,9 +408,26 @@ const handleUpdateClick = async () => {
} }
.progress-wrap { .progress-wrap {
width: 394rpx; width: 394rpx;
margin-top: 40rpx; margin-top: 28rpx;
margin-left: 44rpx; margin-left: 44rpx;
} }
.progress-meta {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 16rpx;
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.progress-phase {
flex: 1;
}
.progress-value {
flex-shrink: 0;
margin-left: 16rpx;
color: #fed847;
}
.progress-track { .progress-track {
width: 100%; width: 100%;
height: 18rpx; height: 18rpx;
@@ -419,6 +440,14 @@ const handleUpdateClick = async () => {
background-color: #FED847; background-color: #FED847;
border-radius: 999rpx; border-radius: 999rpx;
} }
.progress-warning {
display: block;
margin-top: 16rpx;
color: rgba(255, 255, 255, 0.88);
font-size: 22rpx;
line-height: 32rpx;
text-align: center;
}
/* 关闭按钮(位于弹窗下方) */ /* 关闭按钮(位于弹窗下方) */
.ota-close-below { .ota-close-below {
+2 -2
View File
@@ -40,10 +40,10 @@ const getMemberNicknameClass = (player = {}) => [
opacity: opacity:
(scores[0] || []).length + (scores[1] || []).length === 12 ? 1 : 0, (scores[0] || []).length + (scores[1] || []).length === 12 ? 1 : 0,
}" }"
src="../static/checked-green.png" src="https://static.shelingxingqiu.com/shootmini/static/checked-green.png"
mode="widthFix" mode="widthFix"
/> />
<image :src="player.avatar || '../static/user-icon.png'" mode="widthFix" /> <image :src="player.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" mode="widthFix" />
<view <view
v-if="isMember(player)" v-if="isMember(player)"
:class="['player-score-name', ...getMemberNicknameClass(player)]" :class="['player-score-name', ...getMemberNicknameClass(player)]"
+4 -4
View File
@@ -30,25 +30,25 @@ const rowCount = new Array(6).fill(0);
<view> <view>
<image <image
v-if="rank === 1" v-if="rank === 1"
src="../static/champ1.png" src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<image <image
v-if="rank === 2" v-if="rank === 2"
src="../static/champ2.png" src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<image <image
v-if="rank === 3" v-if="rank === 3"
src="../static/champ3.png" src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix" mode="widthFix"
class="avatar-rank" class="avatar-rank"
/> />
<view v-if="rank > 3" class="rank-view">{{ rank }}</view> <view v-if="rank > 3" class="rank-view">{{ rank }}</view>
<image <image
:src="avatar || '../static/user-icon.png'" :src="avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
mode="widthFix" mode="widthFix"
:style="{ borderColor: topThreeColors[rank - 1] || '#fff' }" :style="{ borderColor: topThreeColors[rank - 1] || '#fff' }"
/> />
+4 -4
View File
@@ -38,7 +38,7 @@ const seats = new Array(props.total).fill(1);
<image src="https://static.shelingxingqiu.com/shootmini/static/player-bg.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/player-bg.png" mode="widthFix" />
<view v-if="players[index] && players[index].name" class="avatar"> <view v-if="players[index] && players[index].name" class="avatar">
<Avatar <Avatar
:src="players[index].avatar || '../static/user-icon.png'" :src="players[index].avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
:size="40" :size="40"
/> />
<text <text
@@ -47,7 +47,7 @@ const seats = new Array(props.total).fill(1);
> >
</view> </view>
<view v-else class="player-unknow"> <view v-else class="player-unknow">
<image src="../static/question-mark.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view> </view>
<view <view
v-if="players[index] && players[index].name && isMember(players[index])" v-if="players[index] && players[index].name && isMember(players[index])"
@@ -72,7 +72,7 @@ const seats = new Array(props.total).fill(1);
</text> </text>
<view v-if="index === 0" class="founder">管理员</view> <view v-if="index === 0" class="founder">管理员</view>
<!-- <image <!-- <image
:src="`../static/player-${index + 1}.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/player-${index + 1}.png`"
mode="widthFix" mode="widthFix"
class="player-bg" class="player-bg"
/> --> /> -->
@@ -83,7 +83,7 @@ const seats = new Array(props.total).fill(1);
class="remove-player" class="remove-player"
@click="() => removePlayer(players[index])" @click="() => removePlayer(players[index])"
> >
<image src="../static/close-white.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</button> </button>
</view> </view>
</view> </view>
+5 -5
View File
@@ -55,12 +55,12 @@ const onClick = async () => {
<template> <template>
<view class="rank-item" :style="{ borderWidth: borderWidth + 'rpx' }"> <view class="rank-item" :style="{ borderWidth: borderWidth + 'rpx' }">
<image v-if="data.rank === 1" src="../static/point-no1.png" /> <image v-if="data.rank === 1" src="https://static.shelingxingqiu.com/shootmini/static/point-no1.png" />
<image v-else-if="data.rank === 2" src="../static/point-no2.png" /> <image v-else-if="data.rank === 2" src="https://static.shelingxingqiu.com/shootmini/static/point-no2.png" />
<image v-else-if="data.rank === 3" src="../static/point-no3.png" /> <image v-else-if="data.rank === 3" src="https://static.shelingxingqiu.com/shootmini/static/point-no3.png" />
<text v-else>{{ data.rank || "" }}</text> <text v-else>{{ data.rank || "" }}</text>
<view> <view>
<Avatar :src="data.avatar || '../static/user-icon.png'" :size="36" /> <Avatar :src="data.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" :size="36" />
<view> <view>
<view v-if="isMember(data)" :class="getMemberNicknameClass(data)"> <view v-if="isMember(data)" :class="getMemberNicknameClass(data)">
<text class="member-nickname__text">{{ data.name }}</text> <text class="member-nickname__text">{{ data.name }}</text>
@@ -87,7 +87,7 @@ const onClick = async () => {
<button hover-class="none" @click="onClick"> <button hover-class="none" @click="onClick">
<text>{{ likeCount }}</text> <text>{{ likeCount }}</text>
<image <image
:src="`../static/like-${like ? 'on' : 'off'}.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/like-${like ? 'on' : 'off'}.png`"
mode="widthFix" mode="widthFix"
/> />
</button> </button>
+1 -1
View File
@@ -113,7 +113,7 @@ onMounted(async () => {
@click="checked = !checked" @click="checked = !checked"
:style="{ marginBottom: !checked ? '20rpx' : '0' }" :style="{ marginBottom: !checked ? '20rpx' : '0' }"
> >
<image v-if="checked" src="../static/checked.png" mode="widthFix" /> <image v-if="checked" src="https://static.shelingxingqiu.com/shootmini/static/checked.png" mode="widthFix" />
<view v-else></view> <view v-else></view>
<text>我想给建议(选填)</text> <text>我想给建议(选填)</text>
</view> </view>
+1 -1
View File
@@ -69,7 +69,7 @@ const onBtnClick = debounce(async () => {
<slot /> <slot />
</block> </block>
<block v-else> <block v-else>
<image src="../static/btn-loading.png" mode="widthFix" class="loading" /> <image src="https://static.shelingxingqiu.com/shootmini/static/btn-loading.png" mode="widthFix" class="loading" />
</block> </block>
</button> </button>
</template> </template>
+1 -1
View File
@@ -60,7 +60,7 @@ watch(
mode="widthFix" mode="widthFix"
/> />
<view class="close-btn" @click="onClose" v-if="!noBg"> <view class="close-btn" @click="onClose" v-if="!noBg">
<image src="../static/close-yellow.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-yellow.png" mode="widthFix" />
</view> </view>
<slot></slot> <slot></slot>
</view> </view>
+50 -30
View File
@@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, watch, onMounted, onBeforeUnmount } from "vue"; import { ref, watch } from "vue";
const props = defineProps({ const props = defineProps({
rowCount: { rowCount: {
type: Number, type: Number,
@@ -29,42 +29,36 @@ const bgImages = [
"https://static.shelingxingqiu.com/shootmini/static/complete-light1.png", "https://static.shelingxingqiu.com/shootmini/static/complete-light1.png",
"https://static.shelingxingqiu.com/shootmini/static/complete-light2.png", "https://static.shelingxingqiu.com/shootmini/static/complete-light2.png",
]; ];
const bgIndex = ref(0);
watch( watch(
() => props.total, () => props.total,
(newValue) => { (newValue) => {
items.value = new Array(newValue).fill(9); items.value = new Array(newValue).fill(9);
} }
); );
const timer = ref(null);
onMounted(() => {
timer.value = setInterval(() => {
bgIndex.value = bgIndex.value === 0 ? 1 : 0;
}, 200);
});
onBeforeUnmount(() => {
if (timer.value) {
clearInterval(timer.value);
}
});
</script> </script>
<template> <template>
<view class="container"> <view class="container">
<image <template v-if="total > 0 && arrows.length === total && completeEffect">
v-if="total > 0 && arrows.length === total && completeEffect" <image
:src="bgImages[bgIndex]" v-for="(image, index) in bgImages"
class="complete-light" :key="image"
:style="{ :src="image"
width: `calc(${(100 / (rowCount + 2)) * rowCount}vw + ${ :class="[
(100 / (total * 2)) * (rowCount * 2 + (total === 12 ? 8 : 24)) 'complete-light',
}px)`, index === 0 ? 'complete-light--first' : 'complete-light--second',
height: `calc(${(100 / (rowCount + 2)) * (total / rowCount)}vw + ${ ]"
(100 / (total * 2)) * :style="{
((total / rowCount) * 2 + (total === 12 ? 7 : 24)) width: `calc(${(100 / (rowCount + 2)) * rowCount}vw + ${
}px)`, (100 / (total * 2)) * (rowCount * 2 + (total === 12 ? 8 : 24))
top: `${total === 12 ? -2 : -3}vw`, }px)`,
}" height: `calc(${(100 / (rowCount + 2)) * (total / rowCount)}vw + ${
/> (100 / (total * 2)) *
((total / rowCount) * 2 + (total === 12 ? 7 : 24))
}px)`,
top: `${total === 12 ? -2 : -3}vw`,
}"
/>
</template>
<view <view
v-for="(_, index) in items" v-for="(_, index) in items"
:key="index" :key="index"
@@ -77,7 +71,7 @@ onBeforeUnmount(() => {
margin: 100 / (total * 2) + 'px', margin: 100 / (total * 2) + 'px',
}" }"
> >
<image src="../static/score-bg.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/score-bg.png" mode="widthFix" />
<text <text
:style="{ fontWeight: arrows[index] !== undefined ? 'bold' : 'normal' }" :style="{ fontWeight: arrows[index] !== undefined ? 'bold' : 'normal' }"
>{{ >{{
@@ -99,7 +93,7 @@ onBeforeUnmount(() => {
padding: 1vw 0; padding: 1vw 0;
} }
.score-item { .score-item {
/* background-image: url("../static/score-bg.png"); /* background-image: url("https://static.shelingxingqiu.com/shootmini/static/score-bg.png");
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; */ background-position: center; */
@@ -121,4 +115,30 @@ onBeforeUnmount(() => {
.complete-light { .complete-light {
position: absolute; position: absolute;
} }
.complete-light--first {
animation: complete-light-first 400ms steps(1, end) infinite;
}
.complete-light--second {
animation: complete-light-second 400ms steps(1, end) infinite;
}
@keyframes complete-light-first {
0%,
49.9% {
opacity: 1;
}
50%,
100% {
opacity: 0;
}
}
@keyframes complete-light-second {
0%,
49.9% {
opacity: 0;
}
50%,
100% {
opacity: 1;
}
}
</style> </style>
+3 -3
View File
@@ -100,7 +100,7 @@ const openCoachComment = () => {
<button @click="() => (showBowData = true)"> <button @click="() => (showBowData = true)">
<text>查看靶纸</text> <text>查看靶纸</text>
<image <image
src="../static/enter-arrow-blue.png" src="https://static.shelingxingqiu.com/shootmini/static/enter-arrow-blue.png"
mode="widthFix" mode="widthFix"
:style="{ width: '20px' }" :style="{ width: '20px' }"
/> />
@@ -116,13 +116,13 @@ const openCoachComment = () => {
<block v-if="validArrows === total"> <block v-if="validArrows === total">
<IconButton <IconButton
name="分享" name="分享"
src="../static/share.png" src="https://static.shelingxingqiu.com/shootmini/static/share.png"
:onClick="onClickShare" :onClick="onClickShare"
/> />
<IconButton <IconButton
v-if="isMember" v-if="isMember"
name="教练点评" name="教练点评"
src="../static/review.png" src="https://static.shelingxingqiu.com/shootmini/static/review.png"
:onClick="openCoachComment" :onClick="openCoachComment"
/> />
</block> </block>
+7 -3
View File
@@ -14,8 +14,13 @@ const props = defineProps({
type: String, type: String,
default: "normal", default: "normal",
}, },
contentHeight: {
type: String,
default: "",
},
}); });
const getContentHeight = () => { const getContentHeight = () => {
if (props.contentHeight) return props.contentHeight;
if (props.mode === "tall") return "50vw"; if (props.mode === "tall") return "50vw";
if (props.mode === "square") return "74vw"; if (props.mode === "square") return "74vw";
return "36vw"; return "36vw";
@@ -49,7 +54,7 @@ const getContentHeight = () => {
</view> </view>
<IconButton <IconButton
v-if="!!onClose" v-if="!!onClose"
src="../static/close-gold-outline.png" src="https://static.shelingxingqiu.com/shootmini/static/close-gold-outline.png"
:width="30" :width="30"
:onClick="onClose" :onClick="onClose"
/> />
@@ -82,8 +87,7 @@ const getContentHeight = () => {
position: absolute; position: absolute;
width: 80vw; width: 80vw;
left: -7%; left: -7%;
bottom: -18vw; bottom: -8rpx;
z-index: -1; z-index: -1;
transform: translateY(-75px);
} }
</style> </style>
+1 -1
View File
@@ -25,7 +25,7 @@ const props = defineProps({
</view> </view>
<IconButton <IconButton
v-if="!!onClose" v-if="!!onClose"
src="../static/close-white-outline.png" src="https://static.shelingxingqiu.com/shootmini/static/close-white-outline.png"
:width="30" :width="30"
:onClick="onClose" :onClick="onClose"
/> />
+8 -4
View File
@@ -2,7 +2,11 @@
import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue"; import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText } from "@/util"; import {
getDirectionText,
getInvalidShotAudioKey,
getInvalidShotText,
} from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -171,10 +175,10 @@ async function onReceiveMessage(msg) {
audioManager.play("中场休息"); audioManager.play("中场休息");
} else if (msg.type === MESSAGETYPESV2.InvalidShot) { } else if (msg.type === MESSAGETYPESV2.InvalidShot) {
uni.showToast({ uni.showToast({
title: "距离不足,无效", title: getInvalidShotText(msg.shootData),
icon: "none", icon: "none",
}); });
audioManager.play("射击无效"); audioManager.play(getInvalidShotAudioKey(msg.shootData));
} }
} }
@@ -203,7 +207,7 @@ onBeforeUnmount(() => {
<text>{{ tipContent }}</text> <text>{{ tipContent }}</text>
<button hover-class="none" @click="updateSound"> <button hover-class="none" @click="updateSound">
<image <image
:src="`../static/sound${sound ? '' : '-off'}-yellow.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/sound${sound ? '' : '-off'}-yellow.png`"
mode="widthFix" mode="widthFix"
/> />
</button> </button>
+10 -8
View File
@@ -12,12 +12,11 @@ import {
getHomeData, getHomeData,
getPhoneNumberAPI, getPhoneNumberAPI,
getPhoneNumberAPIv2, getPhoneNumberAPIv2,
getDeviceBatteryAPI,
} from "@/apis"; } from "@/apis";
import useStore from "@/store"; import useStore from "@/store";
const store = useStore(); const store = useStore();
const { updateUser, updateDevice, updateOnline, clearDevice } = store; const { updateUser, updateDevice, clearDevice } = store;
const props = defineProps({ const props = defineProps({
show: { show: {
@@ -32,6 +31,10 @@ const props = defineProps({
type: Function, type: Function,
default: () => {}, default: () => {},
}, },
onSuccess: {
type: Function,
default: () => {},
},
}); });
const agree = ref(false); const agree = ref(false);
const phone = ref(""); const phone = ref("");
@@ -121,12 +124,11 @@ async function doLogin() {
devices.bindings[0].deviceId, devices.bindings[0].deviceId,
devices.bindings[0].deviceName devices.bindings[0].deviceName
); );
const data = await getDeviceBatteryAPI();
updateOnline(data.online);
} else { } else {
clearDevice(); clearDevice();
} }
props.onClose(); props.onClose();
await props.onSuccess();
} catch (error) { } catch (error) {
console.log("login error", error); console.log("login error", error);
} finally { } finally {
@@ -176,7 +178,7 @@ onShow(() => {
<text v-else :style="{ color: noBg ? '#666' : '#fff9' }" <text v-else :style="{ color: noBg ? '#666' : '#fff9' }"
>点击获取</text >点击获取</text
> >
<image src="../static/enter.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/enter.png" mode="widthFix" />
</button> </button>
</view> </view>
<view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }"> <view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }">
@@ -191,7 +193,7 @@ onShow(() => {
<text v-else :style="{ color: noBg ? '#666' : '#fff9' }" <text v-else :style="{ color: noBg ? '#666' : '#fff9' }"
>点击获取</text >点击获取</text
> >
<image src="../static/enter.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/enter.png" mode="widthFix" />
</button> </button>
</view> </view>
<view <view
@@ -215,7 +217,7 @@ onShow(() => {
</block> </block>
<block v-else> <block v-else>
<image <image
src="../static/btn-loading.png" src="https://static.shelingxingqiu.com/shootmini/static/btn-loading.png"
mode="widthFix" mode="widthFix"
class="loading" class="loading"
/> />
@@ -226,7 +228,7 @@ onShow(() => {
v-if="!agree" v-if="!agree"
:style="{ borderColor: noBg ? '#E3E3E3' : '#fff' }" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff' }"
/> />
<image v-if="agree" src="../static/checked.png" mode="widthFix" /> <image v-if="agree" src="https://static.shelingxingqiu.com/shootmini/static/checked.png" mode="widthFix" />
<view> <view>
<text>已同意并阅读</text> <text>已同意并阅读</text>
<view <view
+185 -40
View File
@@ -1,8 +1,18 @@
<script setup> <script setup>
import { computed, getCurrentInstance, nextTick, onMounted, ref, watch } from "vue"; import {
computed,
getCurrentInstance,
nextTick,
onBeforeUnmount,
onMounted,
ref,
watch,
} from "vue";
const defaultCanvasSize = 300; const defaultCanvasSize = 300;
const defaultRingCount = 10; const defaultRingCount = 10;
const highlightRevealProgressFrames = [0.08, 0.2, 0.38, 0.6, 0.82, 1];
const highlightRevealFrameInterval = 60;
const props = defineProps({ const props = defineProps({
// canvas 唯一标识;不传时组件内部自动生成,避免多个靶面 canvas-id 冲突。 // canvas 唯一标识;不传时组件内部自动生成,避免多个靶面 canvas-id 冲突。
@@ -36,8 +46,13 @@ const props = defineProps({
type: Number, type: Number,
default: 0, default: 0,
}, },
// 指定环数,1 到 10;无效值表示高亮整个区域。 // 指定一个或多个环数,空数组表示高亮整个区域。
activeRing: { activeRings: {
type: Array,
default: () => [],
},
// 每次变化时以固定低帧数重新展开当前高亮扇区;默认关闭。
highlightRefreshToken: {
type: Number, type: Number,
default: 0, default: 0,
}, },
@@ -94,6 +109,10 @@ const canvasSize = ref({
width: defaultCanvasSize, width: defaultCanvasSize,
height: defaultCanvasSize, height: defaultCanvasSize,
}); });
let drawRequestGeneration = 0;
let highlightAnimationGeneration = 0;
let highlightAnimationTimer = null;
let mountDrawTimer = null;
// 完整靶纸默认样式,调用方可以通过 targetStyleConfig 局部覆盖。 // 完整靶纸默认样式,调用方可以通过 targetStyleConfig 局部覆盖。
const defaultTargetStyleConfig = { const defaultTargetStyleConfig = {
@@ -145,6 +164,8 @@ const defaultHighlightStyle = {
color: "rgba(255, 228, 0, 0.6)", color: "rgba(255, 228, 0, 0.6)",
strokeColor: "rgba(254, 216, 71, 0.82)", strokeColor: "rgba(254, 216, 71, 0.82)",
lineWidthRatio: 0.003, lineWidthRatio: 0.003,
// 在最小线宽计算后应用倍数,确保不同靶面尺寸下按比例加粗。
lineWidthScale: 1,
}; };
// 合并默认靶纸样式和外部传入样式,ringColors 单独深合并。 // 合并默认靶纸样式和外部传入样式,ringColors 单独深合并。
@@ -173,6 +194,25 @@ const getPositiveInteger = (value) => {
return Number.isInteger(numberValue) && numberValue > 0 ? numberValue : 0; return Number.isInteger(numberValue) && numberValue > 0 ? numberValue : 0;
}; };
// 过滤、去重并合并连续环,避免 3、4 环同时高亮时绘制中间描边。
const getActiveRingRanges = (ringCount) => {
const rings = [...new Set(
(Array.isArray(props.activeRings) ? props.activeRings : [])
.map(getPositiveInteger)
.filter((ring) => ring >= 1 && ring <= ringCount)
)].sort((first, second) => first - second);
return rings.reduce((ranges, ring) => {
const lastRange = ranges[ranges.length - 1];
if (lastRange && ring === lastRange.end + 1) {
lastRange.end = ring;
} else {
ranges.push({ start: ring, end: ring });
}
return ranges;
}, []);
};
// 正上方作为第一区起始边界,Canvas 角度递增方向即为顺时针。 // 正上方作为第一区起始边界,Canvas 角度递增方向即为顺时针。
const getSectorAngles = (sector, sectorCount) => { const getSectorAngles = (sector, sectorCount) => {
const count = getPositiveInteger(sectorCount); const count = getPositiveInteger(sectorCount);
@@ -237,36 +277,53 @@ const drawTargetRings = (ctx, centerX, centerY, targetRadius, config) => {
} }
}; };
// 高亮后端指定区域;activeRing 有效时只高亮该区域内的单个环。 // 高亮后端指定区域;activeRings 非空时高亮该区域内的一个或多个环。
const drawSectorHighlight = (ctx, centerX, centerY, targetRadius, config) => { const drawSectorHighlight = (
ctx,
centerX,
centerY,
targetRadius,
config,
revealProgress = 1
) => {
const angles = getSectorAngles(props.activeSector, props.sectorCount); const angles = getSectorAngles(props.activeSector, props.sectorCount);
if (!angles) return; if (!angles) return;
const ring = getPositiveInteger(props.activeRing); const safeRevealProgress = Math.min(
const hasActiveRing = ring >= 1 && ring <= config.ringCount; Math.max(getNumber(revealProgress, 1), 0),
const innerRadius = hasActiveRing 1
? targetRadius * ((config.ringCount - ring) / config.ringCount) );
: 0; if (safeRevealProgress <= 0) return;
const outerRadius = hasActiveRing
? targetRadius * ((config.ringCount + 1 - ring) / config.ringCount) const ringRanges = getActiveRingRanges(config.ringCount);
: targetRadius; const highlightRanges = ringRanges.length > 0
? ringRanges
: [{ start: 1, end: config.ringCount }];
const style = { const style = {
...defaultHighlightStyle, ...defaultHighlightStyle,
...props.highlightStyle, ...props.highlightStyle,
}; };
drawAnnularSector( highlightRanges.forEach((range) => {
ctx, const innerRadius =
centerX, targetRadius * ((config.ringCount - range.end) / config.ringCount);
centerY, const outerRadius =
innerRadius, targetRadius * ((config.ringCount + 1 - range.start) / config.ringCount);
outerRadius,
angles.startAngle, drawAnnularSector(
angles.endAngle, ctx,
style.color, centerX,
style.strokeColor, centerY,
Math.max(1, targetRadius * style.lineWidthRatio) innerRadius,
); outerRadius,
angles.startAngle,
angles.startAngle +
(angles.endAngle - angles.startAngle) * safeRevealProgress,
style.color,
style.strokeColor,
Math.max(1, targetRadius * style.lineWidthRatio) * style.lineWidthScale
);
});
}; };
// 从正上方开始顺时针绘制所有区域边界。 // 从正上方开始顺时针绘制所有区域边界。
@@ -387,7 +444,7 @@ const getDrawKey = (width, height) => {
showRingLabels: props.showRingLabels, showRingLabels: props.showRingLabels,
sectorCount: props.sectorCount, sectorCount: props.sectorCount,
activeSector: props.activeSector, activeSector: props.activeSector,
activeRing: props.activeRing, activeRings: props.activeRings,
showSectorLabels: props.showSectorLabels, showSectorLabels: props.showSectorLabels,
targetStyleConfig: props.targetStyleConfig, targetStyleConfig: props.targetStyleConfig,
crosshairStyle: props.crosshairStyle, crosshairStyle: props.crosshairStyle,
@@ -399,12 +456,12 @@ const getDrawKey = (width, height) => {
}; };
// 主绘制入口:根据 highlightOnly 决定画完整靶纸,还是只画透明高亮层。 // 主绘制入口:根据 highlightOnly 决定画完整靶纸,还是只画透明高亮层。
const drawTarget = () => { const drawTarget = ({ force = false, highlightProgress = 1 } = {}) => {
const width = Math.max(getNumber(canvasSize.value.width, defaultCanvasSize), 1); const width = Math.max(getNumber(canvasSize.value.width, defaultCanvasSize), 1);
const height = Math.max(getNumber(canvasSize.value.height, defaultCanvasSize), 1); const height = Math.max(getNumber(canvasSize.value.height, defaultCanvasSize), 1);
const drawKey = getDrawKey(width, height); const drawKey = getDrawKey(width, height);
if (drawKey === lastDrawKey.value) { if (!force && drawKey === lastDrawKey.value) {
return; return;
} }
@@ -421,7 +478,14 @@ const drawTarget = () => {
drawTargetRings(ctx, centerX, centerY, targetRadius, config); drawTargetRings(ctx, centerX, centerY, targetRadius, config);
} }
drawSectorHighlight(ctx, centerX, centerY, targetRadius, config); drawSectorHighlight(
ctx,
centerX,
centerY,
targetRadius,
config,
highlightProgress
);
if (!props.highlightOnly) { if (!props.highlightOnly) {
drawRingLines(ctx, centerX, centerY, targetRadius, config); drawRingLines(ctx, centerX, centerY, targetRadius, config);
@@ -441,26 +505,82 @@ const drawTarget = () => {
drawSectorLabels(ctx, centerX, centerY, targetRadius); drawSectorLabels(ctx, centerX, centerY, targetRadius);
ctx.draw(); ctx.draw();
lastDrawKey.value = drawKey; lastDrawKey.value = highlightProgress >= 1 ? drawKey : "";
}; };
const setCanvasSizeAndDraw = async (width, height) => { const cancelHighlightAnimation = () => {
highlightAnimationGeneration += 1;
if (highlightAnimationTimer) {
clearTimeout(highlightAnimationTimer);
highlightAnimationTimer = null;
}
};
// 固定 6 帧展开黄色扇区,避免对原生 canvas 节点做缩放导致低端机错位。
const runHighlightRevealAnimation = () => {
cancelHighlightAnimation();
const generation = highlightAnimationGeneration;
let frameIndex = 0;
const drawNextFrame = () => {
if (generation !== highlightAnimationGeneration) return;
drawTarget({
force: true,
highlightProgress: highlightRevealProgressFrames[frameIndex],
});
frameIndex += 1;
if (frameIndex < highlightRevealProgressFrames.length) {
highlightAnimationTimer = setTimeout(
drawNextFrame,
highlightRevealFrameInterval
);
} else {
highlightAnimationTimer = null;
}
};
drawNextFrame();
};
const setCanvasSizeAndDraw = async (
width,
height,
{ animateHighlight = false, requestGeneration } = {}
) => {
canvasSize.value = { canvasSize.value = {
width: width > 0 ? width : defaultCanvasSize, width: width > 0 ? width : defaultCanvasSize,
height: height > 0 ? height : width || defaultCanvasSize, height: height > 0 ? height : width || defaultCanvasSize,
}; };
await nextTick(); await nextTick();
drawTarget(); if (requestGeneration !== drawRequestGeneration) return;
const canAnimateHighlight =
animateHighlight &&
props.highlightOnly &&
!!getSectorAngles(props.activeSector, props.sectorCount);
if (canAnimateHighlight) {
runHighlightRevealAnimation();
} else {
cancelHighlightAnimation();
drawTarget();
}
}; };
// 读取 canvas 实际渲染尺寸后再绘制,保证小程序真机尺寸和坐标一致。 // 读取 canvas 实际渲染尺寸后再绘制,保证小程序真机尺寸和坐标一致。
const measureAndDraw = () => { const measureAndDraw = ({ animateHighlight = false } = {}) => {
const requestGeneration = ++drawRequestGeneration;
const propWidth = Math.round(getNumber(props.canvasWidth, 0)); const propWidth = Math.round(getNumber(props.canvasWidth, 0));
const propHeight = Math.round(getNumber(props.canvasHeight, 0)); const propHeight = Math.round(getNumber(props.canvasHeight, 0));
if (propWidth > 0 && propHeight > 0) { if (propWidth > 0 && propHeight > 0) {
setCanvasSizeAndDraw(propWidth, propHeight); setCanvasSizeAndDraw(propWidth, propHeight, {
animateHighlight,
requestGeneration,
});
return; return;
} }
@@ -469,18 +589,23 @@ const measureAndDraw = () => {
query query
.select(`#${currentCanvasId.value}`) .select(`#${currentCanvasId.value}`)
.boundingClientRect(async (rect) => { .boundingClientRect(async (rect) => {
if (requestGeneration !== drawRequestGeneration) return;
const width = Math.round(getNumber(rect?.width, defaultCanvasSize)); const width = Math.round(getNumber(rect?.width, defaultCanvasSize));
const height = Math.round(getNumber(rect?.height, width || defaultCanvasSize)); const height = Math.round(getNumber(rect?.height, width || defaultCanvasSize));
await setCanvasSizeAndDraw(width, height); await setCanvasSizeAndDraw(width, height, {
animateHighlight,
requestGeneration,
});
}) })
.exec(); .exec();
}; };
// 等待 Vue 完成 DOM 更新后重新测量和绘制。 // 等待 Vue 完成 DOM 更新后重新测量和绘制。
const scheduleDraw = async () => { const scheduleDraw = async ({ animateHighlight = false } = {}) => {
await nextTick(); await nextTick();
measureAndDraw(); measureAndDraw({ animateHighlight });
}; };
watch( watch(
@@ -490,7 +615,8 @@ watch(
props.showRingLabels, props.showRingLabels,
props.sectorCount, props.sectorCount,
props.activeSector, props.activeSector,
props.activeRing, props.activeRings,
props.highlightRefreshToken,
props.showSectorLabels, props.showSectorLabels,
props.highlightOnly, props.highlightOnly,
props.canvasWidth, props.canvasWidth,
@@ -501,14 +627,33 @@ watch(
props.sectorLabelStyle, props.sectorLabelStyle,
props.highlightStyle, props.highlightStyle,
], ],
scheduleDraw, (currentValues, previousValues = []) => {
const refreshTokenIndex = 6;
const refreshToken = Number(currentValues[refreshTokenIndex]);
const previousRefreshToken = Number(previousValues[refreshTokenIndex]);
const animateHighlight =
Number.isFinite(refreshToken) &&
refreshToken > 0 &&
refreshToken !== previousRefreshToken;
return scheduleDraw({ animateHighlight });
},
{ {
deep: true, deep: true,
} }
); );
onMounted(() => { onMounted(() => {
setTimeout(measureAndDraw, 30); mountDrawTimer = setTimeout(measureAndDraw, 30);
});
onBeforeUnmount(() => {
drawRequestGeneration += 1;
cancelHighlightAnimation();
if (mountDrawTimer) {
clearTimeout(mountDrawTimer);
mountDrawTimer = null;
}
}); });
</script> </script>
+1 -1
View File
@@ -81,7 +81,7 @@ const handleConfirm = () => {
<view class="header-title-line-right"></view> <view class="header-title-line-right"></view>
</view> </view>
<view class="close-btn" @click="onClose"> <view class="close-btn" @click="onClose">
<image src="../static/close-yellow.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-yellow.png" mode="widthFix" />
</view> </view>
</view> </view>
<view class="target-options"> <view class="target-options">
+2 -2
View File
@@ -65,7 +65,7 @@ watch(
<template> <template>
<view class="container"> <view class="container">
<image <image
:src="isRed ? '../static/flag-red.png' : '../static/flag-blue.png'" :src="isRed ? 'https://static.shelingxingqiu.com/shootmini/static/flag-red.png' : 'https://static.shelingxingqiu.com/shootmini/static/flag-blue.png'"
class="flag" class="flag"
:style="{ :style="{
[isRed ? 'left' : 'right']: '10rpx', [isRed ? 'left' : 'right']: '10rpx',
@@ -86,7 +86,7 @@ watch(
[isRed ? 'left' : 'right']: getPos(item.id) + 'rpx', [isRed ? 'left' : 'right']: getPos(item.id) + 'rpx',
}" }"
> >
<image :src="item.avatar || '../static/user-icon.png'" mode="widthFix" /> <image :src="item.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" mode="widthFix" />
<text <text
v-if="isFirst(item.id)" v-if="isFirst(item.id)"
:style="{ backgroundColor: isRed ? '#ff6060' : '#5fadff' }" :style="{ backgroundColor: isRed ? '#ff6060' : '#5fadff' }"
+63 -12
View File
@@ -6,10 +6,16 @@ import Avatar from "@/components/Avatar.vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { simulShootAPI } from "@/apis"; import { simulShootAPI } from "@/apis";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import {
getDistanceCheckAudioKey,
getDistanceCheckText,
getShootValidation,
} from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const store = useStore(); const store = useStore();
const { user, device } = storeToRefs(store); const { user, device } = storeToRefs(store);
const emit = defineEmits(["passed"]);
const props = defineProps({ const props = defineProps({
guide: { guide: {
type: Boolean, type: Boolean,
@@ -23,18 +29,50 @@ const props = defineProps({
type: Number, type: Number,
default: 15, default: 15,
}, },
targetType: {
type: [Number, String],
default: 40,
},
autoStart: {
type: Boolean,
default: false,
},
}); });
const arrow = ref({}); const arrow = ref({});
const distance = ref(0); const distance = ref(0);
const statusText = ref("");
const showsimul = ref(false); const showsimul = ref(false);
const count = ref(props.count); const count = ref(props.count);
const timer = ref(null); const timer = ref(null);
const autoStartPending = ref(false);
const autoStartTriggered = ref(false);
let autoStartTimer = null;
const DISTANCE_PASSED_AUDIO_KEY = "站距合格,靶纸正确";
const AUTO_START_TIMEOUT_MS = 6000;
const clearAutoStartTimer = () => {
if (!autoStartTimer) return;
clearTimeout(autoStartTimer);
autoStartTimer = null;
};
const triggerAutoStart = () => {
if (!autoStartPending.value || autoStartTriggered.value) return;
clearAutoStartTimer();
autoStartPending.value = false;
autoStartTriggered.value = true;
emit("passed");
};
const onAudioEnded = (key) => {
if (key === DISTANCE_PASSED_AUDIO_KEY) triggerAutoStart();
};
const updateTimer = (value) => { const updateTimer = (value) => {
count.value = Math.round(value); count.value = Math.round(value);
}; };
onMounted(() => { onMounted(() => {
audioManager.play("请射箭测试距离"); audioManager.play("请射箭!测试站距与靶纸");
if (props.isBattle) { if (props.isBattle) {
timer.value = setInterval(() => { timer.value = setInterval(() => {
count.value -= 1; count.value -= 1;
@@ -42,28 +80,43 @@ onMounted(() => {
}, 1000); }, 1000);
} }
uni.$on("update-timer", updateTimer); uni.$on("update-timer", updateTimer);
uni.$on("audioEnded", onAudioEnded);
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (timer.value) clearInterval(timer.value); if (timer.value) clearInterval(timer.value);
clearAutoStartTimer();
uni.$off("update-timer", updateTimer); uni.$off("update-timer", updateTimer);
uni.$off("audioEnded", onAudioEnded);
}); });
async function onReceiveMessage(msg) { async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return; if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.TestDistance) { if (msg.type === MESSAGETYPESV2.TestDistance) {
const rawDistance = Number(msg.shootData?.distance); if (autoStartPending.value || autoStartTriggered.value) return;
const rawDistance = Number(msg.shootData?.distance ?? msg.shootData?.dst);
distance.value = Number.isFinite(rawDistance) distance.value = Number.isFinite(rawDistance)
? Number((rawDistance / 100).toFixed(2)) ? Number((rawDistance / 100).toFixed(2))
: 0; : 0;
if (rawDistance === 0) { statusText.value = getDistanceCheckText(msg.shootData);
audioManager.play("未发现靶纸,请瞄准靶纸射箭"); const audioKey = getDistanceCheckAudioKey(msg.shootData);
} else if (distance.value >= 5) audioManager.play("距离合格"); const validation = getShootValidation(msg.shootData);
else audioManager.play("距离不足"); if (props.autoStart && validation.distanceOk && validation.targetOk) {
autoStartPending.value = true;
autoStartTimer = setTimeout(triggerAutoStart, AUTO_START_TIMEOUT_MS);
}
audioManager.play(audioKey);
} }
} }
const simulShoot = async () => { const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId); if (device.value.deviceId) {
await simulShootAPI(
device.value.deviceId,
undefined,
undefined,
props.targetType
);
}
}; };
onMounted(() => { onMounted(() => {
@@ -101,13 +154,11 @@ onBeforeUnmount(() => {
模拟射箭 模拟射箭
</button> </button>
<view class="warnning-text"> <view class="warnning-text">
<block v-if="distance > 0"> <block v-if="statusText">
<text>当前距离{{ distance }}米</text> <text>{{ statusText }}</text>
<text v-if="distance >= 5">已达到距离要求</text>
<text v-else>请调整站位</text>
</block> </block>
<block v-else> <block v-else>
<text>请射箭,测试站距</text> <text>请射箭,测试站距与靶纸</text>
</block> </block>
</view> </view>
<view class="user-row"> <view class="user-row">
+6 -1
View File
@@ -9,11 +9,13 @@ const props = defineProps({
const show = ref(false); const show = ref(false);
const count = ref(props.countdown); const count = ref(props.countdown);
const timer = ref(null); const timer = ref(null);
const showTimer = ref(null);
const updateTimer = (value) => { const updateTimer = (value) => {
count.value = Math.round(value); count.value = Math.round(value);
}; };
onMounted(() => { onMounted(() => {
setTimeout(() => { showTimer.value = setTimeout(() => {
showTimer.value = null;
show.value = true; show.value = true;
timer.value = setInterval(() => { timer.value = setInterval(() => {
if (count.value === 0) { if (count.value === 0) {
@@ -27,7 +29,10 @@ onMounted(() => {
uni.$on("update-timer", updateTimer); uni.$on("update-timer", updateTimer);
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (showTimer.value) clearTimeout(showTimer.value);
showTimer.value = null;
if (timer.value) clearInterval(timer.value); if (timer.value) clearInterval(timer.value);
timer.value = null;
uni.$off("update-timer", updateTimer); uni.$off("update-timer", updateTimer);
}); });
</script> </script>
+171
View File
@@ -0,0 +1,171 @@
<script setup>
import { computed } from "vue";
const MAX_VISIBLE_SCORE_CARDS = 60;
const props = defineProps({
arrows: {
type: Array,
default: () => [],
},
total: {
type: Number,
default: 0,
},
trainingType: {
type: String,
default: "",
},
recordMode: {
type: Boolean,
default: false,
},
});
const getDisplayText = (arrow = {}) => {
if (!arrow) return "";
if (!arrow.ring) return props.trainingType === "stability" ? "-" : "0";
return arrow.ringX ? "X" : String(arrow.ring);
};
const isFailed = (arrow = {}) => {
if (!arrow) return false;
if (
props.recordMode &&
props.trainingType !== "precision" &&
props.trainingType !== "rhythm" &&
props.trainingType !== "stability"
) {
return false;
}
return arrow.ok !== true;
};
const hiddenScoreCount = computed(() =>
props.recordMode
? 0
: Math.max(props.arrows.length - MAX_VISIBLE_SCORE_CARDS, 0)
);
const displayArrows = computed(() => {
const list = props.recordMode
? [...props.arrows]
: props.arrows.slice(-MAX_VISIBLE_SCORE_CARDS);
// total 是达标箭数,不是实际射箭上限;训练中始终预留下一箭空框。
if (!props.recordMode) list.push(null);
return list;
});
</script>
<template>
<view v-if="displayArrows.length" class="score-panel">
<text v-if="hiddenScoreCount" class="score-window-tip">
已省略前 {{ hiddenScoreCount }} 支,仅显示最近
{{ MAX_VISIBLE_SCORE_CARDS }} 支
</text>
<view class="score-grid">
<view
v-for="(arrow, index) in displayArrows"
:key="index"
class="score-card"
>
<image
class="score-card-bg"
:src="
isFailed(arrow)
? 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gray.png'
: 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gold.png'
"
/>
<image
v-if="trainingType === 'precision' && arrow"
class="score-result-icon"
:src="
arrow.ok === true
? 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/gou.png'
: 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/cha.png'
"
mode="aspectFit"
/>
<text
v-else
class="score-value"
:class="{ 'score-value--low': isFailed(arrow) }"
>
{{ getDisplayText(arrow) }}
</text>
</view>
</view>
</view>
</template>
<style scoped lang="scss">
.score-panel {
width: 100%;
padding: 30rpx 40rpx 0 40rpx;
box-sizing: border-box;
}
.score-grid {
display: flex;
flex-wrap: wrap;
}
.score-window-tip {
display: block;
margin-bottom: 18rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 22rpx;
line-height: 1.4;
}
.score-card {
position: relative;
width: 100rpx;
height: 56rpx;
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
margin-right: 14rpx;
margin-bottom: 14rpx;
}
.score-card:nth-child(6n) {
margin-right: 0;
}
.score-card-bg {
position: absolute;
top: 0;
left: 0;
width: 100rpx;
height: 56rpx;
}
.score-result-icon {
position: relative;
z-index: 1;
width: 30rpx;
height: 30rpx;
}
.score-value {
position: relative;
z-index: 1;
min-width: 28rpx;
text-align: center;
font-size: 34rpx;
line-height: 1;
font-weight: 700;
font-style: italic;
color: #f6e3b2;
text-shadow: 0 2rpx 0 rgba(36, 36, 48, 0.5);
margin-left: -10rpx;
}
.score-value--low {
color: #cfcfcf;
text-shadow: 0 2rpx 0 rgba(0, 0, 0, 0.5);
}
</style>
+4 -4
View File
@@ -95,7 +95,7 @@ watch(
</view> </view>
<!-- <image <!-- <image
class="user-name-image" class="user-name-image"
src="../static/vip1.png" src="https://static.shelingxingqiu.com/shootmini/static/vip1.png"
mode="widthFix" mode="widthFix"
/> --> /> -->
</view> </view>
@@ -117,7 +117,7 @@ watch(
<view v-if="showRank === true" class="rank-info" @click="toRankListPage"> <view v-if="showRank === true" class="rank-info" @click="toRankListPage">
<image <image
class="rank-info-image" class="rank-info-image"
src="../static/global-rank.png" src="https://static.shelingxingqiu.com/shootmini/static/global-rank.png"
mode="widthFix" mode="widthFix"
/> />
<block v-if="user.ranking > 0 && rankData.rank.length"> <block v-if="user.ranking > 0 && rankData.rank.length">
@@ -136,12 +136,12 @@ watch(
</block> </block>
<block v-else> <block v-else>
<view class="signin" @click="onSignin"> <view class="signin" @click="onSignin">
<image src="../static/user-icon.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/user-icon.png" mode="widthFix" />
<view> <view>
<text>新来的弓箭手你好呀~</text> <text>新来的弓箭手你好呀~</text>
<view> <view>
<text>登录</text> <text>登录</text>
<image src="../static/enter-arrow-blue.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/enter-arrow-blue.png" mode="widthFix" />
</view> </view>
</view> </view>
</view> </view>
+1 -1
View File
@@ -25,7 +25,7 @@ defineProps({
<view> <view>
<slot></slot> <slot></slot>
<view v-if="onClick !== null"> <view v-if="onClick !== null">
<image src="../static/enter.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/enter.png" mode="widthFix" />
</view> </view>
</view> </view>
</view> </view>
+2 -2
View File
@@ -52,7 +52,7 @@ onBeforeUnmount(() => {
<template> <template>
<view class="content" :style="{ display: show ? 'flex' : 'none' }"> <view class="content" :style="{ display: show ? 'flex' : 'none' }">
<view v-if="showRank" class="up-rank"> <view v-if="showRank" class="up-rank">
<image :src="user.avatar || '../static/user-icon.png'" mode="widthFix" /> <image :src="user.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" mode="widthFix" />
<image :src="nextRankImage" mode="widthFix" /> <image :src="nextRankImage" mode="widthFix" />
<image class="bg-effect" src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" /> <image class="bg-effect" src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" />
<image <image
@@ -75,7 +75,7 @@ onBeforeUnmount(() => {
/> />
</view> </view>
<view class="text-content"> <view class="text-content">
<image src="../static/update-text-bg.png" /> <image src="https://static.shelingxingqiu.com/shootmini/static/update-text-bg.png" />
<text>恭喜你升级到</text> <text>恭喜你升级到</text>
<text>{{ showRank ? nextRankTitle : `射灵${lvl}级` }}</text> <text>{{ showRank ? nextRankTitle : `射灵${lvl}级` }}</text>
<text>!</text> <text>!</text>
+241
View File
@@ -0,0 +1,241 @@
import { computed, ref } from "vue";
import { sendHardwareBoxUpdateAPI } from "@/apis";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const OTA_PROGRESS_EVENT = "/addons/shoot/otaProgress";
const OTA_RESULT_EVENT = "/addons/shoot/otaResult";
const UPDATE_TIMEOUT = 10 * 60 * 1000;
const phaseTextMap = {
started: "正在准备固件更新",
downloading: "正在下载固件",
installing: "正在安装固件",
};
// 设备详情中的 latestVersion 是升级目标,version 是当前固件版本。
export const getOtaInfoFromDetail = (detail) => ({
versionNumber: String(detail?.latestVersion ?? "").trim(),
currentVersion: String(detail?.version ?? "").trim(),
versionInfo: String(detail?.versionInfo ?? "").trim(),
needUpdate: detail?.needUpdate === true || Number(detail?.needUpdate) === 1,
forceUpdate: detail?.forceUpdate === true || Number(detail?.forceUpdate) === 1,
});
// OTA 状态由首页、WiFi 设置页和我的设备页共享,页面切换后仍可继续接收进度。
const updating = ref(false);
const progress = ref(0);
const phase = ref("started");
const resultVisible = ref(false);
const resultStatus = ref("");
const resultReason = ref("");
let deviceRef = null;
let updateRunId = 0;
let targetVersion = "";
let lastFinishedVersion = "";
let timeoutTimer = null;
let successCallback = null;
let socketListening = false;
const phaseText = computed(
() => phaseTextMap[phase.value] || "正在进行固件更新"
);
const resultTitle = computed(() =>
resultStatus.value === "success" ? "固件更新完成" : "固件更新失败"
);
const resultContent = computed(() => {
if (resultStatus.value === "success") return "固件更新已完成";
return resultReason.value || "更新失败,请检查设备及网络后重试";
});
const clearTimers = () => {
clearTimeout(timeoutTimer);
timeoutTimer = null;
};
const resetActiveUpdate = () => {
clearTimers();
successCallback = null;
};
const finishUpdate = (status, reason = "", runId = updateRunId) => {
if (runId !== updateRunId || !updating.value) return;
const onSuccess = successCallback;
resetActiveUpdate();
updating.value = false;
resultStatus.value = status;
resultReason.value = reason;
lastFinishedVersion = targetVersion;
if (status === "success") {
progress.value = 100;
phase.value = "installing";
onSuccess?.();
}
resultVisible.value = true;
};
const isCurrentDeviceMessage = (data) => {
const messageDeviceId = String(data?.deviceId || "");
const currentDeviceId = String(deviceRef?.value?.deviceId || "");
return !messageDeviceId || !currentDeviceId || messageDeviceId === currentDeviceId;
};
const isCurrentVersionMessage = (data) => {
const messageVersion = String(data?.versionNumber || "");
return !messageVersion || !targetVersion || messageVersion === targetVersion;
};
// 页面切换导致弹窗关闭后,使用下一条进度消息恢复当前 OTA 会话。
const recoverUpdateFromMessage = (data) => {
updateRunId += 1;
const runId = updateRunId;
targetVersion = String(data?.versionNumber || "");
lastFinishedVersion = "";
successCallback = null;
resultVisible.value = false;
resultStatus.value = "";
resultReason.value = "";
progress.value = 0;
phase.value = "started";
updating.value = true;
clearTimers();
timeoutTimer = setTimeout(() => {
finishUpdate("failed", "固件更新超时,请稍后重试", runId);
}, UPDATE_TIMEOUT);
};
function handleSocketMessage(message) {
if (Number(message?.code ?? 0) !== 0) return;
if (![OTA_PROGRESS_EVENT, OTA_RESULT_EVENT].includes(message?.event)) return;
if (!isCurrentDeviceMessage(message.data)) return;
const messageVersion = String(message.data?.versionNumber || "");
if (message.event === OTA_PROGRESS_EVENT) {
if (!updating.value) {
if (
lastFinishedVersion &&
(!messageVersion || messageVersion === lastFinishedVersion)
) {
return;
}
recoverUpdateFromMessage(message.data);
} else if (!isCurrentVersionMessage(message.data)) {
return;
}
if (!targetVersion && messageVersion) targetVersion = messageVersion;
const nextProgress = Math.min(
100,
Math.max(0, Number(message.data?.progress) || 0)
);
progress.value = Math.max(progress.value, nextProgress);
if (phaseTextMap[message.data?.phase]) {
phase.value = message.data.phase;
}
return;
}
if (!updating.value) {
if (
lastFinishedVersion &&
(!messageVersion || messageVersion === lastFinishedVersion)
) {
return;
}
recoverUpdateFromMessage(message.data);
} else if (!isCurrentVersionMessage(message.data)) {
return;
}
if (!targetVersion && messageVersion) targetVersion = messageVersion;
if (message.data?.status === "success") {
finishUpdate("success");
} else if (message.data?.status === "failed") {
finishUpdate("failed", message.data?.reason || "");
}
}
const startSocketListening = () => {
if (socketListening) return;
uni.$on("socket-inbox", handleSocketMessage);
socketListening = true;
};
export const useOtaUpdate = () => {
const store = useStore();
const { device } = storeToRefs(store);
deviceRef = device;
startSocketListening();
const startUpdate = async ({
versionNumber,
wifiSsid = "",
wifiPassword = "",
onSuccess,
}) => {
if (updating.value) return false;
const nextVersion = String(versionNumber || "").trim();
if (!nextVersion) {
uni.showToast({ title: "缺少固件目标版本", icon: "none" });
return false;
}
updateRunId += 1;
const runId = updateRunId;
targetVersion = nextVersion;
lastFinishedVersion = "";
successCallback = onSuccess || null;
resultVisible.value = false;
resultStatus.value = "";
resultReason.value = "";
progress.value = 0;
phase.value = "started";
updating.value = true;
clearTimers();
timeoutTimer = setTimeout(() => {
finishUpdate("failed", "固件更新超时,请稍后重试", runId);
}, UPDATE_TIMEOUT);
try {
const updateResult = await sendHardwareBoxUpdateAPI({
versionNumber: targetVersion,
wifiSsid,
wifiPassword,
});
if (runId !== updateRunId || !updating.value) return false;
if (!updateResult?.taskId) {
finishUpdate("failed", "固件更新任务创建失败,请稍后重试", runId);
return false;
}
return true;
} catch (error) {
if (runId === updateRunId) {
finishUpdate(
"failed",
error?.message || "固件更新请求失败,请稍后重试",
runId
);
}
return false;
}
};
const closeResult = () => {
resultVisible.value = false;
};
return {
updating,
progress,
phase,
phaseText,
resultVisible,
resultStatus,
resultTitle,
resultContent,
startUpdate,
closeResult,
};
};
+1
View File
@@ -29,6 +29,7 @@ export const MESSAGETYPES = {
DeviceOnline: 4168086626, DeviceOnline: 4168086626,
DeviceOffline: 4168086627, DeviceOffline: 4168086627,
SomeoneIsReady: 4168086628, SomeoneIsReady: 4168086628,
DeviceCharging: 4168086631, // 设备充电中
}; };
export const MESSAGETYPESV2 = { export const MESSAGETYPESV2 = {
+8
View File
@@ -294,6 +294,14 @@
{ {
"type" : "folder", "type" : "folder",
"value" : "static/training-difficulty-design" "value" : "static/training-difficulty-design"
},
{
"type" : "folder",
"value" : "static/coin"
},
{
"type" : "folder",
"value" : "static/home-device"
} }
] ]
}, },
+275 -10
View File
@@ -9,7 +9,20 @@ import {
getServerMessageTypeName, getServerMessageTypeName,
} from "@/utils/matchProtocol"; } from "@/utils/matchProtocol";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText } from "@/util"; import {
getDirectionText,
getDistanceCheckAudioKey,
getInvalidShotAudioKey,
} from "@/util";
import {
getPrecisionShotAudioKeys,
getRhythmShotAudioKeys,
getStabilityShotAudioKeys,
getTrainingEndAudioKey,
getTrainingStartAudioKey,
STABILITY_ENERGY_50_AUDIO_KEY,
STABILITY_ENERGY_70_AUDIO_KEY,
} from "@/audioManager";
import { import {
normalizeId, normalizeId,
normalizeMatchInfo, normalizeMatchInfo,
@@ -41,6 +54,13 @@ const LIVENESS_TIMEOUT_MS = 30000;
const RECONNECT_DELAYS_MS = [1000, 2000, 4000, 8000, 15000]; const RECONNECT_DELAYS_MS = [1000, 2000, 4000, 8000, 15000];
const ROUND_AUDIO_NAMES = ["一", "二", "三", "四", "五"]; const ROUND_AUDIO_NAMES = ["一", "二", "三", "四", "五"];
const MATCH_STATUS_HALF_REST = 3; const MATCH_STATUS_HALF_REST = 3;
const ENABLE_REALTIME_MESSAGE_LOG = (() => {
try {
return uni.getAccountInfoSync().miniProgram.envVersion !== "release";
} catch (_) {
return false;
}
})();
// 比赛服消息类型先映射成项目里已有的 V2 业务消息,页面仍然复用原来的 socket-inbox 流程。 // 比赛服消息类型先映射成项目里已有的 V2 业务消息,页面仍然复用原来的 socket-inbox 流程。
const BUSINESS_TYPE_BY_SERVER_TYPE = { const BUSINESS_TYPE_BY_SERVER_TYPE = {
@@ -66,6 +86,9 @@ function normalizeShootData(shootData) {
if (normalized.distance === undefined && normalized.dst !== undefined) { if (normalized.distance === undefined && normalized.dst !== undefined) {
normalized.distance = normalized.dst; normalized.distance = normalized.dst;
} }
if (normalized.targetOk === undefined && normalized.target_ok !== undefined) {
normalized.targetOk = normalized.target_ok;
}
return normalized; return normalized;
} }
@@ -131,6 +154,15 @@ function buildBusinessMessage(message) {
matchInfo.status = 0; matchInfo.status = 0;
} }
const practiceInfo = normalizePracticeInfo(message.practice_info); const practiceInfo = normalizePracticeInfo(message.practice_info);
const trainingType = String(
practiceInfo.trainingType ||
matchInfo.trainingType ||
currentContext?.trainingType ||
""
).trim();
if (currentContext && trainingType) {
currentContext.trainingType = trainingType;
}
const businessType = getBusinessType(message, matchInfo); const businessType = getBusinessType(message, matchInfo);
if (!businessType) return null; if (!businessType) return null;
@@ -183,11 +215,22 @@ function buildBusinessMessage(message) {
matchWsType: message.type, matchWsType: message.type,
matchWsTypeName: getServerMessageTypeName(message.type), matchWsTypeName: getServerMessageTypeName(message.type),
isSecondHalfStart, isSecondHalfStart,
...(trainingType ? { trainingType } : {}),
}; };
} }
function buildPracticeSyncMessage(message) { function buildPracticeSyncMessage(message) {
const practiceInfo = normalizePracticeInfo(message.practice_info); const practiceInfo = normalizePracticeInfo(message.practice_info);
if (currentContext && practiceInfo.trainingType) {
currentContext.trainingType = String(practiceInfo.trainingType).trim();
}
updateStabilityEnergyContext(practiceInfo, {
fullSnapshot: true,
detectCrossing: false,
});
updateStabilityShotContext(practiceInfo, {
detectShot: false,
});
const matchId = normalizeId( const matchId = normalizeId(
pickField(message, "matchId", "match_id") || pickField(message, "matchId", "match_id") ||
practiceInfo.id || practiceInfo.id ||
@@ -346,17 +389,183 @@ function getShootResultAudioKeys(shootData) {
return keys; return keys;
} }
function normalizeScoreSlot(value) {
const scoreSlot = Number(value);
return Number.isFinite(scoreSlot) && scoreSlot > 0 ? scoreSlot : 0;
}
function clampEnergy(value, scoreSlot = 0) {
const energy = Number(value);
if (!Number.isFinite(energy)) return 0;
const maxEnergy = normalizeScoreSlot(scoreSlot);
return maxEnergy > 0
? Math.min(maxEnergy, Math.max(0, energy))
: Math.max(0, energy);
}
function getEnergyPercent(energy, scoreSlot) {
const maxEnergy = normalizeScoreSlot(scoreSlot);
if (!maxEnergy) return 0;
return Math.min(100, (clampEnergy(energy, maxEnergy) / maxEnergy) * 100);
}
function getStabilityArrowCount(source = {}) {
const candidates = [
Array.isArray(source.details) ? source.details.length : NaN,
Number(source.currentArrows),
Number(source.totalArrows),
].filter((value) => Number.isFinite(value) && value >= 0);
return candidates.length > 0 ? Math.max(...candidates) : null;
}
function updateStabilityShotContext(
source = {},
{ detectShot = false } = {}
) {
const trainingType = String(
source.trainingType || currentContext?.trainingType || ""
).trim();
if (trainingType !== "stability" || !currentContext) return false;
const nextArrowCount = getStabilityArrowCount(source);
if (nextArrowCount === null) return false;
const storedArrowCount = Number(currentContext.stabilityArrowCount);
const previousArrowCount = Number.isFinite(storedArrowCount)
? storedArrowCount
: 0;
const hasNewShot =
detectShot && nextArrowCount > previousArrowCount;
if (nextArrowCount >= previousArrowCount) {
currentContext.stabilityArrowCount = nextArrowCount;
}
return hasNewShot;
}
// 稳定训练的阈值语音必须和 ACK 使用同一份判定结果,避免页面播放了
// 里程碑语音但比赛服提前收到 ACK。能量跌破阈值后再次向上跨越可重复触发。
function updateStabilityEnergyContext(
source = {},
{ fullSnapshot = false, detectCrossing = false } = {}
) {
const trainingType = String(
source.trainingType || currentContext?.trainingType || ""
).trim();
if (trainingType !== "stability" || !currentContext) return "";
const hasCurrentEnergy = Object.prototype.hasOwnProperty.call(
source,
"currentEnergy"
);
if (!hasCurrentEnergy && !fullSnapshot) return "";
const previousScoreSlot = normalizeScoreSlot(
currentContext.stabilityScoreSlot
);
const nextScoreSlot =
normalizeScoreSlot(source.scoreSlot) || previousScoreSlot;
const previousEnergy = clampEnergy(
currentContext.stabilityEnergy,
previousScoreSlot
);
const nextEnergy = clampEnergy(
hasCurrentEnergy ? source.currentEnergy : 0,
nextScoreSlot
);
const previousPercent = getEnergyPercent(
previousEnergy,
previousScoreSlot || nextScoreSlot
);
const nextPercent = getEnergyPercent(nextEnergy, nextScoreSlot);
currentContext.stabilityEnergy = nextEnergy;
currentContext.stabilityScoreSlot = nextScoreSlot;
if (!detectCrossing) {
currentContext.stabilityEnergy50Armed = nextPercent < 50;
currentContext.stabilityEnergy70Armed = nextPercent < 70;
return "";
}
let energy50Armed =
typeof currentContext.stabilityEnergy50Armed === "boolean"
? currentContext.stabilityEnergy50Armed
: previousPercent < 50;
let energy70Armed =
typeof currentContext.stabilityEnergy70Armed === "boolean"
? currentContext.stabilityEnergy70Armed
: previousPercent < 70;
if (nextPercent < 50) energy50Armed = true;
if (nextPercent < 70) energy70Armed = true;
let milestoneAudioKey = "";
if (energy70Armed && nextPercent >= 70) {
milestoneAudioKey = STABILITY_ENERGY_70_AUDIO_KEY;
energy70Armed = false;
// 同一次直接跨过两个阈值时只播70%,不能在后续补播50%。
energy50Armed = false;
} else if (energy50Armed && nextPercent >= 50) {
milestoneAudioKey = STABILITY_ENERGY_50_AUDIO_KEY;
energy50Armed = false;
}
currentContext.stabilityEnergy50Armed = energy50Armed;
currentContext.stabilityEnergy70Armed = energy70Armed;
return milestoneAudioKey;
}
function getTestDistanceAudioKeys(shootData) { function getTestDistanceAudioKeys(shootData) {
const distance = Number(shootData?.distance ?? shootData?.dst); if (!shootData) return [];
if (Number.isNaN(distance)) return []; return [getDistanceCheckAudioKey(shootData)];
if (distance === 0) return ["未发现靶纸,请瞄准靶纸射箭"]; }
return [distance / 100 >= 5 ? "\u8ddd\u79bb\u5408\u683c" : "\u8ddd\u79bb\u4e0d\u8db3"];
function attachStabilityAudioContext(message, businessMessage) {
const fullStabilitySnapshot = [
ServerMessageType.SERVER_MSG_MATCH_START,
ServerMessageType.SERVER_MSG_SHOT,
ServerMessageType.SERVER_MSG_MATCH_END,
ServerMessageType.SERVER_MSG_TIMEOUT,
ServerMessageType.SERVER_MSG_PRACTICE_END,
].includes(message.type);
const stabilityMilestoneAudioKey = updateStabilityEnergyContext(
businessMessage,
{
fullSnapshot: fullStabilitySnapshot,
detectCrossing: message.type === ServerMessageType.SERVER_MSG_SHOT,
}
);
const stabilityHasNewShot = updateStabilityShotContext(businessMessage, {
detectShot: message.type === ServerMessageType.SERVER_MSG_SHOT,
});
if (businessMessage && stabilityMilestoneAudioKey) {
businessMessage.stabilityMilestoneAudioKey = stabilityMilestoneAudioKey;
}
if (businessMessage) {
businessMessage.stabilityHasNewShot = stabilityHasNewShot;
}
} }
function getAckAudioKeys(message, businessMessage) { function getAckAudioKeys(message, businessMessage) {
const stabilityMilestoneAudioKey = String(
businessMessage?.stabilityMilestoneAudioKey || ""
).trim();
const stabilityHasNewShot =
businessMessage?.stabilityHasNewShot === true;
switch (message.type) { switch (message.type) {
case ServerMessageType.SERVER_MSG_MATCH_START: case ServerMessageType.SERVER_MSG_MATCH_START:
return [businessMessage?.isSecondHalfStart ? "下半场开始" : "比赛开始"]; if (businessMessage?.isSecondHalfStart) return ["下半场开始"];
// 个人训练在开始接口成功后主动播报,不再等待 MATCH_START 触发语音。
if (
getTrainingStartAudioKey(
businessMessage?.trainingType || currentContext?.trainingType
)
) {
return [];
}
return ["比赛开始"];
case ServerMessageType.SERVER_MSG_NOW_YOU: case ServerMessageType.SERVER_MSG_NOW_YOU:
if (isMeleeMessage(message, businessMessage)) return []; if (isMeleeMessage(message, businessMessage)) return [];
return getNowYouAudioKeys(businessMessage); return getNowYouAudioKeys(businessMessage);
@@ -367,6 +576,27 @@ function getAckAudioKeys(message, businessMessage) {
) { ) {
return []; return [];
} }
const trainingType =
businessMessage?.trainingType || currentContext?.trainingType;
if (trainingType === "precision") {
const shootData = businessMessage?.shootData;
const directionText =
shootData?.angle !== null && shootData?.angle !== undefined
? getDirectionText(shootData.angle)
: "";
return getPrecisionShotAudioKeys(shootData, directionText);
}
if (trainingType === "rhythm") {
return getRhythmShotAudioKeys(businessMessage?.shootData);
}
if (trainingType === "stability") {
return [
...(stabilityHasNewShot
? getStabilityShotAudioKeys(businessMessage?.shootData)
: []),
stabilityMilestoneAudioKey,
].filter(Boolean);
}
return getShootResultAudioKeys(businessMessage?.shootData); return getShootResultAudioKeys(businessMessage?.shootData);
case ServerMessageType.SERVER_MSG_MATCH_END: case ServerMessageType.SERVER_MSG_MATCH_END:
return ["比赛结束"]; return ["比赛结束"];
@@ -374,11 +604,15 @@ function getAckAudioKeys(message, businessMessage) {
if (businessMessage?.type === MESSAGETYPESV2.HalfRest) return ["中场休息"]; if (businessMessage?.type === MESSAGETYPESV2.HalfRest) return ["中场休息"];
return ["比赛结束"]; return ["比赛结束"];
case ServerMessageType.SERVER_MSG_PRACTICE_END: case ServerMessageType.SERVER_MSG_PRACTICE_END:
// 个人训练的 ACK 等待实际播放的通关语音,其他练习保留原有配置。
if (currentContext?.practiceEndAudioKey === "练习结束") {
return [getTrainingEndAudioKey(businessMessage?.completed)];
}
return [currentContext?.practiceEndAudioKey || "比赛结束"]; return [currentContext?.practiceEndAudioKey || "比赛结束"];
case ServerMessageType.SERVER_MSG_CHECK: case ServerMessageType.SERVER_MSG_CHECK:
return getTestDistanceAudioKeys(businessMessage?.shootData); return getTestDistanceAudioKeys(businessMessage?.shootData);
case ServerMessageType.SERVER_MSG_NOT_ENOUGH_DISTANCE: case ServerMessageType.SERVER_MSG_NOT_ENOUGH_DISTANCE:
return ["射击无效"]; return [getInvalidShotAudioKey(businessMessage?.shootData)];
default: default:
return []; return [];
} }
@@ -631,7 +865,9 @@ function sendHeartbeatAck() {
} }
function sendPracticeInfoSync() { function sendPracticeInfoSync() {
if (!socket || !currentContext?.matchId || !currentContext?.userId) return; if (!socket || !currentContext?.matchId || !currentContext?.userId) {
return false;
}
const clientMessage = { const clientMessage = {
type: ClientMessageType.CLIENT_MSG_SYNC_PRACTICE_INFO, type: ClientMessageType.CLIENT_MSG_SYNC_PRACTICE_INFO,
@@ -646,6 +882,12 @@ function sendPracticeInfoSync() {
"CLIENT_MSG_SYNC_PRACTICE_INFO", "CLIENT_MSG_SYNC_PRACTICE_INFO",
clientMessage clientMessage
); );
return true;
}
// 训练开始后可在不重连 WebSocket 的情况下主动刷新完整练习快照。
export function requestPracticeInfoSync() {
return sendPracticeInfoSync();
} }
function sendAck({ matchId, sequence }) { function sendAck({ matchId, sequence }) {
@@ -784,8 +1026,9 @@ function handleMessage(data) {
return; return;
} }
const typeName = getServerMessageTypeName(message.type); if (ENABLE_REALTIME_MESSAGE_LOG) {
console.log("收到比赛服 WebSocket 消息", typeName, message); console.log("收到比赛服 WebSocket 消息", message);
}
const decodedMatchId = normalizeId(pickField(message, "matchId", "match_id")); const decodedMatchId = normalizeId(pickField(message, "matchId", "match_id"));
if (message.type === ServerMessageType.SERVER_MSG_SYNC_PRACTICE_INFO) { if (message.type === ServerMessageType.SERVER_MSG_SYNC_PRACTICE_INFO) {
@@ -819,6 +1062,8 @@ function handleMessage(data) {
if (businessMessage?.matchId && currentContext) { if (businessMessage?.matchId && currentContext) {
currentContext.matchId = businessMessage.matchId; currentContext.matchId = businessMessage.matchId;
} }
// 阈值事件必须先于 ACK 判断生成,确保无 sequence 的状态推送也能播放。
attachStabilityAudioContext(message, businessMessage);
queueAckAfterAudio(message, businessMessage); queueAckAfterAudio(message, businessMessage);
emitBusinessMessage(businessMessage); emitBusinessMessage(businessMessage);
} }
@@ -852,6 +1097,7 @@ export function connectMatchWebSocket(options = {}) {
requestPracticeInfoOnOpen = false, requestPracticeInfoOnOpen = false,
appHideResumable = false, appHideResumable = false,
practiceEndAudioKey = "", practiceEndAudioKey = "",
trainingType = "",
force = false, force = false,
reconnecting = false, reconnecting = false,
reconnectReason = "", reconnectReason = "",
@@ -859,6 +1105,7 @@ export function connectMatchWebSocket(options = {}) {
const normalizedMatchId = normalizeId(matchId); const normalizedMatchId = normalizeId(matchId);
const normalizedUserId = normalizeId(userId); const normalizedUserId = normalizeId(userId);
const normalizedMode = Number(mode); const normalizedMode = Number(mode);
const normalizedTrainingType = String(trainingType || "").trim();
const incomingUrl = normalizeServerUrl(serverAddr, token); const incomingUrl = normalizeServerUrl(serverAddr, token);
const currentUrlToken = getUrlToken(currentContext?.url); const currentUrlToken = getUrlToken(currentContext?.url);
const shouldKeepAuthenticatedUrl = !!( const shouldKeepAuthenticatedUrl = !!(
@@ -925,6 +1172,24 @@ export function connectMatchWebSocket(options = {}) {
requestPracticeInfoOnOpen: requestPracticeInfoOnOpen === true, requestPracticeInfoOnOpen: requestPracticeInfoOnOpen === true,
appHideResumable: appHideResumable === true, appHideResumable: appHideResumable === true,
practiceEndAudioKey: String(practiceEndAudioKey || "").trim(), practiceEndAudioKey: String(practiceEndAudioKey || "").trim(),
trainingType:
normalizedTrainingType ||
(isSameContext ? currentContext?.trainingType || "" : ""),
stabilityEnergy: isSameContext
? currentContext?.stabilityEnergy
: undefined,
stabilityScoreSlot: isSameContext
? currentContext?.stabilityScoreSlot
: undefined,
stabilityEnergy50Armed: isSameContext
? currentContext?.stabilityEnergy50Armed
: undefined,
stabilityEnergy70Armed: isSameContext
? currentContext?.stabilityEnergy70Armed
: undefined,
stabilityArrowCount: isSameContext
? currentContext?.stabilityArrowCount
: undefined,
meleeHalfRest: isSameContext meleeHalfRest: isSameContext
? currentContext?.meleeHalfRest === true ? currentContext?.meleeHalfRest === true
: false, : false,
-104
View File
@@ -1,104 +0,0 @@
// 首页一周打卡展示数据,直接对应顶部 7 个日期卡片。
export const trainingHomeWeekSchedule = [
{
key: "mon",
label: "周一",
status: "done",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
},
{
key: "tue",
label: "周二",
status: "done",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
},
{
key: "wed",
label: "周三",
status: "missed",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
},
{
key: "thu",
label: "周四",
status: "missed",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
},
{
key: "fri",
label: "周五",
status: "done",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
},
{
key: "sat",
label: "周六",
status: "done",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
},
{
key: "sun",
label: "周日",
status: "missed",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
},
];
// 首页统计卡数据,按设计稿从左到右展示。
export const trainingHomeStats = [
{ key: "days", value: "12", unit: "天", label: "共训练" },
{ key: "shots", value: "112", unit: "支", label: "累计射箭" },
{ key: "hitRate", value: "30", unit: "%", label: "命中率" },
{ key: "endurance", value: "6", unit: "支/分钟", label: "耐力射击" },
{ key: "calories", value: "31W", unit: "卡路里", label: "共消耗" },
];
// 雷达图区文案与数值配置。
export const trainingHomeRadar = {
labels: ["基础", "精准", "力量", "节奏", "耐力"],
values: [5.5, 6.3, 10, 4.5, 6],
maxValue: 10,
surpassValue: '80%'
};
// 首页主推荐训练卡数据。
export const trainingHomeFeatured = {
title: "基础训练",
progressText: "当前进度 LV7 >",
};
// 首页四个训练入口卡片数据。
export const trainingHomeModes = [
{
key: "endurance",
title: "耐力训练",
progressText: "当前进度 LV5 >",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_3.png",
recommended: true,
disabled: false,
},
{
key: "precision",
title: "精准训练",
progressText: "当前进度 LV3 >",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_4.png",
recommended: false,
disabled: false,
},
{
key: "rhythm",
title: "节奏训练",
progressText: "当前进度 LV6 >",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_5.png",
recommended: false,
disabled: false,
},
{
key: "power",
title: "力量训练",
progressText: "Coming! LV10",
icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png",
recommended: false,
disabled: true,
},
];
-113
View File
@@ -1,113 +0,0 @@
// 难度页当前用于保存“开始训练前上下文”的本地存储 key。
export const trainingDifficultyStorageKey = "training-selection";
// 当前是页面联调用的模拟数据:
// 1. 总难度 20 级
// 2. 已解锁到 Lv3
// 3. 前三关展示不同完成进度
const totalDifficultyLevel = 20;
const mockedUnlockedDifficultyId = "lv3";
const mockedDifficultyProgressMap = {
lv1: 100,
lv2: 90,
lv3: 70,
};
const modeList = [
{
key: "endurance",
title: "耐力训练",
},
{
key: "precision",
title: "精准训练",
},
{
key: "rhythm",
title: "节奏训练",
},
{
key: "basic",
title: "基础训练",
},
{
key: "power",
title: "力量训练",
},
{
key: "focus",
title: "专注训练",
},
];
const createDifficultyId = (level) => `lv${level}`;
const createDifficultyLabel = (level) => `Lv${level}`;
// 根据等级生成模拟文案,方便一次性扩展到更多关卡。
const createDifficultySummary = (level) => {
return [
`箭靶划分为${Math.min(1 + Math.floor((level - 1) / 5), 4)}个区域`,
`需${4 + level}次命中目标`,
`${100 + Math.floor((level - 1) / 2) * 10}秒内完成所有射击`,
"需使用20CM全环靶",
];
};
// 难度页的节点位置已经在页面内统一计算,
// 这里保留最核心的 id / label 即可,不再维护无效的 left / top / style 字段。
const createDifficultyNode = (level) => {
return {
id: createDifficultyId(level),
label: createDifficultyLabel(level),
};
};
const createDifficultyDetail = (level) => {
const id = createDifficultyId(level);
const label = createDifficultyLabel(level);
return {
id,
label,
title: `${label}难度`,
summary: createDifficultySummary(level),
startText: "开始",
targetPaperType: "20CM全环靶",
};
};
// 所有训练模式当前共用同一套难度定义。
const sharedDifficultyNodes = Array.from(
{ length: totalDifficultyLevel },
(_, index) => createDifficultyNode(index + 1)
);
const sharedDifficultyDetails = Object.fromEntries(
Array.from({ length: totalDifficultyLevel }, (_, index) => {
const detail = createDifficultyDetail(index + 1);
return [detail.id, detail];
})
);
const createModeConfig = ({ key, title, reward = null }) => {
return {
key,
title,
nodes: sharedDifficultyNodes,
details: sharedDifficultyDetails,
activeDifficultyId: mockedUnlockedDifficultyId,
progressMap: mockedDifficultyProgressMap,
reward,
};
};
// 难度页数据源入口:
// 页面通过 getTrainingDifficultyModeConfig(modeKey) 获取当前模式完整配置。
export const trainingDifficultyModeMap = Object.fromEntries(
modeList.map((mode) => [mode.key, createModeConfig(mode)])
);
export const getTrainingDifficultyModeConfig = (modeKey) => {
return trainingDifficultyModeMap[modeKey] || trainingDifficultyModeMap.precision;
};
+232 -176
View File
@@ -1,138 +1,194 @@
{ {
"pages": [ "pages": [
{ {
"path": "pages/index" "path": "pages/index"
}, },
{ {
"path": "pages/friend-battle" "path": "pages/org-bind"
}, },
{ {
"path": "pages/point-book" "path": "pages/friend-battle"
}, },
{ {
"path": "pages/point-book-rank" "path": "pages/point-book"
}, },
{ {
"path": "pages/my-like-list" "path": "pages/point-book-rank"
}, },
{ {
"path": "pages/audio-test" "path": "pages/my-like-list"
}, },
{ {
"path": "pages/calibration" "path": "pages/audio-test"
}, },
{ {
"path": "pages/about-us" "path": "pages/calibration"
}, },
{ {
"path": "pages/webview", "path": "pages/about-us"
"style": { },
"navigationBarTitleText": "" {
} "path": "pages/webview",
}, "style": {
{ "navigationBarTitleText": ""
"path": "pages/melee-battle" }
}, },
{ {
"path": "pages/battle-result" "path": "pages/melee-battle"
}, },
{ {
"path": "pages/friend-battle-result" "path": "pages/battle-result"
}, },
{ {
"path": "pages/point-book-edit" "path": "pages/friend-battle-result"
}, },
{ {
"path": "pages/point-book-create" "path": "pages/point-book-edit"
}, },
{ {
"path": "pages/point-book-list" "path": "pages/point-book-create"
}, },
{ {
"path": "pages/point-book-detail" "path": "pages/point-book-list"
}, },
{ {
"path": "pages/point-book-detail-share" "path": "pages/point-book-detail"
}, },
{ {
"path": "pages/match-page" "path": "pages/point-book-detail-share"
}, },
{ {
"path": "pages/my-device" "path": "pages/match-page"
}, },
{ {
"path": "pages/device-intro" "path": "pages/my-device"
}, },
{ {
"path": "pages/user" "path": "pages/device-intro"
}, },
{ {
"path": "pages/grade-intro" "path": "pages/user"
}, },
{ {
"path": "pages/rank-intro" "path": "pages/grade-intro"
}, },
{ {
"path": "pages/my-growth" "path": "pages/rank-intro"
}, },
{ {
"path": "pages/first-try" "path": "pages/my-growth"
}, },
{ {
"path": "pages/practise" "path": "pages/first-try"
}, },
{ {
"path": "pages/practise-one" "path": "pages/practise"
}, },
{ {
"path": "pages/practise-two" "path": "pages/practise-one"
}, },
{ {
"path": "pages/battle-room" "path": "pages/practise-two"
}, },
{ {
"path": "pages/ranking" "path": "pages/battle-room"
}, },
{ {
"path": "pages/rank-list" "path": "pages/ranking"
}, },
{ {
"path": "pages/match-detail" "path": "pages/rank-list"
}, },
{ {
"path": "pages/melee-bow-data" "path": "pages/match-detail"
}, },
{ {
"path": "pages/mine-bow-data" "path": "pages/melee-bow-data"
}, },
{ {
"path": "pages/ota-wifi", "path": "pages/mine-bow-data"
"style": { },
"navigationStyle": "custom" {
} "path": "pages/ota-wifi",
} "style": {
], "navigationStyle": "custom"
"globalStyle": { }
"backgroundColor": "@bgColor", }
"backgroundColorBottom": "@bgColorBottom", ],
"backgroundColorTop": "@bgColorTop", "globalStyle": {
"backgroundTextStyle": "@bgTxtStyle", "backgroundColor": "@bgColor",
"navigationBarBackgroundColor": "#000000", "backgroundColorBottom": "@bgColorBottom",
"navigationBarTextStyle": "@navTxtStyle", "backgroundColorTop": "@bgColorTop",
"navigationBarTitleText": "Uni Creator", "backgroundTextStyle": "@bgTxtStyle",
"navigationStyle": "custom", "navigationBarBackgroundColor": "#000000",
"enablePullDownRefresh": false "navigationBarTextStyle": "@navTxtStyle",
}, "navigationBarTitleText": "Uni Creator",
"easycom": { "navigationStyle": "custom",
"autoscan": true, "enablePullDownRefresh": false
"custom": { },
"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue" "easycom": {
} "autoscan": true,
}, "custom": {
"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
}
},
"subPackages": [ "subPackages": [
{
"root": "pages/coin",
"pages": [
{
"path": "vip-intro"
},
{
"path": "index"
},
{
"path": "rules"
},
{
"path": "earning-records"
},
{
"path": "exchange-records"
},
{
"path": "nearby-stores"
},
{
"path": "product-detail"
}
]
},
{ {
"root": "pages/device", "root": "pages/device",
"pages": [ "pages": [
{
"path": "my-device"
},
{
"path": "device-qrcode"
},
{
"path": "device-bind-success"
},
{
"path": "device-bind-failure"
},
{
"path": "device-already-bound"
},
{
"path": "device-intro"
},
{
"path": "ota-wifi",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "calibration"
},
{ {
"path": "unbind-device" "path": "unbind-device"
} }
@@ -140,48 +196,48 @@
}, },
{ {
"root": "pages/member", "root": "pages/member",
"pages": [ "pages": [
{ {
"path": "orders" "path": "orders"
}, },
{ {
"path": "order-detail" "path": "order-detail"
}, },
{ {
"path": "be-vip" "path": "be-vip"
}, },
{ {
"path": "vip-intro" "path": "vip-intro"
}, },
{ {
"path": "agreement" "path": "agreement"
} }
] ]
}, },
{ {
"root": "pages/team-battle", "root": "pages/team-battle",
"pages": [ "pages": [
{ {
"path": "index" "path": "index"
}, },
{ {
"path": "team-bow-data" "path": "team-bow-data"
} }
] ]
}, },
{ {
"root": "pages/training", "root": "pages/training",
"pages": [ "pages": [
{ {
"path": "index" "path": "index"
}, },
{ {
"path": "difficulty" "path": "difficulty"
}, },
{ {
"path": "practise-one" "path": "practise-one"
} }
] ]
} }
] ]
} }
+14 -6
View File
@@ -9,17 +9,23 @@ const playAudio = (key) => {
audioManager.play(key); audioManager.play(key);
}; };
const onAudioLoaded = (key) => {
loaded.value = {
...loaded.value,
[key]: true,
};
};
onMounted(() => { onMounted(() => {
const loadedAudioKeys = uni.getStorageSync("loadedAudioKeys") || {}; const loadedAudioKeys = uni.getStorageSync("loadedAudioKeys") || {};
loaded.value = loadedAudioKeys; loaded.value = loadedAudioKeys;
uni.$on("audioLoaded", (key) => { uni.$on("audioLoaded", onAudioLoaded);
loaded.value[key] = true; void audioManager.initAudios();
});
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
uni.$off("audioLoaded"); uni.$off("audioLoaded", onAudioLoaded);
}); });
</script> </script>
@@ -40,8 +46,10 @@ onBeforeUnmount(() => {
</view> </view>
<view v-for="key in Object.keys(audioFils)" :key="key"> <view v-for="key in Object.keys(audioFils)" :key="key">
<text>{{ key }}</text> <text>{{ key }}</text>
<text v-if="!loaded[key]">未加载</text> <text>{{ loaded[key] ? "已加载" : "未加载" }}</text>
<button v-else hover-class="none" @click="playAudio(key)">播放</button> <button hover-class="none" @click="playAudio(key)">
{{ loaded[key] ? "播放" : "加载并播放" }}
</button>
</view> </view>
</view> </view>
</Container> </Container>
+9 -7
View File
@@ -3,6 +3,7 @@ import { ref, computed, onMounted } from "vue";
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
import UserUpgrade from "@/components/UserUpgrade.vue"; import UserUpgrade from "@/components/UserUpgrade.vue";
import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
import { getBattleAPI } from "@/apis"; import { getBattleAPI } from "@/apis";
import { topThreeColors, getBattleResultTips } from "@/constants"; import { topThreeColors, getBattleResultTips } from "@/constants";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
@@ -155,7 +156,7 @@ const checkBowData = () => {
<view class="battle-winner"> <view class="battle-winner">
<image src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" />
<image <image
:src="ifWin ? '../static/you-win.png' : '../static/you-lost.png'" :src="ifWin ? 'https://static.shelingxingqiu.com/shootmini/static/you-win.png' : 'https://static.shelingxingqiu.com/shootmini/static/you-lost.png'"
mode="widthFix" mode="widthFix"
class="scale-in" class="scale-in"
/> />
@@ -192,37 +193,37 @@ const checkBowData = () => {
<image <image
v-if="player.rank === 1" v-if="player.rank === 1"
class="player-bg" class="player-bg"
src="../static/melee-player-bg1.png" src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg1.png"
mode="aspectFill" mode="aspectFill"
/> />
<image <image
v-if="player.rank === 2" v-if="player.rank === 2"
class="player-bg" class="player-bg"
src="../static/melee-player-bg2.png" src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg2.png"
mode="aspectFill" mode="aspectFill"
/> />
<image <image
v-if="player.rank === 3" v-if="player.rank === 3"
class="player-bg" class="player-bg"
src="../static/melee-player-bg3.png" src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg3.png"
mode="aspectFill" mode="aspectFill"
/> />
<image <image
v-if="player.rank === 1" v-if="player.rank === 1"
class="player-crown" class="player-crown"
src="../static/champ1.png" src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix" mode="widthFix"
/> />
<image <image
v-if="player.rank === 2" v-if="player.rank === 2"
class="player-crown" class="player-crown"
src="../static/champ2.png" src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix" mode="widthFix"
/> />
<image <image
v-if="player.rank === 3" v-if="player.rank === 3"
class="player-crown" class="player-crown"
src="../static/champ3.png" src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix" mode="widthFix"
/> />
<view v-if="player.rank > 3" class="view-crown">{{ <view v-if="player.rank > 3" class="view-crown">{{
@@ -287,6 +288,7 @@ const checkBowData = () => {
<view @click="exit">返回</view> <view @click="exit">返回</view>
</view> </view>
<UserUpgrade /> <UserUpgrade />
<DeviceChargingDialog />
</view> </view>
</template> </template>
+8 -8
View File
@@ -587,7 +587,7 @@ onBeforeUnmount(() => {
<text v-else class="room-player-name">{{ owner.name }}</text> <text v-else class="room-player-name">{{ owner.name }}</text>
</view> </view>
<view v-else class="no-player" :style="{ transform: 'translateY(-60px)' }"> <view v-else class="no-player" :style="{ transform: 'translateY(-60px)' }">
<image src="../static/question-mark.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view> </view>
<image src="https://static.shelingxingqiu.com/shootmini/static/versus.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/versus.png" mode="widthFix" />
<view v-if="opponent.id" class="player" :style="{ transform: 'translateY(60px)' }"> <view v-if="opponent.id" class="player" :style="{ transform: 'translateY(60px)' }">
@@ -607,11 +607,11 @@ onBeforeUnmount(() => {
<text v-else class="room-player-name">{{ opponent.name }}</text> <text v-else class="room-player-name">{{ opponent.name }}</text>
<button v-if="owner.id === user.id" hover-class="none" class="remove-player" <button v-if="owner.id === user.id" hover-class="none" class="remove-player"
@click="() => removePlayer(opponent)"> @click="() => removePlayer(opponent)">
<image src="../static/close-white.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</button> </button>
</view> </view>
<view class="no-player" v-else> <view class="no-player" v-else>
<image src="../static/question-mark.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view> </view>
</view> </view>
</view> </view>
@@ -627,7 +627,7 @@ onBeforeUnmount(() => {
<!-- 仅房主可见踢人按钮,且不能踢自己 --> <!-- 仅房主可见踢人按钮,且不能踢自己 -->
<button v-if="owner.id !== item.id && item.id && owner.id === user.id" hover-class="none" class="remove-player" <button v-if="owner.id !== item.id && item.id && owner.id === user.id" hover-class="none" class="remove-player"
@click="() => removePlayer(item)" :style="{ top: '-10rpx', right: '-10rpx' }"> @click="() => removePlayer(item)" :style="{ top: '-10rpx', right: '-10rpx' }">
<image src="../static/close-white.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</button> </button>
</view> </view>
</view> </view>
@@ -636,7 +636,7 @@ onBeforeUnmount(() => {
<view> <view>
<view v-for="(item, index) in redTeam" :key="index" class="choose-side-left-item"> <view v-for="(item, index) in redTeam" :key="index" class="choose-side-left-item">
<button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)"> <button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
<image src="../static/close-grey.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-grey.png" mode="widthFix" />
</button> </button>
<view <view
v-if="item.id && isMember(item)" v-if="item.id && isMember(item)"
@@ -653,7 +653,7 @@ onBeforeUnmount(() => {
<text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text> <text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text>
</view> </view>
<button v-else hover-class="none" @click="chooseTeam(2)"> <button v-else hover-class="none" @click="chooseTeam(2)">
<image src="../static/add-grey.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/add-grey.png" mode="widthFix" />
</button> </button>
</view> </view>
</view> </view>
@@ -664,7 +664,7 @@ onBeforeUnmount(() => {
<text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text> <text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text>
</view> </view>
<button v-else hover-class="none" @click="chooseTeam(1)"> <button v-else hover-class="none" @click="chooseTeam(1)">
<image src="../static/add-grey.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/add-grey.png" mode="widthFix" />
</button> </button>
<view <view
v-if="item.id && isMember(item)" v-if="item.id && isMember(item)"
@@ -677,7 +677,7 @@ onBeforeUnmount(() => {
</view> </view>
<text v-else class="truncate">{{ item.name || "我要加入" }}</text> <text v-else class="truncate">{{ item.name || "我要加入" }}</text>
<button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)"> <button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
<image src="../static/close-grey.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/close-grey.png" mode="widthFix" />
</button> </button>
</view> </view>
</view> </view>
@@ -0,0 +1,75 @@
<script setup>
defineProps({
cumulative: {
type: [Number, String],
default: 0,
},
available: {
type: [Number, String],
default: 0,
},
});
</script>
<template>
<view class="balance-panel">
<view class="balance-list">
<view class="balance-item">
<text class="balance-item__label">累计金币:</text>
<text class="balance-item__value">{{ cumulative }}</text>
</view>
<view class="balance-list__line" />
<view class="balance-item">
<text class="balance-item__label">可兑换金币:</text>
<text class="balance-item__value">{{ available }}</text>
</view>
</view>
</view>
</template>
<style scoped>
.balance-panel {
width: 100%;
padding: 8rpx 28rpx 0;
box-sizing: border-box;
}
.balance-list {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 60rpx;
margin-top: 0;
border-radius: 12rpx;
box-sizing: border-box;
background: linear-gradient(90deg, transparent, rgba(4, 4, 4, 0.7), transparent);
}
.balance-item {
width: auto;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.balance-item__label {
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.balance-item__value {
color: #ffd947;
font-size: 30rpx;
line-height: 42rpx;
}
.balance-list__line {
width: 2rpx;
height: 16rpx;
background-color: rgba(255, 255, 255, 0.5);
margin: 0 22rpx;
}
</style>
@@ -0,0 +1,37 @@
<script setup>
defineProps({
text: {
type: String,
default: "暂无金币获取记录。",
},
});
</script>
<template>
<view class="empty-state">
<image
src="https://static.shelingxingqiu.com/shootmini/static/coin/empty-coin-record.png"
mode="aspectFit"
/>
<text>{{ text }}</text>
</view>
</template>
<style scoped>
.empty-state {
width: 100%;
padding-top: 280rpx;
display: flex;
flex-direction: column;
align-items: center;
color: #ffffff;
font-size: 26rpx;
line-height: 36rpx;
}
.empty-state > image {
width: 162rpx;
height: 190rpx;
margin-bottom: 26rpx;
}
</style>
+92
View File
@@ -0,0 +1,92 @@
<script setup>
import Header from "@/components/Header.vue";
const props = defineProps({
title: {
type: String,
default: "",
},
subtitle: {
type: String,
default: "",
},
switchable: { type: Boolean, default: false },
onBack: {
type: Function,
default: null,
},
});
const emit = defineEmits(["select-store"]);
</script>
<template>
<view class="coin-header">
<Header title="" :onBack="onBack">
<template #title>
<view class="coin-header__title-group">
<text
:class="[
'coin-header__title',
subtitle ? 'coin-header__title--with-subtitle' : '',
]"
>
{{ title }}
</text>
<view v-if="subtitle" class="coin-header__store" @click="switchable && emit('select-store')">
<text class="coin-header__subtitle">{{ subtitle }}</text>
<image v-if="switchable" class="coin-header__switch" src="https://static.shelingxingqiu.com/shootmini/static/coin/store-switch.png" mode="aspectFit" />
</view>
</view>
</template>
</Header>
</view>
</template>
<style scoped lang="scss">
.coin-header__store { display: flex; align-items: center; max-width: 430rpx; }
.coin-header__store .coin-header__subtitle { overflow: hidden; text-overflow: ellipsis; }
.coin-header__switch { flex-shrink: 0; width: 28rpx; height: 28rpx; margin-left: 10rpx; }
.coin-header {
position: sticky;
top: 0;
z-index: 20;
width: 100%;
height: 50px;
display: flex;
align-items: center;
flex-shrink: 0;
}
.coin-header__title-group {
position: absolute;
top: 50%;
left: 50%;
width: 430rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
transform: translate(-50%, -50%);
text-align: center;
}
.coin-header__title {
color: #e7ba80;
font-size: 30rpx;
line-height: 42rpx;
font-weight: 500;
white-space: nowrap;
}
.coin-header__title--with-subtitle {
font-size: 28rpx;
}
.coin-header__subtitle {
color: #ffffff;
font-size: 20rpx;
line-height: 28rpx;
font-weight: 400;
white-space: nowrap;
}
</style>
@@ -0,0 +1,50 @@
<script setup>
defineProps({
menus: {
type: Array,
default: () => [],
},
});
const emit = defineEmits(["select"]);
</script>
<template>
<view class="quick-menu">
<view
v-for="item in menus"
:key="item.key"
class="quick-menu__item"
@click="emit('select', item)"
>
<image class="quick-menu__icon" :src="item.icon" mode="aspectFit" />
<text>{{ item.label }}</text>
</view>
</view>
</template>
<style scoped>
.quick-menu {
display: flex;
align-items: flex-start;
justify-content: space-between;
width: 100%;
padding: 26rpx 46rpx 30rpx;
box-sizing: border-box;
}
.quick-menu__item {
width: 142rpx;
display: flex;
flex-direction: column;
align-items: center;
color: #fae6bc;
font-size: 24rpx;
line-height: 34rpx;
}
.quick-menu__icon {
width: 116rpx;
height: 116rpx;
}
</style>
@@ -0,0 +1,188 @@
<script setup>
defineProps({
records: {
type: Array,
default: () => [],
},
mode: {
type: String,
default: "earning",
},
});
</script>
<template>
<view
class="record-table"
:class="{ 'record-table--exchange': mode === 'exchange' }"
>
<view class="record-table__header">
<template v-if="mode === 'exchange'">
<text>兑换内容</text>
<text>兑换类型</text>
<text>时间</text>
<text>金币使用</text>
</template>
<template v-else>
<text>时间</text>
<text>类型</text>
<text>金币获取</text>
</template>
</view>
<view
v-for="item in records"
:key="item.id"
class="record-table__row"
>
<template v-if="mode === 'exchange'">
<text class="record-table__exchange-content">{{ item.content }}</text>
<text class="record-table__exchange-type">{{ item.type }}</text>
<view class="record-table__time record-table__exchange-time">
<text>{{ item.date }}</text>
<text>{{ item.time }}</text>
</view>
<text class="record-table__amount record-table__exchange-amount">
{{ item.amount }}
</text>
</template>
<template v-else>
<view class="record-table__time">
<text>{{ item.date }}</text>
<text>{{ item.time }}</text>
</view>
<text class="record-table__type">{{ item.type }}</text>
<text class="record-table__amount">{{ item.amount }}</text>
</template>
</view>
</view>
</template>
<style scoped>
.record-table {
width: 670rpx;
margin: 20rpx auto 0;
box-sizing: border-box;
border: 2rpx solid rgba(255, 255, 255, 0.35);
}
.record-table__header,
.record-table__row {
display: flex;
align-items: center;
}
.record-table__header {
height: 66rpx;
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.record-table__header > text {
height: 100%;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
border-right: 2rpx solid rgba(255, 255, 255, 0.35);
}
.record-table__header > text:nth-child(1),
.record-table__time {
width: 182rpx;
flex: 0 0 182rpx;
}
.record-table__header > text:nth-child(2),
.record-table__type {
width: 304rpx;
flex: 0 0 304rpx;
}
.record-table__header > text:nth-child(3),
.record-table__amount {
width: 180rpx;
flex: 0 0 180rpx;
border-right: none;
}
.record-table__row {
height: 86rpx;
border-top: 2rpx solid rgba(255, 255, 255, 0.35);
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.record-table__row > view,
.record-table__row > text {
height: 100%;
box-sizing: border-box;
border-right: 2rpx solid rgba(255, 255, 255, 0.35);
}
.record-table__time {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.record-table__time > text:last-child {
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.record-table__type {
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
}
.record-table__row > .record-table__amount {
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
text-align: center;
font-size: 24rpx;
border-right: none;
}
.record-table__exchange-content,
.record-table__exchange-type {
display: flex;
align-items: center;
justify-content: center;
padding: 0 8rpx;
color: #ffffff;
text-align: center;
}
.record-table--exchange .record-table__header > text:nth-child(1),
.record-table__exchange-content {
width: 286rpx;
flex: 0 0 286rpx;
}
.record-table--exchange .record-table__header > text:nth-child(2),
.record-table__exchange-type {
width: 110rpx;
flex: 0 0 110rpx;
}
.record-table--exchange .record-table__header > text:nth-child(3),
.record-table__exchange-time {
width: 160rpx;
flex: 0 0 160rpx;
}
.record-table--exchange .record-table__header > text:nth-child(4),
.record-table__exchange-amount {
width: 110rpx;
flex: 0 0 110rpx;
border-right: none;
}
</style>
@@ -0,0 +1,54 @@
<script setup>
const emit = defineEmits(["authorize"]);
</script>
<template>
<view class="location-state">
<image
src="https://static.shelingxingqiu.com/shootmini/static/coin/location-permission.png"
mode="aspectFit"
/>
<text>授权获取你的定位,以便推荐附近门店。</text>
<button hover-class="none" @click="emit('authorize')">立即授权</button>
</view>
</template>
<style scoped>
.location-state {
width: 100%;
padding-top: 190rpx;
display: flex;
flex-direction: column;
align-items: center;
color: #ffffff;
font-size: 32rpx;
line-height: 44rpx;
font-weight: 600;
}
.location-state > image {
width: 168rpx;
height: 190rpx;
margin-bottom: 52rpx;
}
.location-state > button {
width: 360rpx;
height: 72rpx;
margin-top: 44rpx;
padding: 0;
display: flex;
align-items: center;
justify-content: center;
border-radius: 36rpx;
background-color: #ffd947;
color: #22222e;
font-size: 26rpx;
line-height: 72rpx;
font-weight: 500;
}
.location-state > button::after {
border: none;
}
</style>
@@ -0,0 +1,56 @@
<script setup>
defineProps({
variant: {
type: String,
default: "gold",
},
});
</script>
<template>
<view class="exchange-notice" :class="`exchange-notice--${variant}`">
<image
src="https://static.shelingxingqiu.com/shootmini/static/coin/icon-notice.png"
mode="aspectFit"
/>
<text>暂不支持线上兑换,请前往线下门店进行兑换。</text>
</view>
</template>
<style scoped>
.exchange-notice {
display: flex;
align-items: center;
justify-content: center;
width: 504rpx;
height: 40rpx;
margin: 0 auto;
padding: 0 16rpx;
box-sizing: border-box;
color: rgba(255, 255, 255, 0.65);
font-size: 20rpx;
line-height: 28rpx;
border-radius: 24rpx;
}
.exchange-notice--gold {
border: 2rpx solid rgba(255, 217, 71, 0.28);
background-color: rgba(255, 217, 71, 0.05);
}
.exchange-notice--red {
width: 492rpx;
height: 44rpx;
margin: 0 0 0 40rpx;
border: none;
background-color: rgba(255, 96, 96, 0.3);
color: #ffffff;
}
.exchange-notice > image {
width: 24rpx;
height: 24rpx;
margin-right: 8rpx;
flex-shrink: 0;
}
</style>
@@ -0,0 +1,90 @@
<script setup>
import { computed, ref } from "vue";
const DEFAULT_PRODUCT_IMAGE =
"https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png";
const props = defineProps({
images: {
type: Array,
default: () => [],
},
});
const current = ref(0);
const slideImages = computed(() => {
const images = props.images.filter(
(image) => typeof image === "string" && image.trim()
);
return images.length ? images : [DEFAULT_PRODUCT_IMAGE];
});
const onChange = (event) => {
current.value = event.detail.current;
};
</script>
<template>
<view class="hero-swiper">
<swiper class="hero-swiper__body" :duration="260" @change="onChange">
<swiper-item v-for="(image, index) in slideImages" :key="index">
<view class="hero-swiper__item">
<image
class="hero-swiper__background"
src="https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png"
mode="scaleToFill"
/>
<image class="hero-swiper__product" :src="image" mode="aspectFit" />
</view>
</swiper-item>
</swiper>
<view class="hero-swiper__dots">
<view
v-for="(_, index) in slideImages"
:key="index"
class="hero-swiper__dot"
:class="{ 'hero-swiper__dot--active': current === index }"
/>
</view>
</view>
</template>
<style scoped>
.hero-swiper,
.hero-swiper__body,
.hero-swiper__item {
position: relative;
width: 750rpx;
height: 750rpx;
}
.hero-swiper__background,
.hero-swiper__product {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.hero-swiper__dots {
position: absolute;
left: 0;
bottom: 20rpx;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.hero-swiper__dot {
width: 12rpx;
height: 12rpx;
margin: 0 6rpx;
border-radius: 50%;
background-color: rgba(34, 34, 46, 0.55);
}
.hero-swiper__dot--active {
background-color: #ffd947;
}
</style>
@@ -0,0 +1,100 @@
<script setup>
import { computed } from "vue";
const DEFAULT_PRODUCT_IMAGE =
"https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png";
const props = defineProps({
product: {
type: Object,
required: true,
},
});
const productImage = computed(() => {
const image = props.product?.image;
return typeof image === "string" && image.trim()
? image
: DEFAULT_PRODUCT_IMAGE;
});
</script>
<template>
<view class="product-card">
<view class="product-card__image-wrap">
<image class="product-card__image" :src="productImage" mode="aspectFit" />
</view>
<text class="product-card__name">{{ product.name }}</text>
<view class="product-card__footer">
<text>{{ product.cost }}金币</text>
<text class="product-card__divider">|</text>
<text>剩余{{ product.stock }}个</text>
</view>
</view>
</template>
<style scoped>
.product-card {
width: 336rpx;
height: 418rpx;
padding: 10rpx 10rpx 14rpx;
box-sizing: border-box;
border: 2rpx solid rgba(255, 217, 71, 0.1);
border-radius: 12rpx;
background-color: rgba(84, 67, 29, 0.2);
overflow: hidden;
}
.product-card__image-wrap {
position: relative;
width: 312rpx;
height: 312rpx;
overflow: hidden;
border-radius: 12rpx;
background-image: url("https://static.shelingxingqiu.com/shootmini/static/coin/product-card-bg.png");
background-size: 100% 100%;
background-repeat: no-repeat;
}
.product-card__image {
display: block;
width: 100%;
height: 100%;
}
.product-card__name {
display: block;
margin-top: 12rpx;
color: #fff0c9;
font-size: 26rpx;
line-height: 36rpx;
font-weight: 600;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.product-card__footer {
display: flex;
align-items: center;
justify-content: center;
margin-top: 4rpx;
color: rgba(255, 255, 255, 0.85);
font-size: 22rpx;
line-height: 32rpx;
}
.product-card__footer > text:first-child {
color: #ffffff;
}
.product-card__footer > text:last-child {
color: rgba(255, 255, 255, 0.78);
}
.product-card__divider {
margin: 0 10rpx;
color: rgba(255, 255, 255, 0.45);
}
</style>
@@ -0,0 +1,80 @@
<script setup>
defineProps({
benefit: {
type: Object,
required: true,
},
});
</script>
<template>
<!-- 与会员卡共用剩余次数,接口缺失时显示占位。 -->
<view class="benefit-card">
<text class="benefit-card__badge">{{ benefit.remaining }}次</text>
<image class="benefit-card__icon" :src="benefit.icon" mode="aspectFit" />
<view class="benefit-card__content">
<text class="benefit-card__title">{{ benefit.title }}</text>
<text class="benefit-card__description">{{ benefit.description }}</text>
</view>
</view>
</template>
<style scoped lang="scss">
.benefit-card {
position: relative;
display: flex;
align-items: center;
min-height: 176rpx;
margin-bottom: 24rpx;
padding: 28rpx 28rpx 28rpx 56rpx;
box-sizing: border-box;
border-radius: 20rpx;
background: linear-gradient(180deg, #080808, rgba(152, 124, 84, 0.4));
}
// .benefit-card:last-child {
// margin-bottom: 0;
// }
.benefit-card__badge {
position: absolute;
top: 0;
left: 0;
width: 64rpx;
height: 32rpx;
border-radius: 16rpx 0 16rpx 0;
background: linear-gradient(135deg, #ffd19a, #a17636);
color: #ffffff;
font-size: 22rpx;
line-height: 30rpx;
text-align: center;
}
.benefit-card__icon {
flex-shrink: 0;
width: 120rpx;
height: 120rpx;
margin-right: 38rpx;
}
.benefit-card__content {
flex: 1;
min-width: 0;
}
.benefit-card__title {
display: block;
color: #fae6bc;
font-size: 30rpx;
line-height: 42rpx;
font-weight: 500;
}
.benefit-card__description {
display: block;
margin-top: 10rpx;
color: #ffffff;
font-size: 22rpx;
line-height: 30rpx;
}
</style>
+69
View File
@@ -0,0 +1,69 @@
<script setup>
const props = defineProps({
store: {
type: Object,
required: true,
},
});
const emit = defineEmits(["select"]);
const selectStore = () => {
emit("select", props.store);
};
</script>
<template>
<view class="store-card" hover-class="none" @click="selectStore">
<image class="store-card__photo" :src="store.image" mode="aspectFill" />
<text class="store-card__name">{{ store.name }}</text>
<view class="store-card__info">
<view class="store-card__row">
<text>地址:{{ store.address }}</text>
</view>
<view class="store-card__row">
<text>电话:{{ store.phone }}</text>
</view>
<view class="store-card__row">
<text>营业时间:{{ store.hours }}</text>
</view>
</view>
</view>
</template>
<style scoped>
.store-card {
width: 650rpx;
margin: 22rpx auto 0;
box-sizing: border-box;
}
.store-card__photo {
width: 650rpx;
height: 324rpx;
border-radius: 20rpx;
}
.store-card__name {
display: block;
margin-top: 24rpx;
margin-left: 10rpx;
color: #ffffff;
font-size: 32rpx;
line-height: 44rpx;
font-weight: 500;
}
.store-card__info {
width: 584rpx;
margin-top: 12rpx;
margin-left: 10rpx;
}
.store-card__row {
margin-top: 0;
color: #ffffff;
font-size: 24rpx;
line-height: 40rpx;
}
</style>
@@ -0,0 +1,61 @@
<script setup>
defineProps({
tabs: {
type: Array,
default: () => [],
},
active: {
type: String,
default: "vip",
},
});
const emit = defineEmits(["select"]);
</script>
<template>
<!-- 业务 Tab 只切换内容,不接管系统导航。 -->
<view class="section-tabs">
<view
v-for="tab in tabs"
:key="tab.key"
class="section-tabs__item"
:class="{ 'section-tabs__item--active': active === tab.key }"
hover-class="section-tabs__item--pressed"
@click="emit('select', tab.key)"
>
<text>{{ tab.label }}</text>
</view>
</view>
</template>
<style scoped lang="scss">
.section-tabs {
display: flex;
justify-content: space-between;
padding: 20rpx 40rpx 0;
box-sizing: border-box;
}
.section-tabs__item {
display: flex;
align-items: center;
justify-content: center;
width: 326rpx;
height: 68rpx;
border-radius: 34rpx;
color: #999999;
background: #000000;
font-size: 28rpx;
line-height: 40rpx;
}
.section-tabs__item--active {
color: #ffffff;
background: linear-gradient(135deg, #ffd19a, #a17636);
}
.section-tabs__item--pressed {
opacity: 0.8;
}
</style>
+135
View File
@@ -0,0 +1,135 @@
<script setup>
defineProps({
membership: {
type: Object,
required: true,
},
benefits: {
type: Array,
default: () => [],
},
});
const emit = defineEmits(["introduction"]);
</script>
<template>
<view class="vip-card" :class="{ 'vip-card--active': membership.active }">
<!-- 切图仅含静态字效与徽章,次数、有效期和状态独立渲染。 -->
<image class="vip-card__background" :src="membership.cardImage" mode="aspectFit" />
<view class="vip-card__benefits">
<view v-for="benefit in benefits" :key="benefit.key" class="vip-card__benefit">
<text class="vip-card__label">{{ benefit.title }}</text>
<view class="vip-card__count">
<text class="vip-card__number">{{ membership.remaining[benefit.key] }}</text>
<text class="vip-card__unit">次</text>
</view>
</view>
</view>
<text class="vip-card__status">
{{ membership.active ? `有效期至${membership.expiresAt}` : "未开通" }}
</text>
<view class="vip-card__introduction" @click="emit('introduction')">
<text>查看更多关于体验中心VIP的介绍 &gt;</text>
</view>
</view>
</template>
<style scoped lang="scss">
.vip-card {
position: relative;
width: 750rpx;
height: 288rpx;
color: #333333;
}
.vip-card__background {
position: absolute;
top: 0;
left: 0;
width: 750rpx;
height: 288rpx;
}
.vip-card__benefits {
position: absolute;
top: 124rpx;
left: 70rpx;
display: flex;
justify-content: space-between;
width: 400rpx;
}
.vip-card__benefit {
width: 120rpx;
text-align: center;
}
.vip-card__label {
display: block;
font-size: 20rpx;
line-height: 28rpx;
white-space: nowrap;
opacity: 0.8;
}
.vip-card__count {
display: flex;
align-items: baseline;
justify-content: center;
position: relative;
height: 44rpx;
}
.vip-card__count::before {
content: "";
position: absolute;
left: 16rpx;
bottom: 4rpx;
width: 88rpx;
height: 12rpx;
border-radius: 8rpx;
background: #ffd947;
}
.vip-card__number {
position: relative;
font-size: 40rpx;
line-height: 48rpx;
font-weight: 500;
}
.vip-card__unit {
position: relative;
margin-left: 2rpx;
font-size: 22rpx;
line-height: 30rpx;
opacity: 0.8;
}
.vip-card__status {
position: absolute;
top: 212rpx;
left: 496rpx;
width: 232rpx;
color: #888888;
font-size: 22rpx;
line-height: 30rpx;
text-align: center;
white-space: nowrap;
}
.vip-card--active .vip-card__status {
color: #b47d42;
}
.vip-card__introduction {
position: absolute;
left: 74rpx;
bottom: 16rpx;
padding: 6rpx 0;
font-size: 22rpx;
line-height: 30rpx;
opacity: 0.8;
}
</style>
@@ -0,0 +1,62 @@
<script setup>
const props = defineProps({
active: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(["open"]);
const handleOpen = () => {
if (!props.active) emit("open");
};
</script>
<template>
<!-- 当前门店已开通时仅展示状态,未开通时提供线下开通提醒。 -->
<view class="vip-footer">
<text class="vip-footer__price">特惠价格:9.9元/90天</text>
<view class="vip-footer__status" @click="handleOpen">
<image class="vip-footer__badge" src="https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-badge.png" mode="aspectFit" />
<text>{{ active ? "您已开通VIP" : "开通方式:请前往线下门店联系工作人员开通" }}</text>
</view>
</view>
</template>
<style scoped lang="scss">
.vip-footer {
margin-top: 84rpx;
padding: 0 24rpx 22rpx;
box-sizing: border-box;
}
.vip-footer__price {
display: block;
color: #fae6bc;
font-size: 40rpx;
line-height: 56rpx;
font-weight: 500;
text-align: center;
}
.vip-footer__status {
display: flex;
align-items: center;
justify-content: center;
min-height: 90rpx;
margin-top: 12rpx;
padding: 8rpx 28rpx;
box-sizing: border-box;
border-radius: 46rpx;
color: #333333;
background: #ffd947;
font-size: 26rpx;
line-height: 36rpx;
}
.vip-footer__badge {
flex-shrink: 0;
width: 80rpx;
height: 74rpx;
margin-right: 4rpx;
}
</style>
+50
View File
@@ -0,0 +1,50 @@
// 金币快捷入口保持原有路由与图标配置。
export const quickMenus = [
{
key: "rules",
label: "金币规则",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-rules.png",
},
{
key: "earningRecords",
label: "获取明细",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-earning-records.png",
},
{
key: "exchangeRecords",
label: "兑换记录",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-exchange-records.png",
},
{
key: "nearbyStores",
label: "附近门店",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-nearby-store.png",
},
];
// 体验中心业务 Tab。
export const storeSections = [
{ key: "vip", label: "体验中心VIP" },
{ key: "coin", label: "我的金币" },
];
export const storeVipBenefits = [
{
key: "trial",
title: "免费体验权益",
description: "使用该权益可免费体验智能弓箭30分钟1次,加入官方社群还可以额外获赠1次。",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-trial.png",
},
{
key: "discount",
title: "特惠购买权益",
description: "使用该权益可以19.9元的特惠价格购买30分钟体验服务1次。",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-discount.png",
},
{
key: "drink",
title: "到店赠饮权益",
description: "使用该权益每次到店后可获得免费赠送的指定饮品一支。",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-drink.png",
},
];
+130
View File
@@ -0,0 +1,130 @@
<script setup>
import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import CoinRecordList from "./components/CoinRecordList.vue";
import CoinEmptyState from "./components/CoinEmptyState.vue";
import { getGoldLogAPI } from "@/apis";
const PAGE_SIZE = 20;
const storeId = ref("");
const earningRecords = ref([]);
const page = ref(0);
const total = ref(0);
const loading = ref(false);
const noMore = ref(false);
const loaded = ref(false);
const showEmpty = computed(() => loaded.value && !earningRecords.value.length);
const formatRecord = (item = {}) => {
const [date = "", time = ""] = String(item.createdAt || "").split(" ");
const amount = Number(item.amount) || 0;
return {
id: item.id,
date,
time,
type: item.remark || item.typeDesc || "-",
amount: amount > 0 ? `+${amount}` : String(amount),
};
};
// 实际接口返回 totalCount/pageCount/pageSize,同时兼容接口文档中的旧字段。
const updatePaginationState = (result, list, nextPage) => {
const currentPage = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize = Number(result?.pageSize ?? result?.perPage) || PAGE_SIZE;
page.value = currentPage;
total.value = Number.isFinite(totalCount) ? totalCount : 0;
if (Number.isFinite(pageCount) && pageCount >= 0) {
noMore.value = currentPage >= pageCount;
return;
}
if (Number.isFinite(totalCount) && totalCount >= 0) {
noMore.value = earningRecords.value.length >= totalCount;
return;
}
noMore.value = list.length < responsePageSize;
};
const loadRecords = async ({ reset = false } = {}) => {
if (loading.value || (!reset && noMore.value)) return;
const nextPage = reset ? 1 : page.value + 1;
loading.value = true;
if (reset) noMore.value = false;
try {
const result = await getGoldLogAPI({
page: nextPage,
pageSize: PAGE_SIZE,
type: 1,
storeId: storeId.value,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map(formatRecord);
earningRecords.value = reset
? mappedList
: earningRecords.value.concat(mappedList);
updatePaginationState(result, list, nextPage);
} catch (error) {
if (reset) {
earningRecords.value = [];
page.value = 0;
}
console.error("加载金币获取明细失败", error);
} finally {
loading.value = false;
loaded.value = true;
}
};
onLoad((options = {}) => {
const currentStoreId = String(options.storeId || "");
if (!/^\d+$/.test(currentStoreId) || Number(currentStoreId) <= 0) {
uni.redirectTo({
url: "/pages/coin/nearby-stores",
});
return;
}
storeId.value = currentStoreId;
loadRecords({ reset: true });
});
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRecords">
<template #header>
<CoinHeader title="金币获取明细" />
</template>
<view class="records-page">
<CoinEmptyState v-if="showEmpty" />
<CoinRecordList v-else :records="earningRecords" />
<view
v-if="loading || (noMore && earningRecords.length)"
class="records-page__status"
>
<text>{{ loading ? "加载中..." : "没有更多了" }}</text>
</view>
</view>
</Container>
</template>
<style scoped>
.records-page {
width: 100%;
min-height: 100%;
}
.records-page__status {
padding: 24rpx 0 32rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 24rpx;
line-height: 34rpx;
text-align: center;
}
</style>
+130
View File
@@ -0,0 +1,130 @@
<script setup>
import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import CoinRecordList from "./components/CoinRecordList.vue";
import CoinEmptyState from "./components/CoinEmptyState.vue";
import { getGoldLogAPI } from "@/apis";
const PAGE_SIZE = 20;
const storeId = ref("");
const exchangeRecords = ref([]);
const page = ref(0);
const total = ref(0);
const loading = ref(false);
const noMore = ref(false);
const loaded = ref(false);
const showEmpty = computed(() => loaded.value && !exchangeRecords.value.length);
const formatRecord = (item = {}) => {
const [date = "", time = ""] = String(item.createdAt || "").split(" ");
return {
id: item.id,
content: item.remark || "-",
type: item.typeDesc || "-",
date,
time,
amount: String(Number(item.amount) || 0),
};
};
// 实际接口返回 totalCount/pageCount/pageSize,同时兼容接口文档中的旧字段。
const updatePaginationState = (result, list, nextPage) => {
const currentPage = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize = Number(result?.pageSize ?? result?.perPage) || PAGE_SIZE;
page.value = currentPage;
total.value = Number.isFinite(totalCount) ? totalCount : 0;
if (Number.isFinite(pageCount) && pageCount >= 0) {
noMore.value = currentPage >= pageCount;
return;
}
if (Number.isFinite(totalCount) && totalCount >= 0) {
noMore.value = exchangeRecords.value.length >= totalCount;
return;
}
noMore.value = list.length < responsePageSize;
};
const loadRecords = async ({ reset = false } = {}) => {
if (loading.value || (!reset && noMore.value)) return;
const nextPage = reset ? 1 : page.value + 1;
loading.value = true;
if (reset) noMore.value = false;
try {
const result = await getGoldLogAPI({
page: nextPage,
pageSize: PAGE_SIZE,
type: 2,
storeId: storeId.value,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map(formatRecord);
exchangeRecords.value = reset
? mappedList
: exchangeRecords.value.concat(mappedList);
updatePaginationState(result, list, nextPage);
} catch (error) {
if (reset) {
exchangeRecords.value = [];
page.value = 0;
}
console.error("加载金币兑换记录失败", error);
} finally {
loading.value = false;
loaded.value = true;
}
};
onLoad((options = {}) => {
const currentStoreId = String(options.storeId || "");
if (!/^\d+$/.test(currentStoreId) || Number(currentStoreId) <= 0) {
uni.redirectTo({
url: "/pages/coin/nearby-stores",
});
return;
}
storeId.value = currentStoreId;
loadRecords({ reset: true });
});
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRecords">
<template #header>
<CoinHeader title="金币兑换记录" />
</template>
<view class="records-page">
<CoinEmptyState v-if="showEmpty" text="暂无金币兑换记录。" />
<CoinRecordList v-else mode="exchange" :records="exchangeRecords" />
<view
v-if="loading || (noMore && exchangeRecords.length)"
class="records-page__status"
>
<text>{{ loading ? "加载中..." : "没有更多了" }}</text>
</view>
</view>
</Container>
</template>
<style scoped>
.records-page {
width: 100%;
min-height: 100%;
}
.records-page__status {
padding: 24rpx 0 32rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 24rpx;
line-height: 34rpx;
text-align: center;
}
</style>
+334
View File
@@ -0,0 +1,334 @@
<script setup>
import { computed, ref } from "vue";
import { onLoad, onShow } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import ModalDialog from "@/components/ModalDialog.vue";
import CoinHeader from "./components/CoinHeader.vue";
import CoinBalancePanel from "./components/CoinBalancePanel.vue";
import CoinQuickMenu from "./components/CoinQuickMenu.vue";
import OfflineExchangeNotice from "./components/OfflineExchangeNotice.vue";
import RewardProductCard from "./components/RewardProductCard.vue";
import { getGiftListAPI, getMyGoldAPI } from "@/apis";
import { quickMenus, storeSections, storeVipBenefits } from "./data";
import StoreSectionTabs from "./components/StoreSectionTabs.vue";
import StoreVipCard from "./components/StoreVipCard.vue";
import StoreBenefitCard from "./components/StoreBenefitCard.vue";
import StoreVipFooter from "./components/StoreVipFooter.vue";
import { getSelectedExperienceStore, rememberExperienceStore, loadStoreMembership } from "@/utils/storeVip";
const activeTab = ref("vip");
const membership = ref(null);
const vipLoading = ref(false);
const vipError = ref("");
const displayedBenefits = computed(() => storeVipBenefits.map((benefit) => ({
...benefit, remaining: membership.value?.remaining[benefit.key] ?? "--",
})));
const loadMembership = async () => {
if (!selectedStoreId.value || vipLoading.value) return;
vipLoading.value = true;
vipError.value = "";
membership.value = null;
try {
const result = await loadStoreMembership(selectedStoreId.value);
membership.value = result;
if (result.name) selectedStoreName.value = result.name;
rememberExperienceStore(selectedStoreId.value, selectedStoreName.value);
} catch (error) {
vipError.value = "会员信息加载失败,请点击重试或切换门店";
console.error("加载门店会员失败", error);
} finally {
vipLoading.value = false;
}
};
const selectStore = () => uni.redirectTo({ url: `/pages/coin/nearby-stores?tab=${activeTab.value}` });
const selectTab = (tab) => {
if (storeSections.some((item) => item.key === tab)) activeTab.value = tab;
};
const showVipIntroduction = () => uni.navigateTo({ url: "/pages/coin/vip-intro" });
const vipOpeningVisible = ref(false);
const showVipOpening = () => { vipOpeningVisible.value = true; };
const closeVipOpening = () => { vipOpeningVisible.value = false; };
const PAGE_SIZE = 20;
const coinSummary = ref({
cumulative: 0,
available: 0,
});
const selectedStoreId = ref("");
const selectedStoreName = ref("");
const rewardProducts = ref([]);
const productPage = ref(0);
const productLoading = ref(false);
const productError = ref(false);
const productNoMore = ref(false);
const loadCoinSummary = async () => {
try {
const result = await getMyGoldAPI(selectedStoreId.value);
coinSummary.value = {
cumulative: Number(result?.totalGold) || 0,
available: Number(result?.usableGold) || 0,
};
} catch (error) {
console.error("加载金币统计失败", error);
}
};
const loadProducts = async ({ reset = false } = {}) => {
if (productLoading.value || (!reset && productNoMore.value)) return;
const nextPage = reset ? 1 : productPage.value + 1;
productLoading.value = true;
productError.value = false;
if (reset) productNoMore.value = false;
try {
const result = await getGiftListAPI({
page: nextPage,
pageSize: PAGE_SIZE,
storeId: selectedStoreId.value,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map((item) => ({
id: item.id,
name: item.name || "",
cost: Number(item.coin_price) || 0,
stock: Number(item.stock) || 0,
image: item.cover_image || "",
}));
rewardProducts.value = reset
? mappedList
: rewardProducts.value.concat(mappedList);
productPage.value = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount ?? result?.page_count);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize =
Number(result?.pageSize ?? result?.page_size) || PAGE_SIZE;
if (Number.isFinite(pageCount) && pageCount >= 0) {
productNoMore.value = productPage.value >= pageCount;
} else if (Number.isFinite(totalCount) && totalCount >= 0) {
productNoMore.value = rewardProducts.value.length >= totalCount;
} else {
productNoMore.value = list.length < responsePageSize;
}
} catch (error) {
if (reset) {
rewardProducts.value = [];
productPage.value = 0;
}
productError.value = true;
console.error("加载礼品列表失败", error);
} finally {
productLoading.value = false;
}
};
const menuRoutes = {
rules: "/pages/coin/rules",
earningRecords: "/pages/coin/earning-records",
exchangeRecords: "/pages/coin/exchange-records",
};
const buildStorePageUrl = (path, extraQuery = "") => {
const query = [
`storeId=${encodeURIComponent(selectedStoreId.value)}`,
`storeName=${encodeURIComponent(selectedStoreName.value)}`,
extraQuery,
]
.filter(Boolean)
.join("&");
return `${path}?${query}`;
};
const decodeRouteText = (value = "") => {
const text = String(value);
try {
return decodeURIComponent(text.replace(/\+/g, " "));
} catch (error) {
console.error("门店名称解码失败", error);
return text;
}
};
const onMenuSelect = (menu) => {
if (menu.key === "nearbyStores") {
uni.redirectTo({
url: `/pages/coin/nearby-stores?tab=${activeTab.value}`,
});
return;
}
const url = menuRoutes[menu.key];
if (!url) {
uni.showToast({
title: "功能开发中",
icon: "none",
});
return;
}
uni.navigateTo({
url: buildStorePageUrl(url),
});
};
const toProductDetail = (product) => {
uni.navigateTo({
url: buildStorePageUrl(
"/pages/coin/product-detail",
`id=${encodeURIComponent(product.id)}`
),
});
};
onLoad((options = {}) => {
activeTab.value = options.tab === "coin" ? "coin" : "vip";
const previous = getSelectedExperienceStore();
const storeId = String(options.storeId || previous?.id || "");
if (!/^\d+$/.test(storeId) || Number(storeId) <= 0) {
selectStore();
return;
}
selectedStoreId.value = storeId;
selectedStoreName.value = options.storeId
? decodeRouteText(options.storeName)
: previous?.name || "";
rememberExperienceStore(storeId, selectedStoreName.value);
loadProducts({ reset: true });
});
// 从介绍、商品等页面返回时刷新会员和余额。
onShow(() => {
if (!selectedStoreId.value) return;
loadMembership();
loadCoinSummary();
});
</script>
<template>
<!-- 标题固定,门店切换复用原有附近门店页面。 -->
<Container :bgType="6" bgColor="#22222e" :isHome="true" @scrolltolower="activeTab === 'coin' && loadProducts()">
<template #header>
<CoinHeader title="线下体验中心" :subtitle="selectedStoreName || '选择门店'" switchable @select-store="selectStore" />
</template>
<view class="coin-page">
<StoreSectionTabs
:tabs="storeSections"
:active="activeTab"
@select="selectTab"
/>
<!-- 卡片与权益列表共用当前门店的会员数据。 -->
<view v-if="activeTab === 'vip'" class="vip-section">
<view v-if="vipLoading" class="page-status">会员信息加载中...</view>
<view v-else-if="vipError" class="page-status" @click="loadMembership">{{ vipError }}</view>
<StoreVipCard
v-else-if="membership"
:membership="membership"
:benefits="storeVipBenefits"
@introduction="showVipIntroduction"
/>
<view class="vip-section__content">
<text class="vip-section__description">
门店体验中心VIP是为热爱射箭运动的用户专属打造的VIP服务,开通后即可享受以下三大专属权益:
</text>
<view class="vip-section__benefits">
<StoreBenefitCard
v-for="benefit in displayedBenefits"
:key="benefit.key"
:benefit="benefit"
/>
</view>
</view>
<StoreVipFooter v-if="membership" :active="membership.active" @open="showVipOpening" />
</view>
<!-- 保留原金币接口、分页与详情链路。 -->
<view v-else class="coin-section">
<CoinBalancePanel
:cumulative="coinSummary.cumulative"
:available="coinSummary.available"
/>
<CoinQuickMenu :menus="quickMenus" @select="onMenuSelect" />
<OfflineExchangeNotice />
<view class="reward-section">
<view class="reward-grid">
<view
v-for="product in rewardProducts"
:key="product.id"
class="reward-grid__item"
@click="toProductDetail(product)"
>
<RewardProductCard :product="product" />
</view>
</view>
</view>
<view v-if="productLoading" class="page-status">加载中...</view>
<view v-else-if="productError" class="page-status" @click="loadProducts()">加载失败,点击重试</view>
<view v-else-if="productNoMore" class="page-status">{{ rewardProducts.length ? '没有更多商品了~' : '暂无兑换商品~' }}</view>
</view>
</view>
</Container>
<ModalDialog
:show="vipOpeningVisible"
content="请前往线下门店体验中心,联系工作人员开通VIP。"
:show-cancel="false"
confirm-text="我已知晓"
:on-confirm="closeVipOpening"
/>
</template>
<style scoped lang="scss">
.page-status { padding: 30rpx; color: #cccccc; text-align: center; font-size: 26rpx; }
.coin-page {
width: 100%;
min-height: 100%;
padding-bottom: 40rpx;
box-sizing: border-box;
}
.vip-section {
padding-top: 30rpx;
}
.vip-section__content {
padding: 0 28rpx;
}
.vip-section__description {
display: block;
margin-top: 50rpx;
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.vip-section__benefits {
margin-top: 30rpx;
}
.coin-section {
padding-top: 20rpx;
}
.reward-section {
padding: 20rpx 28rpx 40rpx;
box-sizing: border-box;
}
.reward-grid {
display: flex;
flex-wrap: wrap;
}
.reward-grid__item {
width: 336rpx;
margin-right: 22rpx;
margin-bottom: 20rpx;
}
.reward-grid__item:nth-child(2n) {
margin-right: 0;
}
</style>
+174
View File
@@ -0,0 +1,174 @@
<script setup>
import { ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import LocationPermissionState from "./components/LocationPermissionState.vue";
import StoreCard from "./components/StoreCard.vue";
import { getNearbyStoresAPI } from "@/apis";
import { rememberExperienceStore } from "@/utils/storeVip";
const activeTab = ref("vip");
const PAGE_SIZE = 20;
const DEFAULT_STORE_IMAGE =
"https://static.shelingxingqiu.com/shootmini/static/coin/store-photo.png";
const showPermissionState = ref(false);
const stores = ref([]);
const location = ref(null);
const page = ref(0);
const total = ref(0);
const loading = ref(false);
const noMore = ref(false);
const loaded = ref(false);
const getCurrentLocation = () =>
new Promise((resolve, reject) => {
uni.getLocation({
type: "gcj02",
success: resolve,
fail: reject,
});
});
const mapStore = (item = {}) => ({
id: item.id,
name: item.name || "",
address: item.address || "",
phone: item.phone || "",
hours: item.businessHours || "",
image: item.coverImage || DEFAULT_STORE_IMAGE,
});
const loadStores = async ({ reset = false } = {}) => {
if (!location.value || loading.value || (!reset && noMore.value)) return;
const nextPage = reset ? 1 : page.value + 1;
loading.value = true;
if (reset) noMore.value = false;
try {
const result = await getNearbyStoresAPI({
...location.value,
page: nextPage,
pageSize: PAGE_SIZE,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map(mapStore);
stores.value = reset ? mappedList : stores.value.concat(mappedList);
page.value = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize = Number(result?.pageSize) || PAGE_SIZE;
total.value = Number.isFinite(totalCount) ? totalCount : 0;
if (Number.isFinite(pageCount) && pageCount >= 0) {
noMore.value = page.value >= pageCount;
} else if (Number.isFinite(totalCount) && totalCount >= 0) {
noMore.value = stores.value.length >= totalCount;
} else {
noMore.value = list.length < responsePageSize;
}
} catch (error) {
if (reset) {
stores.value = [];
page.value = 0;
}
console.error("加载附近门店失败", error);
} finally {
loading.value = false;
loaded.value = true;
}
};
const locateAndLoadStores = async () => {
try {
const position = await getCurrentLocation();
location.value = {
longitude: position.longitude,
latitude: position.latitude,
};
showPermissionState.value = false;
await loadStores({ reset: true });
} catch (error) {
showPermissionState.value = true;
loaded.value = true;
console.error("获取定位失败", error);
}
};
const authorizeLocation = () => {
uni.openSetting({
success: locateAndLoadStores,
fail: locateAndLoadStores,
});
};
// 选择门店后替换当前页面,返回时直接回到进入金币模块前的页面。
const selectStore = (store) => {
const storeId = String(store?.id || "");
if (!/^\d+$/.test(storeId) || Number(storeId) <= 0) {
uni.showToast({
title: "门店信息无效",
icon: "none",
});
return;
}
const storeName = encodeURIComponent(store?.name || "");
rememberExperienceStore(storeId, store?.name || "");
uni.redirectTo({
url: `/pages/coin/index?storeId=${encodeURIComponent(storeId)}&storeName=${storeName}&tab=${activeTab.value}`,
});
};
onLoad((options = {}) => {
activeTab.value = options.tab === "coin" ? "coin" : "vip";
locateAndLoadStores();
});
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadStores">
<template #header>
<CoinHeader title="附近门店" />
</template>
<view class="stores-page">
<LocationPermissionState
v-if="showPermissionState"
@authorize="authorizeLocation"
/>
<template v-else>
<StoreCard
v-for="store in stores"
:key="store.id"
:store="store"
@select="selectStore"
/>
<text v-if="loaded && !stores.length" class="stores-page__more">
附近暂无门店~
</text>
<text v-else-if="noMore" class="stores-page__more">没有更多门店了~</text>
</template>
</view>
</Container>
</template>
<style scoped>
.stores-page {
width: 100%;
min-height: 100%;
padding-bottom: 54rpx;
box-sizing: border-box;
}
.stores-page__more {
display: block;
width: 650rpx;
margin: 26rpx auto 0;
color: rgba(255, 255, 255, 0.72);
font-size: 26rpx;
line-height: 36rpx;
text-align: left;
}
</style>
+144
View File
@@ -0,0 +1,144 @@
<script setup>
import { ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import ProductHeroSwiper from "./components/ProductHeroSwiper.vue";
import OfflineExchangeNotice from "./components/OfflineExchangeNotice.vue";
import { getGiftDetailAPI } from "@/apis";
const productDetail = ref({
name: "",
coinPrice: 0,
stock: 0,
images: [],
descriptions: [],
});
const loadProductDetail = async (id) => {
try {
const result = await getGiftDetailAPI(id);
const images = Array.isArray(result?.images)
? result.images
.slice()
.sort((first, second) =>
(Number(first?.sort_order) || 0) - (Number(second?.sort_order) || 0)
)
.map((item) => item?.image_url)
.filter(Boolean)
: [];
productDetail.value = {
...productDetail.value,
name: result?.name || "",
coinPrice: Number(result?.coin_price) || 0,
stock: Number(result?.stock) || 0,
images,
descriptions: result?.description
? String(result.description).split(/\r?\n/).filter(Boolean)
: [],
};
} catch (error) {
console.error("加载礼品详情失败", error);
}
};
onLoad((options = {}) => {
const id = Number(options.id);
if (!Number.isInteger(id) || id <= 0) {
uni.showToast({
title: "商品参数无效",
icon: "none",
});
return;
}
loadProductDetail(id);
});
</script>
<template>
<Container :bgType="6" :isHome="true">
<template #header>
<CoinHeader title="商品详情" />
</template>
<view class="product-detail">
<ProductHeroSwiper
:images="productDetail.images"
/>
<view class="product-detail__summary">
<text class="product-detail__name">{{ productDetail.name }}</text>
<view class="product-detail__balance">
<text>金币:</text>
<text class="product-detail__amount">{{ productDetail.coinPrice }}</text>
<text>(剩余{{ productDetail.stock }}个)</text>
</view>
</view>
<OfflineExchangeNotice variant="red" />
<view class="product-detail__content">
<text
v-for="(description, index) in productDetail.descriptions"
:key="index"
class="product-detail__paragraph"
>
{{ description }}
</text>
</view>
</view>
</Container>
</template>
<style scoped>
.product-detail {
width: 100%;
min-height: 100%;
padding-bottom: 60rpx;
box-sizing: border-box;
background-color: #22222e;
}
.product-detail__summary {
padding: 30rpx 40rpx 20rpx;
display: flex;
flex-direction: column;
}
.product-detail__name {
color: #ffd947;
font-size: 52rpx;
line-height: 74rpx;
font-weight: 500;
}
.product-detail__balance {
display: flex;
align-items: baseline;
margin-top: 10rpx;
color: rgba(255, 255, 255, 0.75);
font-size: 24rpx;
line-height: 34rpx;
}
.product-detail__amount {
margin-right: 6rpx;
color: #ffffff;
font-size: 36rpx;
line-height: 50rpx;
font-weight: 500;
}
.product-detail__content {
padding: 38rpx 40rpx 60rpx;
box-sizing: border-box;
border-bottom: 2rpx solid rgba(255, 217, 71, 0.05);
}
.product-detail__paragraph {
display: block;
margin-bottom: 20rpx;
color: rgba(255, 255, 255, 0.75);
font-size: 26rpx;
line-height: 40rpx;
text-align: justify;
}
</style>
+133
View File
@@ -0,0 +1,133 @@
<script setup>
import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import CoinEmptyState from "./components/CoinEmptyState.vue";
import { getStoreGoldRuleListAPI } from "@/apis";
const PAGE_SIZE = 20;
const storeId = ref("");
const coinRules = ref([]);
const page = ref(0);
const loading = ref(false);
const noMore = ref(false);
const loaded = ref(false);
const showEmpty = computed(() => loaded.value && !coinRules.value.length);
const updatePaginationState = (result, list, nextPage) => {
const currentPage = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount ?? result?.page_count);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize =
Number(result?.pageSize ?? result?.page_size) || PAGE_SIZE;
page.value = currentPage;
if (Number.isFinite(pageCount) && pageCount >= 0) {
noMore.value = currentPage >= pageCount;
return;
}
if (Number.isFinite(totalCount) && totalCount >= 0) {
noMore.value = coinRules.value.length >= totalCount;
return;
}
noMore.value = list.length < responsePageSize;
};
const loadRules = async ({ reset = false } = {}) => {
if (loading.value || (!reset && noMore.value)) return;
const nextPage = reset ? 1 : page.value + 1;
loading.value = true;
if (reset) noMore.value = false;
try {
const result = await getStoreGoldRuleListAPI({
storeId: storeId.value,
page: nextPage,
pageSize: PAGE_SIZE,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map((item) => ({
id: item.id,
content: item.content || "",
}));
coinRules.value = reset ? mappedList : coinRules.value.concat(mappedList);
updatePaginationState(result, list, nextPage);
} catch (error) {
if (reset) {
coinRules.value = [];
page.value = 0;
}
console.error("加载金币规则失败", error);
} finally {
loading.value = false;
loaded.value = true;
}
};
onLoad((options = {}) => {
const currentStoreId = String(options.storeId || "");
if (!/^\d+$/.test(currentStoreId) || Number(currentStoreId) <= 0) {
uni.redirectTo({
url: "/pages/coin/nearby-stores",
});
return;
}
storeId.value = currentStoreId;
loadRules({ reset: true });
});
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRules">
<template #header>
<CoinHeader title="金币规则" />
</template>
<view class="rules-page">
<CoinEmptyState v-if="showEmpty" text="暂无金币规则。" />
<template v-else>
<view
v-for="rule in coinRules"
:key="rule.id"
class="rules-page__item"
>
<rich-text class="rules-page__content" :nodes="rule.content" />
</view>
</template>
<view v-if="loading" class="rules-page__status">
<text>加载中...</text>
</view>
</view>
</Container>
</template>
<style scoped>
.rules-page {
width: 100%;
padding: 28rpx 38rpx 60rpx;
box-sizing: border-box;
}
.rules-page__item {
margin-bottom: 26rpx;
color: rgba(255, 255, 255, 0.88);
font-size: 28rpx;
line-height: 52rpx;
text-align: justify;
}
.rules-page__content {
display: block;
}
.rules-page__status {
padding: 12rpx 0 20rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 24rpx;
line-height: 34rpx;
text-align: center;
}
</style>
+48
View File
@@ -0,0 +1,48 @@
<script setup>
import { ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import { getStoreVipIntroAPI } from "@/apis";
const content = ref("");
const loading = ref(false);
const failed = ref(false);
const loadIntroduction = async () => {
if (loading.value) return;
loading.value = true;
failed.value = false;
try {
const result = await getStoreVipIntroAPI();
if (typeof result?.content !== "string") {
throw new Error("体验中心 VIP 介绍响应格式异常");
}
// 保留服务端原文与换行,空白内容单独展示提示。
content.value = result.content;
} catch (error) {
failed.value = true;
console.error("加载体验中心 VIP 介绍失败", error);
} finally {
loading.value = false;
}
};
onLoad(loadIntroduction);
</script>
<template>
<Container :bgType="6" bgColor="#22222e" :isHome="true">
<template #header><CoinHeader title="体验中心VIP介绍" /></template>
<view class="vip-intro">
<text v-if="loading">加载中...</text>
<text v-else-if="failed" @click="loadIntroduction">加载失败,点击重试</text>
<text v-else-if="content.trim()">{{ content }}</text>
<text v-else>暂无介绍内容</text>
</view>
</Container>
</template>
<style scoped lang="scss">
.vip-intro { padding: 32rpx 28rpx; color: #ffffff; font-size: 28rpx; line-height: 44rpx; white-space: pre-wrap; }
</style>
@@ -0,0 +1,94 @@
import { bindDeviceAPIV2 } from "@/apis";
export function useDeviceBinding({
token,
confirmBindTip,
binding,
updateDevice,
deviceDetails,
}) {
const showBindFailurePage = () => {
uni.hideToast();
uni.navigateTo({
url: "/pages/device/device-bind-failure",
fail: (error) => {
console.error("打开绑定失败页失败", error);
uni.showToast({ title: "二维码不正确,请重新扫码", icon: "none" });
},
});
};
const showAlreadyBoundPage = () => {
uni.navigateTo({
url: "/pages/device/device-already-bound",
fail: (error) => {
console.error("打开设备已绑定页失败", error);
uni.showToast({ title: "设备已绑定其他账号,请解绑后再绑定", icon: "none" });
},
});
};
const handleScan = () => {
uni.scanCode({
onlyFromCamera: true,
scanType: ["qrCode"],
success: (result) => {
if (!result?.result) {
showBindFailurePage();
return;
}
token.value = result.result;
confirmBindTip.value = true;
},
fail: (error) => {
const message = String(error?.errMsg || error?.message || "");
if (/cancel|取消/i.test(message)) return;
showBindFailurePage();
},
});
};
const confirmBind = async () => {
if (!token.value || binding.value) return;
binding.value = true;
try {
const result = await bindDeviceAPIV2(token.value);
confirmBindTip.value = false;
if (result?.binded) {
token.value = "";
showAlreadyBoundPage();
return;
}
const deviceId = String(result?.deviceId || "").trim();
const deviceName = String(result?.name || result?.deviceName || "").trim();
if (!deviceId || !deviceName) {
confirmBindTip.value = false;
token.value = "";
showBindFailurePage();
return;
}
const applyBoundDevice = () => {
updateDevice(deviceId, deviceName);
deviceDetails.value = result || {};
};
uni.navigateTo({
url: `/pages/device/device-bind-success?deviceId=${encodeURIComponent(deviceId)}`,
success: applyBoundDevice,
fail: (navigationError) => {
applyBoundDevice();
console.error("打开绑定成功页失败", navigationError);
uni.showToast({ title: "绑定成功,请返回查看设备", icon: "none" });
},
});
} catch (error) {
console.error("绑定设备失败", error);
confirmBindTip.value = false;
token.value = "";
showBindFailurePage();
} finally {
binding.value = false;
}
};
return { confirmBind, handleScan, showBindFailurePage };
}
@@ -0,0 +1,234 @@
import { computed, ref } from "vue";
import {
getDeviceDetailAPI,
getMyDevicesAPI,
unbindDeviceAPI,
} from "@/apis";
export const DEVICE_NAME_STORAGE_KEY = "device_name_overrides";
export function useDeviceStatus({
user,
device,
deviceStatus,
deviceUsageDuration,
online,
updateDevice,
updateDeviceUsageDuration,
clearDevice,
unbindDialogVisible,
}) {
const deviceDetails = ref({});
let deviceDetailRequestVersion = 0;
const isDeviceOnline = computed(
() => deviceStatus.value.online === true || online.value === true
);
const isDeviceCharging = computed(
() => isDeviceOnline.value && deviceStatus.value.charging === true
);
const statusText = computed(() => {
if (!isDeviceOnline.value) return "未连接";
return isDeviceCharging.value ? "已连接(充电中)" : "已连接";
});
const statusClass = computed(() =>
isDeviceOnline.value ? "device-status--online" : "device-status--offline"
);
const battery = computed(() => {
const rawValue = deviceStatus.value.battery ?? deviceStatus.value.power;
if (rawValue === null || rawValue === undefined || rawValue === "") return null;
const value = Number(rawValue);
return Number.isFinite(value) ? Math.min(100, Math.max(0, value)) : null;
});
const batteryText = computed(() =>
battery.value === null ? "暂无数据" : `${battery.value}%`
);
const normalizeDuration = (value) => {
if (value == null || String(value).trim() === "") return null;
const seconds = Number(value);
return Number.isFinite(seconds) && seconds >= 0 ? seconds : null;
};
const onlineDurationText = computed(() => {
const currentDeviceId = String(device.value.deviceId || "");
const cachedDuration =
String(deviceUsageDuration.value.deviceId || "") === currentDeviceId
? normalizeDuration(deviceUsageDuration.value.seconds)
: null;
const durations = [
normalizeDuration(deviceStatus.value.onlineDuration),
normalizeDuration(deviceDetails.value.onlineDuration),
cachedDuration,
].filter((value) => value !== null);
if (!durations.length) return "--";
const seconds = Math.max(...durations);
// 累计时长应单调递增,页面按完整分钟展示当前已知最大值。
const totalMinutes = Math.floor(seconds / 60);
const hours = Math.floor(totalMinutes / 60);
const minutes = totalMinutes % 60;
return hours > 0 ? `${hours}小时${minutes}分钟` : `${minutes}分钟`;
});
const networkType = computed(() =>
String(deviceStatus.value.netType ?? "").trim().toLowerCase()
);
const networkText = computed(() => {
const netType = networkType.value;
if (netType === "wifi") return "WiFi";
if (netType === "4g") return "4G";
return isDeviceOnline.value ? "在线" : "未连接";
});
const maskedDeviceId = computed(() => {
const id = String(device.value.deviceId || "");
if (!id) return "暂无设备编号";
return "*****";
});
const deviceRows = computed(() => [
{ label: "设备型号", value: deviceDetails.value.model || "射灵智能弓" },
{ label: "当前电量", value: batteryText.value },
{ label: "连接方式", value: networkText.value },
{ label: "设备编号", value: maskedDeviceId.value },
]);
const getDeviceNameOverrides = () => {
const value = uni.getStorageSync(DEVICE_NAME_STORAGE_KEY);
return value && typeof value === "object" ? value : {};
};
const refreshDeviceDetails = async () => {
const deviceId = device.value.deviceId;
if (!deviceId) return null;
const requestVersion = ++deviceDetailRequestVersion;
try {
const detailResponse = await getDeviceDetailAPI(deviceId);
const detail = detailResponse?.detail || detailResponse?.data?.detail;
if (
!detail ||
typeof detail !== "object" ||
requestVersion !== deviceDetailRequestVersion ||
device.value.deviceId !== deviceId
) {
return null;
}
deviceDetails.value = {
...deviceDetails.value,
...detail,
deviceModelName: detail.deviceModelName ?? "",
latestVersion: detail.latestVersion ?? "",
needUpdate: detail.needUpdate ?? false,
forceUpdate: detail.forceUpdate ?? false,
version: detail.version ?? "",
bindTime: String(
detail.bindTime ?? deviceDetails.value.bindTime ?? ""
).trim(),
qrCodeUrl: String(
detail.qrCodeUrl ?? deviceDetails.value.qrCodeUrl ?? ""
).trim(),
};
updateDeviceUsageDuration(detail.onlineDuration, deviceId);
return detail;
} catch (error) {
// 实时刷新失败时保留当前页面数据,等待下次通知或页面重新显示。
console.log("刷新设备详情失败", error);
return null;
}
};
const syncDeviceBinding = async () => {
if (!user.value.id) return;
try {
const devices = await getMyDevicesAPI();
if (Array.isArray(devices?.bindings) && devices.bindings.length > 0) {
const currentDevice = devices.bindings[0];
const nameOverrides = getDeviceNameOverrides();
// 二维码和绑定时间仅取详情接口,绑定列表不能作为这两项的回退数据。
let latestDevice = {
...currentDevice,
deviceModelName: "",
latestVersion: "",
needUpdate: false,
forceUpdate: false,
version: "",
bindTime: "",
qrCodeUrl: "",
};
try {
const detailResponse = await getDeviceDetailAPI(currentDevice.deviceId);
const detail = detailResponse?.detail || detailResponse?.data?.detail;
if (detail && typeof detail === "object") {
latestDevice = {
...currentDevice,
...detail,
deviceModelName: detail.deviceModelName ?? "",
bindTime: String(detail.bindTime ?? "").trim(),
qrCodeUrl: String(detail.qrCodeUrl ?? "").trim(),
deviceName:
detail.deviceAlias || detail.deviceName || currentDevice.deviceName,
};
}
} catch (error) {
// 详情接口失败时保留绑定关系,二维码和绑定时间仍保持为空。
console.log("获取设备详情失败", error);
}
deviceDetails.value = latestDevice;
updateDevice(
latestDevice.deviceId,
nameOverrides[latestDevice.deviceId] ||
latestDevice.deviceAlias ||
latestDevice.deviceName ||
latestDevice.name ||
"我的智能弓"
);
updateDeviceUsageDuration(latestDevice.onlineDuration, latestDevice.deviceId);
return;
}
clearDevice();
deviceDetailRequestVersion += 1;
deviceDetails.value = {};
} catch (error) {
console.log("同步设备绑定失败", error);
}
};
const unbindDevice = async () => {
if (!device.value.deviceId) return;
try {
await unbindDeviceAPI(device.value.deviceId);
uni.setStorageSync("calibration", false);
clearDevice();
deviceDetailRequestVersion += 1;
deviceDetails.value = {};
unbindDialogVisible.value = false;
uni.showToast({ title: "解绑成功", icon: "success" });
} catch (error) {
console.error("解绑设备失败", error);
if (error?.type === "DEVICE_BIND_INVALID") {
clearDevice();
unbindDialogVisible.value = false;
}
}
};
return {
batteryText,
deviceDetails,
deviceRows,
getDeviceNameOverrides,
isDeviceCharging,
isDeviceOnline,
maskedDeviceId,
networkText,
networkType,
onlineDurationText,
refreshDeviceDetails,
statusClass,
statusText,
syncDeviceBinding,
unbindDevice,
};
}
+154
View File
@@ -0,0 +1,154 @@
<script setup>
import Container from "@/components/Container.vue";
// 结果页从设备页进入,返回时优先保留原页面状态。
const goBackToDevicePage = () => {
const pages = getCurrentPages();
if (pages.length > 1) {
uni.navigateBack({ delta: 1 });
return;
}
uni.redirectTo({ url: "/pages/device/my-device" });
};
// 回到设备页后复用其扫码绑定流程。
const retryScan = () => {
const pages = getCurrentPages();
if (pages.length > 1) {
uni.navigateBack({
delta: 1,
success: () => uni.$emit("device-bind-retry-scan"),
});
return;
}
uni.redirectTo({ url: "/pages/device/my-device?retryScan=1" });
};
</script>
<template>
<view class="device-already-bound-page">
<Container
:bgType="12"
bgColor="transparent"
:onBack="goBackToDevicePage"
headerClass="already-bound-header"
:scroll="false"
:usePageScroll="true"
>
<view class="already-bound-page">
<view class="already-bound-scene">
<view class="already-bound-hero-wrap">
<view class="already-bound-hero-shadow"></view>
<image
class="already-bound-hero"
src="/static/device-assets/device-already-bound-hero.png"
mode="aspectFit"
/>
</view>
<view class="already-bound-message">
<text>该设备已经绑定了其他账号,</text>
<text>如需绑定本账号,请先解除绑定。</text>
</view>
<view class="already-bound-retry" @click="$clickSound(retryScan)">
<text>重新扫码</text>
</view>
</view>
</view>
</Container>
</view>
</template>
<style scoped lang="scss">
.device-already-bound-page {
position: relative;
min-height: 100vh;
background: transparent;
}
.already-bound-header {
position: relative;
z-index: 20;
pointer-events: auto;
}
/* 与现有绑定结果页保持相同的 375 宽画布尺寸。 */
.already-bound-page {
position: fixed;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100vh;
overflow: hidden;
pointer-events: none;
}
.already-bound-scene {
position: relative;
width: 100%;
height: 100%;
}
.already-bound-hero-wrap,
.already-bound-message,
.already-bound-retry {
position: absolute;
}
.already-bound-hero-wrap {
top: 568rpx;
left: 244rpx;
width: 260rpx;
height: 222rpx;
}
.already-bound-hero-shadow {
position: absolute;
left: 22rpx;
bottom: 0;
width: 238rpx;
height: 40rpx;
border-radius: 50%;
background: rgba(0, 0, 0, 0.3);
}
.already-bound-hero {
position: absolute;
top: 0;
left: 0;
width: 260rpx;
height: 222rpx;
}
.already-bound-message {
top: 804rpx;
left: 110rpx;
display: flex;
width: 530rpx;
flex-direction: column;
align-items: center;
color: #fff;
font-family: PingFang SC-Regular;
font-size: 28rpx;
line-height: 40rpx;
text-align: center;
white-space: nowrap;
}
.already-bound-retry {
top: 930rpx;
left: 195rpx;
display: flex;
width: 360rpx;
height: 70rpx;
box-sizing: border-box;
align-items: center;
justify-content: center;
border: 2rpx solid #ffd947;
border-radius: 78rpx;
color: #ffd947;
font-size: 26rpx;
line-height: 26rpx;
pointer-events: auto;
}
</style>
+156
View File
@@ -0,0 +1,156 @@
<script setup>
import Container from "@/components/Container.vue";
// 失败页由设备页进入,返回时优先回到上一页;页面栈异常时兜底回到设备页。
const goBackToDevicePage = () => {
const pages = getCurrentPages();
if (pages.length > 1) {
uni.navigateBack({ delta: 1 });
return;
}
uni.redirectTo({ url: "/pages/device/my-device" });
};
// 返回设备页后沿用原有扫码绑定流程,不在结果页重复处理二维码数据。
const retryScan = () => {
const pages = getCurrentPages();
if (pages.length > 1) {
uni.navigateBack({
delta: 1,
success: () => uni.$emit("device-bind-retry-scan"),
});
return;
}
uni.redirectTo({ url: "/pages/device/my-device?retryScan=1" });
};
</script>
<template>
<view class="device-bind-failure-page">
<Container
:bgType="12"
bgColor="transparent"
:onBack="goBackToDevicePage"
headerClass="bind-failure-header"
:scroll="false"
:usePageScroll="true"
>
<view class="bind-failure-page">
<view class="bind-failure-scene">
<view class="bind-failure-hero-wrap">
<view class="bind-failure-hero-shadow"></view>
<image
class="bind-failure-hero"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-failure-hero.png"
mode="aspectFit"
/>
</view>
<view class="bind-failure-message">
<text>二维码不正确,</text>
<text>仅支持扫描射灵智能弓箭的设备二维码。</text>
</view>
<view class="bind-failure-retry" @click="$clickSound(retryScan)">
<text>重新扫码</text>
</view>
</view>
</view>
</Container>
</view>
</template>
<style scoped lang="scss">
.device-bind-failure-page {
position: relative;
min-height: 100vh;
background: transparent;
}
.bind-failure-header {
position: relative;
z-index: 20;
pointer-events: auto;
}
/* 与绑定成功页共用固定画布,页面内的视觉尺寸全部按 375 宽设计稿换算为 rpx。 */
.bind-failure-page {
position: fixed;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100vh;
overflow: hidden;
pointer-events: none;
}
.bind-failure-scene {
position: relative;
width: 100%;
height: 100%;
}
.bind-failure-hero-wrap,
.bind-failure-message,
.bind-failure-retry {
position: absolute;
}
.bind-failure-hero-wrap {
top: 568rpx;
left: 244rpx;
width: 260rpx;
height: 222rpx;
}
.bind-failure-hero-shadow {
position: absolute;
left: 22rpx;
bottom: 0;
width: 238rpx;
height: 40rpx;
border-radius: 50%;
background: rgba(0, 0, 0, 0.3);
}
.bind-failure-hero {
position: absolute;
top: 0;
left: 0;
width: 260rpx;
height: 222rpx;
}
.bind-failure-message {
top: 824rpx;
left: 122rpx;
display: flex;
width: 504rpx;
min-height: 80rpx;
flex-direction: column;
align-items: center;
color: #ffffff;
font-family: PingFang SC-Regular;
font-size: 28rpx;
font-weight: normal;
line-height: 40rpx;
text-align: center;
white-space: nowrap;
}
.bind-failure-retry {
top: 960rpx;
left: 195rpx;
display: flex;
width: 360rpx;
height: 70rpx;
box-sizing: border-box;
align-items: center;
justify-content: center;
border: 2rpx solid #ffd947;
border-radius: 78rpx;
color: #ffd947;
font-size: 26rpx;
line-height: 26rpx;
pointer-events: auto;
}
</style>
+248
View File
@@ -0,0 +1,248 @@
<script setup>
import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import { getDeviceDetailAPI, getHomeData } from "@/apis";
const bindResult = ref({
isFirstBind: false,
expireDate: "",
});
const bindSuccessHero = computed(() =>
bindResult.value.isFirstBind
? "https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-success-hero-first.png"
: "https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-success-hero-nonfirst.png"
);
const bindRewardExpireDate = computed(() => bindResult.value.expireDate);
// 与会员页使用相同的到期时间格式,设备详情接口本身不提供会员有效期。
const formatVipDate = (value) => {
if (!value) return "";
const numericValue = Number(value);
const timestamp = Number.isNaN(numericValue)
? new Date(value).getTime()
: numericValue < 1000000000000
? numericValue * 1000
: numericValue;
const date = new Date(timestamp);
if (Number.isNaN(date.getTime())) return "";
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, "0");
const day = String(date.getDate()).padStart(2, "0");
return `${year}-${month}-${day}`;
};
const loadBindResult = async (deviceId) => {
if (!deviceId) return;
try {
const data = await getDeviceDetailAPI(deviceId);
if (data?.detail?.isFirstBind !== true) return;
bindResult.value.isFirstBind = true;
try {
const homeData = await getHomeData();
bindResult.value.expireDate = formatVipDate(
homeData?.user?.normalVipExpiredAt
);
} catch (error) {
console.error("获取赠送会员有效期失败", error);
}
} catch (error) {
console.error("获取设备详情失败", error);
}
};
const toFirstTryPage = () => {
uni.navigateTo({ url: "/pages/first-try" });
};
// 成功页由设备页 navigateTo 进入,优先返回上一页;页面栈异常时兜底回到设备页。
const goBackToDevicePage = () => {
const pages = getCurrentPages();
if (pages.length > 1) {
uni.navigateBack({ delta: 1 });
return;
}
uni.redirectTo({ url: "/pages/device/my-device" });
};
onLoad((options = {}) => {
bindResult.value = {
isFirstBind: false,
expireDate: "",
};
void loadBindResult(options.deviceId);
});
</script>
<template>
<view class="device-bind-success-page">
<Container
:bgType="12"
bgColor="transparent"
:onBack="goBackToDevicePage"
headerClass="bind-success-header"
:scroll="false"
:usePageScroll="true"
>
<view class="bind-success-page">
<view
class="bind-success-scene"
:class="{ 'bind-success-scene--first': bindResult.isFirstBind }"
>
<image
class="bind-success-confetti"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-success-confetti.png"
mode="aspectFit"
/>
<image class="bind-success-hero" :src="bindSuccessHero" mode="aspectFit" />
<image
class="bind-success-title-image"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-success-title.png"
mode="aspectFit"
/>
<view v-if="bindResult.isFirstBind" class="bind-reward-card">
<image
class="bind-reward-gift"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-success-reward-gift.png"
mode="aspectFit"
/>
<text class="bind-reward-text">
新设备首次绑定礼包:
<text class="bind-reward-highlight">6个月射灵会员</text>
已自动发放至本账号<text v-if="bindRewardExpireDate">,有效期{{ bindRewardExpireDate }}</text>。
</text>
</view>
<view class="bind-success-tutorial" @click="$clickSound(toFirstTryPage)">
<text>立即查看新手教程</text>
</view>
</view>
</view>
</Container>
</view>
</template>
<style scoped lang="scss">
.device-bind-success-page {
position: relative;
min-height: 100vh;
background: transparent;
}
.bind-success-header {
position: relative;
z-index: 20;
pointer-events: auto;
}
/* 绑定结果页使用固定画布,背景和前景素材按蓝湖 375 x 812 画布定位。 */
.bind-success-page {
position: fixed;
top: 0;
left: 0;
z-index: 1;
width: 100%;
height: 100vh;
overflow: hidden;
pointer-events: none;
}
.bind-success-scene {
position: relative;
width: 100%;
height: 100%;
}
.bind-success-confetti,
.bind-success-hero,
.bind-success-title-image,
.bind-reward-card,
.bind-success-tutorial {
position: absolute;
}
.bind-success-confetti {
top: 488rpx;
left: 78rpx;
width: 588rpx;
height: 508rpx;
}
.bind-success-hero {
top: 568rpx;
left: 244rpx;
width: 260rpx;
height: 222rpx;
}
.bind-success-scene--first .bind-success-confetti {
top: 314rpx;
}
.bind-success-scene--first .bind-success-hero {
top: 400rpx;
}
.bind-success-title-image {
top: 828rpx;
left: 216rpx;
width: 316rpx;
height: 70rpx;
}
.bind-success-scene--first .bind-success-title-image {
top: 660rpx;
}
.bind-reward-card {
top: 768rpx;
left: 170rpx;
width: 508rpx;
height: 152rpx;
box-sizing: border-box;
padding: 16rpx 16rpx 16rpx 90rpx;
border-radius: 16rpx 64rpx 16rpx 64rpx;
background: rgba(0, 0, 0, 0.6);
}
.bind-reward-gift {
position: absolute;
top: -18rpx;
left: -100rpx;
width: 178rpx;
height: 176rpx;
}
.bind-reward-text {
display: block;
width: 380rpx;
height: 120rpx;
color: #ffffff;
font-family: PingFang SC-Regular;
font-size: 28rpx;
font-weight: normal;
line-height: 40rpx;
}
.bind-reward-highlight {
color: #ffd947;
}
.bind-success-tutorial {
top: 960rpx;
left: 195rpx;
display: flex;
width: 360rpx;
height: 70rpx;
box-sizing: border-box;
align-items: center;
justify-content: center;
border: 2rpx solid #ffd947;
border-radius: 78rpx;
color: #ffd947;
font-size: 26rpx;
line-height: 26rpx;
pointer-events: auto;
}
</style>
@@ -1,6 +1,7 @@
<script setup> <script setup>
import { ref, onMounted } from "vue"; import { ref, onMounted } from "vue";
import SButton from "@/components/SButton.vue"; import SButton from "@/components/SButton.vue";
import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
import { capsuleHeight } from "@/util"; import { capsuleHeight } from "@/util";
@@ -37,7 +38,7 @@ const onScrollView = (e) => {
mode="widthFix" mode="widthFix"
/> />
<navigator open-type="navigateBack"> <navigator open-type="navigateBack">
<image class="header-back" src="../static/back.png" mode="widthFix" /> <image class="header-back" src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</navigator> </navigator>
<text <text
:style="{ opacity: addBg ? 1 : 0, color: '#fff', fontWeight: 'bold' }" :style="{ opacity: addBg ? 1 : 0, color: '#fff', fontWeight: 'bold' }"
@@ -55,6 +56,7 @@ const onScrollView = (e) => {
/> />
</view> </view>
</scroll-view> </scroll-view>
<DeviceChargingDialog />
</view> </view>
</template> </template>
+192
View File
@@ -0,0 +1,192 @@
<script setup>
import { ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import { getDeviceDetailAPI } from "@/apis";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const store = useStore();
const { device } = storeToRefs(store);
const deviceId = ref("");
const qrImageUrl = ref("");
const qrSaved = ref(false);
const loading = ref(true);
const loadQrCode = async () => {
if (!deviceId.value) {
loading.value = false;
return;
}
try {
const response = await getDeviceDetailAPI(deviceId.value);
const detail = response?.detail || response?.data?.detail;
qrImageUrl.value = String(detail?.qrCodeUrl ?? "").trim();
} catch (error) {
console.error("获取设备二维码失败", error);
qrImageUrl.value = "";
} finally {
loading.value = false;
}
};
const saveQrCode = async () => {
if (!qrImageUrl.value) return;
let filePath = qrImageUrl.value;
try {
if (/^https?:\/\//.test(filePath)) {
filePath = await new Promise((resolve, reject) => {
uni.downloadFile({
url: filePath,
success: (result) =>
result.statusCode === 200
? resolve(result.tempFilePath)
: reject(new Error("二维码下载失败")),
fail: reject,
});
});
}
await new Promise((resolve, reject) => {
uni.saveImageToPhotosAlbum({ success: resolve, fail: reject, filePath });
});
qrSaved.value = true;
uni.showToast({ title: "已保存至相册", icon: "success" });
} catch (error) {
uni.showToast({ title: "请长按二维码保存", icon: "none" });
}
};
onLoad((options = {}) => {
try {
deviceId.value = decodeURIComponent(options.deviceId || "") || device.value.deviceId || "";
} catch (error) {
deviceId.value = device.value.deviceId || "";
}
void loadQrCode();
});
</script>
<template>
<Container :bgType="12" :scroll="false">
<view class="qr-page">
<view class="qr-corner qr-corner--top"></view>
<view class="qr-corner qr-corner--bottom"></view>
<view class="qr-canvas">
<text v-if="loading" class="qr-empty">二维码加载中...</text>
<template v-else-if="qrImageUrl">
<image class="qr-image" :src="qrImageUrl" mode="aspectFit" show-menu-by-longpress />
<text v-if="qrSaved" class="qr-device-id">设备ID:{{ deviceId }}</text>
<view v-else class="qr-save-button" @click="saveQrCode">
<text>保存至相册</text>
</view>
<text class="qr-description">
该二维码为当前绑定弓箭的二维码,你可以截图保存到相册,以便当二维码丢失或不在身边时,可以扫描二维码进行设备绑定。
</text>
<text class="qr-note">注:解除绑定后将无法查看该二维码。</text>
</template>
<text v-else class="qr-empty">暂无设备二维码</text>
</view>
</view>
</Container>
</template>
<style scoped>
.qr-page {
position: relative;
width: 100%;
height: 100%;
min-height: 0;
box-sizing: border-box;
overflow: hidden;
background: transparent;
}
.qr-corner {
position: absolute;
width: 300rpx;
height: 300rpx;
background: #ffeb00;
}
.qr-corner--top {
top: -220rpx;
right: -170rpx;
transform: rotate(42deg);
}
.qr-corner--bottom {
bottom: -220rpx;
left: -170rpx;
transform: rotate(42deg);
}
.qr-canvas {
position: relative;
z-index: 1;
display: flex;
width: 100%;
height: 100%;
min-height: 0;
box-sizing: border-box;
flex-direction: column;
align-items: center;
padding: 260rpx 62rpx 70rpx;
}
.qr-image {
width: 432rpx;
height: 432rpx;
box-sizing: border-box;
background: #ffffff;
}
.qr-save-button {
display: flex;
width: 360rpx;
height: 72rpx;
align-items: center;
justify-content: center;
margin-top: 34rpx;
border: 1rpx solid #e8c840;
border-radius: 36rpx;
color: #ffe846;
font-size: 26rpx;
}
.qr-device-id,
.qr-empty {
color: rgba(255, 255, 255, 0.72);
font-size: 26rpx;
line-height: 40rpx;
text-align: center;
}
.qr-device-id {
margin-top: 24rpx;
}
.qr-empty {
margin-top: 140rpx;
}
.qr-description,
.qr-note {
width: 100%;
color: rgba(255, 255, 255, 0.6);
font-size: 22rpx;
line-height: 36rpx;
text-align: center;
}
.qr-description {
margin-top: 42rpx;
}
.qr-note {
margin-top: 12rpx;
color: rgba(255, 232, 70, 0.7);
}
</style>
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+16 -12
View File
@@ -22,7 +22,12 @@ import {
} from "@/apis"; } from "@/apis";
import { connectMatchWebSocket, closeMatchWebSocket } from "@/matchWebsocket"; import { connectMatchWebSocket, closeMatchWebSocket } from "@/matchWebsocket";
import { sharePractiseData } from "@/canvas"; import { sharePractiseData } from "@/canvas";
import { wxShare, debounce } from "@/util"; import {
wxShare,
debounce,
getDistanceCheckAudioKey,
getShootValidation,
} from "@/util";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -109,7 +114,7 @@ const createPractise = async (arrows) => {
const result = await createPractiseAPI( const result = await createPractiseAPI(
arrows, arrows,
120, 120,
1, 2,
device.value.deviceId device.value.deviceId
); );
if (result) practiseId.value = result.id; if (result) practiseId.value = result.id;
@@ -154,14 +159,11 @@ async function onReceiveMessage(msg) {
} else if (msg.type === MESSAGETYPESV2.BattleEnd) { } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
setTimeout(() => onOver(msg), 1500); setTimeout(() => onOver(msg), 1500);
} else if (msg.type === MESSAGETYPESV2.TestDistance && step.value === 3) { } else if (msg.type === MESSAGETYPESV2.TestDistance && step.value === 3) {
const rawDistance = Number(msg.shootData?.distance); const result = getShootValidation(msg.shootData);
if (rawDistance === 0) { const isQualified = result.distanceOk && result.targetOk;
audioManager.play("未发现靶纸,请瞄准靶纸射箭"); audioManager.play(getDistanceCheckAudioKey(msg.shootData));
} else if (rawDistance / 100 >= 5) { btnDisabled.value = !isQualified;
audioManager.play("距离合格"); showGuide.value = isQualified;
btnDisabled.value = false;
showGuide.value = true;
} else audioManager.play("距离不足");
} }
// messages.forEach((msg) => { // messages.forEach((msg) => {
// if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) { // if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
@@ -195,7 +197,7 @@ const onClickShare = debounce(async () => {
}); });
onMounted(() => { onMounted(() => {
void audioManager.warmAll(); void audioManager.warmCommon();
uni.setKeepScreenOn({ uni.setKeepScreenOn({
keepScreenOn: true, keepScreenOn: true,
}); });
@@ -382,7 +384,7 @@ const getResultTipSrc = (result = {}) => {
<text>请完成以上步骤校准智能弓</text> <text>请完成以上步骤校准智能弓</text>
</view> </view>
<ShootProgress v-if="step === 5" tips="请开始连续射箭" :start="start" /> <ShootProgress v-if="step === 5" tips="请开始连续射箭" :start="start" />
<TestDistance v-if="step === 3" :guide="false" /> <TestDistance v-if="step === 3" :guide="false" :targetType="40" />
<view <view
class="user-row" class="user-row"
v-if="step === 5" v-if="step === 5"
@@ -397,6 +399,8 @@ const getResultTipSrc = (result = {}) => {
:totalRound="step === 5 ? total : 0" :totalRound="step === 5 ? total : 0"
:scores="scores" :scores="scores"
:isSvip="isSvip" :isSvip="isSvip"
:targetType="40"
stable-shot-effect
/> />
<ScorePanel <ScorePanel
v-if="step === 5" v-if="step === 5"
+2 -2
View File
@@ -168,7 +168,7 @@ const meleeRankList = computed(() => {
*/ */
function getMeleeRankBgSrc(rank) { function getMeleeRankBgSrc(rank) {
const names = ["one", "two", "three"]; const names = ["one", "two", "three"];
return `../static/friend-battle-result/rank-${names[rank - 1]}.svg`; return `https://static.shelingxingqiu.com/shootmini/static/friend-battle-result/rank-${names[rank - 1]}.svg`;
} }
/** /**
@@ -485,7 +485,7 @@ function goBack() {
<image <image
v-if="item.rank <= 3" v-if="item.rank <= 3"
class="rank-badge-img" class="rank-badge-img"
:src="`../static/champ${item.rank}.png`" :src="`https://static.shelingxingqiu.com/shootmini/static/champ${item.rank}.png`"
mode="aspectFit" mode="aspectFit"
/> />
<view v-else class="rank-badge-default"> <view v-else class="rank-badge-default">
+5 -5
View File
@@ -190,10 +190,10 @@ onLoad(async (options) => {
<view> <view>
<view class="stars"> <view class="stars">
<block v-for="i in 5" :key="i"> <block v-for="i in 5" :key="i">
<image v-if="data.totalWinningRate >= i * 0.2" src="../static/star-full.png" mode="widthFix" /> <image v-if="data.totalWinningRate >= i * 0.2" src="https://static.shelingxingqiu.com/shootmini/static/star-full.png" mode="widthFix" />
<image v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1" src="../static/star-half.png" <image v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1" src="https://static.shelingxingqiu.com/shootmini/static/star-half.png"
mode="widthFix" /> mode="widthFix" />
<image v-else src="../static/star-empty.png" mode="widthFix" /> <image v-else src="https://static.shelingxingqiu.com/shootmini/static/star-empty.png" mode="widthFix" />
</block> </block>
</view> </view>
<text>挑战难度</text> <text>挑战难度</text>
@@ -201,7 +201,7 @@ onLoad(async (options) => {
</view> </view>
</view> </view>
<view class="founded-room"> <view class="founded-room">
<image src="../static/founded-room.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/founded-room.png" mode="widthFix" />
<view> <view>
<input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" /> <input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" />
<view @click="$clickSound(() => enterRoom(roomNumber))">进入房间</view> <view @click="$clickSound(() => enterRoom(roomNumber))">进入房间</view>
@@ -214,7 +214,7 @@ onLoad(async (options) => {
<image :src="user.avatar" mode="widthFix" /> <image :src="user.avatar" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/versus.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/versus.png" mode="widthFix" />
<view> <view>
<image src="../static/question-mark.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view> </view>
</view> </view>
<view> <view>
+583 -268
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -132,7 +132,7 @@ const checkBowData = (selected) => {
<text>大乱斗</text> <text>大乱斗</text>
<view @click="checkBowData"> <view @click="checkBowData">
<text>查看靶纸</text> <text>查看靶纸</text>
<image src="../static/back.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view> </view>
</view> </view>
<PlayerScore2 <PlayerScore2
@@ -155,7 +155,7 @@ const checkBowData = (selected) => {
<text>{{ round.ifGold ? "决金箭" : `第${index + 1}轮` }}</text> <text>{{ round.ifGold ? "决金箭" : `第${index + 1}轮` }}</text>
<view @click="() => checkBowData(index)"> <view @click="() => checkBowData(index)">
<text>查看靶纸</text> <text>查看靶纸</text>
<image src="../static/back.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view> </view>
</view> </view>
<view <view
@@ -171,7 +171,7 @@ const checkBowData = (selected) => {
borderColor: '#64BAFF', borderColor: '#64BAFF',
transform: `translateX(-${index * 15}px)`, transform: `translateX(-${index * 15}px)`,
}" }"
:src="p.avatar || '../static/user-icon.png'" :src="p.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
:key="index" :key="index"
mode="widthFix" mode="widthFix"
/> />
+1 -1
View File
@@ -234,7 +234,7 @@ onLoad(async (options) => {
}); });
onMounted(() => { onMounted(() => {
void audioManager.warmAll(); void audioManager.warmCommon();
uni.setKeepScreenOn({ uni.setKeepScreenOn({
keepScreenOn: true, keepScreenOn: true,
}); });
+6
View File
@@ -29,6 +29,7 @@ const { user, online } = storeToRefs(store);
const title = ref(""); const title = ref("");
const start = ref(null); const start = ref(null);
const battleId = ref(""); const battleId = ref("");
const targetType = ref(20);
/** 对战模式:1=好友约战 2=排位赛,用于结算页跳转判断 */ /** 对战模式:1=好友约战 2=排位赛,用于结算页跳转判断 */
const way = ref(0); const way = ref(0);
const currentRound = ref(1); const currentRound = ref(1);
@@ -254,6 +255,8 @@ watch(online, (newVal, oldVal) => {
function recoverData(battleInfo, { force = false } = {}) { function recoverData(battleInfo, { force = false } = {}) {
battleInfo = normalizeBattleInfo(battleInfo); battleInfo = normalizeBattleInfo(battleInfo);
if (!battleInfo) return; if (!battleInfo) return;
const nextTargetType = Number(battleInfo.targetType ?? battleInfo.target_type);
if ([20, 40].includes(nextTargetType)) targetType.value = nextTargetType;
if (battleInfo.status !== undefined) { if (battleInfo.status !== undefined) {
battleEnded = [2, 4].includes(Number(battleInfo.status)); battleEnded = [2, 4].includes(Number(battleInfo.status));
} }
@@ -374,6 +377,7 @@ function onMatchSocketState(event) {
} }
onLoad(async (options) => { onLoad(async (options) => {
targetType.value = 20;
const returnSnapshot = options.fromReturn ? takeMatchReturnSnapshot() : null; const returnSnapshot = options.fromReturn ? takeMatchReturnSnapshot() : null;
skipNextRestoreOnShow = false; skipNextRestoreOnShow = false;
if (returnSnapshot?.matchId) battleId.value = returnSnapshot.matchId; if (returnSnapshot?.matchId) battleId.value = returnSnapshot.matchId;
@@ -468,6 +472,7 @@ onShow(() => {
:guide="false" :guide="false"
:isBattle="true" :isBattle="true"
:count="readyTime" :count="readyTime"
:targetType="targetType"
/> />
<ShootProgress <ShootProgress
:show="start" :show="start"
@@ -490,6 +495,7 @@ onShow(() => {
:totalRound="12" :totalRound="12"
:scores="playersScores.map((r) => r[user.id]).flat()" :scores="playersScores.map((r) => r[user.id]).flat()"
:isSvip="isCurrentUserSvip" :isSvip="isCurrentUserSvip"
:targetType="targetType"
:stop="halfRest" :stop="halfRest"
stable-shot-effect stable-shot-effect
/> />
+2 -2
View File
@@ -81,7 +81,7 @@ onLoad(async (options) => {
> >
<image <image
v-if="player.userId === currentUser.userId" v-if="player.userId === currentUser.userId"
src="../static/player-bg2.png" src="https://static.shelingxingqiu.com/shootmini/static/player-bg2.png"
:style="{ :style="{
width: `${Math.max(100 / players.length, 18)}vw`, width: `${Math.max(100 / players.length, 18)}vw`,
}" }"
@@ -203,7 +203,7 @@ onLoad(async (options) => {
flex-wrap: wrap; flex-wrap: wrap;
} }
.score-item { .score-item {
background-image: url("../static/score-bg.png"); background-image: url("https://static.shelingxingqiu.com/shootmini/static/score-bg.png");
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
+18 -18
View File
@@ -31,15 +31,15 @@ const memberTypes = [
themeClass: "vip-page--normal", themeClass: "vip-page--normal",
heroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-title.png", heroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-title.png",
activeHeroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-title2.png", activeHeroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-title2.png",
orderIcon: "../../static/vip/vip-order.png", orderIcon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-order.png",
heroBadge: "../../static/vip/normal-hero-badge.png", heroBadge: "https://static.shelingxingqiu.com/shootmini/static/vip/normal-hero-badge.png",
buttonClass: "activate-btn--normal", buttonClass: "activate-btn--normal",
benefits: [ benefits: [
{ label: "黄金昵称", icon: "../../static/vip/vip-badge.png" }, { label: "黄金昵称", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-badge.png" },
{ label: "教练点评", icon: "../../static/vip/vip-comment.png" }, { label: "教练点评", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-comment.png" },
{ label: "专享VIP客服", icon: "../../static/vip/vip-service.png" }, { label: "专享VIP客服", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-service.png" },
{ label: "排位赛\n每日+20次", icon: "../../static/vip/vip-rank.png" }, { label: "排位赛\n每日+20次", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-rank.png" },
{ label: "约战\n每日+20次", icon: "../../static/vip/vip-battle.png" }, { label: "约战\n每日+20次", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-battle.png" },
], ],
}, },
{ {
@@ -52,18 +52,18 @@ const memberTypes = [
themeClass: "vip-page--super", themeClass: "vip-page--super",
heroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-title.png", heroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-title.png",
activeHeroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-title2.png", activeHeroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-title2.png",
orderIcon: "../../static/vip/svip-order.png", orderIcon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-order.png",
heroBadge: "../../static/vip/super-hero-badge.png", heroBadge: "https://static.shelingxingqiu.com/shootmini/static/vip/super-hero-badge.png",
buttonClass: "activate-btn--super", buttonClass: "activate-btn--super",
benefits: [ benefits: [
{ label: "专属落点标识", icon: "../../static/vip/svip-point.png" }, { label: "专属落点标识", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-point.png" },
{ label: "专属命中效果", icon: "../../static/vip/svip-hit.png" }, { label: "专属命中效果", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-hit.png" },
{ label: "专属射箭效果", icon: "../../static/vip/svip-arrow.png" }, { label: "专属射箭效果", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-arrow.png" },
{ label: "炫彩昵称", icon: "../../static/vip/svip-badge.png" }, { label: "炫彩昵称", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-badge.png" },
{ label: "教练点评", icon: "../../static/vip/svip-comment.png" }, { label: "教练点评", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-comment.png" },
{ label: "约战无限制", icon: "../../static/vip/svip-battle.png" }, { label: "约战无限制", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-battle.png" },
{ label: "排位赛无限制", icon: "../../static/vip/svip-rank.png" }, { label: "排位赛无限制", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-rank.png" },
{ label: "专享SVIP客服", icon: "../../static/vip/svip-service.png" }, { label: "专享SVIP客服", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-service.png" },
], ],
}, },
]; ];
@@ -446,7 +446,7 @@ onShow(loadVipConfig);
<text>套餐说明</text> <text>套餐说明</text>
<image <image
class="package-header__icon" class="package-header__icon"
src="../../static/enter.png" src="https://static.shelingxingqiu.com/shootmini/static/enter.png"
mode="aspectFit" mode="aspectFit"
/> />
</view> </view>
+1 -1
View File
@@ -31,7 +31,7 @@ import Container from "@/components/Container.vue";
<view class="table-wrap"> <view class="table-wrap">
<view class="intro-toast"> <view class="intro-toast">
<image class="intro-toast__bg" src="../../static/vip/intro-toast.png" mode="scaleToFill" /> <image class="intro-toast__bg" src="https://static.shelingxingqiu.com/shootmini/static/vip/intro-toast.png" mode="scaleToFill" />
<text class="intro-toast__text">初次绑定设备赠送6个月</text> <text class="intro-toast__text">初次绑定设备赠送6个月</text>
</view> </view>
<view class="benefit-table"> <view class="benefit-table">
+73 -16
View File
@@ -1,25 +1,61 @@
<script setup> <script setup>
import { ref } from "vue"; import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
import BowTarget from "@/components/BowTarget.vue"; import BowTarget from "@/components/BowTarget.vue";
import ScorePanel from "@/components/ScorePanel.vue"; import ScorePanel2 from "@/components/TrainingScorePanel.vue";
import { getPractiseAPI } from "@/apis"; import { getPractiseDetailAPI } from "@/apis";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const store = useStore(); const store = useStore();
const { user } = storeToRefs(store); const { user } = storeToRefs(store);
const arrows = ref([]); const arrows = ref([]);
const isSvip = ref(false); const isSvip = ref(false);
const total = ref(0); const practiseDetail = ref({});
const trainingType = computed(() =>
String(practiseDetail.value.trainingType || "").trim().toLowerCase()
);
const targetTypeText = computed(() => {
const targetType = Number(practiseDetail.value.targetType);
return targetType > 0 ? `${targetType}CM靶` : "";
});
const difficultyText = computed(() => {
const difficultyLevel = Number(practiseDetail.value.difficultyLevel);
return Number.isInteger(difficultyLevel) && difficultyLevel > 0
? `LV${difficultyLevel}`
: "";
});
const totalRings = computed(() => {
const interpretationTotal = Number(
practiseDetail.value.interpretation?.totalRings
);
if (Number.isFinite(interpretationTotal)) return interpretationTotal;
return arrows.value.reduce(
(total, arrow) => total + (Number(arrow.ring) || 0),
0
);
});
const normalizeArrow = (arrow = {}) => ({
...arrow,
ring: Number(arrow.ring) || 0,
ringX:
arrow.ringX === true ||
Number(arrow.ringX) === 1 ||
Number(arrow.ifX) === 1,
ok: arrow.ok === true || Number(arrow.ok) === 1,
});
onLoad(async (options) => { onLoad(async (options) => {
if (!options.id) return; if (!options.id) return;
const result = await getPractiseAPI(options.id || 176); const result = (await getPractiseDetailAPI(options.id)) || {};
arrows.value = result.details; practiseDetail.value = result;
isSvip.value = result.sVip === true; arrows.value = Array.isArray(result.details)
total.value = result.details.length; ? result.details.map(normalizeArrow)
: [];
isSvip.value = result.sVip === true || user.value?.sVip === true;
}); });
</script> </script>
@@ -35,22 +71,29 @@ onLoad(async (options) => {
</view> </view>
</view> </view>
</view> --> </view> -->
<view v-if="practiseDetail.id" class="practice-meta">
<text v-if="targetTypeText">{{ targetTypeText }}</text>
<text>{{ practiseDetail.trainingTypeText }}</text>
<text v-if="difficultyText">{{ difficultyText }}</text>
</view>
<view :style="{ marginBottom: '20px' }"> <view :style="{ marginBottom: '20px' }">
<BowTarget :scores="arrows" :isSvip="isSvip" /> <BowTarget
:scores="arrows"
:isSvip="isSvip"
:enableShotEffect="false"
/>
</view> </view>
<view class="desc"> <view class="desc">
<text>{{ arrows.length }}</text> <text>{{ arrows.length }}</text>
<text>支箭,共</text> <text>支箭,共</text>
<text>{{ arrows.reduce((a, b) => a + b.ring, 0) }}</text> <text>{{ totalRings }}</text>
<text>环</text> <text>环</text>
</view> </view>
<ScorePanel <ScorePanel2
:completeEffect="false"
:rowCount="total === 12 ? 6 : 9"
:total="total"
:arrows="arrows" :arrows="arrows"
:margin="arrows.length === 12 ? 4 : 1" :total="arrows.length"
:fontSize="arrows.length === 12 ? 25 : 22" :trainingType="trainingType"
recordMode
/> />
</view> </view>
</Container> </Container>
@@ -63,6 +106,20 @@ onLoad(async (options) => {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.practice-meta {
width: 100%;
display: flex;
justify-content: center;
align-items: center;
color: #fff;
font-size: 26rpx;
font-weight: 600;
line-height: 40rpx;
padding: 16rpx 0;
}
.practice-meta > text + text {
margin-left: 24rpx;
}
.header { .header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

Some files were not shown because too many files have changed in this diff Show More