34 Commits
Author SHA1 Message Date
zhangyi d1c689cfda update:翻译备份 2026-11-05 18:25:03 +08:00
zhangyi 53ac4473f9 update:英文版代码备份 2026-11-05 14:49:42 +08:00
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 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 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 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 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 03fa2f4d48 update:代码备份 2026-09-15 15:39:46 +08:00
237 changed files with 11950 additions and 4146 deletions
+62
View File
@@ -0,0 +1,62 @@
# 小程序英文静态文案交付记录
## 实现范围
- 固定英文,使用现有 `vue-i18n`;没有新增或升级依赖,没有增加语言切换入口或在线翻译请求。
- `src/locales/en.json` 为英文词条,`zh-CN.json` 为中文校对基线,`source-keys.json` 为原文到文案键的索引。
- 已整理 1,108 条词条,覆盖主包、会员/设备/金币/团队对战/训练分包,以及保留在源码中的历史页面和公共组件。
- 页面文本、输入提示、弹窗默认文案、前端固定错误提示、静态说明、协议、状态显示、分享标题及 Canvas 绘制文字均纳入翻译;`manifest.json` 中的小程序定位权限用途说明使用对应英文常量。
- 公共按钮支持英文换行,弹窗和教练点评支持长文案滚动;会员提示和分享 Canvas 的文字做了局部排版调整。
## 业务隔离
- API 地址、请求结构、路由、状态码、缓存键、WebSocket/Protobuf 字段、计分、射距及靶纸判断保持原样。
- `audioManager.js` 完全未修改,中文音频键、语音结束事件与播放顺序继续使用原值。
- 比赛提示继续以原值参与状态与语音判断,由 `formatBattleTip` 在明确的渲染位置显示英文。
- 新手引导步骤标题保留原值;Header 只对四个已知的静态步骤值转换显示,不对任意动态标题做翻译。
- Wi-Fi 样式判断继续使用原始状态;段位图片的 `picNames` 和名称保持中文,仅在文本节点展示英文。
- 训练雷达的兜底数据增加仅用于显示的 `staticLabel`,原始 `name` 及其映射保持原样。服务端返回的维度名称直接显示原文。
- `translateStatic` 只用于明确来自前端配置或前端计算结果的展示,不应用于接口响应、用户输入或 store 的整体数据。
## 保留内容及后续交接
| 内容 | 当前处理 | 后续负责人/事项 |
| --- | --- | --- |
| 底部导航图片 `tab-vip.png`、`tab-point-book.png`、`tab-mall.png` | 地址与资源不变 | UI 提供英文图 |
| 首页、引导、设备介绍、VIP/SVIP、训练标题及比赛结果等图片 | 地址与资源不变,图片内中文保留 | UI 按原尺寸与资源位交付英文图 |
| 分享卡片底图、二维码、徽章等 | 保留;只翻译代码绘制的文字 | UI 后续提供需要替换的英文底图 |
| 音频、视频 | 保留 | 如需英语语音,另行准备资源与实施方案 |
| 商品、门店、套餐、公告、固件说明、服务端规则与协议、接口错误消息 | 保留接口原文 | 后端/运营提供英文内容 |
| 接口段位名称及介绍 | 所有后端 HTTP 请求统一携带 `Accept-Language: en-US`,直接展示后端响应 | 后端部署并维护英文段位配置;图标仍按接口原地址展示 |
| 昵称、组织名、设备别名、Wi-Fi 名称、记分备注等用户内容 | 原样展示及提交 | 不机翻 |
| WebView 外部页面、微信授权和支付系统界面 | 保持原有行为 | 对应内容方/系统管理 |
| 调试日志、音频测试页中的原始音频标识、中文正则与判断字符串 | 保留技术原值 | 无需作为页面文案替换 |
币种、金额、距离、时区与日期计算不作转换。品牌名暂译为 **Sheling Planet**;段位和射箭术语已统一机翻用词,正式品牌译名及协议可由业务方继续校对。
## 验证记录
- 比赛界面修复:独立及公共 `BattleFooter` 的空回合循环改用明确的变量名,避免编译后的文案字段与 `wx:for-item="i"` 同名,导致文本节点输出 `[object Object]`。不修改回合数据、得分求和或回合图片。
- 独立比赛顶部进度组件接入 `formatBattleTip`,仅在渲染时转换英文,保留原始中文提示和语音队列;英文顶部文字与调试按钮做局部排版调整,调试按钮保留非正式环境才显示的原条件。
- `npm run battle:display:check`:先在旧微信编译产物复现行对象输出,再在修复后的 JS + WXML 中验证 0–3 个正常回合、加赛回合、空成绩/零分、红蓝方英文提示和中文状态不变。调试按钮改为紧凑两列,最终真机视觉效果仍需预览验收。
- 全局英文请求头:统一请求封装的所有 HTTP 请求均携带 `Accept-Language: en-US`,移除段位接口白名单;独立的 `aimRenewAPI` 同样携带英文头,保留不等待响应和忽略响应结果的行为。认证、请求参数、接口地址及响应处理不变。首页继续使用现有 `/user/myHome`,未按文档示例替换成 `/index/myHome`。
- 固定英文版缓存兼容:恢复用户缓存时仅清空 `lvlName`、`rankName`、`nextRankName` 中的旧中文显示名,等待原有接口回填;保留英文缓存、昵称、身份、设备、段位编号、成绩与图标。配置和榜单维持现有不持久化方式,不新增语言切换或整体清缓存。
- `npm run rank:i18n:check`:验证所有已覆盖 HTTP 请求的英文头(包括 GET、POST、PUT、DELETE 和独立调瞄续期),有/无登录凭证、分页/赛季参数及原始错误消息保持原行为,并通过真实 Pinia 持久化插件验证旧中文缓存恢复和英文缓存再次恢复。
- 2026-11-05 只读联调 `/index/appConfig`:测试环境 `apitest.shelingxingqiu.com` 返回 74 条段位,中文请求为 `倔强青铜I / 倔强青铜`,英文请求为 `Bronze I / Bronze`;正式环境 `api.shelingxingqiu.com` 的英文请求仍返回中文,需要后端确认正式环境的多语言支持。两边的中英文请求中,段位编号、升级积分及图标地址均一致。未使用用户凭证调用首页或个人榜单,登录态接口仍需真机联调。
- 同日只读联调积分榜、十环榜、MVP 榜(各取 1 条、携带 `en-US`):测试环境三榜均返回英文 `Bronze I`;正式环境三榜仍返回中文段位。这是后端响应差异,前端未额外机翻或覆盖这些动态字段。
- 参数占位符修复:统一 `t` 入口直接读取固定英文词条并执行一次参数替换,兼容 uni-app 小程序运行库直接返回原文的情况。31 条参数文案对照完整版翻译库及当前 uni-app 消息编译器检查,包含数字 0、空字符串、布尔值及参数中含花括号的场景。页面调用和业务数据不作修改。
- 上传限制修复:定位权限用途说明缩短为 `Find Wi-Fi for device updates`(29 个字符),并在 `i18n:check` 中检查权限说明为 1–30 个字符。上传校验与本地编译是不同步骤,本地构建通过不代表微信上传校验通过。
- `npm run i18n:check`:通过。核查中英文键、占位符与插值、翻译函数遮蔽、163 个 Vue 文件的 SFC 编译,以及未翻译的模板直接文字与展示属性。
- 专项用例通过:中文方向音效键、测距/无效射箭语音键、英文测距/无效射箭提示、499/500 cm 边界、次数上限消息、设备/新手试炼进入条件。
- 使用本次修改前的 Git 基线完成附加对照:所有受影响源码中的资源 URL 一致,音频源码未改变;脚本语法树去除文案调用和明确的显示层调整后与基线一致。
- `npm run build`:微信小程序构建通过;构建前的协议检查通过(12 个消息、164 个字段)。
- 已清理四条不存在的旧主包路由:`pages/calibration`、`pages/my-device`、`pages/device-intro`、`pages/ota-wifi`。保留 `pages/device/` 下对应分包页面及现有跳转,剩余 58 条路由均有源文件。
- 未执行真机视觉验收、实物智能弓/OTA 联调或真实支付。代码与构建检查不能替代这些验收。
建议在微信开发者工具及真机重点检查首页、首次引导、设备三态、训练规则、比赛提示、结果页、会员协议、订单、记分本与分享图的英文排版;验证登录、绑定/解绑、OTA、训练/比赛、支付/取消与分享仍按原流程工作。
## 日常维护
新增固定文案时同步维护三份词条文件,模板和脚本通过 `t(key, params)` 取值;整句使用参数,避免重新引入中文语序拼接。业务枚举、接口数据与媒体标识不要作为翻译目标。
运行 `npm run i18n:check` 做本地检查;构建后运行 `npm run i18n:check -- --built`,对真实微信产物模块执行参数插值回归。`npm run battle:display:check` 检查比赛组件真实 JS + WXML 的渲染作用域及英文提示。`node scripts/localization-inventory.cjs` 可只读输出保留中文候选。候选包含日志、语音及判断字符串,不能作为全文替换清单。
+3
View File
@@ -3,6 +3,9 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
"i18n:check": "node scripts/check-localization.cjs",
"rank:i18n:check": "node scripts/check-rank-i18n.cjs",
"battle:display:check": "node scripts/check-battle-display.cjs",
"proto:generate": "node scripts/generate-match-schema.mjs", "proto:generate": "node scripts/generate-match-schema.mjs",
"proto:check": "node scripts/generate-match-schema.mjs --check", "proto:check": "node scripts/generate-match-schema.mjs --check",
"proto:update": "npm run proto:generate && npm run build", "proto:update": "npm run proto:generate && npm run build",
+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": []
+96
View File
@@ -0,0 +1,96 @@
// 回归截图中的小程序循环作用域问题:执行真实 render,再按 WXML 作用域取文本。
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const vm = require('node:vm');
const {baseParse} = require('@vue/compiler-dom');
const root = path.resolve(__dirname, '..');
const read = file => fs.readFileSync(path.join(root, file), 'utf8');
const en = JSON.parse(read('src/locales/en.json'));
const sourceKeys = JSON.parse(read('src/locales/source-keys.json'));
const localeCode = read('src/locales/index.js').replace(/^import .*;\r?\n/gm, '').replace(/export /g, '');
const locale = new Function('createI18n','en','sourceKeys',localeCode+'\nreturn {t,formatBattleTip};')(
() => ({global: {t: key => key}}), en, sourceKeys);
const computed = getter => ({get value() {return getter();}});
const vendor = {
computed, unref: value => value,
e: (...parts) => Object.assign({}, ...parts),
f: (items, render) => (typeof items === 'number' ? Array.from({length: items}, (_,i) => i+1) : items)
.map((item,index) => render(item,index,index)),
t: value => value == null ? '' : String(value),
_export_sfc: component => component,
};
function loadComponent(file, dependencies) {
let component;
vm.runInNewContext(read(file), {
exports: {}, wx: {createComponent: value => {component = value;}},
require: id => {
for (const [suffix,value] of Object.entries(dependencies)) if (id.endsWith(suffix)) return value;
throw Error('Unexpected component dependency: '+id);
},
}, {filename: file});
assert(component, 'No compiled component: '+file);
return component;
}
const prefix = 'dist/build/mp-weixin/pages/team-battle/components/';
const footer = loadComponent(prefix+'BattleFooter.js', {
'common/vendor.js': vendor,
'locales/index.js': locale,
'constants.js': {RoundImages: {round1:'round1',round2:'round2',round3:'round3',gold1:'gold1'}},
});
const wxml = baseParse(read(prefix+'BattleFooter.wxml'));
function evaluate(expression, scope) {
return new Function('scope', 'with(scope){return ('+expression+');}')(scope);
}
function renderedTexts(node,scope) {
const attr = name => (node.props || []).find(p => p.name === name)?.value?.content;
const forValue = attr('wx:for');
if (forValue) {
const rows = evaluate(forValue.slice(2,-2),scope);
return rows.flatMap((item,index) => renderedTexts({...node,props:node.props.filter(p=>p.name!=='wx:for')},
{...scope,[attr('wx:for-item') || 'item']:item,[attr('wx:for-index') || 'index']:index}));
}
const ifValue = attr('wx:if');
if (ifValue && !evaluate(ifValue.slice(2,-2),scope)) return [];
if (node.tag === 'text') {
return [(node.children || []).map(child => {
const value = child.type === 5 ? evaluate(child.content.content,scope) : child.content || '';
assert(value === null || typeof value !== 'object', 'WXML rendered a loop object in a text node');
return value == null ? '' : String(value);
}).join('')];
}
return (node.children || []).flatMap(child => renderedTexts(child,scope));
}
for (const count of [0,1,2,3,4]) {
const roundResults = Array.from({length:count},(_,index)=>({
ifGold:index===3, goldRound:index===3 ? 1 : 0,
shoots:{1:[{ring:index===0 ? 10 : 0}],2:[{ring:8}]},
}));
const props = {roundResults,bluePoints:0,redPoints:0,goldenRound:count===4 ? 1 : 0};
const data = footer.setup(props)(props,{});
const texts = renderedTexts(wxml,data);
assert.equal(texts.filter(text=>text===en.pts).length, Math.max(3,count)*2);
assert(!texts.join('').includes('[object Object]'));
if (count) assert(texts.includes('10'), 'Completed round score lost');
if (count>1) assert(texts.includes('0'), 'Zero score lost');
}
// 顶部只转换显示值,监听器仍接收原始中文提示,语音控制不增加播放调用。
for (const tip of ['请蓝队射箭','请红队射箭你重回']) {
const store = {game:{currentShot:1,totalShot:3,tips:tip}};
const header = loadComponent(prefix+'HeaderProgress.js', {
'common/vendor.js': {...vendor,
ref:value=>({value}), watch:(source,callback)=>callback(source()),
onMounted:()=>{},onBeforeUnmount:()=>{},o:handler=>handler,
},
'locales/index.js':locale,
'store.js':{useStore:()=>store},
'audioManager.js':{audioManager:{setMuted:()=>{}}},
});
const data = header.setup({})({},{});
assert.equal(data.a,locale.formatBattleTip(tip));
assert(!/[\u3400-\u9fff]/.test(data.a));
assert.equal(store.game.tips,tip);
assert.equal(data.c,'1');
assert.equal(data.d,'3');
}
console.log('Battle display checks passed: compiled JS + WXML, 0–3 rounds and golden round, blank/zero scores, English tips and original Chinese state preserved.');
+220
View File
@@ -0,0 +1,220 @@
// 英文文案与业务边界检查:不调用网络、设备或支付接口。
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const vm = require('node:vm');
const parser = require('@babel/parser');
const traverse = require('@babel/traverse').default;
const { parse, compileScript } = require('@vue/compiler-sfc');
const { baseParse } = require('@vue/compiler-dom');
const { createI18n } = require('vue-i18n');
const root = path.resolve(__dirname, '..');
const read = file => fs.readFileSync(path.join(root, file), 'utf8');
const en = JSON.parse(read('src/locales/en.json'));
const zh = JSON.parse(read('src/locales/zh-CN.json'));
const sourceKeys = JSON.parse(read('src/locales/source-keys.json'));
const han = /[\p{Script=Han}]/u;
const manifest=JSON.parse(read('src/manifest.json'));
assert.equal(manifest['mp-weixin'].permission['scope.userLocation'].desc,en.wifi_location_permission);
// 微信上传会校验权限用途说明,英文也最多允许 30 个字符。
for (const [scope, permission] of Object.entries(manifest['mp-weixin'].permission || {})) {
assert.equal(typeof permission.desc, 'string', `${scope}: permission description must be a string`);
assert(permission.desc.length > 0 && permission.desc.length <= 30,
`${scope}: permission description must contain 1–30 characters (got ${permission.desc.length})`);
}
const params = value => [...value.matchAll(/\{(p\d+)\}/g)].map(m=>m[1]).sort();
assert.deepEqual(Object.keys(en).sort(), Object.keys(zh).sort());
const localeCode = read('src/locales/index.js').replace(/^import .*;\r?\n/gm, '').replace(/export /g, '');
const api = new Function('createI18n','en','sourceKeys', localeCode+'\nreturn {t,translateStatic,formatBattleTip};')(createI18n,en,sourceKeys);
// 使用当前 uni-app 实际打包的消息编译器复现问题,避免只测 Node 完整版。
const miniRuntimePath = path.join(path.dirname(require.resolve('@dcloudio/uni-cli-shared/package.json')),
'lib/vue-i18n/dist/vue-i18n.runtime.esm-bundler.js');
const miniRuntimeCode = fs.readFileSync(miniRuntimePath, 'utf8');
let miniCompilerCode;
traverse(parser.parse(miniRuntimeCode, {sourceType: 'module'}), {
ObjectProperty(p) {
if (p.node.key.name === 'messageCompiler' && p.node.value.type === 'FunctionExpression') {
miniCompilerCode = miniRuntimeCode.slice(p.node.value.start, p.node.value.end);
}
},
});
assert(miniCompilerCode, 'Cannot locate uni-app message compiler; review runtime compatibility test');
const miniCompiler = new Function('return (' + miniCompilerCode + ');')();
const createMiniI18n = ({locale, messages}) => ({global: {t: (key, args = {}) => {
const message = messages[locale][key];
return message === undefined ? key : miniCompiler(message)({
normalize: values => values.join(''),
interpolate: value => String(value),
named: name => args[name],
});
}}});
const miniApi = new Function('createI18n','en','sourceKeys', localeCode+'\nreturn {t,translateStatic,formatBattleTip};')(createMiniI18n,en,sourceKeys);
const referenceI18n = createI18n({legacy: false, locale: 'en', fallbackLocale: 'en', messages: {en}});
const parameterized = Object.entries(en).filter(([,value]) => params(value).length);
for (const [key,value] of parameterized) {
for (const example of [0, 7, -2, '', false, 'Bronze', '$& {p1}']) {
const args = Object.fromEntries(params(value).map(name => [name, example]));
const expected = referenceI18n.global.t(key, args);
assert.equal(api.t(key, args), expected, key + ': full runtime interpolation');
assert.equal(miniApi.t(key, args), expected, key + ': mini runtime interpolation');
}
}
assert.equal(miniApi.t('value_value_matches', {p0: 'Bronze', p1: 0}), 'Bronze, 0 matches');
assert.equal(miniApi.t('value_value_matches', {p0: 'Bronze', p1: 12}), 'Bronze, 12 matches');
assert.equal(miniApi.t('value_value_matches', {p0: '{p1}', p1: 12}), '{p1}, 12 matches');
assert.equal(miniApi.t('value_value_matches', {p0: '', p1: 0}), ', 0 matches');
assert.equal(miniApi.t('value_value_matches', {p0: null, p1: 0}), ', 0 matches');
assert.equal(miniApi.t('value_value_matches', {p0: 'Bronze'}), 'Bronze, {p1} matches');
assert.equal(miniApi.t('value_value_matches', Object.create({p0: 'Inherited', p1: 12})), en.value_value_matches);
assert.equal(miniApi.formatBattleTip('请开始射箭第三轮'), 'Start shooting round 3');
console.log(`Interpolation compatibility passed: ${parameterized.length} messages, full and uni-app mini compilers, zero/empty/boolean/literal-brace values.`);
// 构建后检查真实产物模块;只替换平台启动依赖,沿用上方实际小程序编译器。
if (process.argv.includes('--built')) {
const builtExports = {};
vm.runInNewContext(read('dist/build/mp-weixin/locales/index.js'), {
exports: builtExports,
require: id => {
assert(/common\/vendor\.js$/.test(id), 'Unexpected built locale dependency: ' + id);
return {createI18n: createMiniI18n};
},
}, {filename: 'dist/build/mp-weixin/locales/index.js'});
for (const [key,value] of parameterized) {
for (const example of [0, 12, '', false, 'Bronze', '$& {p1}']) {
const args = Object.fromEntries(params(value).map(name => [name, example]));
assert.equal(builtExports.t(key, args), referenceI18n.global.t(key, args), key + ': built module interpolation');
}
}
console.log(`Built WeChat locale module passed: ${parameterized.length} parameterized messages.`);
}
for (const [key,value] of Object.entries(en)) {
assert(!han.test(value), 'English contains Chinese: '+key);
assert.deepEqual(params(value), params(zh[key]), 'Placeholder mismatch: '+key);
const args=Object.fromEntries(params(value).map(name=>[name, name.toUpperCase()]));
const output=api.t(key,args);
for (const name of params(value)) assert(output.includes(args[name]),'Interpolation failed: '+key);
}
for (const [source,key] of Object.entries(sourceKeys)) assert.equal(zh[key],source);
assert.equal(api.formatBattleTip('请红队射箭你重回'),'Red team, shoot');
assert.equal(api.formatBattleTip('上半场:请先射6箭'),'First half: shoot 6 arrows first');
assert.equal(api.formatBattleTip('请开始射箭第三轮'),'Start shooting round 3');
assert.equal(api.translateStatic('An unknown server value'),'An unknown server value');
let vueCount=0, references=0;
const files=[];
function walk(dir) {
for (const item of fs.readdirSync(path.join(root,dir),{withFileTypes:true})) {
const file=dir+'/'+item.name;
if (item.isDirectory()) {if (!['static','locales'].includes(item.name)) walk(file);}
else if (/\.(vue|js)$/.test(file) && !/match\.min\.js/.test(file)) files.push(file);
}
}
walk('src');
function checkJs(code,file,expression=false) {
let ast;
try {ast=parser.parse(expression?'('+code+')':code,{sourceType:'module'});} catch(error) {if (expression) return;throw error;}
traverse(ast,{CallExpression(p) {
const n=p.node;
if (!['t','translate'].includes(n.callee.name) || n.arguments[0]?.type!=='StringLiteral') return;
const binding=p.scope.getBinding(n.callee.name);
if (!expression) assert(binding && binding.path.node.type==='ImportSpecifier' && /locales/.test(binding.path.parent.source.value),file+': translation function shadowed');
const key=n.arguments[0].value;
assert(Object.hasOwn(en,key),file+': missing key '+key);references++;
const supplied=n.arguments[1]?.properties?.map(prop=>prop.key.name)||[];
assert.deepEqual(supplied.sort(),params(en[key]),file+': wrong parameters for '+key);
}});
}
for (const file of files) {
const code=read(file);
if (!file.endsWith('.vue')) {checkJs(code,file);continue;}
const {descriptor,errors}=parse(code,{filename:file});
assert.equal(errors.length,0,file+': SFC parse failed');vueCount++;
if (descriptor.script || descriptor.scriptSetup) {
compileScript(descriptor,{id:file});
for (const b of [descriptor.script,descriptor.scriptSetup]) if (b) checkJs(b.content,file);
}
if (!descriptor.template) continue;
function visit(n) {
if (n.type===2) assert(!han.test(n.content),file+': untranslated template text '+n.content);
if (n.type===5) checkJs(n.content.content,file,true);
for (const prop of n.props||[]) {
if (prop.exp) checkJs(prop.exp.content,file,true);
if (prop.type===6 && prop.value && !/^(src|class|id|style|key|name|value|tips|end-audio-key|practice-end-audio-key)$/.test(prop.name)) assert(!han.test(prop.value.content),file+': untranslated attribute '+prop.name);
}
for (const c of n.children||[]) visit(c);
}
visit(baseParse(descriptor.template.content));
}
// 固件与比赛继续使用中文语音键,英文仅用于展示。
const utilCode=read('src/util.js').replace(/^import .*;\r?\n/gm,'').replace(/export /g,'');
const uni={getMenuButtonBoundingClientRect:()=>({top:20}),getAccountInfoSync:()=>({miniProgram:{envVersion:'release'}}),showToast:()=>{}};
const util=new Function('t','translateStatic','uni',utilCode+'\nreturn {getDirectionText,getShootValidation,getDistanceCheckAudioKey,getDistanceCheckText,getInvalidShotAudioKey,getInvalidShotText,isLimitError,canEenter};')(api.t,api.translateStatic,uni);
for (const [angle,expected] of [[0,'下'],[45,'左下'],[90,'左'],[135,'左上'],[180,'上'],[225,'右上'],[270,'右'],[315,'右下']]) assert.equal(util.getDirectionText(angle),expected);
for (const shot of [null,{}, {distance:0}, {distance:-1}, {distance:499,targetOk:true}, {distance:500,targetOk:true}, {distance:600,targetOk:false}]) {
assert(han.test(util.getInvalidShotAudioKey(shot)));
assert(han.test(util.getDistanceCheckAudioKey(shot)));
assert(!han.test(util.getInvalidShotText(shot)));
assert(!han.test(util.getDistanceCheckText(shot)));
}
assert.equal(util.getShootValidation({distance:499,targetOk:true}).distanceOk,false);
assert.equal(util.getShootValidation({distance:500,targetOk:true}).distanceOk,true);
assert(util.isLimitError({message:'今日次数已达上限'}));
assert(!util.isLimitError({message:'other error'}));
assert.equal(util.canEenter({}, {}, true),false);
assert.equal(util.canEenter({trio:1},{deviceId:'test'},true),true);
assert.equal(util.canEenter({trio:1},{deviceId:'test'},false),false);
assert.equal(util.canEenter({trio:0},{deviceId:'test'},true),false);
// 对照 Git 基线检查协议资源未改动,只检查当前变更涉及的源码文件。
const urls=code=>[...code.matchAll(/https?:\/\/[^\s"'`<>]+/g)].map(m=>m[0]).sort();
function scriptShapes(code,file) {
const blocks=file.endsWith('.vue') ? ((d)=>[d.script,d.scriptSetup].filter(Boolean).map(b=>b.content))(parse(code).descriptor) : [code];
return blocks.map(block=>{
const ast=parser.parse(block,{sourceType:'module'});
function clean(value) {
if (Array.isArray(value)) return value.map(clean).filter(v=>v!==undefined);
if (!value || typeof value!=='object') return value;
if (value.type==='ImportDeclaration' && /locales/.test(value.source.value)) return undefined;
if (file==='src/pages/training/index.vue' && value.type==='ObjectProperty' && value.key.name==='staticLabel') return undefined;
if (file==='src/canvas.js' && value.type==='CallExpression' && value.callee.name==='renderText') {
const key=value.arguments[1]?.arguments?.[0]?.value;
if (key==='today_s_check_in') { assert.equal(value.arguments[2].value,9); value.arguments[2].value=14; }
if (key==='total') { assert.equal(value.arguments[4].value,102); value.arguments[4].value=122; }
}
if (value.type==='ExpressionStatement' && value.expression.callee?.property?.name==='use' && value.expression.arguments?.[0]?.name==='i18n') return undefined;
if (value.type==='CallExpression') {
if (value.callee.name==='translateStatic') return clean(value.arguments[0]);
if (['t','translate'].includes(value.callee.name) && value.arguments[0]?.type==='StringLiteral') {
const source=zh[value.arguments[0].value];
assert.notEqual(source,undefined,file+': unknown source');
const matches=[...source.matchAll(/\{(p\d+)\}/g)];
if (!matches.length) return {type:'StringLiteral',value:source};
const argumentsMap=Object.fromEntries((value.arguments[1]?.properties||[]).map(p=>[p.key.name,p.value]));
let cursor=0;
const quasis=matches.map(m=>{const text=source.slice(cursor,m.index);cursor=m.index+m[0].length;return {type:'TemplateElement',value:{cooked:text},tail:false};});
quasis.push({type:'TemplateElement',value:{cooked:source.slice(cursor)},tail:true});
return clean({type:'TemplateLiteral',quasis,expressions:matches.map(m=>argumentsMap[m[1]])});
}
}
if (value.type==='TemplateLiteral' && !value.expressions.length) return {type:'StringLiteral',value:value.quasis[0].value.cooked};
const result={};
for (const [key,item] of Object.entries(value)) {
if (['start','end','loc','extra','leadingComments','innerComments','trailingComments','comments','tokens','errors','raw'].includes(key)) continue;
const next=clean(item);
if (next!==undefined) result[key]=next;
}
// 唯一调整的脚本标点位于测距展示文本,不参与判断。
if (result.type==='TemplateElement' && result.value.cooked===',') result.value.cooked='; ';
return result;
}
return clean(ast.program);
});
}
const baselinePath=process.argv.slice(2).find(arg => arg !== '--built');
if (baselinePath) {
const baseline=JSON.parse(fs.readFileSync(baselinePath,'utf8').replace(/^\uFEFF/,''));
for (const [file,original] of Object.entries(baseline)) {
assert.deepEqual(urls(read(file)),urls(original),file+': URL changed');
assert.deepEqual(scriptShapes(read(file),file),scriptShapes(original,file),file+': non-localization script change');
if (file==='src/audioManager.js') assert.equal(read(file).replace(/\r\n/g,'\n'),original.replace(/\r\n/g,'\n'),'Audio resources or keys changed');
}
console.log('Git baseline media URLs and audio resources verified.');
}
console.log(`Localization checks passed: ${Object.keys(en).length} entries, ${references} references, ${vueCount} Vue files; placeholders, static templates, audio keys, shooting validation and entry conditions verified.`);
+136
View File
@@ -0,0 +1,136 @@
// 段位多语言集成回归:请求使用本地桩,缓存通过真实 Pinia 持久化插件恢复。
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const { createPinia, defineStore } = require('pinia');
const { createSSRApp } = require('vue');
const persist = require('pinia-plugin-persistedstate').default;
const root = path.resolve(__dirname, '..');
const read = file => fs.readFileSync(path.join(root, file), 'utf8');
const requests = [];
let hasToken = true;
let nextFailure;
const rank = {rankLvl: 1, rankName: 'Bronze I', rankIcon: 'https://example.test/青铜1.png'};
const apiUni = {
getAccountInfoSync: () => ({miniProgram: {envVersion: 'trial'}}),
getStorageSync: key => hasToken && key === 'trial_token' ? 'existing-token' : '',
request(options) {
requests.push(options);
if (options.url.endsWith('/user/device/aimRenew')) return {};
if (nextFailure) {
const error = nextFailure;
nextFailure = undefined;
options.success({statusCode: 200, data: error});
return;
}
const data = options.url.includes('/myHome')
? {...rank, user: {id: 42, scores: 150, rankLvl: 1, nickName: '原昵称'}}
: {list: [{...rank}], randInfos: [{rank_id: 1, upgrade_scores: 100, name: 'Bronze I', icoin: rank.rankIcon}]};
options.success({statusCode: 200, data: {code: 0, data}});
},
};
const apiCode = read('src/apis.js').replace(/^import .*;\r?\n/gm, '').replace(/^export /gm, '');
const api = new Function('uni', 't', 'normalizeBattleApiResult', apiCode + `
return {request, getAppConfig, getHomeData, getScoreRankList, getTenRingRankList, getMvpRankList,
getMyScoreRank, getMyTenRingRank, getMyMvpRank, getSeasonStats, getProvinceData, getDailyCountAPI, aimRenewAPI};
`)(apiUni, key => key, data => data);
const storeCode = read('src/store.js').replace(/^import .*;\r?\n/gm, '').replace('export default defineStore', 'return defineStore');
function restore(cached) {
const storage = new Map([
['store', JSON.stringify(cached)],
['trial_token', 'existing-token'],
['point-book', JSON.stringify({draft: true})],
]);
const uni = {getStorageSync: key => storage.get(key), setStorageSync: (key, value) => storage.set(key, value)};
const useStore = new Function('defineStore', 'uni', storeCode)(defineStore, uni);
const pinia = createPinia();
pinia.use(persist);
createSSRApp({}).use(pinia);
return {store: useStore(pinia), storage};
}
async function main() {
const config = await api.getAppConfig();
const home = await api.getHomeData(42);
await api.getScoreRankList(42, 2, 20);
await api.getTenRingRankList(42, 2, 20);
await api.getMvpRankList(42, 2, 20);
await api.getMyScoreRank(42);
await api.getMyTenRingRank(42);
await api.getMyMvpRank(42);
await api.getSeasonStats(0);
await api.request('GET', '/index/myHome?seasonId=42');
for (const request of requests) {
assert.equal(request.header['Accept-Language'], 'en-US');
assert.equal(request.header.Authorization, 'Bearer existing-token');
assert.equal(request.method, 'GET');
assert(request.url.startsWith('https://apitest.shelingxingqiu.com/api/shoot/'));
}
assert(requests[1].url.endsWith('/user/myHome?seasonId=42'), 'Existing home route must remain unchanged');
assert.deepEqual(requests[2].data, {seasonId: 42, page: 2, perPage: 20});
assert.deepEqual(requests[8].data, {seasonId: 0});
assert.equal(home.user.rankName, rank.rankName);
assert.equal(home.user.rankIcon, rank.rankIcon);
assert.equal(home.user.nickName, '原昵称');
await api.getProvinceData();
await api.getDailyCountAPI();
await api.request('GET', '/index/appConfig/other');
await api.request('POST', '/index/appConfig');
await api.request('PUT', '/test/update', {value: 0});
await api.request('DELETE', '/test/delete', {id: 42});
for (const request of requests.slice(10)) {
assert.equal(request.header['Accept-Language'], 'en-US', 'All HTTP requests must declare English');
assert.equal(request.header.Authorization, 'Bearer existing-token');
}
assert.deepEqual(requests.at(-2).data, {value: 0});
assert.deepEqual(requests.at(-1).data, {id: 42});
// 续期请求即使未收到响应,也必须保持同步返回且不弹失败提示。
assert.equal(api.aimRenewAPI(), undefined);
assert.equal(requests.at(-1).header['Accept-Language'], 'en-US');
assert.equal(requests.at(-1).header.Authorization, 'Bearer existing-token');
assert.equal(requests.at(-1).method, 'POST');
assert.deepEqual(requests.at(-1).data, {});
assert.equal(requests.at(-1).timeout, 10000);
assert.equal(requests.at(-1).fail({errMsg: 'timeout'}), undefined);
hasToken = false;
await api.getAppConfig();
assert.deepEqual(requests.at(-1).header, {'Accept-Language': 'en-US'});
assert.equal(api.aimRenewAPI(), undefined);
assert.deepEqual(requests.at(-1).header, {'Accept-Language': 'en-US'});
hasToken = true;
nextFailure = {code: 400, message: '设备未连接', data: {reason: 'offline'}};
await assert.rejects(api.request('POST', '/test/error', {}, undefined, undefined, {showErrorToast: false}),
error => error.code === 400 && error.message === '设备未连接' && error.data.reason === 'offline');
assert.equal(requests.at(-1).header['Accept-Language'], 'en-US');
const legacy = {
user: {id: 42, nickName: '原昵称', avatar: 'avatar.png', trio: 1, scores: 150, rankLvl: 1,
lvlName: '倔强青铜I', rankName: '倔强青铜I', nextRankName: '倔强青铜II',
rankIcon: rank.rankIcon, nextRankIcon: 'next.png', lvlImage: 'level.png', vip: true},
device: {deviceId: 'unchanged-device', deviceName: '我的弓'},
};
const {store, storage} = restore(legacy);
for (const [field, value] of Object.entries(legacy.user)) {
assert.deepEqual(store.user[field], ['lvlName','rankName','nextRankName'].includes(field) ? '' : value);
}
assert.deepEqual({...store.device}, legacy.device);
assert.equal(storage.get('trial_token'), 'existing-token');
assert.equal(storage.get('point-book'), JSON.stringify({draft: true}));
assert.deepEqual([...storage.keys()].sort(), ['store', 'trial_token', 'point-book'].sort());
await store.updateConfig(config);
await store.updateUser(home.user);
assert.equal(store.user.rankName, 'Bronze I');
assert.equal(store.user.lvlName, 'Bronze I');
assert.equal(store.user.scores, 150);
assert.equal(store.user.rankLvl, 1);
store.$persist();
const next = restore(JSON.parse(storage.get('store'))).store;
assert.equal(next.user.rankName, 'Bronze I', 'English cached labels must survive cold start');
assert.equal(next.user.lvlName, 'Bronze I');
assert.equal(next.user.nickName, '原昵称');
assert.deepEqual({...next.device}, legacy.device);
assert.equal(restore({user: {id: 7, rankName: '', lvlName: null}, device: {}}).store.user.lvlName, null);
console.log('Rank i18n checks passed: global HTTP English headers (GET/POST/PUT/DELETE + aim renewal), auth/query/pagination and original errors preserved; non-blocking renewal and real Pinia cache hydration verified.');
}
main().catch(error => {console.error(error); process.exitCode = 1;});
+63
View File
@@ -0,0 +1,63 @@
// 只读提取源码中的中文候选;不扫描图片、生成物或第三方依赖。
const fs = require('node:fs');
const path = require('node:path');
const parser = require('@babel/parser');
const traverse = require('@babel/traverse').default;
const sfc = require('@vue/compiler-sfc');
const dom = require('@vue/compiler-dom');
const han = /[\p{Script=Han}]/u;
const root = path.resolve(__dirname, '../src');
const entries = [];
function scripts(code, file, offset = 0, context = 'script') {
if (context === 'expression') { code = '(' + code + ')'; offset -= 1; }
const ast = parser.parse(code, {sourceType: 'module', plugins: ['typescript'], errorRecovery: true});
traverse(ast, {
StringLiteral(p) { add(p, p.node.value, 'string'); },
TemplateLiteral(p) {
if (!p.node.quasis.some(q => han.test(q.value.cooked || q.value.raw))) return;
const text = p.node.quasis.map((q, i) => (q.value.cooked ?? q.value.raw) + (i < p.node.expressions.length ? `{p${i}}` : '')).join('');
add(p, text, 'template');
},
});
function add(p, text, kind) {
if (!han.test(text) || /^https?:/.test(text)) return;
const ancestors = [];
let q = p;
for (let i = 0; q && i < 5; i++, q = q.parentPath) {
const n = q.node;
ancestors.push(n.type + (n.key?.name ? ':' + n.key.name : '') + (n.type === 'CallExpression' ? ':' + code.slice(n.callee.start, n.callee.end) : ''));
}
entries.push({file, start: offset + p.node.start, end: offset + p.node.end, kind, text, context, ancestors: ancestors.join(' > '), snippet: code.slice(Math.max(0, p.node.start - 65), Math.min(code.length, p.node.end + 65))});
}
}
function inspect(file) {
const code = fs.readFileSync(path.join(root, file), 'utf8');
if (file.endsWith('.js')) return scripts(code, file);
const {descriptor} = sfc.parse(code);
for (const block of [descriptor.script, descriptor.scriptSetup]) if (block) scripts(block.content, file, block.loc.start.offset);
const block = descriptor.template;
if (!block) return;
const ast = dom.baseParse(block.content);
function walk(n) {
if (n.type === 2 && han.test(n.content)) entries.push({file, start: block.loc.start.offset + n.loc.start.offset, end: block.loc.start.offset + n.loc.end.offset, kind:'text', text:n.content, context:'template'});
if (n.type === 5 && han.test(n.content.content)) scripts(n.content.content, file, block.loc.start.offset + n.content.loc.start.offset, 'expression');
for (const prop of n.props || []) {
if (prop.type === 6 && prop.value && han.test(prop.value.content) && !/^(src|class|id|style|key|name|value)$/.test(prop.name)) entries.push({file, start:block.loc.start.offset + prop.loc.start.offset, end:block.loc.start.offset + prop.loc.end.offset, kind:'attribute', text:prop.value.content, attribute:prop.name, context:'template'});
if (prop.type === 7 && prop.exp && han.test(prop.exp.content)) {
try { scripts(prop.exp.content, file, block.loc.start.offset + prop.exp.loc.start.offset, 'expression'); } catch (e) { /* v-for 等非独立表达式保留人工检查 */ }
}
}
for (const child of n.children || []) walk(child);
}
walk(ast);
}
function walk(dir) {
for (const item of fs.readdirSync(path.join(root, dir), {withFileTypes:true})) {
const file = path.posix.join(dir, item.name);
if (item.isDirectory()) { if (item.name !== 'static' && item.name !== 'locales') walk(file); }
else if (/\.(vue|js)$/.test(file) && !/match\.min\.js|audioManager\.js/.test(file)) inspect(file);
}
}
walk('');
if (require.main === module) process.stdout.write(JSON.stringify(entries, null, 2));
module.exports = entries;
+26 -12
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { import {
watch watch
} from "vue"; } from "vue";
@@ -8,9 +10,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 +26,9 @@
} = storeToRefs(store); } = storeToRefs(store);
const { const {
updateUser, updateUser,
updateOnline, updateDeviceStatus,
setDeviceOnline,
clearDeviceStatus,
showDeviceChargingDialog, showDeviceChargingDialog,
clearSessionState, clearSessionState,
clearDevice clearDevice
@@ -63,19 +64,25 @@
uni.removeStorageSync(`${env}_token`); uni.removeStorageSync(`${env}_token`);
clearSessionState(); clearSessionState();
uni.showModal({ uni.showModal({
title: "提示", title: t('notice'),
content: "账号已在其他设备登录", content: t('your_account_has_been_signed_in_on_another_device'),
showCancel: false, showCancel: false,
}); });
} }
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() {
@@ -111,6 +118,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()
} }
@@ -122,6 +133,7 @@
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); uni.$on("device-charging", onDeviceCharging);
@@ -148,6 +160,7 @@
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); uni.$off("device-charging", onDeviceCharging);
@@ -157,6 +170,7 @@
matchWebsocket.closeMatchWebSocket({ matchWebsocket.closeMatchWebSocket({
reason: "app-hide" reason: "app-hide"
}); });
clearDeviceStatus();
websocket.closeWebSocket(); websocket.closeWebSocket();
}); });
</script> </script>
+69 -29
View File
@@ -1,3 +1,4 @@
import { t } from "@/locales";
import { normalizeBattleApiResult } from "@/utils/matchAdapter"; import { normalizeBattleApiResult } from "@/utils/matchAdapter";
let BASE_URL = "https://api.shelingxingqiu.com/api/shoot"; // 默认正式版 let BASE_URL = "https://api.shelingxingqiu.com/api/shoot"; // 默认正式版
@@ -28,11 +29,13 @@ 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$/, ""); const API_ROOT_URL = BASE_URL.replace(/\/api\/shoot$/, "");
// 统一处理业务接口请求,包含登录态、业务错误和特定接口空响应兼容。 // 统一处理业务接口请求,包含登录态、业务错误和特定接口空响应兼容。
function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0]) { 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`
); );
const header = {}; // 英文版全部后端 HTTP 请求统一声明语言,保留原有认证与响应处理。
const header = {"Accept-Language": "en-US"};
if (token) header.Authorization = `Bearer ${token || ""}`; if (token) header.Authorization = `Bearer ${token || ""}`;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uni.request({ uni.request({
@@ -40,8 +43,16 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
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",
@@ -91,7 +102,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
if (message === "BIND_FAILD") { if (message === "BIND_FAILD") {
uni.$emit("device-bind-invalid"); uni.$emit("device-bind-invalid");
uni.showToast({ uni.showToast({
title: "设备绑定状态已失效,请重新绑定", title: t('your_device_binding_has_expired_please_bind_it_again'),
icon: "none", icon: "none",
}); });
reject({type: "DEVICE_BIND_INVALID", message}); reject({type: "DEVICE_BIND_INVALID", message});
@@ -99,7 +110,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
} }
if (message === "ERROR_ORDER_UNPAY") { if (message === "ERROR_ORDER_UNPAY") {
uni.showToast({ uni.showToast({
title: "当前有未支付订单", title: t('you_have_an_unpaid_order'),
icon: "none", icon: "none",
}); });
resolve({}); resolve({});
@@ -107,14 +118,16 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
} }
if (message === "ROOM_EMPTY") { if (message === "ROOM_EMPTY") {
return uni.showToast({ return uni.showToast({
title: "房间已过期", title: t('this_room_has_expired'),
icon: "none", icon: "none",
}); });
} }
if (showErrorToast) {
uni.showToast({ uni.showToast({
title: message, title: message,
icon: "none", icon: "none",
}); });
}
reject(error); reject(error);
return; return;
} }
@@ -122,7 +135,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
} }
}, },
fail: (err) => { fail: (err) => {
handleRequestError(err, url); if (showErrorToast) handleRequestError(err, url);
reject(err); reject(err);
}, },
}); });
@@ -136,26 +149,26 @@ function handleRequestError(err, url) {
// 根据错误类型显示不同提示 // 根据错误类型显示不同提示
if (err.errMsg) { if (err.errMsg) {
if (err.errMsg.includes("timeout")) { if (err.errMsg.includes("timeout")) {
showCustomToast("请求超时,请稍后重试", "timeout"); showCustomToast(t('request_timed_out_please_try_again'), "timeout");
} else if (err.errMsg.includes("fail")) { } else if (err.errMsg.includes("fail")) {
// 检查网络状态 // 检查网络状态
uni.getNetworkType({ uni.getNetworkType({
success: (res) => { success: (res) => {
if (res.networkType === "none") { if (res.networkType === "none") {
showCustomToast("网络连接已断开,请检查网络设置", "network"); showCustomToast(t('network_disconnected_check_your_network_settings'), "network");
} else { } else {
showCustomToast("服务器连接失败,请稍后重试", "server"); showCustomToast(t('cannot_connect_to_the_server_please_try_again'), "server");
} }
}, },
fail: () => { fail: () => {
showCustomToast("网络异常,请检查网络连接", "unknown"); showCustomToast(t('network_error_check_your_connection'), "unknown");
}, },
}); });
} else { } else {
showCustomToast("请求失败,请稍后重试", "general"); showCustomToast(t('request_failed_please_try_again'), "general");
} }
} else { } else {
showCustomToast("网络异常,请稍后重试", "unknown"); showCustomToast(t('network_error_please_try_again'), "unknown");
} }
} }
@@ -281,6 +294,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,
@@ -543,7 +564,7 @@ export const aimRenewAPI = () => {
const token = uni.getStorageSync( const token = uni.getStorageSync(
`${uni.getAccountInfoSync().miniProgram.envVersion}_token` `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
); );
const header = {}; const header = {"Accept-Language": "en-US"};
if (token) header.Authorization = `Bearer ${token}`; if (token) header.Authorization = `Bearer ${token}`;
uni.request({ uni.request({
@@ -561,28 +582,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) => {
@@ -747,6 +772,21 @@ export const getGiftDetailAPI = (id) => {
); );
}; };
// 分页获取启用门店及当前用户在各店的会员状态。
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 = ({ export const getNearbyStoresAPI = ({
longitude, longitude,
+11 -3
View File
@@ -2,7 +2,7 @@ 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 RHYTHM_SHOOT_WINDOW_AUDIO_KEY = "请射箭";
export const STABILITY_START_AUDIO_KEY = export const STABILITY_START_AUDIO_KEY =
"请在计时结束前能量条达到百分百"; "请在计时结束时能量条达到标记区域";
export const STABILITY_ENERGY_50_AUDIO_KEY = "加油!到达50%啦"; export const STABILITY_ENERGY_50_AUDIO_KEY = "加油!到达50%啦";
export const STABILITY_ENERGY_70_AUDIO_KEY = export const STABILITY_ENERGY_70_AUDIO_KEY =
"70%啦!还差一点,胜利就在眼前"; "70%啦!还差一点,胜利就在眼前";
@@ -12,12 +12,16 @@ const TRAINING_START_AUDIO_KEY_MAP = Object.freeze({
endurance: "请于计时前完成累计环数和箭量", endurance: "请于计时前完成累计环数和箭量",
precision: "请射箭命中高亮区域", precision: "请射箭命中高亮区域",
rhythm: "请在读条推进到标记区间内射箭", rhythm: "请在读条推进到标记区间内射箭",
stability: "请在计时结束前能量条达到百分百", stability: STABILITY_START_AUDIO_KEY,
}); });
export const getTrainingStartAudioKey = (trainingType, fallback = "") => export const getTrainingStartAudioKey = (trainingType, fallback = "") =>
TRAINING_START_AUDIO_KEY_MAP[trainingType] || fallback; TRAINING_START_AUDIO_KEY_MAP[trainingType] || fallback;
// 与服务端通关判定保持一致,proto3 省略的 false 同样按失败处理。
export const getTrainingEndAudioKey = (completed) =>
completed === true ? "通关成功" : "通关失败";
export const getPrecisionShotAudioKeys = (shootData, directionText = "") => { export const getPrecisionShotAudioKeys = (shootData, directionText = "") => {
if (!shootData || typeof shootData !== "object") return []; if (!shootData || typeof shootData !== "object") return [];
const ring = Number(shootData.ring); const ring = Number(shootData.ring);
@@ -176,7 +180,7 @@ export const audioFils = {
练习开始: 练习开始:
"https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3", "https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3",
[STABILITY_START_AUDIO_KEY]: [STABILITY_START_AUDIO_KEY]:
"https://static.shelingxingqiu.com/shootaudio/%E8%AF%B7%E5%9C%A8%E8%AE%A1%E6%97%B6%E7%BB%93%E6%9D%9F%E5%89%8D%E8%83%BD%E9%87%8F%E6%9D%A1%E8%BE%BE%E5%88%B0%E7%99%BE%E5%88%86%E7%99%BE.MP3", "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]: [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", "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]: [STABILITY_ENERGY_70_AUDIO_KEY]:
@@ -201,6 +205,10 @@ export const audioFils = {
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E6%9C%AA%E5%91%BD%E4%B8%AD.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",
命中: 命中:
+37 -39
View File
@@ -1,3 +1,4 @@
import { t as translate } from "@/locales";
import { formatTimestamp } from "@/util"; import { formatTimestamp } from "@/util";
const loadImage = (src) => const loadImage = (src) =>
@@ -277,7 +278,7 @@ export const generateShareImage = async (canvasId, data) => {
renderText(ctx, data.user.name, 18, "#000", 84, 36); renderText(ctx, data.user.name, 18, "#000", 84, 36);
renderText(ctx, data.recordDate, 9, "#fff", 348, 23, "center", 39); renderText(ctx, data.recordDate, 9, "#fff", 348, 23, "center", 39);
renderText(ctx, "今日打卡", 14, "#fff", 336, 38, "center", 39); renderText(ctx, translate('today_s_check_in'), 9, "#fff", 336, 38, "center", 39);
// 文本标签 // 文本标签
let cursorX = 84; let cursorX = 84;
@@ -295,7 +296,7 @@ export const generateShareImage = async (canvasId, data) => {
); );
cursorX = drawTextBoxesLine( cursorX = drawTextBoxesLine(
ctx, ctx,
String(pointBook.distance) + " 米", String(pointBook.distance) + translate('m'),
cursorX + 6, cursorX + 6,
58, 58,
9, 9,
@@ -318,9 +319,9 @@ export const generateShareImage = async (canvasId, data) => {
2 2
); );
renderText(ctx, "落点稳定性", 13, "#999", 25, 110); renderText(ctx, translate('shot_grouping'), 13, "#999", 25, 110);
renderText(ctx, "黄心率", 13, "#999", 145, 110); renderText(ctx, translate('gold_hit_rate'), 13, "#999", 145, 110);
renderText(ctx, "10环数", 13, "#999", 262, 110); renderText(ctx, translate('10s'), 13, "#999", 262, 110);
renderText( renderText(
ctx, ctx,
@@ -340,8 +341,8 @@ export const generateShareImage = async (canvasId, data) => {
); );
renderText(ctx, arrowData.tenRings, 15, "#000", 262, 133); renderText(ctx, arrowData.tenRings, 15, "#000", 262, 133);
renderText(ctx, "平均环数", 13, "#999", 25, 175); renderText(ctx, translate('average_score'), 13, "#999", 25, 175);
renderText(ctx, "总环数", 13, "#999", 145, 175); renderText(ctx, translate('total_score'), 13, "#999", 145, 175);
renderText( renderText(
ctx, ctx,
Number(arrowData.averageRing.toFixed(2)), Number(arrowData.averageRing.toFixed(2)),
@@ -361,7 +362,7 @@ export const generateShareImage = async (canvasId, data) => {
if (hasPoint) { if (hasPoint) {
drawRoundedRect(ctx, 20, 230, 5, 15, 5, "#FED847"); drawRoundedRect(ctx, 20, 230, 5, 15, 5, "#FED847");
renderText(ctx, "落点分布", 13, "#999", 32, 242); renderText(ctx, translate('shot_distribution'), 13, "#999", 32, 242);
const bowSrc = await loadImage(pointBook.bowtargetType.iconPng); const bowSrc = await loadImage(pointBook.bowtargetType.iconPng);
const bowImg = await loadCanvasImage(canvas, bowSrc); const bowImg = await loadCanvasImage(canvas, bowSrc);
@@ -421,7 +422,7 @@ export const generateShareImage = async (canvasId, data) => {
); );
}); });
renderText(ctx, "环值", 9, "#999", 15, ringBarHeight - 1); renderText(ctx, translate('score'), 9, "#999", 15, ringBarHeight - 1);
ringNames.forEach((ring, index) => { ringNames.forEach((ring, index) => {
renderText( renderText(
ctx, ctx,
@@ -441,17 +442,17 @@ export const generateShareImage = async (canvasId, data) => {
const qrcodeImg = await loadCanvasImage(canvas, qrcodeSrc); const qrcodeImg = await loadCanvasImage(canvas, qrcodeSrc);
ctx.drawImage(qrcodeImg, 40, hasPoint ? 715 : 358, 68, 68); ctx.drawImage(qrcodeImg, 40, hasPoint ? 715 : 358, 68, 68);
renderText(ctx, "射灵星球", 18, "#333", 120, hasPoint ? 734 : 380); renderText(ctx, translate('sheling_planet'), 18, "#333", 120, hasPoint ? 734 : 380);
renderText( renderText(
ctx, ctx,
"高效记录每一箭,快来一起打卡吧!", translate('track_every_arrow_join_us'),
13, 13,
"#999", "#999",
120, 120,
hasPoint ? 756 : 402 hasPoint ? 756 : 402
); );
renderText(ctx, "扫码打卡", 13, "#FFA118", 142, hasPoint ? 777 : 422); renderText(ctx, translate('scan_to_check_in'), 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) {
@@ -539,10 +540,10 @@ export const sharePointData = async (canvasId, data) => {
const bubble2Img = await loadCanvasImage(canvas, bubble2Src); const bubble2Img = await loadCanvasImage(canvas, bubble2Src);
const bubble3Img = await loadCanvasImage(canvas, bubble3Src); const bubble3Img = await loadCanvasImage(canvas, bubble3Src);
ctx.drawImage(bubble1Img, 10, 88, 143, 87); ctx.drawImage(bubble1Img, 10, 88, 143, 87);
renderText(ctx, "本周箭数", 14, "#FDA103", 84, 116, "center"); renderText(ctx, translate('arrows_this_week'), 14, "#FDA103", 84, 116, "center");
renderText(ctx, data.weekArrow, 36, "#FA2A2A", 84, 152, "center"); renderText(ctx, data.weekArrow, 36, "#FA2A2A", 84, 152, "center");
ctx.drawImage(bubble2Img, 65, 220, 143, 87); ctx.drawImage(bubble2Img, 65, 220, 143, 87);
renderText(ctx, "本周消耗", 14, "#FDA103", 139, 248, "center"); renderText(ctx, translate('calories_this_week'), 14, "#FDA103", 139, 248, "center");
renderText( renderText(
ctx, ctx,
Math.round(data.weekArrow * 1.6), Math.round(data.weekArrow * 1.6),
@@ -553,7 +554,7 @@ export const sharePointData = async (canvasId, data) => {
"center" "center"
); );
ctx.drawImage(bubble3Img, 255, 52, 114, 92); ctx.drawImage(bubble3Img, 255, 52, 114, 92);
renderText(ctx, "我的名次", 14, "#FDA103", 312, 80, "center"); renderText(ctx, translate('my_rank'), 14, "#FDA103", 312, 80, "center");
renderText(ctx, data.rank, 36, "#FA2A2A", 312, 116, "center"); renderText(ctx, data.rank, 36, "#FA2A2A", 312, 116, "center");
const qrcodeSrc = await loadImage( const qrcodeSrc = await loadImage(
@@ -562,8 +563,8 @@ export const sharePointData = async (canvasId, data) => {
const qrcodeImg = await loadCanvasImage(canvas, qrcodeSrc); const qrcodeImg = await loadCanvasImage(canvas, qrcodeSrc);
ctx.drawImage(qrcodeImg, 40, 383, 68, 68); ctx.drawImage(qrcodeImg, 40, 383, 68, 68);
renderText(ctx, "射灵星球", 18, "#333", 120, 412); renderText(ctx, translate('sheling_planet'), 18, "#333", 120, 412);
renderText(ctx, "高效记录每一箭,快来一起打卡吧!", 13, "#999", 120, 435); renderText(ctx, translate('track_every_arrow_join_us'), 13, "#999", 120, 435);
// 2D 即时绘制,无需 ctx.draw() // 2D 即时绘制,无需 ctx.draw()
} catch (e) { } catch (e) {
console.error("generateShareImage 绘制失败:", e); console.error("generateShareImage 绘制失败:", e);
@@ -635,7 +636,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 +658,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 +709,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 +723,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([
@@ -761,9 +759,9 @@ export async function sharePractiseData(canvasId, type, user, data) {
renderText(ctx, user.nickName, 13, "#fff", 58, 34); renderText(ctx, user.nickName, 13, "#fff", 58, 34);
renderRankTitle(ctx, user.lvlName); renderRankTitle(ctx, user.lvlName);
let subTitle = "正式开启弓箭手之路"; let subTitle = translate('your_archery_journey_starts_here');
if (type > 1) { if (type > 1) {
subTitle = `今日弓箭练习打卡 ${formatTimestamp(data.startTime)}`; subTitle = translate('archery_check_in_value', { p0: formatTimestamp(data.startTime) });
} }
ctx.drawImage(titleImg, (width - 160) / 2, 160, 160, 40); ctx.drawImage(titleImg, (width - 160) / 2, 160, 160, 40);
@@ -771,10 +769,10 @@ export async function sharePractiseData(canvasId, type, user, data) {
ctx.font = "18px sans-serif"; ctx.font = "18px sans-serif";
renderText(ctx, subTitle, 18, "#fff", width / 2, 224, "center"); renderText(ctx, subTitle, 18, "#fff", width / 2, 224, "center");
renderText(ctx, "共", 14, "#fff", 122, 300); renderText(ctx, translate('total'), 14, "#fff", 102, 300);
const totalRing = data.details.reduce((last, next) => last + next.ring, 0); const totalRing = data.details.reduce((last, next) => last + next.ring, 0);
renderText(ctx, totalRing, 14, "#fed847", 148, 300, "center"); renderText(ctx, totalRing, 14, "#fed847", 148, 300, "center");
renderText(ctx, "环", 14, "#fff", 161, 300); renderText(ctx, translate('pts'), 14, "#fff", 161, 300);
renderLine(ctx, 77); renderLine(ctx, 77);
renderLine(ctx, 185); renderLine(ctx, 185);
@@ -782,10 +780,10 @@ export async function sharePractiseData(canvasId, type, user, data) {
renderScores(ctx, data.details, scoreBgImg); renderScores(ctx, data.details, scoreBgImg);
ctx.drawImage(qrCodeImg, width * 0.06, height * 0.87, 52, 52); ctx.drawImage(qrCodeImg, width * 0.06, height * 0.87, 52, 52);
renderText(ctx, "射灵平台", 12, "#fff", width * 0.26, height * 0.9); renderText(ctx, translate('sheling'), 12, "#fff", width * 0.26, height * 0.9);
renderText( renderText(
ctx, ctx,
"快加入我们一起玩吧~", translate('join_us_and_play'),
9, 9,
"rgba(255, 255, 255, 0.5)", "rgba(255, 255, 255, 0.5)",
width * 0.26, width * 0.26,
@@ -793,7 +791,7 @@ export async function sharePractiseData(canvasId, type, user, data) {
); );
renderText( renderText(
ctx, ctx,
"后羿就是这样练成的", translate('practice_makes_a_great_archer'),
9, 9,
"rgba(255, 255, 255, 0.5)", "rgba(255, 255, 255, 0.5)",
width * 0.26, width * 0.26,
@@ -905,7 +903,7 @@ export const generateShareCard = (canvasId, date, actual, total) => {
const totalWidth = ctx.measureText(`${t || ""}`).width || 0; const totalWidth = ctx.measureText(`${t || ""}`).width || 0;
renderText( renderText(
ctx, ctx,
"环", translate('pts'),
20, 20,
"#FFFFFF", "#FFFFFF",
centerX + totalWidth + 5, centerX + totalWidth + 5,
@@ -997,7 +995,7 @@ export const generateShareCard = (canvasId, date, actual, total) => {
const totalWidth = ctx.measureText(`${t || ""}`).width || 0; const totalWidth = ctx.measureText(`${t || ""}`).width || 0;
renderText( renderText(
ctx, ctx,
"环", translate('pts'),
20, 20,
"#FFFFFF", "#FFFFFF",
centerX + totalWidth + 5, centerX + totalWidth + 5,
+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"
+10 -4
View File
@@ -1,15 +1,21 @@
<script setup> <script setup>
import { t } from "@/locales";
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: t('coming_soon'),
icon: "none",
}); });
// uni.navigateTo({
// url: "/pages/member/be-vip",
// });
} }
if (index === 1) { if (index === 1) {
uni.navigateTo({ uni.navigateTo({
@@ -18,7 +24,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"
+5 -3
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch, onMounted, onBeforeUnmount } from "vue"; import { ref, watch, onMounted, onBeforeUnmount } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
@@ -99,12 +101,12 @@ onBeforeUnmount(() => {
<image src="https://static.shelingxingqiu.com/shootmini/static/back-to-game-bg.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/back-to-game-bg.png" mode="widthFix" />
<block v-if="game.inBattle"> <block v-if="game.inBattle">
<image src="https://static.shelingxingqiu.com/shootmini/static/pk-icon.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/pk-icon.png" mode="widthFix" />
<text>返回进行中的对局</text> <text>{{ t('return_to_your_current_match') }}</text>
</block> </block>
<block v-else-if="game.roomID"> <block v-else-if="game.roomID">
<text>返回房间</text> <text>{{ t('back_to_room') }}</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>
+12 -10
View File
@@ -1,5 +1,7 @@
= =
<script setup> <script setup>
import { t } from "@/locales";
import { computed } from "vue"; import { computed } from "vue";
import BowPower from "@/components/BowPower.vue"; import BowPower from "@/components/BowPower.vue";
import { RoundImages } from "@/constants"; import { RoundImages } from "@/constants";
@@ -43,8 +45,8 @@ const normalRounds = computed(() => {
</view> </view>
<view> <view>
<image src="https://static.shelingxingqiu.com/shootmini/static/battle-header-melee.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/battle-header-melee.png" mode="widthFix" />
<text>蓝队({{ bluePoints }})</text> <text>{{ t('blue') }}{{ bluePoints }})</text>
<text>红队({{ redPoints }})</text> <text>{{ t('red') }}{{ redPoints }})</text>
</view> </view>
<view class="players"> <view class="players">
<view> <view>
@@ -66,18 +68,18 @@ const normalRounds = computed(() => {
.reduce((last, next) => last + next, 0) .reduce((last, next) => last + next, 0)
: "" : ""
}}</text> }}</text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
</view> </view>
<block v-if="roundResults.length < 3"> <block v-if="roundResults.length < 3">
<view v-for="i in 3 - roundResults.length" :key="i"> <view v-for="pendingRoundNumber in 3 - roundResults.length" :key="pendingRoundNumber">
<image <image
:src="RoundImages[`round${i + roundResults.length}`]" :src="RoundImages[`round${pendingRoundNumber + roundResults.length}`]"
mode="widthFix" mode="widthFix"
/> />
<view> <view>
<text></text> <text></text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
</view> </view>
</block> </block>
@@ -101,18 +103,18 @@ const normalRounds = computed(() => {
.reduce((last, next) => last + next, 0) .reduce((last, next) => last + next, 0)
: "" : ""
}}</text> }}</text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
</view> </view>
<block v-if="roundResults.length < 3"> <block v-if="roundResults.length < 3">
<view v-for="i in 3 - roundResults.length" :key="i"> <view v-for="pendingRoundNumber in 3 - roundResults.length" :key="pendingRoundNumber">
<image <image
:src="RoundImages[`round${i + roundResults.length}`]" :src="RoundImages[`round${pendingRoundNumber + roundResults.length}`]"
mode="widthFix" mode="widthFix"
/> />
<view> <view>
<text></text> <text></text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
</view> </view>
</block> </block>
+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"
/> />
+5 -3
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { computed } from "vue"; import { computed } from "vue";
import AppBackground from "@/components/AppBackground.vue"; import AppBackground from "@/components/AppBackground.vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
@@ -58,7 +60,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' }">
@@ -66,9 +68,9 @@ const props = defineProps({
</view> </view>
<view class="desc"> <view class="desc">
<text>{{ arrows.length }}</text> <text>{{ arrows.length }}</text>
<text>支箭,共</text> <text>{{ t('arrows_total') }}</text>
<text>{{ arrows.reduce((a, b) => a + (b.ring || 0), 0) }}</text> <text>{{ arrows.reduce((a, b) => a + (b.ring || 0), 0) }}</text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
<ScorePanel <ScorePanel
:completeEffect="false" :completeEffect="false"
+7 -34
View File
@@ -1,44 +1,17 @@
<script setup> <script setup>
import { ref, onMounted, onBeforeUnmount } from "vue"; import { t } from "@/locales";
import { getDeviceBatteryAPI } from "@/apis";
const power = ref(0); import useStore from "@/store";
const timer = ref(null); import { storeToRefs } from "pinia";
let disposed = false;
let requestInFlight = false;
const refreshPower = async () => { const store = useStore();
if (disposed || requestInFlight) return; const { deviceBattery: power } = storeToRefs(store);
requestInFlight = true;
try {
const data = await getDeviceBatteryAPI();
if (!disposed) power.value = data.battery;
} catch (_) {
// 电量轮询失败时等待下一轮,避免产生未处理的 Promise 拒绝。
} finally {
requestInFlight = false;
}
};
onMounted(async () => {
await refreshPower();
if (disposed) return;
timer.value = setInterval(() => {
void refreshPower();
}, 1000 * 10);
});
onBeforeUnmount(() => {
disposed = true;
clearInterval(timer.value);
timer.value = null;
});
</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 ? t('battery') : t('battery_value', { p0: power }) }}</view>
</view> </view>
</template> </template>
+15 -17
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { import {
ref, ref,
watch, watch,
@@ -97,9 +99,9 @@ const ROUND_TIP_OFFSET_Y = -32;
const EXPERIENCE_TIP_OFFSET_Y = -68; const EXPERIENCE_TIP_OFFSET_Y = -68;
function getRoundText(shot) { function getRoundText(shot) {
if (shot?.ringX) return "X环"; if (shot?.ringX) return t('x');
if (shot?.ring) return `${shot.ring}环`; if (shot?.ring) return t('value_pts', { p0: shot.ring });
return props.missAsZero ? "0环" : "未上靶"; return props.missAsZero ? t('0_pts') : t('miss');
} }
function buildShotEffectKey(team, shot, index) { function buildShotEffectKey(team, shot, index) {
@@ -527,17 +529,15 @@ 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">{{ t('halftime') }}</view>
<view <view
v-if="latestOne && latestOne.ring && user.id === latestOne.playerId" v-if="latestOne && latestOne.ring && user.id === latestOne.playerId"
class="e-value fade-in-out" class="e-value fade-in-out"
:style="getExperienceTipStyle(latestOne)" :style="getExperienceTipStyle(latestOne)"
> >{{ t('xp_1') }}</view>
经验 +1
</view>
<view <view
v-if="latestOne" v-if="latestOne"
class="round-tip fade-in-out" class="round-tip fade-in-out"
@@ -552,9 +552,7 @@ onBeforeUnmount(() => {
" "
class="e-value fade-in-out" class="e-value fade-in-out"
:style="getExperienceTipStyle(bluelatestOne)" :style="getExperienceTipStyle(bluelatestOne)"
> >{{ t('xp_1') }}</view>
经验 +1
</view>
<view <view
v-if="bluelatestOne" v-if="bluelatestOne"
class="round-tip fade-in-out" class="round-tip fade-in-out"
@@ -565,7 +563,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"
/> />
@@ -585,7 +583,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"
/> />
@@ -638,10 +636,10 @@ onBeforeUnmount(() => {
/> />
</view> </view>
<view class="simul" v-if="env !== 'release'"> <view class="simul" v-if="env !== 'release'">
<button @click="simulShoot">模拟</button> <button @click="simulShoot">{{ t('simulate') }}</button>
<button @click="simulShoot2">射箭</button> <button @click="simulShoot2">{{ t('shoot') }}</button>
<button @click="openAim">开瞄</button> <button @click="openAim">{{ t('sight_on') }}</button>
<button @click="closeAim">关瞄</button> <button @click="closeAim">{{ t('sight_off') }}</button>
</view> </view>
</view> </view>
</template> </template>
+6 -4
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
import { getElementRect, calcRing, capsuleHeight } from "@/util"; import { getElementRect, calcRing, capsuleHeight } from "@/util";
@@ -258,7 +260,7 @@ onBeforeUnmount(() => {
fontSize: '16px', fontSize: '16px',
marginLeft: '2px', marginLeft: '2px',
}" }"
>环</text >{{ t('pts') }}</text
> >
</view> </view>
<view <view
@@ -266,16 +268,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%;
+18 -24
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref } from "vue"; import { ref } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
import AppBackground from "@/components/AppBackground.vue"; import AppBackground from "@/components/AppBackground.vue";
@@ -124,7 +126,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>
@@ -179,43 +181,35 @@ const goCalibration = async () => {
</view> </view>
<ScreenHint :show="showHint"> <ScreenHint :show="showHint">
<view v-if="hintType === 1" class="tip-content"> <view v-if="hintType === 1" class="tip-content">
<text>完成进行中的对局才能开启新的。</text> <text>{{ t('finish_your_current_match_before_starting_a_new_one') }}</text>
<text>您有正在进行中的对局,是否进入?</text> <text>{{ t('you_have_a_match_in_progress_join_it') }}</text>
<view> <view>
<button hover-class="none" @click="() => (showHint = false)"> <button hover-class="none" @click="() => (showHint = false)">{{ t('stay_out') }}</button>
不进入
</button>
<button hover-class="none" @click="backToGame" :disabled="isLoading"> <button hover-class="none" @click="backToGame" :disabled="isLoading">
{{ isLoading ? "加载中..." : "进入" }} {{ isLoading ? t('loading') : t('join') }}
</button> </button>
</view> </view>
</view> </view>
<view v-if="hintType === 2" class="tip-content"> <view v-if="hintType === 2" class="tip-content">
<text>离开比赛可能会导致比赛失败,</text> <text>{{ t('leaving_may_result_in_a_loss') }}</text>
<text>确认离开吗?</text> <text>{{ t('are_you_sure_you_want_to_leave') }}</text>
<view> <view>
<button hover-class="none" @click="goBack">离开比赛</button> <button hover-class="none" @click="goBack">{{ t('leave_match') }}</button>
<button hover-class="none" @click="() => (showHint = false)"> <button hover-class="none" @click="() => (showHint = false)">{{ t('continue_match') }}</button>
继续比赛
</button>
</view> </view>
</view> </view>
<view v-if="hintType === 3" class="tip-content"> <view v-if="hintType === 3" class="tip-content">
<text>今天不玩了吗?</text> <text>{{ t('done_playing_for_today') }}</text>
<view> <view>
<button hover-class="none" @click="() => (showHint = false)"> <button hover-class="none" @click="() => (showHint = false)">{{ t('cancel') }}</button>
取消 <button hover-class="none" @click="$clickSound(cancelMatching)">{{ t('confirm') }}</button>
</button>
<button hover-class="none" @click="$clickSound(cancelMatching)">确认</button>
</view> </view>
</view> </view>
<view v-if="hintType === 4" class="tip-content"> <view v-if="hintType === 4" class="tip-content">
<text>完成智能弓校准,即可解锁全部功能</text> <text>{{ t('calibrate_your_smart_bow_to_unlock_all_features') }}</text>
<view> <view>
<button hover-class="none" @click="() => (showHint = false)"> <button hover-class="none" @click="() => (showHint = false)">{{ t('cancel') }}</button>
取消 <button hover-class="none" @click="goCalibration">{{ t('calibrate') }}</button>
</button>
<button hover-class="none" @click="goCalibration">去校准</button>
</view> </view>
</view> </view>
</ScreenHint> </ScreenHint>
@@ -228,7 +222,7 @@ const goCalibration = async () => {
<view :style="{ width: '100%' }"></view> <view :style="{ width: '100%' }"></view>
</view> </view>
<view> <view>
<text>{{ loadingText || "加载中..." }}</text> <text>{{ loadingText || t('loading') }}</text>
</view> </view>
</view> </view>
<DeviceChargingDialog /> <DeviceChargingDialog />
+11 -9
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref } from "vue"; import { ref } from "vue";
import SButton from "@/components/SButton.vue"; import SButton from "@/components/SButton.vue";
@@ -27,7 +29,7 @@ const roomNumber = ref("");
const createRoom = debounce(async () => { const createRoom = debounce(async () => {
// 校验必填项:对战模式与靶纸均必须选择 // 校验必填项:对战模式与靶纸均必须选择
if (!battleMode.value || !targetMode.value) { if (!battleMode.value || !targetMode.value) {
uni.showToast({ title: '请完善创建信息', icon: 'none' }); uni.showToast({ title: t('please_complete_the_room_settings'), icon: 'none' });
return; return;
} }
if (game.value.inBattle) { if (game.value.inBattle) {
@@ -77,30 +79,30 @@ const createRoom = debounce(async () => {
:class="{ 'battle-btn': true, 'battle-choosen': battleMode === 1 }" :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 1 }"
@click="() => (battleMode = 1)" @click="() => (battleMode = 1)"
> >
<text>对抗模式(1V1)</text> <text>{{ t('versus_1v1') }}</text>
</view> </view>
<view <view
:class="{ 'battle-btn': true, 'battle-choosen': battleMode === 3 }" :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 3 }"
@click="() => (battleMode = 3)" @click="() => (battleMode = 3)"
> >
<text>对抗模式(2V2)</text> <text>{{ t('versus_2v2') }}</text>
</view> </view>
<view <view
:class="{ 'battle-btn': true, 'battle-choosen': battleMode === 4 }" :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 4 }"
@click="() => (battleMode = 4)" @click="() => (battleMode = 4)"
> >
<text>对抗模式(3V3)</text> <text>{{ t('versus_3v3') }}</text>
</view> </view>
<view <view
:class="{ 'battle-btn': true, 'battle-choosen': battleMode === 2 }" :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 2 }"
@click="() => (battleMode = 2)" @click="() => (battleMode = 2)"
> >
<text>乱斗模式(3-10人)</text> <text>{{ t('free_for_all_3_10_players') }}</text>
</view> </view>
</view> </view>
<view class="target-options-header"> <view class="target-options-header">
<view class="target-options-header-line-left"></view> <view class="target-options-header-line-left"></view>
<view class="target-options-header-title">选择靶纸</view> <view class="target-options-header-title">{{ t('select_target_face') }}</view>
<view class="target-options-header-line-right"></view> <view class="target-options-header-line-right"></view>
</view> </view>
<view class="target-options"> <view class="target-options">
@@ -108,16 +110,16 @@ const createRoom = debounce(async () => {
:class="{ 'battle-btn': true, 'battle-choosen': targetMode === 1 }" :class="{ 'battle-btn': true, 'battle-choosen': targetMode === 1 }"
@click="() => (targetMode = 1)" @click="() => (targetMode = 1)"
> >
<text>20厘米全环靶</text> <text>{{ t('20_cm_full_ring_target') }}</text>
</view> </view>
<view <view
:class="{ 'battle-btn': true, 'battle-choosen': targetMode === 2 }" :class="{ 'battle-btn': true, 'battle-choosen': targetMode === 2 }"
@click="() => (targetMode = 2)" @click="() => (targetMode = 2)"
> >
<text>40厘米全环靶</text> <text>{{ t('40_cm_full_ring_target') }}</text>
</view> </view>
</view> </view>
<SButton :disabled="loading" :onClick="() => { $clickSound(); return createRoom(); }">创建房间</SButton> <SButton :disabled="loading" :onClick="() => { $clickSound(); return createRoom(); }">{{ t('create_room') }}</SButton>
</view> </view>
</template> </template>
+4 -2
View File
@@ -1,10 +1,12 @@
<script setup> <script setup>
import { t } from "@/locales";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
import ModalDialog from "@/components/ModalDialog.vue"; import ModalDialog from "@/components/ModalDialog.vue";
import useStore from "@/store"; import useStore from "@/store";
const chargingNotice = const chargingNotice =
"检测到智能弓箭已开始充电,为保护电池,设备即将自动关机。\n(注意:此时拔出充电线将会重启设备。)"; t('your_smart_bow_is_charging_and_will_shut_down_automatically_to_p');
const store = useStore(); const store = useStore();
const { deviceChargingDialogVisible } = storeToRefs(store); const { deviceChargingDialogVisible } = storeToRefs(store);
@@ -16,7 +18,7 @@ const { hideDeviceChargingDialog } = store;
:show="deviceChargingDialogVisible" :show="deviceChargingDialogVisible"
:content="chargingNotice" :content="chargingNotice"
:show-cancel="false" :show-cancel="false"
confirm-text="我知道了" :confirm-text="t('got_it')"
:on-confirm="hideDeviceChargingDialog" :on-confirm="hideDeviceChargingDialog"
/> />
</template> </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>
+16 -16
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch, onMounted, computed } from "vue"; import { ref, watch, onMounted, computed } from "vue";
import { getPointBookConfigAPI } from "@/apis"; import { getPointBookConfigAPI } from "@/apis";
const props = defineProps({ const props = defineProps({
@@ -27,7 +29,7 @@ const props = defineProps({
default: "", default: "",
}, },
}); });
const itemTexts = ["选择弓种", "选择练习距离", "选择靶纸", "选择组/箭数"]; const itemTexts = [t('select_bow_type'), t('select_shooting_distance'), t('select_target_face'), t('select_ends_arrows')];
const distances = [5, 8, 10, 18, 25, 30, 50, 60, 70]; const distances = [5, 8, 10, 18, 25, 30, 50, 60, 70];
const groupArrows = [3, 6, 12, 18]; const groupArrows = [3, 6, 12, 18];
@@ -157,11 +159,9 @@ const formatSetAndAmount = computed(() => {
return itemTexts[props.itemIndex]; return itemTexts[props.itemIndex];
if (secondSelectIndex.value === 99 && !arrowAmount.value) if (secondSelectIndex.value === 99 && !arrowAmount.value)
return itemTexts[props.itemIndex]; return itemTexts[props.itemIndex];
return `${selectedIndex.value === 99 ? sets.value : selectedIndex.value}组/${ return t('value_ends_value_arrows', { p0: selectedIndex.value === 99 ? sets.value : selectedIndex.value, p1: secondSelectIndex.value === 99
secondSelectIndex.value === 99
? arrowAmount.value ? arrowAmount.value
: groupArrows[secondSelectIndex.value] : groupArrows[secondSelectIndex.value] });
}箭`;
}); });
onMounted(async () => { onMounted(async () => {
const config = uni.getStorageSync("point-book-config"); const config = uni.getStorageSync("point-book-config");
@@ -187,13 +187,13 @@ onMounted(async () => {
<view></view> <view></view>
<block> <block>
<text v-if="expand" :style="{ color: '#999', fontWeight: 'normal' }">{{ <text v-if="expand" :style="{ color: '#999', fontWeight: 'normal' }">{{
itemIndex !== 3 ? itemTexts[itemIndex] : "选择组" itemIndex !== 3 ? itemTexts[itemIndex] : t('select_ends')
}}</text> }}</text>
<text v-if="!expand && itemIndex === 0">{{ <text v-if="!expand && itemIndex === 0">{{
value || itemTexts[itemIndex] value || itemTexts[itemIndex]
}}</text> }}</text>
<text v-if="!expand && itemIndex === 1">{{ <text v-if="!expand && itemIndex === 1">{{
value && value > 0 ? value + "米" : itemTexts[itemIndex] value && value > 0 ? value + t('m_92') : itemTexts[itemIndex]
}}</text> }}</text>
<text v-if="!expand && itemIndex === 2">{{ <text v-if="!expand && itemIndex === 2">{{
value || itemTexts[itemIndex] value || itemTexts[itemIndex]
@@ -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)' }"
/> />
@@ -232,7 +232,7 @@ onMounted(async () => {
@click="onSelectItem(index)" @click="onSelectItem(index)"
> >
<text>{{ item }}</text> <text>{{ item }}</text>
<text>米</text> <text>{{ t('m_92') }}</text>
</view> </view>
<view <view
:style="{ :style="{
@@ -242,12 +242,12 @@ onMounted(async () => {
<input <input
v-model="meter" v-model="meter"
type="number" type="number"
placeholder="自定义" :placeholder="t('custom')"
placeholder-style="color: #DDDDDD" placeholder-style="color: #DDDDDD"
@focus="() => (selectedIndex = 9)" @focus="() => (selectedIndex = 9)"
@blur="onMeterChange" @blur="onMeterChange"
/> />
<text>米</text> <text>{{ t('m_92') }}</text>
</view> </view>
</view> </view>
<view v-if="itemIndex === 2" class="bowtarget-items"> <view v-if="itemIndex === 2" class="bowtarget-items">
@@ -274,7 +274,7 @@ onMounted(async () => {
@click="onSelectItem(i)" @click="onSelectItem(i)"
> >
<text>{{ i }}</text> <text>{{ i }}</text>
<text>组</text> <text>{{ t('ends') }}</text>
</view> </view>
<view <view
:style="{ :style="{
@@ -289,7 +289,7 @@ onMounted(async () => {
@focus="() => (selectedIndex = 99)" @focus="() => (selectedIndex = 99)"
@blur="onSetsChange" @blur="onSetsChange"
/> />
<text>组</text> <text>{{ t('ends') }}</text>
</view> </view>
</view> </view>
<view <view
@@ -299,7 +299,7 @@ onMounted(async () => {
color: '#999999', color: '#999999',
textAlign: 'center', textAlign: 'center',
}" }"
>选择每组的箭数</view >{{ t('select_arrows_per_end') }}</view
> >
<view class="amount-items"> <view class="amount-items">
<view <view
@@ -311,7 +311,7 @@ onMounted(async () => {
@click="onSelectSecondItem(index)" @click="onSelectSecondItem(index)"
> >
<text>{{ item }}</text> <text>{{ item }}</text>
<text>箭</text> <text>{{ t('arrows') }}</text>
</view> </view>
<view <view
:style="{ :style="{
@@ -327,7 +327,7 @@ onMounted(async () => {
@focus="() => (secondSelectIndex = 99)" @focus="() => (secondSelectIndex = 99)"
@blur="onArrowAmountChange" @blur="onArrowAmountChange"
/> />
<text>箭</text> <text>{{ t('arrows') }}</text>
</view> </view>
</view> </view>
</view> </view>
+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>
+14 -12
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t, translateStatic } from "@/locales";
import { ref, computed, onMounted, onBeforeUnmount } from "vue"; import { ref, computed, onMounted, onBeforeUnmount } from "vue";
import HeaderProgress from "@/components/HeaderProgress.vue"; import HeaderProgress from "@/components/HeaderProgress.vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
@@ -115,10 +117,10 @@ 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>
@@ -156,13 +158,13 @@ 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>{{ t('welcome_new_archer') }}</text>
</block> </block>
</view> </view>
<block <block
@@ -171,7 +173,7 @@ onBeforeUnmount(() => {
'-箭前准备-感知距离-小试牛刀'.indexOf(title) === 11 '-箭前准备-感知距离-小试牛刀'.indexOf(title) === 11
" "
> >
<text>{{ title }}</text> <text>{{ ['-箭前准备', '-感知距离', '-小试牛刀', '小试牛刀'].includes(title) ? translateStatic(title) : title }}</text>
</block> </block>
<block <block
v-if=" v-if="
@@ -181,14 +183,14 @@ onBeforeUnmount(() => {
" "
> >
<view class="first-try-steps"> <view class="first-try-steps">
<text :class="title === '-箭前准备' ? 'current-step' : ''">箭前准备</text> <text :class="title === '-箭前准备' ? 'current-step' : ''">{{ t('get_ready') }}</text>
<text>-</text> <text>-</text>
<text :class="title === '-感知距离' ? 'current-step' : ''" <text :class="title === '-感知距离' ? 'current-step' : ''"
>感知距离</text >{{ t('find_your_distance') }}</text
> >
<text>-</text> <text>-</text>
<text :class="title === '-小试牛刀' ? 'current-step' : ''" <text :class="title === '-小试牛刀' ? 'current-step' : ''"
>小试牛刀</text >{{ t('first_challenge') }}</text
> >
</view> </view>
</block> </block>
@@ -196,7 +198,7 @@ onBeforeUnmount(() => {
</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>
<text>{{ pointBook.distance }} 米</text> <text>{{ pointBook.distance }}{{ t('m') }}</text>
<text <text
>{{ >{{
pointBook.bowtargetType.name.substring( pointBook.bowtargetType.name.substring(
@@ -228,8 +230,8 @@ onBeforeUnmount(() => {
class="battle-room-number" class="battle-room-number"
:style="battleRoomBtnStyle" :style="battleRoomBtnStyle"
> >
<text class="battle-room-number__text">房号: {{ game.roomNumber }}</text> <text class="battle-room-number__text">{{ t('room') }}{{ 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>
+3 -2
View File
@@ -1,4 +1,5 @@
<script setup> <script setup>
import { formatBattleTip } from "@/locales";
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";
@@ -143,10 +144,10 @@ onBeforeUnmount(() => {
<template> <template>
<view class="container"> <view class="container">
<text>{{ (tips || "").replace(/你/g, "").replace(/重回/g, "") }}</text> <text>{{ formatBattleTip(tips) }}</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>
+14 -12
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount, watch } from "vue"; import { ref, onMounted, onBeforeUnmount, watch } from "vue";
const props = defineProps({ const props = defineProps({
stopMatch: { stopMatch: {
@@ -11,17 +13,17 @@ const props = defineProps({
}, },
}); });
const playerNames = [ const playerNames = [
"乐正青山", t('yuezheng_qingshan'),
"宇文玉兰", t('yuwen_yulan'),
"岑思宇", t('cen_siyu'),
"邬梓瑜", t('wu_ziyu'),
"范子衿", t('fan_zijin'),
"旗鼓相当的对手", t('a_worthy_opponent'),
"乐子睿", t('le_zirui'),
"时春晓", t('shi_chunxiao'),
"柏孤鸿", t('bai_guhong'),
"东宫锦瑟", t('donggong_jinse'),
"段干流云", t('duangan_liuyun'),
]; ];
const textStyles = [ const textStyles = [
{ {
@@ -123,7 +125,7 @@ onBeforeUnmount(() => {
</text> </text>
</view> </view>
</view> </view>
<button hover-class="none" @click="$clickSound(stopMatch)">取消匹配</button> <button hover-class="none" @click="$clickSound(stopMatch)">{{ t('cancel_matchmaking') }}</button>
</view> </view>
</template> </template>
+56 -5
View File
@@ -1,4 +1,8 @@
<script setup> <script setup>
import { t } from "@/locales";
import IconButton from "./IconButton.vue";
const props = defineProps({ const props = defineProps({
show: { show: {
type: Boolean, type: Boolean,
@@ -14,11 +18,11 @@ const props = defineProps({
}, },
cancelText: { cancelText: {
type: String, type: String,
default: "取消", default: t('cancel_133'),
}, },
confirmText: { confirmText: {
type: String, type: String,
default: "确定", default: t('confirm_134'),
}, },
showCancel: { showCancel: {
type: Boolean, type: Boolean,
@@ -28,6 +32,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 +48,10 @@ const props = defineProps({
type: Function, type: Function,
default: null, default: null,
}, },
onClose: {
type: Function,
default: null,
},
}); });
const handleCancel = () => { const handleCancel = () => {
@@ -43,8 +59,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 +110,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 +118,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 +137,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 +146,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;
@@ -164,6 +195,9 @@ const handleConfirm = () => {
} }
.dialog-content { .dialog-content {
max-height: 45vh;
overflow-y: auto;
overflow-wrap: break-word;
position: relative; position: relative;
z-index: 1; z-index: 1;
display: flex; display: flex;
@@ -187,6 +221,7 @@ const handleConfirm = () => {
} }
.dialog-actions { .dialog-actions {
width: 100%;
position: relative; position: relative;
z-index: 1; z-index: 1;
display: flex; display: flex;
@@ -200,11 +235,19 @@ const handleConfirm = () => {
justify-content: center; justify-content: center;
} }
.dialog-actions.single .dialog-button {
flex: 0 1 232rpx;
}
.dialog-button { .dialog-button {
display: flex; display: flex;
width: 232rpx; flex: 1;
height: 70rpx; min-width: 0;
line-height: 70rpx; min-height: 70rpx;
padding: 12rpx 20rpx;
box-sizing: border-box;
line-height: 1.3;
text-align: center;
border-radius: 44rpx; border-radius: 44rpx;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@@ -222,6 +265,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);
+63 -32
View File
@@ -1,10 +1,13 @@
<script setup> <script setup>
import { computed } from "vue"; import { t } from "@/locales";
import { getDeviceBatteryAPI } from "@/apis";
const OTA_MIN_BATTERY = 50; import { computed } from "vue";
const OTA_LOW_BATTERY_TEXT = "电量不足 50%,暂不支持 OTA 升级"; import useStore from "@/store";
const OTA_OFFLINE_TEXT = "请先开启智能弓"; import { storeToRefs } from "pinia";
const OTA_OFFLINE_TEXT = t('please_turn_on_your_smart_bow_first');
const store = useStore();
const { deviceStatus } = storeToRefs(store);
const props = defineProps({ const props = defineProps({
visible: { visible: {
@@ -23,6 +26,10 @@ const props = defineProps({
type: Number, type: Number,
default: 40, default: 40,
}, },
phase: {
type: String,
default: "",
},
// 副标题:如“新版本将优化智能弓体验” // 副标题:如“新版本将优化智能弓体验”
description: { description: {
type: String, type: String,
@@ -47,30 +54,24 @@ 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: t('preparing_firmware_update'),
downloading: t('downloading_firmware'),
installing: t('installing_firmware'),
};
return phaseText[props.phase] || t('updating_firmware');
});
// 点击立即更新前先校验设备在线状态,再校验设备电量。 // 点击立即更新前先校验设备在线状态。
const handleUpdateClick = async () => { const handleUpdateClick = () => {
try { if (deviceStatus.value?.online !== true) {
const deviceStatus = await getDeviceBatteryAPI();
if (deviceStatus?.online !== true) {
uni.showToast({ uni.showToast({
title: OTA_OFFLINE_TEXT, title: OTA_OFFLINE_TEXT,
icon: "none", icon: "none",
}); });
return; return;
} }
if (Number(deviceStatus?.battery) <= OTA_MIN_BATTERY) {
uni.showToast({
title: OTA_LOW_BATTERY_TEXT,
icon: "none",
});
return;
}
} catch (err) {
emit("update");
return;
}
emit("update"); emit("update");
}; };
</script> </script>
@@ -131,19 +132,19 @@ const handleUpdateClick = async () => {
<text v-if="changelog" class="changelog-text">{{ changelog }}</text> <text v-if="changelog" class="changelog-text">{{ changelog }}</text>
<view class="btn-group"> <view class="btn-group">
<view class="primary-btn" @click="handleUpdateClick"> <view class="primary-btn" @click="handleUpdateClick">
<text class="primary-btn-text">立即更新</text> <text class="primary-btn-text">{{ t('update_now') }}</text>
</view> </view>
<text v-if="!forceUpdate" class="skip-text" @click="emit('skip')">暂不更新</text> <text v-if="!forceUpdate" class="skip-text" @click="emit('skip')">{{ t('later') }}</text>
</view> </view>
</block> </block>
<!-- 更新成功:图片左边距 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">{{ t('firmware_update_complete') }}</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">{{ t('close') }}</text>
</view> </view>
</view> </view>
</block> </block>
@@ -152,21 +153,26 @@ 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">{{ t('please_stay_on_this_page') }}</text>
</view> </view>
</block> </block>
<!-- 更新失败:图片左边距 34rpx,文案左对齐 44rpx,按钮浮动底部居中 --> <!-- 更新失败:图片左边距 34rpx,文案左对齐 44rpx,按钮浮动底部居中 -->
<block v-else-if="isFailure"> <block v-else-if="isFailure">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-fail.png" mode="aspectFit" class="result-title-img" style="width: 222rpx; height: 62rpx;" /> <image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-fail.png" mode="aspectFit" class="result-title-img" style="width: 222rpx; height: 62rpx;" />
<text class="dialog-desc">请确保:</text> <text class="dialog-desc">{{ t('please_make_sure') }}</text>
<text class="dialog-desc">1、智能弓已开启</text> <text class="dialog-desc">{{ t('1_your_smart_bow_is_on') }}</text>
<text class="dialog-desc">2、网路连接稳定</text> <text class="dialog-desc">{{ t('2_your_network_connection_is_stable') }}</text>
<view class="btn-group-result"> <view class="btn-group-result">
<view class="primary-btn" @click="emit('retry')"> <view class="primary-btn" @click="emit('retry')">
<text class="primary-btn-text">重试</text> <text class="primary-btn-text">{{ t('retry') }}</text>
</view> </view>
</view> </view>
</block> </block>
@@ -181,7 +187,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 +410,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 +442,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 {
+7 -5
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const { user } = storeToRefs(useStore()); const { user } = storeToRefs(useStore());
@@ -18,8 +20,8 @@ const rowCount = new Array(6).fill(0);
const getRingText = (arrow) => { const getRingText = (arrow) => {
if (!arrow) return "-"; if (!arrow) return "-";
if (arrow.ringX && arrow.ring) return "X环"; if (arrow.ringX && arrow.ring) return t('x');
return `${Number(arrow.ring) || 0}环`; return t('value_pts', { p0: Number(arrow.ring) || 0 });
}; };
const isMember = (player = {}) => player.vip === true || player.sVip === true; const isMember = (player = {}) => player.vip === true || player.sVip === true;
@@ -40,10 +42,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)]"
@@ -71,7 +73,7 @@ const getMemberNicknameClass = (player = {}) => [
scores scores
.map((s) => (s || []).reduce((last, next) => last + next.ring, 0)) .map((s) => (s || []).reduce((last, next) => last + next.ring, 0))
.reduce((last, next) => last + next, 0) .reduce((last, next) => last + next, 0)
}}环</text }}{{ t('pts') }}</text
> >
</view> </view>
</template> </template>
+10 -8
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { topThreeColors } from "@/constants"; import { topThreeColors } from "@/constants";
defineProps({ defineProps({
avatar: { avatar: {
@@ -30,25 +32,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' }"
/> />
@@ -56,20 +58,20 @@ const rowCount = new Array(6).fill(0);
<view> <view>
<view> <view>
<view v-for="(_, index) in rowCount" :key="index"> <view v-for="(_, index) in rowCount" :key="index">
<text>{{ arrows[index] ? `${arrows[index].ring}环` : "-" }}</text> <text>{{ arrows[index] ? t('value_pts', { p0: arrows[index].ring }) : "-" }}</text>
</view> </view>
</view> </view>
<view> <view>
<view v-for="(_, index) in rowCount" :key="index"> <view v-for="(_, index) in rowCount" :key="index">
<text>{{ <text>{{
arrows[index + 6] ? `${arrows[index + 6].ring}环` : "-" arrows[index + 6] ? t('value_pts', { p0: arrows[index + 6].ring }) : "-"
}}</text> }}</text>
</view> </view>
</view> </view>
</view> </view>
<view> <view>
<text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}环</text> <text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}{{ t('pts') }}</text>
<text>积分{{ totalScore }}</text> <text>{{ t('points') }}{{ totalScore }}</text>
</view> </view>
</view> </view>
</template> </template>
+9 -9
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
const props = defineProps({ const props = defineProps({
@@ -38,16 +40,16 @@ 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
:style="{ opacity: players[index] && !!players[index].state ? 1 : 0 }" :style="{ opacity: players[index] && !!players[index].state ? 1 : 0 }"
>已准备</text >{{ t('ready') }}</text
> >
</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])"
@@ -67,12 +69,10 @@ const seats = new Array(props.total).fill(1);
> >
{{ players[index].name }} {{ players[index].name }}
</text> </text>
<text v-else class="player-seat-name" :style="{ color: '#fff9' }"> <text v-else class="player-seat-name" :style="{ color: '#fff9' }">{{ t('waiting_for_a_player') }}</text>
虚位以待 <view v-if="index === 0" class="founder">{{ t('host') }}</view>
</text>
<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>
+11 -9
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch } from "vue"; import { ref, watch } from "vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
@@ -55,12 +57,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>
@@ -70,24 +72,24 @@ const onClick = async () => {
</view> </view>
<text v-else class="truncate">{{ data.name }}</text> <text v-else class="truncate">{{ data.name }}</text>
<view> <view>
<text>{{ data.totalDay }}天</text> <text>{{ data.totalDay }}{{ t('days') }}</text>
<view /> <view />
<text>平均{{ Number(data.averageRing.toFixed(1)) }}环</text> <text>{{ t('average') }}{{ Number(data.averageRing.toFixed(1)) }}{{ t('pts') }}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="item-info"> <view class="item-info">
<text>{{ data.weekArrow }}</text> <text>{{ data.weekArrow }}</text>
<text>箭</text> <text>{{ t('arrows') }}</text>
</view> </view>
<view class="item-info"> <view class="item-info">
<text>{{ Math.round(data.weekArrow * 1.6) }}</text> <text>{{ Math.round(data.weekArrow * 1.6) }}</text>
<text>千卡</text> <text>{{ t('kcal') }}</text>
</view> </view>
<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>
+6 -4
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, computed } from "vue"; import { ref, onMounted, computed } from "vue";
const props = defineProps({ const props = defineProps({
@@ -48,7 +50,7 @@ onMounted(() => {
<text>{{ <text>{{
bowOptions[data.bowType] ? bowOptions[data.bowType].name : "" bowOptions[data.bowType] ? bowOptions[data.bowType].name : ""
}}</text> }}</text>
<text>{{ data.distance }} 米</text> <text>{{ data.distance }}{{ t('m') }}</text>
<text>{{ <text>{{
targetOptions[data.targetType] targetOptions[data.targetType]
? targetOptions[data.targetType].name ? targetOptions[data.targetType].name
@@ -59,9 +61,9 @@ onMounted(() => {
<text>{{ data.createAt }}</text> <text>{{ data.createAt }}</text>
</view> </view>
<view> <view>
<text>黄心率:{{ Number((data.yellowRate * 100).toFixed(2)) }}%</text> <text>{{ t('gold_hit_rate_156') }}{{ Number((data.yellowRate * 100).toFixed(2)) }}%</text>
<text>10环数:{{ data.tenRings }}</text> <text>{{ t('10s_157') }}{{ data.tenRings }}</text>
<text>平均:{{ data.averageRing }}</text> <text>{{ t('average_158') }}{{ data.averageRing }}</text>
</view> </view>
</view> </view>
<view class="right-part"> <view class="right-part">
+4 -2
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref } from "vue"; import { ref } from "vue";
const props = defineProps({ const props = defineProps({
@@ -25,9 +27,9 @@ const onClick = () => {
@click="onClick" @click="onClick"
:style="{ transform: 'translateX(' + (mode ? '-58' : '4') + 'rpx)' }" :style="{ transform: 'translateX(' + (mode ? '-58' : '4') + 'rpx)' }"
> >
<text>放大</text> <text>{{ t('zoom') }}</text>
<view :style="{ background: mode ? '#D8D8D8' : '#53EF56' }"></view> <view :style="{ background: mode ? '#D8D8D8' : '#53EF56' }"></view>
<text>真实</text> <text>{{ t('actual_size') }}</text>
</view> </view>
</view> </view>
</template> </template>
+11 -9
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, reactive, watch, onMounted } from "vue"; import { ref, reactive, watch, onMounted } from "vue";
import { getAppConfig, donateAPI } from "@/apis"; import { getAppConfig, donateAPI } from "@/apis";
import useStore from "@/store"; import useStore from "@/store";
@@ -47,7 +49,7 @@ const onPay = async (index) => {
signType: "RSA", signType: "RSA",
async success(res) { async success(res) {
uni.showToast({ uni.showToast({
title: "感谢您的支持!", title: t('thank_you_for_your_support'),
icon: "none", icon: "none",
}); });
props.onClose(); props.onClose();
@@ -55,7 +57,7 @@ const onPay = async (index) => {
fail(res) { fail(res) {
console.log("pay error", res); console.log("pay error", res);
uni.showToast({ uni.showToast({
title: "取消支付", title: t('payment_canceled'),
icon: "none", icon: "none",
}); });
props.onClose(); props.onClose();
@@ -94,7 +96,7 @@ onMounted(async () => {
<template> <template>
<view class="container"> <view class="container">
<image src="https://static.shelingxingqiu.com/shootmini/static/donate.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/donate.png" mode="widthFix" />
<text>感谢您对我们公益项目的支持!</text> <text>{{ t('thank_you_for_supporting_our_community_project') }}</text>
<view class="amounts"> <view class="amounts">
<button <button
v-for="(item, index) in amounts" v-for="(item, index) in amounts"
@@ -113,25 +115,25 @@ 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>{{ t('i_have_a_suggestion_optional') }}</text>
</view> </view>
<view v-if="checked"> <view v-if="checked">
<view> <view>
<text>您的姓名</text> <text>{{ t('your_name') }}</text>
<input v-model="formData.name" /> <input v-model="formData.name" />
</view> </view>
<view> <view>
<text>手机/微信号</text> <text>{{ t('phone_wechat_id') }}</text>
<input v-model="formData.account" /> <input v-model="formData.account" />
</view> </view>
<view> <view>
<text>所在机构</text> <text>{{ t('organization') }}</text>
<input v-model="formData.organization" /> <input v-model="formData.organization" />
</view> </view>
<view> <view>
<text>建议</text> <text>{{ t('suggestion') }}</text>
<textarea v-model="formData.suggestion" /> <textarea v-model="formData.suggestion" />
</view> </view>
</view> </view>
+3 -1
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, computed, onMounted } from "vue"; import { ref, computed, onMounted } from "vue";
const props = defineProps({ const props = defineProps({
@@ -56,7 +58,7 @@ const ringText = (ring) => {
{{ b && b.ring !== undefined ? b.ring : "" }} {{ b && b.ring !== undefined ? b.ring : "" }}
</text> </text>
</view> </view>
<text>环值</text> <text>{{ t('score') }}</text>
</view> </view>
</template> </template>
+20 -26
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
const props = defineProps({ const props = defineProps({
isFinal: { isFinal: {
@@ -47,64 +49,56 @@ onBeforeUnmount(() => {
<template> <template>
<view class="round-end-tip"> <view class="round-end-tip">
<text>第{{ round }}轮射箭结束</text> <text>{{ t('round') }}{{ round }}{{ t('shooting_complete') }}</text>
<block v-if="!isFinal"> <block v-if="!isFinal">
<view class="point-view1" v-if="bluePoint !== 0 || redPoint !== 0"> <view class="point-view1" v-if="bluePoint !== 0 || redPoint !== 0">
<text>本轮蓝队</text> <text>{{ t('blue_team_this_round') }}</text>
<text>{{ <text>{{
(roundData.shoots[1] || []).reduce( (roundData.shoots[1] || []).reduce(
(last, next) => last + next.ring, (last, next) => last + next.ring,
0 0
) )
}}</text> }}</text>
<text>环,红队</text> <text>{{ t('pts_red_team') }}</text>
<text>{{ <text>{{
(roundData.shoots[2] || []).reduce( (roundData.shoots[2] || []).reduce(
(last, next) => last + next.ring, (last, next) => last + next.ring,
0 0
) )
}}</text> }}</text>
<text>环</text> <text>{{ t('pts') }}</text>
</view> </view>
<text <text
v-if="bluePoint === 0 && redPoint === 0" v-if="bluePoint === 0 && redPoint === 0"
:style="{ marginTop: '20px' }" :style="{ marginTop: '20px' }"
> >{{ t('no_arrows_were_shot_by_either_team_for_3_consecutive_turns_match') }}</text>
连续3个来回双方均无人射箭,比赛取消。 <text v-if="bluePoint !== 0 && bluePoint === redPoint">{{ t('red_and_blue_teams_each_earn') }}<text :style="{ color: '#fed847', margin: '0 5px' }">{{
</text>
<text v-if="bluePoint !== 0 && bluePoint === redPoint">
红队、蓝队各得<text :style="{ color: '#fed847', margin: '0 5px' }">{{
redPoint redPoint
}}</text }}</text
>分 >{{ t('pts_175') }}</text>
</text> <text v-if="bluePoint > redPoint">{{ t('blue_team_wins_and_earns') }}<text :style="{ color: '#fed847', margin: '0 5px' }">{{
<text v-if="bluePoint > redPoint">
蓝队获胜,得<text :style="{ color: '#fed847', margin: '0 5px' }">{{
bluePoint bluePoint
}}</text }}</text
>分 >{{ t('pts_175') }}</text>
</text> <text v-if="bluePoint < redPoint">{{ t('red_team_wins_and_earns') }}<text :style="{ color: '#fed847', margin: '0 5px' }">{{
<text v-if="bluePoint < redPoint">
红队获胜,得<text :style="{ color: '#fed847', margin: '0 5px' }">{{
redPoint redPoint
}}</text }}</text
>分 >{{ t('pts_175') }}</text>
</text>
</block> </block>
<block v-if="isFinal"> <block v-if="isFinal">
<view class="point-view2"> <view class="point-view2">
<text>蓝队</text> <text>{{ t('blue_team') }}</text>
<text>{{ bluePoint }}</text> <text>{{ bluePoint }}</text>
<text>分,红队</text> <text>{{ t('pts_red_team_179') }}</text>
<text>{{ redPoint }}</text> <text>{{ redPoint }}</text>
<text>分</text> <text>{{ t('pts_180') }}</text>
</view> </view>
<text>同分僵局!最后一箭定江山</text> <text>{{ t('a_tie_one_final_arrow_decides_the_winner') }}</text>
<view class="final-shoot"> <view class="final-shoot">
<text>{{ count }}</text> <text>{{ count }}</text>
<text>秒后蓝红双方</text> <text>{{ t('s_until_both_teams_shoot') }}</text>
<text>决金箭</text> <text>{{ t('golden_arrow') }}</text>
<text>一箭决胜负</text> <text>{{ t('one_arrow_decides_it_all') }}</text>
</view> </view>
</block> </block>
</view> </view>
+8 -3
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>
@@ -77,8 +77,13 @@ const onBtnClick = debounce(async () => {
<style scoped> <style scoped>
.sbtn { .sbtn {
margin: 0 auto; margin: 0 auto;
height: 44px; min-height: 88rpx;
line-height: 44px; height: auto;
line-height: 1.3;
padding: 20rpx 24rpx;
box-sizing: border-box;
white-space: normal;
overflow-wrap: break-word;
font-weight: bold; font-weight: bold;
font-size: 15px; font-size: 15px;
display: flex; display: flex;
+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>
+2 -2
View File
@@ -71,7 +71,7 @@ watch(
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' }"
>{{ >{{
@@ -93,7 +93,7 @@ watch(
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; */
+7 -5
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
const props = defineProps({ const props = defineProps({
arrows: { arrows: {
type: Array, type: Array,
@@ -12,19 +14,19 @@ const getSum = (...arrows) => {
(total, arrow) => total + (Number(arrow.ring) || 0), (total, arrow) => total + (Number(arrow.ring) || 0),
0 0
); );
return `${sum}环`; return t('value_pts', { p0: sum });
}; };
const roundsName = ["第一轮", "第二轮", "第三轮", "第四轮"]; const roundsName = [t('round_1'), t('round_2'), t('round_3'), t('round_4')];
const getShowText = (arrow) => { const getShowText = (arrow) => {
if (!arrow) return "-"; if (!arrow) return "-";
return arrow.ringX ? "X" : `${Number(arrow.ring) || 0}环`; return arrow.ringX ? "X" : t('value_pts', { p0: Number(arrow.ring) || 0 });
}; };
</script> </script>
<template> <template>
<view class="container"> <view class="container">
<view> <view>
<text :style="{ transform: 'translateX(-10%)' }">总成绩</text> <text :style="{ transform: 'translateX(-10%)' }">{{ t('final_score') }}</text>
<text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}环</text> <text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}{{ t('pts') }}</text>
</view> </view>
<view <view
v-for="(_, index) in new Array( v-for="(_, index) in new Array(
+22 -23
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, computed } from "vue"; import { ref, onMounted, computed } from "vue";
import IconButton from "@/components/IconButton.vue"; import IconButton from "@/components/IconButton.vue";
import SButton from "@/components/SButton.vue"; import SButton from "@/components/SButton.vue";
@@ -86,9 +88,9 @@ const openCoachComment = () => {
<image :src="tipSrc" mode="widthFix" /> <image :src="tipSrc" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/finish-frame.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/finish-frame.png" mode="widthFix" />
<text <text
>完成<text class="gold-text">{{ validArrows }}</text >{{ t('completed') }}<text class="gold-text">{{ validArrows }}</text
>箭,获得<text class="gold-text">{{ validArrows }}</text >{{ t('arrows_earned') }}<text class="gold-text">{{ validArrows }}</text
>点经验</text >{{ t('xp') }}</text
> >
</view> </view>
<view <view
@@ -96,11 +98,11 @@ const openCoachComment = () => {
:style="{ transform: `translateY(${showPanel ? '0%' : '100%'})` }" :style="{ transform: `translateY(${showPanel ? '0%' : '100%'})` }"
> >
<view> <view>
<text>本局成绩(共{{ totalRing }}环):</text> <text>{{ t('score_this_match_total') }}{{ totalRing }}{{ t('pts_194') }}</text>
<button @click="() => (showBowData = true)"> <button @click="() => (showBowData = true)">
<text>查看靶纸</text> <text>{{ t('view_target') }}</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' }"
/> />
@@ -109,20 +111,20 @@ const openCoachComment = () => {
<view :style="{ gridTemplateColumns: `repeat(${rowCount}, 1fr)` }"> <view :style="{ gridTemplateColumns: `repeat(${rowCount}, 1fr)` }">
<view v-for="(_, index) in new Array(total).fill(0)" :key="index"> <view v-for="(_, index) in new Array(total).fill(0)" :key="index">
{{ getRing(arrows[index]) {{ getRing(arrows[index])
}}<text v-if="getRing(arrows[index]) !== '-'">环</text> }}<text v-if="getRing(arrows[index]) !== '-'">{{ t('pts') }}</text>
</view> </view>
</view> </view>
<view> <view>
<block v-if="validArrows === total"> <block v-if="validArrows === total">
<IconButton <IconButton
name="分享" :name="t('share')"
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="t('coach_feedback')"
src="../static/review.png" src="https://static.shelingxingqiu.com/shootmini/static/review.png"
:onClick="openCoachComment" :onClick="openCoachComment"
/> />
</block> </block>
@@ -130,7 +132,7 @@ const openCoachComment = () => {
:width="validArrows === total ? '70vw' : 'calc(100vw - 20px)'" :width="validArrows === total ? '70vw' : 'calc(100vw - 20px)'"
:rounded="30" :rounded="30"
:onClick="closePanel" :onClick="closePanel"
>{{ validArrows === total ? "完成" : "返回" }}</SButton >{{ validArrows === total ? t('completed') : t('back') }}</SButton
> >
</view> </view>
</view> </view>
@@ -140,17 +142,16 @@ const openCoachComment = () => {
mode="tall" mode="tall"
> >
<view class="coach-comment"> <view class="coach-comment">
<text> <text>{{ t('your_score_for_this_session_is') }}<text :style="{ color: '#fed847' }">{{
您本次练习取得了<text :style="{ color: '#fed847' }">{{
totalRing totalRing
}}</text }}</text
>环的成绩,所有箭支上靶后的平均点间距为<text >{{ t('pts_the_average_distance_between_your_arrow_impacts_is') }}<text
:style="{ color: '#fed847' }" :style="{ color: '#fed847' }"
>{{ Number((result?.interpretation?.spreadStability || 0).toFixed(2)) }}</text >{{ Number((result?.interpretation?.spreadStability || 0).toFixed(2)) }}</text
>,{{ >,{{
result.spreadEvaluation === "Dispersed" result.spreadEvaluation === "Dispersed"
? "还需要持续改进哦~" ? t('keep_practicing')
: "成绩优秀。" : t('excellent_performance')
}} }}
</text> </text>
<view> <view>
@@ -159,14 +160,12 @@ const openCoachComment = () => {
mode="widthFix" mode="widthFix"
/> />
<text :style="{ marginTop: '12px' }" <text :style="{ marginTop: '12px' }"
>针对您本次的练习,{{ >{{ t('for_this_session') }}{{
result.spreadEvaluation === "Dispersed" result.spreadEvaluation === "Dispersed"
? "我们建议您充分练习推弓、靠位以及撒放动作一致性。" ? t('we_recommend_practicing_consistency_in_your_bow_arm_anchor_point')
: totalRing >= 100 : totalRing >= 100
? "我们建议您继续保持即可。" ? t('we_recommend_keeping_up_the_good_work')
: `我们建议您将设备的瞄准器${ : t('we_recommend_adjusting_your_sight_value', { p0: directionAdjusts[result.adjustmentHint] })
directionAdjusts[result.adjustmentHint]
}调整。`
}}</text }}</text
> >
</view> </view>
+14 -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,14 @@ 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); }
/* 英文教练点评较长,保持弹窗按钮可见。 */
.container :deep(.coach-comment) {
max-height: 100%;
overflow-y: auto;
overflow-wrap: break-word;
} }
</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"
/> />
+4 -2
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref } from "vue"; import { ref } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
const props = defineProps({ const props = defineProps({
@@ -73,8 +75,8 @@ onShow(async () => {
> >
<slot></slot> <slot></slot>
<view class="tips"> <view class="tips">
<text v-if="loading">加载中...</text> <text v-if="loading">{{ t('loading') }}</text>
<text v-if="noMore">{{ count === 0 ? "暂无数据" : "没有更多了" }}</text> <text v-if="noMore">{{ count === 0 ? t('no_data_yet') : t('no_more_results') }}</text>
</view> </view>
</scroll-view> </scroll-view>
</template> </template>
+7 -5
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t, formatBattleTip } from "@/locales";
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";
@@ -135,9 +137,9 @@ watch(
const tipContent = computed(() => { const tipContent = computed(() => {
if (halfTime.value) { if (halfTime.value) {
return props.battleId ? "中场休息" : `中场休息(${wait.value}秒)`; return props.battleId ? t('halftime') : t('halftime_values', { p0: wait.value });
} }
return props.start && remain.value === 0 ? "时间到!" : props.tips; return props.start && remain.value === 0 ? t('time_s_up') : props.tips;
}); });
const updateSound = () => { const updateSound = () => {
@@ -204,10 +206,10 @@ onBeforeUnmount(() => {
<view class="container" :style="{ display: show ? 'block' : 'none' }"> <view class="container" :style="{ display: show ? 'block' : 'none' }">
<view> <view>
<image src="https://static.shelingxingqiu.com/shootmini/static/shooter.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/shooter.png" mode="widthFix" />
<text>{{ tipContent }}</text> <text>{{ formatBattleTip(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>
@@ -221,7 +223,7 @@ onBeforeUnmount(() => {
transition: transitionStyle, transition: transitionStyle,
}" }"
/> />
<text>剩余{{ remain }}秒</text> <text>{{ t('remaining') }}{{ remain }}{{ t('s') }}</text>
</view> </view>
</view> </view>
</template> </template>
+3 -1
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import {ref, watch, onMounted, onBeforeUnmount} from "vue"; import {ref, watch, onMounted, onBeforeUnmount} from "vue";
import {RoundGoldImages} from "@/constants"; import {RoundGoldImages} from "@/constants";
@@ -129,7 +131,7 @@ onBeforeUnmount(() => {
transition: transitionStyle, transition: transitionStyle,
}" }"
/> />
<text v-if="!loading">剩余{{ remain }}秒</text> <text v-if="!loading">{{ t('remaining') }}{{ remain }}{{ t('s') }}</text>
<text v-else>···</text> <text v-else>···</text>
</view> </view>
</view> </view>
+23 -24
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch } from "vue"; import { ref, watch } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
import SModal from "@/components/SModal.vue"; import SModal from "@/components/SModal.vue";
@@ -12,12 +14,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: {
@@ -84,25 +85,25 @@ const handleLogin = async () => {
if (loading.value) return; if (loading.value) return;
if (!phone.value) { if (!phone.value) {
return uni.showToast({ return uni.showToast({
title: "请获取手机号", title: t('please_authorize_your_phone_number'),
icon: "none", icon: "none",
}); });
} }
if (!avatarUrl.value) { if (!avatarUrl.value) {
return uni.showToast({ return uni.showToast({
title: "请选择头像", title: t('please_select_an_avatar'),
icon: "none", icon: "none",
}); });
} }
if (!nickName.value) { if (!nickName.value) {
return uni.showToast({ return uni.showToast({
title: "请输入昵称", title: t('please_enter_a_nickname'),
icon: "none", icon: "none",
}); });
} }
if (!agree.value) { if (!agree.value) {
return uni.showToast({ return uni.showToast({
title: "请先同意协议", title: t('please_agree_to_the_agreements_first'),
icon: "none", icon: "none",
}); });
} }
@@ -125,8 +126,6 @@ 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();
} }
@@ -168,7 +167,7 @@ onShow(() => {
<SModal :show="show" :onClose="onClose" :noBg="noBg"> <SModal :show="show" :onClose="onClose" :noBg="noBg">
<view class="container" :style="{ background: noBg ? '#fff' : 'none' }"> <view class="container" :style="{ background: noBg ? '#fff' : 'none' }">
<view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }"> <view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }">
<text :style="{ color: noBg ? '#666' : '#fff' }">手机:</text> <text :style="{ color: noBg ? '#666' : '#fff' }">{{ t('phone') }}</text>
<button <button
:open-type="!phone ? 'getPhoneNumber' : ''" :open-type="!phone ? 'getPhoneNumber' : ''"
@getphonenumber="getphonenumber" @getphonenumber="getphonenumber"
@@ -179,13 +178,13 @@ onShow(() => {
phone phone
}}</text> }}</text>
<text v-else :style="{ color: noBg ? '#666' : '#fff9' }" <text v-else :style="{ color: noBg ? '#666' : '#fff9' }"
>点击获取</text >{{ t('authorize') }}</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' }">
<text :style="{ color: noBg ? '#666' : '#fff' }">头像:</text> <text :style="{ color: noBg ? '#666' : '#fff' }">{{ t('avatar') }}</text>
<button <button
open-type="chooseAvatar" open-type="chooseAvatar"
@chooseavatar="onChooseAvatar" @chooseavatar="onChooseAvatar"
@@ -194,20 +193,20 @@ onShow(() => {
> >
<Avatar v-if="avatarUrl" :src="avatarUrl" :size="30" /> <Avatar v-if="avatarUrl" :src="avatarUrl" :size="30" />
<text v-else :style="{ color: noBg ? '#666' : '#fff9' }" <text v-else :style="{ color: noBg ? '#666' : '#fff9' }"
>点击获取</text >{{ t('authorize') }}</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
class="nickname" class="nickname"
:style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }"
> >
<text :style="{ color: noBg ? '#666' : '#fff' }">昵称:</text> <text :style="{ color: noBg ? '#666' : '#fff' }">{{ t('nickname') }}</text>
<input <input
type="nickname" type="nickname"
:value="nickName" :value="nickName"
placeholder="请输入昵称" :placeholder="t('please_enter_a_nickname')"
:placeholder-style="`color: ${noBg ? '#666' : '#fff9'} `" :placeholder-style="`color: ${noBg ? '#666' : '#fff9'} `"
@input="onNicknameChange" @input="onNicknameChange"
@change="onNicknameChange" @change="onNicknameChange"
@@ -216,11 +215,11 @@ onShow(() => {
</view> </view>
<SButton :rounded="20" width="80vw" :onClick="handleLogin"> <SButton :rounded="20" width="80vw" :onClick="handleLogin">
<block v-if="!loading"> <block v-if="!loading">
<text :style="{ color: '#000' }">手机号快捷登录</text> <text :style="{ color: '#000' }">{{ t('sign_in_with_phone_number') }}</text>
</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"
/> />
@@ -231,21 +230,21 @@ 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>{{ t('i_have_read_and_agree_to_the') }}</text>
<view <view
@click.stop="openServiceLink" @click.stop="openServiceLink"
:style="{ color: noBg ? '#333' : '#ffffff99' }" :style="{ color: noBg ? '#333' : '#ffffff99' }"
>《用户协议》</view >{{ t('user_agreement') }}</view
> >
<text>及</text> <text>{{ t('and') }}</text>
<view <view
@click.stop="openPrivacyLink" @click.stop="openPrivacyLink"
:style="{ color: noBg ? '#333' : '#ffffff99' }" :style="{ color: noBg ? '#333' : '#ffffff99' }"
>《隐私协议》</view >{{ t('privacy_policy') }}</view
> >
<text>内容</text> <text>{{ t('terms') }}</text>
</view> </view>
</view> </view>
</view> </view>
+3 -1
View File
@@ -164,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 单独深合并。
@@ -319,7 +321,7 @@ const drawSectorHighlight = (
(angles.endAngle - angles.startAngle) * safeRevealProgress, (angles.endAngle - angles.startAngle) * safeRevealProgress,
style.color, style.color,
style.strokeColor, style.strokeColor,
Math.max(1, targetRadius * style.lineWidthRatio) Math.max(1, targetRadius * style.lineWidthRatio) * style.lineWidthScale
); );
}); });
}; };
+7 -5
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch } from "vue"; import { ref, watch } from "vue";
import SButton from "@/components/SButton.vue"; import SButton from "@/components/SButton.vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
@@ -77,11 +79,11 @@ const handleConfirm = () => {
<view class="header"> <view class="header">
<view class="header-title"> <view class="header-title">
<view class="header-title-line-left"></view> <view class="header-title-line-left"></view>
<text>选择靶型</text> <text>{{ t('select_target_type') }}</text>
<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">
@@ -89,17 +91,17 @@ const handleConfirm = () => {
:class="{ 'target-btn': true, 'target-choosen': selectedTarget === 1 }" :class="{ 'target-btn': true, 'target-choosen': selectedTarget === 1 }"
@click="handleSelectTarget(1)" @click="handleSelectTarget(1)"
> >
<text>20厘米全环靶</text> <text>{{ t('20_cm_full_ring_target') }}</text>
</view> </view>
<view style="width: 30rpx"></view> <view style="width: 30rpx"></view>
<view <view
:class="{ 'target-btn': true, 'target-choosen': selectedTarget === 2 }" :class="{ 'target-btn': true, 'target-choosen': selectedTarget === 2 }"
@click="handleSelectTarget(2)" @click="handleSelectTarget(2)"
> >
<text>40厘米全环靶</text> <text>{{ t('40_cm_full_ring_target') }}</text>
</view> </view>
</view> </view>
<SButton width="694rpx" :onClick="handleConfirm">确定</SButton> <SButton width="694rpx" :onClick="handleConfirm">{{ t('confirm_134') }}</SButton>
</view> </view>
</view> </view>
</template> </template>
+5 -3
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch } from "vue"; import { ref, watch } from "vue";
const props = defineProps({ const props = defineProps({
isRed: { isRed: {
@@ -65,7 +67,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,11 +88,11 @@ 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' }"
>{{ isRed ? "红队" : "蓝队" }}</text >{{ isRed ? t('red_team') : t('blue_team') }}</text
> >
</view> </view>
<text <text
+9 -9
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
import Guide from "@/components/Guide.vue"; import Guide from "@/components/Guide.vue";
import BowPower from "@/components/BowPower.vue"; import BowPower from "@/components/BowPower.vue";
@@ -135,8 +137,8 @@ onBeforeUnmount(() => {
<view class="container"> <view class="container">
<Guide v-show="guide"> <Guide v-show="guide">
<view class="guide-tips"> <view class="guide-tips">
<text>请确保站距达到5米</text> <text>{{ t('stand_at_least_5_m_from_the_target') }}</text>
<text>低于5米的射箭无效</text> <text>{{ t('shots_from_under_5_m_do_not_count') }}</text>
</view> </view>
</Guide> </Guide>
<view class="test-area"> <view class="test-area">
@@ -150,15 +152,13 @@ onBeforeUnmount(() => {
@click="simulShoot" @click="simulShoot"
hover-class="none" hover-class="none"
v-if="showsimul" v-if="showsimul"
> >{{ t('simulate_shot') }}</button>
模拟射箭
</button>
<view class="warnning-text"> <view class="warnning-text">
<block v-if="statusText"> <block v-if="statusText">
<text>{{ statusText }}</text> <text>{{ statusText }}</text>
</block> </block>
<block v-else> <block v-else>
<text>请射箭,测试站距与靶纸</text> <text>{{ t('shoot_to_check_distance_and_target_face') }}</text>
</block> </block>
</view> </view>
<view class="user-row"> <view class="user-row">
@@ -169,11 +169,11 @@ onBeforeUnmount(() => {
<view v-if="isBattle" class="ready-timer"> <view v-if="isBattle" class="ready-timer">
<image src="https://static.shelingxingqiu.com/shootmini/static/test-tip.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/test-tip.png" mode="widthFix" />
<view v-if="count >= 0"> <view v-if="count >= 0">
<text>距离正式比赛还有</text> <text>{{ t('match_starts_in') }}</text>
<text>{{ count }}</text> <text>{{ count }}</text>
<text>秒</text> <text>{{ t('s') }}</text>
</view> </view>
<view v-else> 进入中... </view> <view v-else>{{ t('joining') }}</view>
</view> </view>
</view> </view>
</template> </template>
+5 -3
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, watch, onMounted, onBeforeUnmount } from "vue"; import { ref, watch, onMounted, onBeforeUnmount } from "vue";
const props = defineProps({ const props = defineProps({
countdown: { countdown: {
@@ -42,11 +44,11 @@ onBeforeUnmount(() => {
class="container" class="container"
:style="{ transform: `translateX(${show ? '0' : '100'}%)` }" :style="{ transform: `translateX(${show ? '0' : '100'}%)` }"
> >
<view>距离正式比赛</view> <view>{{ t('match') }}</view>
<view> <view>
<text>开始还有</text> <text>{{ t('starts_in') }}</text>
<text>{{ count }}</text> <text>{{ count }}</text>
<text>秒</text> <text>{{ t('s') }}</text>
</view> </view>
</view> </view>
</template> </template>
+3 -4
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { computed } from "vue"; import { computed } from "vue";
const MAX_VISIBLE_SCORE_CARDS = 60; const MAX_VISIBLE_SCORE_CARDS = 60;
@@ -59,10 +61,7 @@ const displayArrows = computed(() => {
<template> <template>
<view v-if="displayArrows.length" class="score-panel"> <view v-if="displayArrows.length" class="score-panel">
<text v-if="hiddenScoreCount" class="score-window-tip"> <text v-if="hiddenScoreCount" class="score-window-tip">{{ t('earlier') }}{{ hiddenScoreCount }}{{ t('arrows_hidden_showing_the_latest') }}{{ MAX_VISIBLE_SCORE_CARDS }}{{ t('arrows_241') }}</text>
已省略前 {{ hiddenScoreCount }} 支,仅显示最近
{{ MAX_VISIBLE_SCORE_CARDS }} 支
</text>
<view class="score-grid"> <view class="score-grid">
<view <view
v-for="(arrow, index) in displayArrows" v-for="(arrow, index) in displayArrows"
+14 -12
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, computed, watch } from "vue"; import { ref, computed, watch } from "vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
import useStore from "@/store"; import useStore from "@/store";
@@ -95,12 +97,12 @@ 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>
<view class="user-stats"> <view class="user-stats">
<text class="level-tag level-tag-first">段位积分</text> <text class="level-tag level-tag-first">{{ t('rank_points') }}</text>
<view class="rank-tag"> <view class="rank-tag">
<view <view
class="rank-tag-progress" class="rank-tag-progress"
@@ -117,31 +119,31 @@ 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">
<text>本赛季全国</text> <text>{{ t('national_rank_this_season') }}</text>
<text class="rank-number" <text class="rank-number"
>第<text :style="{ color: '#ffd700' }" >{{ t('round') }}<text :style="{ color: '#ffd700' }"
>{{ user.ranking }}/{{ rankData.rank.length }}</text >{{ user.ranking }}/{{ rankData.rank.length }}</text
>名</text >{{ t('empty') }}</text
> >
</block> </block>
<block v-else> <block v-else>
<text>本赛季</text> <text>{{ t('this_season') }}</text>
<text>暂未上榜</text> <text>{{ t('unranked') }}</text>
</block> </block>
</view> </view>
</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>{{ t('welcome_new_archer') }}</text>
<view> <view>
<text>登录</text> <text>{{ t('sign_in') }}</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>
+6 -4
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -52,7 +54,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,9 +77,9 @@ 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>{{ t('congratulations_you_reached') }}</text>
<text>{{ showRank ? nextRankTitle : `射灵${lvl}级` }}</text> <text>{{ showRank ? nextRankTitle : t('sheling_level_value', { p0: lvl }) }}</text>
<text>!</text> <text>!</text>
</view> </view>
<!-- <button @click="onClose" hover-class="none">关闭</button> --> <!-- <button @click="onClose" hover-class="none">关闭</button> -->
+242
View File
@@ -0,0 +1,242 @@
import { t } from "@/locales";
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: t('preparing_firmware_update'),
downloading: t('downloading_firmware'),
installing: t('installing_firmware'),
};
// 设备详情中的 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] || t('updating_firmware')
);
const resultTitle = computed(() =>
resultStatus.value === "success" ? t('firmware_update_complete_250') : t('firmware_update_failed')
);
const resultContent = computed(() => {
if (resultStatus.value === "success") return t('firmware_update_complete');
return resultReason.value || t('update_failed_check_your_device_and_network_then_retry');
});
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", t('firmware_update_timed_out_please_try_again'), 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: t('target_firmware_version_is_missing'), 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", t('firmware_update_timed_out_please_try_again'), runId);
}, UPDATE_TIMEOUT);
try {
const updateResult = await sendHardwareBoxUpdateAPI({
versionNumber: targetVersion,
wifiSsid,
wifiPassword,
});
if (runId !== updateRunId || !updating.value) return false;
if (!updateResult?.taskId) {
finishUpdate("failed", t('could_not_create_the_firmware_update_task_please_retry'), runId);
return false;
}
return true;
} catch (error) {
if (runId === updateRunId) {
finishUpdate(
"failed",
error?.message || t('firmware_update_request_failed_please_retry'),
runId
);
}
return false;
}
};
const closeResult = () => {
resultVisible.value = false;
};
return {
updating,
progress,
phase,
phaseText,
resultVisible,
resultStatus,
resultTitle,
resultContent,
startUpdate,
closeResult,
};
};
+27 -26
View File
@@ -1,3 +1,4 @@
import { t } from "@/locales";
export const MESSAGETYPES = { export const MESSAGETYPES = {
ShootSyncMeArrowID: parseInt("0x789b6b0d"), // 2023451405 ShootSyncMeArrowID: parseInt("0x789b6b0d"), // 2023451405
ShootSyncMePracticeID: parseInt("0xD88AE05E"), // 3632980062 ShootSyncMePracticeID: parseInt("0xD88AE05E"), // 3632980062
@@ -80,15 +81,15 @@ export const meleeAvatarColors = [
]; ];
export const orderStatusNames = { export const orderStatusNames = {
1: "待付款", 1: t('awaiting_payment'),
2: "已付款", 2: t('paid'),
3: "已发货", 3: t('shipped'),
4: "已完成", 4: t('completed_260'),
5: "已关闭", 5: t('closed'),
6: "申请退款", 6: t('refund_requested'),
7: "退款中", 7: t('refund_in_progress'),
8: "已退款", 8: t('refunded'),
9: "拒绝退款", 9: t('refund_declined'),
}; };
export const getStatusColor = (status) => { export const getStatusColor = (status) => {
@@ -103,14 +104,14 @@ export const getStatusColor = (status) => {
}; };
export const directionAdjusts = { export const directionAdjusts = {
AdjustLowerRight: "向右下方调瞄", AdjustLowerRight: t('down_and_right'),
AdjustDown: "向下方调瞄", AdjustDown: t('down'),
AdjustLowerLeft: "向左下方调瞄", AdjustLowerLeft: t('down_and_left'),
AdjustLeft: "向左侧调瞄", AdjustLeft: t('left'),
AdjustUpperLeft: "向左上侧调瞄", AdjustUpperLeft: t('up_and_left'),
AdjustUp: "向上方调瞄", AdjustUp: t('up'),
AdjustUpperRight: "向右上方调瞄", AdjustUpperRight: t('up_and_right'),
AdjustRight: "向右侧调瞄", AdjustRight: t('right'),
}; };
export const getBattleResultTips = ( export const getBattleResultTips = (
@@ -145,12 +146,12 @@ export const getBattleResultTips = (
} else { } else {
if (rank <= 3) { if (rank <= 3) {
const tests = [ const tests = [
"好成绩!全国排位赛等着你!", t('great_score_the_national_ranked_matches_await'),
"持续练习,就会迎来更多高光时刻!", t('keep_practicing_for_more_moments_to_shine'),
]; ];
return tests[getRandomIndex(2)]; return tests[getRandomIndex(2)];
} else { } else {
return "每日练习打卡,争取下次脱颖而出!"; return t('practice_daily_and_stand_out_next_time');
} }
} }
} else if (gameMode === 2) { } else if (gameMode === 2) {
@@ -179,16 +180,16 @@ export const getBattleResultTips = (
} else { } else {
if (score > 0) { if (score > 0) {
const tests = [ const tests = [
"王者一定属于你!", t('the_top_rank_is_within_your_reach'),
"高光时刻!继续保持!", t('a_moment_to_shine_keep_it_up'),
"射灵世界的佼佼者!", t('one_of_the_best_in_the_sheling_world'),
]; ];
return tests[getRandomIndex(3)]; return tests[getRandomIndex(3)];
} else { } else {
const tests = [ const tests = [
"再来一次,定能脱颖而出!", t('try_again_and_make_your_mark'),
"加强练习,争取越战越勇", t('practice_more_and_come_back_stronger'),
"人生走过的每一步都算数", t('every_step_you_take_counts'),
]; ];
return tests[getRandomIndex(3)]; return tests[getRandomIndex(3)];
} }
+1110
View File
File diff suppressed because it is too large Load Diff
+40
View File
@@ -0,0 +1,40 @@
import { createI18n } from "vue-i18n";
import en from "./en.json";
import sourceKeys from "./source-keys.json";
// 英文构建固定使用英文,不读取或写入用户语言与业务缓存。
export const i18n = createI18n({
legacy: false,
locale: "en",
fallbackLocale: "en",
messages: { en },
});
// uni-app 的小程序运行库可能直接返回原始文案,参数在此统一替换一次。
// 从固定英文词条读取,避免完整版运行库先插值后再次处理参数值里的花括号。
export const t = (key, params = {}) => {
const message = Object.prototype.hasOwnProperty.call(en, key)
? en[key]
: i18n.global.t(key);
return message.replace(/\{(p\d+)\}/g, (placeholder, name) =>
params != null && Object.prototype.hasOwnProperty.call(params, name)
? String(params[name] ?? "")
: placeholder
);
};
// 仅用于明确来自前端静态配置的双用途原值;禁止用于接口响应或用户输入。
export const translateStatic = (value) => {
const key = Object.prototype.hasOwnProperty.call(sourceKeys, value) ? sourceKeys[value] : null;
return key ? t(key) : value;
};
// 比赛提示保留中文原值供语音与状态判断使用,只在渲染时转换。
export const formatBattleTip = (value) => {
const text = String(value || "").replace(/你/g, "").replace(/重回/g, "");
const half = text.match(/^(上|下)半场:请先射6箭$/);
if (half) return `${half[1] === "上" ? "First" : "Second"} half: shoot 6 arrows first`;
const round = text.match(/^请开始射箭第(.+)轮$/);
if (round) return t(sourceKeys["请开始射箭第{p0}轮"], { p0: translateStatic(round[1]) });
return translateStatic(text);
};
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+2
View File
@@ -2,6 +2,7 @@ import { createSSRApp } from 'vue'
import { createPinia } from 'pinia' import { createPinia } from 'pinia'
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate' import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
import App from './App.vue' import App from './App.vue'
import { i18n } from './locales'
import audioManager from './audioManager' import audioManager from './audioManager'
export function createApp() { export function createApp() {
@@ -9,6 +10,7 @@ export function createApp() {
const pinia = createPinia() const pinia = createPinia()
pinia.use(piniaPluginPersistedstate) pinia.use(piniaPluginPersistedstate)
app.use(pinia) app.use(pinia)
app.use(i18n)
/** /**
* 全局点击音效工具函数,用于在任意按钮/元素点击时自动播放音效。 * 全局点击音效工具函数,用于在任意按钮/元素点击时自动播放音效。
+9 -1
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"
} }
] ]
}, },
@@ -313,7 +321,7 @@
"themeLocation" : "theme.json", "themeLocation" : "theme.json",
"permission" : { "permission" : {
"scope.userLocation": { "scope.userLocation": {
"desc": "用于扫描附近 WiFi,完成设备 OTA 升级网络连接" "desc": "Find Wi-Fi for device updates"
} }
}, },
"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ] "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
+5
View File
@@ -18,6 +18,7 @@ import {
getPrecisionShotAudioKeys, getPrecisionShotAudioKeys,
getRhythmShotAudioKeys, getRhythmShotAudioKeys,
getStabilityShotAudioKeys, getStabilityShotAudioKeys,
getTrainingEndAudioKey,
getTrainingStartAudioKey, getTrainingStartAudioKey,
STABILITY_ENERGY_50_AUDIO_KEY, STABILITY_ENERGY_50_AUDIO_KEY,
STABILITY_ENERGY_70_AUDIO_KEY, STABILITY_ENERGY_70_AUDIO_KEY,
@@ -603,6 +604,10 @@ 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);
+30 -15
View File
@@ -21,9 +21,6 @@
{ {
"path": "pages/audio-test" "path": "pages/audio-test"
}, },
{
"path": "pages/calibration"
},
{ {
"path": "pages/about-us" "path": "pages/about-us"
}, },
@@ -60,12 +57,6 @@
{ {
"path": "pages/match-page" "path": "pages/match-page"
}, },
{
"path": "pages/my-device"
},
{
"path": "pages/device-intro"
},
{ {
"path": "pages/user" "path": "pages/user"
}, },
@@ -107,12 +98,6 @@
}, },
{ {
"path": "pages/mine-bow-data" "path": "pages/mine-bow-data"
},
{
"path": "pages/ota-wifi",
"style": {
"navigationStyle": "custom"
}
} }
], ],
"globalStyle": { "globalStyle": {
@@ -136,6 +121,9 @@
{ {
"root": "pages/coin", "root": "pages/coin",
"pages": [ "pages": [
{
"path": "vip-intro"
},
{ {
"path": "index" "path": "index"
}, },
@@ -159,6 +147,33 @@
{ {
"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"
} }
+6 -8
View File
@@ -1,25 +1,23 @@
<script setup> <script setup>
import { t } from "@/locales";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
const isIOS = uni.getDeviceInfo().osName === "ios"; const isIOS = uni.getDeviceInfo().osName === "ios";
</script> </script>
<template> <template>
<Container title="关于我们"> <Container :title="t('about_us')">
<view class="container"> <view class="container">
<view class="text"> <view class="text">{{ t('sheling_planet_is_a_platform_for_professional_archers_and_archer') }}</view>
《射灵星球》是以智能和物联网技术驱动的全球射箭专业选手及射箭爱好者互动交流平台,由广州光点飞舞网络有限公司研发并提供线上服务。
</view>
<view class="text"> <view class="text">{{ t('we_explore_and_apply_smart_archery_technology_through_innovation') }}</view>
我们专注于智能射箭技术的探索和应用,通过物联网技术、激光系统、人工智能、嵌入式AI及射箭在线互娱模式的创新与研发,提供专业的智能体育设备和有趣的在线物联游戏,以此推动射箭运动及更多专业体育运动走入大众家庭。
</view>
<view <view
class="copyright" class="copyright"
:style="{ paddingBottom: isIOS ? '40rpx' : '20rpx' }" :style="{ paddingBottom: isIOS ? '40rpx' : '20rpx' }"
> >
<text>粤ICP备2025421150号-2X</text> <text>{{ t('guangdong_icp_no_2025421150_2x') }}</text>
</view> </view>
</view> </view>
</Container> </Container>
+9 -11
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import audioManager, { audioFils } from "@/audioManager"; import audioManager, { audioFils } from "@/audioManager";
@@ -30,25 +32,21 @@ onBeforeUnmount(() => {
</script> </script>
<template> <template>
<Container title="音频测试"> <Container :title="t('audio_test')">
<view class="container"> <view class="container">
<view> <view>
<text>连续播放1</text> <text>{{ t('continuous_playback_1') }}</text>
<button hover-class="none" @click="playAudio(['第一轮', '请蓝方射箭'])"> <button hover-class="none" @click="playAudio(['第一轮', '请蓝方射箭'])">{{ t('play') }}</button>
播放
</button>
</view> </view>
<view> <view>
<text>连续播放2</text> <text>{{ t('continuous_playback_2') }}</text>
<button hover-class="none" @click="playAudio(['第二轮', '请红方射箭'])"> <button hover-class="none" @click="playAudio(['第二轮', '请红方射箭'])">{{ t('play') }}</button>
播放
</button>
</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>{{ loaded[key] ? "已加载" : "未加载" }}</text> <text>{{ loaded[key] ? t('loaded') : t('not_loaded') }}</text>
<button hover-class="none" @click="playAudio(key)"> <button hover-class="none" @click="playAudio(key)">
{{ loaded[key] ? "播放" : "加载并播放" }} {{ loaded[key] ? t('play_301') : t('load_and_play') }}
</button> </button>
</view> </view>
</view> </view>
+20 -21
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, computed, onMounted } from "vue"; 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";
@@ -92,7 +94,7 @@ const checkBowData = () => {
? 'linear-gradient(270deg, #3597ff 0%, rgba(0,0,0,0) 100%);' ? 'linear-gradient(270deg, #3597ff 0%, rgba(0,0,0,0) 100%);'
: 'linear-gradient(270deg, #fd4444 0%, rgba(0, 0, 0, 0) 100%)', : 'linear-gradient(270deg, #fd4444 0%, rgba(0, 0, 0, 0) 100%)',
}" }"
>{{ data.winTeam === 1 ? "蓝队" : "红队" }}获胜</text >{{ data.winTeam === 1 ? t('blue_team') : t('red_team') }}{{ t('win') }}</text
> >
<Avatar <Avatar
:size="32" :size="32"
@@ -121,7 +123,7 @@ const checkBowData = () => {
<view v-if="data.mvp && data.mvp.player_match_result.total_ring"> <view v-if="data.mvp && data.mvp.player_match_result.total_ring">
<image src="https://static.shelingxingqiu.com/shootmini/static/title-mvp.png" mode="widthFix" /> <image src="https://static.shelingxingqiu.com/shootmini/static/title-mvp.png" mode="widthFix" />
<text <text
>斩获<text >{{ t('scored') }}<text
:style="{ :style="{
color: '#fed847', color: '#fed847',
fontSize: '18px', fontSize: '18px',
@@ -129,7 +131,7 @@ const checkBowData = () => {
fontWeight: '600', fontWeight: '600',
}" }"
>{{ data.mvp.player_match_result.total_ring }}</text >{{ data.mvp.player_match_result.total_ring }}</text
>环</text >{{ t('pts') }}</text
> >
</view> </view>
<view v-if="data.mvp && data.mvp.length"> <view v-if="data.mvp && data.mvp.length">
@@ -145,7 +147,7 @@ const checkBowData = () => {
:style="{ :style="{
backgroundColor: myTeam === 1 ? '#5fadff' : '#ff6060', backgroundColor: myTeam === 1 ? '#5fadff' : '#ff6060',
}" }"
>自己</text >{{ t('me') }}</text
> >
</view> </view>
<text class="truncate">{{ player.name }}</text> <text class="truncate">{{ player.name }}</text>
@@ -156,7 +158,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"
/> />
@@ -193,37 +195,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">{{
@@ -239,8 +241,7 @@ const checkBowData = () => {
<text>{{ getLvlName(player.rank_lvl) }}</text> <text>{{ getLvlName(player.rank_lvl) }}</text>
</view> </view>
<text <text
><text :style="{ color: '#fff' }">{{ player.totalRing }}</text> ><text :style="{ color: '#fff' }">{{ player.totalRing }}</text>{{ t('pts_308') }}</text
环</text
> >
</view> </view>
</view> </view>
@@ -259,19 +260,17 @@ const checkBowData = () => {
<text <text
:style="{ backgroundColor: '#5fadff' }" :style="{ backgroundColor: '#5fadff' }"
v-if="data.mode <= 3 && myTeam === 1" v-if="data.mode <= 3 && myTeam === 1"
>蓝队</text >{{ t('blue_team') }}</text
> >
<text <text
:style="{ backgroundColor: '#ff6060' }" :style="{ backgroundColor: '#ff6060' }"
v-if="data.mode <= 3 && myTeam === 2" v-if="data.mode <= 3 && myTeam === 2"
>红队</text >{{ t('red_team') }}</text
> >
</view> </view>
<text v-if="data.way === 1"> <text v-if="data.way === 1">{{ t('your_xp') }}{{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}
你的经验 {{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}
</text> </text>
<text v-if="data.way === 2"> <text v-if="data.way === 2">{{ t('your_points') }}{{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}
你的积分 {{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}
</text> </text>
</view> </view>
<text v-if="data.mode > 3" class="description"> <text v-if="data.mode > 3" class="description">
@@ -284,8 +283,8 @@ const checkBowData = () => {
}} }}
</text> </text>
<view class="op-btn"> <view class="op-btn">
<view @click="checkBowData">查看成绩</view> <view @click="checkBowData">{{ t('view_results') }}</view>
<view @click="exit">返回</view> <view @click="exit">{{ t('back') }}</view>
</view> </view>
<UserUpgrade /> <UserUpgrade />
<DeviceChargingDialog /> <DeviceChargingDialog />
+43 -45
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, computed, onBeforeUnmount } from "vue"; import { ref, onMounted, computed, onBeforeUnmount } from "vue";
import { onShow, onHide, onLoad, onShareAppMessage } from "@dcloudio/uni-app"; import { onShow, onHide, onLoad, onShareAppMessage } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
@@ -53,10 +55,10 @@ const normalizeRoomPlayer = (member = {}) => ({
* battleType=2: 多人乱斗 * battleType=2: 多人乱斗
*/ */
const battleTitle = computed(() => { const battleTitle = computed(() => {
if (!room.value.battleType) return "好友约战"; if (!room.value.battleType) return t('friend_challenge');
if (room.value.battleType === 2) return "多人乱斗"; if (room.value.battleType === 2) return t('free_for_all');
const half = room.value.count / 2; const half = room.value.count / 2;
return `${half}v${half}对抗赛`; return t('valuevvalue_versus', { p0: half, p1: half });
}); });
/** 靶纸尺寸(cm),由 URL 参数或 API 返回的 targetType 字段填充 */ /** 靶纸尺寸(cm),由 URL 参数或 API 返回的 targetType 字段填充 */
@@ -146,7 +148,7 @@ async function reconcileBattleRoom(generation) {
if (!isCurrentForeground(generation)) return; if (!isCurrentForeground(generation)) return;
console.log("resume room match info error", error); console.log("resume room match info error", error);
uni.showToast({ uni.showToast({
title: "比赛状态查询失败,请重试", title: t('could_not_check_match_status_please_retry'),
icon: "none", icon: "none",
}); });
return; return;
@@ -159,7 +161,7 @@ async function reconcileBattleRoom(generation) {
} catch (error) { } catch (error) {
console.log("return to room battle error", error); console.log("return to room battle error", error);
uni.showToast({ uni.showToast({
title: "进入比赛失败,请重试", title: t('could_not_join_the_match_please_retry'),
icon: "none", icon: "none",
}); });
} }
@@ -187,7 +189,7 @@ async function reconcileBattleRoom(generation) {
if (!isCurrentForeground(generation)) return; if (!isCurrentForeground(generation)) return;
console.log("retry room match info error", error); console.log("retry room match info error", error);
uni.showToast({ uni.showToast({
title: "比赛状态查询失败,请重试", title: t('could_not_check_match_status_please_retry'),
icon: "none", icon: "none",
}); });
return; return;
@@ -200,7 +202,7 @@ async function reconcileBattleRoom(generation) {
} catch (error) { } catch (error) {
console.log("return to room battle error", error); console.log("return to room battle error", error);
uni.showToast({ uni.showToast({
title: "进入比赛失败,请重试", title: t('could_not_join_the_match_please_retry'),
icon: "none", icon: "none",
}); });
} }
@@ -208,7 +210,7 @@ async function reconcileBattleRoom(generation) {
} }
uni.showToast({ uni.showToast({
title: "比赛正在创建,请稍候", title: t('creating_match_please_wait'),
icon: "none", icon: "none",
}); });
} }
@@ -352,7 +354,7 @@ async function onReceiveMessage(message) {
} else if (msg.constructor === MESSAGETYPES.UserExitRoom) { } else if (msg.constructor === MESSAGETYPES.UserExitRoom) {
if (msg.userId === user.value.id) { if (msg.userId === user.value.id) {
uni.showToast({ uni.showToast({
title: "你被踢出房间", title: t('you_have_been_removed_from_the_room'),
icon: "none", icon: "none",
}); });
setTimeout(() => { setTimeout(() => {
@@ -367,7 +369,7 @@ async function onReceiveMessage(message) {
refreshRoomData(); refreshRoomData();
} else if (msg.constructor === MESSAGETYPES.RoomDestroy) { } else if (msg.constructor === MESSAGETYPES.RoomDestroy) {
uni.showToast({ uni.showToast({
title: "房间已解散", title: t('this_room_has_been_closed'),
icon: "none", icon: "none",
}); });
setTimeout(() => { setTimeout(() => {
@@ -450,10 +452,10 @@ const canClick = computed(() => {
*/ */
const shareTitle = computed(() => { const shareTitle = computed(() => {
const { battleType, count } = room.value; const { battleType, count } = room.value;
if (battleType === 2) return '热血乱斗赛,敢来争锋?'; if (battleType === 2) return t('ready_for_a_thrilling_free_for_all');
if (battleType === 1 && count === 4) return '2v2对抗赛,是兄弟来助我一把!'; if (battleType === 1 && count === 4) return t('join_my_team_for_a_2v2_match');
if (battleType === 1 && count === 6) return '3v3对抗赛,来了马上发车!'; if (battleType === 1 && count === 6) return t('join_our_3v3_match_we_re_ready_to_go');
return '星球论箭,来一决高下敢否?'; return t('ready_to_see_who_is_the_better_archer');
}); });
/** /**
@@ -564,8 +566,8 @@ onBeforeUnmount(() => {
<GuideTwo> <GuideTwo>
<view class="battle-guide"> <view class="battle-guide">
<view class="guide-tips"> <view class="guide-tips">
<text class="guide-tips__target">请使用{{ targetSizeLabel }}全环靶</text> <text class="guide-tips__target">{{ t('please_use_a') }}{{ targetSizeLabel }}{{ t('full_ring_target') }}</text>
<text class="guide-tips__warn">如果实际靶纸与选择靶纸不同,将导致射箭无效</text> <text class="guide-tips__warn">{{ t('shots_will_not_count_if_the_target_face_differs_from_your_select') }}</text>
</view> </view>
</view> </view>
</GuideTwo> </GuideTwo>
@@ -574,7 +576,7 @@ onBeforeUnmount(() => {
<view> <view>
<view v-if="owner.id" class="player" :style="{ transform: 'translateY(-60px)' }"> <view v-if="owner.id" class="player" :style="{ transform: 'translateY(-60px)' }">
<Avatar :src="owner.avatar" :size="60" /> <Avatar :src="owner.avatar" :size="60" />
<text>管理员</text> <text>{{ t('host') }}</text>
<view <view
v-if="isMember(owner)" v-if="isMember(owner)"
:class="['room-player-name', ...getMemberNicknameClass(owner)]" :class="['room-player-name', ...getMemberNicknameClass(owner)]"
@@ -587,14 +589,12 @@ 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)' }">
<Avatar :src="opponent.avatar" :size="60" /> <Avatar :src="opponent.avatar" :size="60" />
<text class="ready" :style="{ opacity: opponent.ready ? 1 : 0 }"> <text class="ready" :style="{ opacity: opponent.ready ? 1 : 0 }">{{ t('ready_329') }}</text>
已准备
</text>
<view <view
v-if="isMember(opponent)" v-if="isMember(opponent)"
:class="['room-player-name', ...getMemberNicknameClass(opponent)]" :class="['room-player-name', ...getMemberNicknameClass(opponent)]"
@@ -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>
@@ -623,11 +623,11 @@ onBeforeUnmount(() => {
<view> <view>
<view v-for="(item, index) in players" :key="index"> <view v-for="(item, index) in players" :key="index">
<Avatar v-if="item.id" :src="item.avatar" :size="36" /> <Avatar v-if="item.id" :src="item.avatar" :size="36" />
<text v-if="owner.id === item.id">管理员</text> <text v-if="owner.id === item.id">{{ t('host') }}</text>
<!-- 仅房主可见踢人按钮,且不能踢自己 --> <!-- 仅房主可见踢人按钮,且不能踢自己 -->
<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)"
@@ -647,13 +647,13 @@ onBeforeUnmount(() => {
{{ item.name }} {{ item.name }}
</text> </text>
</view> </view>
<text v-else class="truncate">{{ item.name || "我要加入" }}</text> <text v-else class="truncate">{{ item.name || t('join_330') }}</text>
<view v-if="item.id" class="team-player-avatar"> <view v-if="item.id" class="team-player-avatar">
<Avatar :src="item.avatar" :size="36" /> <Avatar :src="item.avatar" :size="36" />
<text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text> <text :style="{ opacity: !!item.state ? 1 : 0 }">{{ t('ready') }}</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>
@@ -661,10 +661,10 @@ onBeforeUnmount(() => {
<view v-for="(item, index) in blueTeam" :key="index" class="choose-side-right-item"> <view v-for="(item, index) in blueTeam" :key="index" class="choose-side-right-item">
<view v-if="item.id" class="team-player-avatar"> <view v-if="item.id" class="team-player-avatar">
<Avatar :src="item.avatar" :size="36" /> <Avatar :src="item.avatar" :size="36" />
<text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text> <text :style="{ opacity: !!item.state ? 1 : 0 }">{{ t('ready') }}</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)"
@@ -675,9 +675,9 @@ onBeforeUnmount(() => {
{{ item.name }} {{ item.name }}
</text> </text>
</view> </view>
<text v-else class="truncate">{{ item.name || "我要加入" }}</text> <text v-else class="truncate">{{ item.name || t('join_330') }}</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>
@@ -693,21 +693,21 @@ onBeforeUnmount(() => {
> >
{{ {{
allReady.value allReady.value
? "即将进入对局..." ? t('joining_match')
: owner.id === user.id : owner.id === user.id
? "开始对局" ? t('start_match')
: "我准备好了" : t('i_m_ready')
}} }}
</SButton> </SButton>
<text class="tips">所有人准备好后由房主点击开始</text> <text class="tips">{{ t('once_everyone_is_ready_the_host_can_start_the_match') }}</text>
</view> </view>
</view> </view>
</Container> </Container>
<ModalDialog <ModalDialog
:show="showLimitModal" :show="showLimitModal"
:content="'今日约战次数已经用完\n开通会员可增加次数'" :content="t('you_have_used_all_your_challenges_for_today_activate_membership_')"
cancelText="知道了" :cancelText="t('got_it_335')"
confirmText="去开通" :confirmText="t('activate')"
:onCancel="closeLimitModal" :onCancel="closeLimitModal"
:onConfirm="goVipPage" :onConfirm="goVipPage"
/> />
@@ -715,13 +715,11 @@ onBeforeUnmount(() => {
<ScreenHint :show="showKickConfirm"> <ScreenHint :show="showKickConfirm">
<view class="kick-confirm"> <view class="kick-confirm">
<!-- 弹窗标题,玩家名字高亮显示 --> <!-- 弹窗标题,玩家名字高亮显示 -->
<text class="kick-confirm__title"> <text class="kick-confirm__title">{{ t('remove') }}<text style="color: #F7D550">{{ playerToKick && playerToKick.name }}</text>{{ t('from_the_room') }}</text>
是否把「<text style="color: #F7D550">{{ playerToKick && playerToKick.name }}</text>」移出房间?
</text>
<!-- 按钮区:确认在左,取消在右 --> <!-- 按钮区:确认在左,取消在右 -->
<view class="kick-confirm__btns"> <view class="kick-confirm__btns">
<button hover-class="none" class="kick-confirm__btn kick-confirm__btn--confirm" @click="confirmKick">确定</button> <button hover-class="none" class="kick-confirm__btn kick-confirm__btn--confirm" @click="confirmKick">{{ t('confirm_134') }}</button>
<button hover-class="none" class="kick-confirm__btn kick-confirm__btn--cancel" @click="cancelKick">取消</button> <button hover-class="none" class="kick-confirm__btn kick-confirm__btn--cancel" @click="cancelKick">{{ t('cancel_133') }}</button>
</view> </view>
</view> </view>
</ScreenHint> </ScreenHint>
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
defineProps({ defineProps({
cumulative: { cumulative: {
type: [Number, String], type: [Number, String],
@@ -15,12 +17,12 @@ defineProps({
<view class="balance-panel"> <view class="balance-panel">
<view class="balance-list"> <view class="balance-list">
<view class="balance-item"> <view class="balance-item">
<text class="balance-item__label">累计金币:</text> <text class="balance-item__label">{{ t('total_coins') }}</text>
<text class="balance-item__value">{{ cumulative }}</text> <text class="balance-item__value">{{ cumulative }}</text>
</view> </view>
<view class="balance-list__line" /> <view class="balance-list__line" />
<view class="balance-item"> <view class="balance-item">
<text class="balance-item__label">可兑换金币:</text> <text class="balance-item__label">{{ t('redeemable_coins') }}</text>
<text class="balance-item__value">{{ available }}</text> <text class="balance-item__value">{{ available }}</text>
</view> </view>
</view> </view>
@@ -38,13 +40,12 @@ defineProps({
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 706rpx; width: 100%;
height: 60rpx; height: 60rpx;
margin-top: 0; margin-top: 0;
border: 2rpx solid rgba(255, 217, 71, 0.25);
border-radius: 12rpx; border-radius: 12rpx;
box-sizing: border-box; box-sizing: border-box;
background-color: rgba(255, 217, 71, 0.06); background: linear-gradient(90deg, transparent, rgba(4, 4, 4, 0.7), transparent);
} }
.balance-item { .balance-item {
@@ -69,7 +70,7 @@ defineProps({
.balance-list__line { .balance-list__line {
width: 2rpx; width: 2rpx;
height: 28rpx; height: 16rpx;
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 0.5);
margin: 0 22rpx; margin: 0 22rpx;
} }
+3 -1
View File
@@ -1,8 +1,10 @@
<script setup> <script setup>
import { t } from "@/locales";
defineProps({ defineProps({
text: { text: {
type: String, type: String,
default: "暂无金币获取记录。", default: t('no_coin_earnings_yet'),
}, },
}); });
</script> </script>
+10 -4
View File
@@ -10,11 +10,13 @@ const props = defineProps({
type: String, type: String,
default: "", default: "",
}, },
switchable: { type: Boolean, default: false },
onBack: { onBack: {
type: Function, type: Function,
default: null, default: null,
}, },
}); });
const emit = defineEmits(["select-store"]);
</script> </script>
<template> <template>
@@ -30,16 +32,20 @@ const props = defineProps({
> >
{{ title }} {{ title }}
</text> </text>
<text v-if="subtitle" class="coin-header__subtitle"> <view v-if="subtitle" class="coin-header__store" @click="switchable && emit('select-store')">
{{ subtitle }} <text class="coin-header__subtitle">{{ subtitle }}</text>
</text> <image v-if="switchable" class="coin-header__switch" src="https://static.shelingxingqiu.com/shootmini/static/coin/store-switch.png" mode="aspectFit" />
</view>
</view> </view>
</template> </template>
</Header> </Header>
</view> </view>
</template> </template>
<style scoped> <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 { .coin-header {
position: sticky; position: sticky;
top: 0; top: 0;
+9 -7
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
defineProps({ defineProps({
records: { records: {
type: Array, type: Array,
@@ -18,15 +20,15 @@ defineProps({
> >
<view class="record-table__header"> <view class="record-table__header">
<template v-if="mode === 'exchange'"> <template v-if="mode === 'exchange'">
<text>兑换内容</text> <text>{{ t('redeemed_item') }}</text>
<text>兑换类型</text> <text>{{ t('redemption_type') }}</text>
<text>时间</text> <text>{{ t('time') }}</text>
<text>金币使用</text> <text>{{ t('coins_used') }}</text>
</template> </template>
<template v-else> <template v-else>
<text>时间</text> <text>{{ t('time') }}</text>
<text>类型</text> <text>{{ t('type') }}</text>
<text>金币获取</text> <text>{{ t('coins_earned') }}</text>
</template> </template>
</view> </view>
<view <view
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
const emit = defineEmits(["authorize"]); const emit = defineEmits(["authorize"]);
</script> </script>
@@ -8,8 +10,8 @@ const emit = defineEmits(["authorize"]);
src="https://static.shelingxingqiu.com/shootmini/static/coin/location-permission.png" src="https://static.shelingxingqiu.com/shootmini/static/coin/location-permission.png"
mode="aspectFit" mode="aspectFit"
/> />
<text>授权获取你的定位,以便推荐附近门店。</text> <text>{{ t('allow_location_access_to_find_nearby_stores') }}</text>
<button hover-class="none" @click="emit('authorize')">立即授权</button> <button hover-class="none" @click="emit('authorize')">{{ t('allow_access') }}</button>
</view> </view>
</template> </template>
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
defineProps({ defineProps({
variant: { variant: {
type: String, type: String,
@@ -13,7 +15,7 @@ defineProps({
src="https://static.shelingxingqiu.com/shootmini/static/coin/icon-notice.png" src="https://static.shelingxingqiu.com/shootmini/static/coin/icon-notice.png"
mode="aspectFit" mode="aspectFit"
/> />
<text>暂不支持线上兑换,请前往线下门店进行兑换。</text> <text>{{ t('online_redemption_is_not_available_please_redeem_at_a_store') }}</text>
</view> </view>
</template> </template>
@@ -2,7 +2,7 @@
import { computed, ref } from "vue"; import { computed, ref } from "vue";
const DEFAULT_PRODUCT_IMAGE = const DEFAULT_PRODUCT_IMAGE =
"https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-item.png"; "https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png";
const props = defineProps({ const props = defineProps({
images: { images: {
type: Array, type: Array,
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { computed } from "vue"; import { computed } from "vue";
const DEFAULT_PRODUCT_IMAGE = const DEFAULT_PRODUCT_IMAGE =
@@ -26,9 +28,9 @@ const productImage = computed(() => {
</view> </view>
<text class="product-card__name">{{ product.name }}</text> <text class="product-card__name">{{ product.name }}</text>
<view class="product-card__footer"> <view class="product-card__footer">
<text>{{ product.cost }}金币</text> <text>{{ product.cost }}{{ t('coins') }}</text>
<text class="product-card__divider">|</text> <text class="product-card__divider">|</text>
<text>剩余{{ product.stock }}个</text> <text>{{ t('remaining') }}{{ product.stock }}{{ t('empty_352') }}</text>
</view> </view>
</view> </view>
</template> </template>
@@ -51,6 +53,9 @@ const productImage = computed(() => {
height: 312rpx; height: 312rpx;
overflow: hidden; overflow: hidden;
border-radius: 12rpx; 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 { .product-card__image {
@@ -0,0 +1,82 @@
<script setup>
import { t } from "@/locales";
defineProps({
benefit: {
type: Object,
required: true,
},
});
</script>
<template>
<!-- 与会员卡共用剩余次数,接口缺失时显示占位。 -->
<view class="benefit-card">
<text class="benefit-card__badge">{{ benefit.remaining }}{{ t('times') }}</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>
+5 -3
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
const props = defineProps({ const props = defineProps({
store: { store: {
type: Object, type: Object,
@@ -19,13 +21,13 @@ const selectStore = () => {
<text class="store-card__name">{{ store.name }}</text> <text class="store-card__name">{{ store.name }}</text>
<view class="store-card__info"> <view class="store-card__info">
<view class="store-card__row"> <view class="store-card__row">
<text>地址:{{ store.address }}</text> <text>{{ t('address') }}{{ store.address }}</text>
</view> </view>
<view class="store-card__row"> <view class="store-card__row">
<text>电话:{{ store.phone }}</text> <text>{{ t('phone_355') }}{{ store.phone }}</text>
</view> </view>
<view class="store-card__row"> <view class="store-card__row">
<text>营业时间:{{ store.hours }}</text> <text>{{ t('hours') }}{{ store.hours }}</text>
</view> </view>
</view> </view>
</view> </view>
@@ -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>
+137
View File
@@ -0,0 +1,137 @@
<script setup>
import { t } from "@/locales";
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">{{ t('times') }}</text>
</view>
</view>
</view>
<text class="vip-card__status">
{{ membership.active ? t('valid_until_value', { p0: membership.expiresAt }) : t('not_activated') }}
</text>
<view class="vip-card__introduction" @click="emit('introduction')">
<text>{{ t('learn_more_about_experience_center_vip') }}</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,64 @@
<script setup>
import { t } from "@/locales";
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">{{ t('special_offer_cny_9_9_90_days') }}</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 ? t('your_vip_is_active') : t('to_activate_please_contact_staff_at_a_store') }}</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>
+33 -4
View File
@@ -1,22 +1,51 @@
import { t } from "@/locales";
// 金币快捷入口保持原有路由与图标配置。
export const quickMenus = [ export const quickMenus = [
{ {
key: "rules", key: "rules",
label: "金币规则", label: t('coin_rules'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-rules.png", icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-rules.png",
}, },
{ {
key: "earningRecords", key: "earningRecords",
label: "获取明细", label: t('earnings'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-earning-records.png", icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-earning-records.png",
}, },
{ {
key: "exchangeRecords", key: "exchangeRecords",
label: "兑换记录", label: t('redemptions'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-exchange-records.png", icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-exchange-records.png",
}, },
{ {
key: "nearbyStores", key: "nearbyStores",
label: "附近门店", label: t('nearby_stores'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-nearby-store.png", icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-nearby-store.png",
}, },
]; ];
// 体验中心业务 Tab。
export const storeSections = [
{ key: "vip", label: t('experience_center_vip') },
{ key: "coin", label: t('my_coins') },
];
export const storeVipBenefits = [
{
key: "trial",
title: t('free_trial'),
description: t('enjoy_one_free_30_minute_smart_archery_session_join_the_official'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-trial.png",
},
{
key: "discount",
title: t('special_offer'),
description: t('buy_one_30_minute_experience_session_at_the_special_price_of_cny'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-discount.png",
},
{
key: "drink",
title: t('complimentary_drink'),
description: t('receive_one_complimentary_designated_drink_each_time_you_visit'),
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-drink.png",
},
];
+4 -2
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { computed, 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";
@@ -99,7 +101,7 @@ onLoad((options = {}) => {
<template> <template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRecords"> <Container :bgType="6" :isHome="true" @scrolltolower="loadRecords">
<template #header> <template #header>
<CoinHeader title="金币获取明细" /> <CoinHeader :title="t('coin_earnings')" />
</template> </template>
<view class="records-page"> <view class="records-page">
<CoinEmptyState v-if="showEmpty" /> <CoinEmptyState v-if="showEmpty" />
@@ -108,7 +110,7 @@ onLoad((options = {}) => {
v-if="loading || (noMore && earningRecords.length)" v-if="loading || (noMore && earningRecords.length)"
class="records-page__status" class="records-page__status"
> >
<text>{{ loading ? "加载中..." : "没有更多了" }}</text> <text>{{ loading ? t('loading') : t('no_more_results') }}</text>
</view> </view>
</view> </view>
</Container> </Container>
+5 -3
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { computed, 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";
@@ -99,16 +101,16 @@ onLoad((options = {}) => {
<template> <template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRecords"> <Container :bgType="6" :isHome="true" @scrolltolower="loadRecords">
<template #header> <template #header>
<CoinHeader title="金币兑换记录" /> <CoinHeader :title="t('coin_redemptions')" />
</template> </template>
<view class="records-page"> <view class="records-page">
<CoinEmptyState v-if="showEmpty" text="暂无金币兑换记录。" /> <CoinEmptyState v-if="showEmpty" :text="t('no_redemptions_yet')" />
<CoinRecordList v-else mode="exchange" :records="exchangeRecords" /> <CoinRecordList v-else mode="exchange" :records="exchangeRecords" />
<view <view
v-if="loading || (noMore && exchangeRecords.length)" v-if="loading || (noMore && exchangeRecords.length)"
class="records-page__status" class="records-page__status"
> >
<text>{{ loading ? "加载中..." : "没有更多了" }}</text> <text>{{ loading ? t('loading') : t('no_more_results') }}</text>
</view> </view>
</view> </view>
</Container> </Container>
+135 -17
View File
@@ -1,14 +1,55 @@
<script setup> <script setup>
import { ref } from "vue"; import { t } from "@/locales";
import { onLoad } from "@dcloudio/uni-app";
import { computed, ref } from "vue";
import { onLoad, onShow } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import ModalDialog from "@/components/ModalDialog.vue";
import CoinHeader from "./components/CoinHeader.vue"; import CoinHeader from "./components/CoinHeader.vue";
import CoinBalancePanel from "./components/CoinBalancePanel.vue"; import CoinBalancePanel from "./components/CoinBalancePanel.vue";
import CoinQuickMenu from "./components/CoinQuickMenu.vue"; import CoinQuickMenu from "./components/CoinQuickMenu.vue";
import OfflineExchangeNotice from "./components/OfflineExchangeNotice.vue"; import OfflineExchangeNotice from "./components/OfflineExchangeNotice.vue";
import RewardProductCard from "./components/RewardProductCard.vue"; import RewardProductCard from "./components/RewardProductCard.vue";
import { getGiftListAPI, getMyGoldAPI } from "@/apis"; import { getGiftListAPI, getMyGoldAPI } from "@/apis";
import { quickMenus } from "./data"; 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 = t('could_not_load_membership_details_retry_or_select_another_store');
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 PAGE_SIZE = 20;
const coinSummary = ref({ const coinSummary = ref({
@@ -19,8 +60,8 @@ const selectedStoreId = ref("");
const selectedStoreName = ref(""); const selectedStoreName = ref("");
const rewardProducts = ref([]); const rewardProducts = ref([]);
const productPage = ref(0); const productPage = ref(0);
const productTotal = ref(0);
const productLoading = ref(false); const productLoading = ref(false);
const productError = ref(false);
const productNoMore = ref(false); const productNoMore = ref(false);
const loadCoinSummary = async () => { const loadCoinSummary = async () => {
@@ -40,6 +81,7 @@ const loadProducts = async ({ reset = false } = {}) => {
const nextPage = reset ? 1 : productPage.value + 1; const nextPage = reset ? 1 : productPage.value + 1;
productLoading.value = true; productLoading.value = true;
productError.value = false;
if (reset) productNoMore.value = false; if (reset) productNoMore.value = false;
try { try {
@@ -65,7 +107,6 @@ const loadProducts = async ({ reset = false } = {}) => {
const totalCount = Number(result?.totalCount ?? result?.total); const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize = const responsePageSize =
Number(result?.pageSize ?? result?.page_size) || PAGE_SIZE; Number(result?.pageSize ?? result?.page_size) || PAGE_SIZE;
productTotal.value = Number.isFinite(totalCount) ? totalCount : 0;
if (Number.isFinite(pageCount) && pageCount >= 0) { if (Number.isFinite(pageCount) && pageCount >= 0) {
productNoMore.value = productPage.value >= pageCount; productNoMore.value = productPage.value >= pageCount;
@@ -79,6 +120,7 @@ const loadProducts = async ({ reset = false } = {}) => {
rewardProducts.value = []; rewardProducts.value = [];
productPage.value = 0; productPage.value = 0;
} }
productError.value = true;
console.error("加载礼品列表失败", error); console.error("加载礼品列表失败", error);
} finally { } finally {
productLoading.value = false; productLoading.value = false;
@@ -115,7 +157,7 @@ const decodeRouteText = (value = "") => {
const onMenuSelect = (menu) => { const onMenuSelect = (menu) => {
if (menu.key === "nearbyStores") { if (menu.key === "nearbyStores") {
uni.redirectTo({ uni.redirectTo({
url: "/pages/coin/nearby-stores", url: `/pages/coin/nearby-stores?tab=${activeTab.value}`,
}); });
return; return;
} }
@@ -123,7 +165,7 @@ const onMenuSelect = (menu) => {
const url = menuRoutes[menu.key]; const url = menuRoutes[menu.key];
if (!url) { if (!url) {
uni.showToast({ uni.showToast({
title: "功能开发中", title: t('coming_soon_385'),
icon: "none", icon: "none",
}); });
return; return;
@@ -143,27 +185,67 @@ const toProductDetail = (product) => {
}; };
onLoad((options = {}) => { onLoad((options = {}) => {
const storeId = String(options.storeId || ""); activeTab.value = options.tab === "coin" ? "coin" : "vip";
const previous = getSelectedExperienceStore();
const storeId = String(options.storeId || previous?.id || "");
if (!/^\d+$/.test(storeId) || Number(storeId) <= 0) { if (!/^\d+$/.test(storeId) || Number(storeId) <= 0) {
uni.redirectTo({ selectStore();
url: "/pages/coin/nearby-stores",
});
return; return;
} }
selectedStoreId.value = storeId; selectedStoreId.value = storeId;
selectedStoreName.value = decodeRouteText(options.storeName); selectedStoreName.value = options.storeId
loadCoinSummary(); ? decodeRouteText(options.storeName)
: previous?.name || "";
rememberExperienceStore(storeId, selectedStoreName.value);
loadProducts({ reset: true }); loadProducts({ reset: true });
}); });
// 从介绍、商品等页面返回时刷新会员和余额。
onShow(() => {
if (!selectedStoreId.value) return;
loadMembership();
loadCoinSummary();
});
</script> </script>
<template> <template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadProducts"> <!-- 标题固定,门店切换复用原有附近门店页面。 -->
<Container :bgType="6" bgColor="#22222e" :isHome="true" @scrolltolower="activeTab === 'coin' && loadProducts()">
<template #header> <template #header>
<CoinHeader title="我的金币" :subtitle="selectedStoreName" /> <CoinHeader :title="t('experience_center')" :subtitle="selectedStoreName || t('select_store')" switchable @select-store="selectStore" />
</template> </template>
<view class="coin-page"> <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">{{ t('loading_membership') }}</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">{{ t('experience_center_vip_is_designed_for_archery_enthusiasts_activa') }}</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 <CoinBalancePanel
:cumulative="coinSummary.cumulative" :cumulative="coinSummary.cumulative"
:available="coinSummary.available" :available="coinSummary.available"
@@ -182,11 +264,23 @@ onLoad((options = {}) => {
</view> </view>
</view> </view>
</view> </view>
<view v-if="productLoading" class="page-status">{{ t('loading') }}</view>
<view v-else-if="productError" class="page-status" @click="loadProducts()">{{ t('could_not_load_tap_to_retry') }}</view>
<view v-else-if="productNoMore" class="page-status">{{ rewardProducts.length ? t('no_more_products') : t('no_items_available_for_redemption') }}</view>
</view>
</view> </view>
</Container> </Container>
<ModalDialog
:show="vipOpeningVisible"
:content="t('please_visit_an_experience_center_and_contact_staff_to_activate_')"
:show-cancel="false"
:confirm-text="t('got_it_394')"
:on-confirm="closeVipOpening"
/>
</template> </template>
<style scoped> <style scoped lang="scss">
.page-status { padding: 30rpx; color: #cccccc; text-align: center; font-size: 26rpx; }
.coin-page { .coin-page {
width: 100%; width: 100%;
min-height: 100%; min-height: 100%;
@@ -194,6 +288,30 @@ onLoad((options = {}) => {
box-sizing: border-box; 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 { .reward-section {
padding: 20rpx 28rpx 40rpx; padding: 20rpx 28rpx 40rpx;
box-sizing: border-box; box-sizing: border-box;
+15 -8
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref } from "vue"; import { 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";
@@ -6,6 +8,9 @@ import CoinHeader from "./components/CoinHeader.vue";
import LocationPermissionState from "./components/LocationPermissionState.vue"; import LocationPermissionState from "./components/LocationPermissionState.vue";
import StoreCard from "./components/StoreCard.vue"; import StoreCard from "./components/StoreCard.vue";
import { getNearbyStoresAPI } from "@/apis"; import { getNearbyStoresAPI } from "@/apis";
import { rememberExperienceStore } from "@/utils/storeVip";
const activeTab = ref("vip");
const PAGE_SIZE = 20; const PAGE_SIZE = 20;
const DEFAULT_STORE_IMAGE = const DEFAULT_STORE_IMAGE =
@@ -106,25 +111,29 @@ const selectStore = (store) => {
const storeId = String(store?.id || ""); const storeId = String(store?.id || "");
if (!/^\d+$/.test(storeId) || Number(storeId) <= 0) { if (!/^\d+$/.test(storeId) || Number(storeId) <= 0) {
uni.showToast({ uni.showToast({
title: "门店信息无效", title: t('invalid_store_information'),
icon: "none", icon: "none",
}); });
return; return;
} }
const storeName = encodeURIComponent(store?.name || ""); const storeName = encodeURIComponent(store?.name || "");
rememberExperienceStore(storeId, store?.name || "");
uni.redirectTo({ uni.redirectTo({
url: `/pages/coin/index?storeId=${encodeURIComponent(storeId)}&storeName=${storeName}`, url: `/pages/coin/index?storeId=${encodeURIComponent(storeId)}&storeName=${storeName}&tab=${activeTab.value}`,
}); });
}; };
onLoad(locateAndLoadStores); onLoad((options = {}) => {
activeTab.value = options.tab === "coin" ? "coin" : "vip";
locateAndLoadStores();
});
</script> </script>
<template> <template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadStores"> <Container :bgType="6" :isHome="true" @scrolltolower="loadStores">
<template #header> <template #header>
<CoinHeader title="附近门店" /> <CoinHeader :title="t('nearby_stores')" />
</template> </template>
<view class="stores-page"> <view class="stores-page">
<LocationPermissionState <LocationPermissionState
@@ -138,10 +147,8 @@ onLoad(locateAndLoadStores);
:store="store" :store="store"
@select="selectStore" @select="selectStore"
/> />
<text v-if="loaded && !stores.length" class="stores-page__more"> <text v-if="loaded && !stores.length" class="stores-page__more">{{ t('no_nearby_stores') }}</text>
附近暂无门店~ <text v-else-if="noMore" class="stores-page__more">{{ t('no_more_stores') }}</text>
</text>
<text v-else-if="noMore" class="stores-page__more">没有更多门店了~</text>
</template> </template>
</view> </view>
</Container> </Container>
+6 -4
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref } from "vue"; import { 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";
@@ -47,7 +49,7 @@ onLoad((options = {}) => {
const id = Number(options.id); const id = Number(options.id);
if (!Number.isInteger(id) || id <= 0) { if (!Number.isInteger(id) || id <= 0) {
uni.showToast({ uni.showToast({
title: "商品参数无效", title: t('invalid_product_parameters'),
icon: "none", icon: "none",
}); });
return; return;
@@ -60,7 +62,7 @@ onLoad((options = {}) => {
<template> <template>
<Container :bgType="6" :isHome="true"> <Container :bgType="6" :isHome="true">
<template #header> <template #header>
<CoinHeader title="商品详情" /> <CoinHeader :title="t('product_details')" />
</template> </template>
<view class="product-detail"> <view class="product-detail">
<ProductHeroSwiper <ProductHeroSwiper
@@ -69,9 +71,9 @@ onLoad((options = {}) => {
<view class="product-detail__summary"> <view class="product-detail__summary">
<text class="product-detail__name">{{ productDetail.name }}</text> <text class="product-detail__name">{{ productDetail.name }}</text>
<view class="product-detail__balance"> <view class="product-detail__balance">
<text>金币:</text> <text>{{ t('coins_403') }}</text>
<text class="product-detail__amount">{{ productDetail.coinPrice }}</text> <text class="product-detail__amount">{{ productDetail.coinPrice }}</text>
<text>(剩余{{ productDetail.stock }}个)</text> <text>{{ t('empty_404') }}{{ productDetail.stock }}{{ t('remaining_405') }}</text>
</view> </view>
</view> </view>
<OfflineExchangeNotice variant="red" /> <OfflineExchangeNotice variant="red" />
+5 -3
View File
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { computed, 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";
@@ -84,10 +86,10 @@ onLoad((options = {}) => {
<template> <template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRules"> <Container :bgType="6" :isHome="true" @scrolltolower="loadRules">
<template #header> <template #header>
<CoinHeader title="金币规则" /> <CoinHeader :title="t('coin_rules')" />
</template> </template>
<view class="rules-page"> <view class="rules-page">
<CoinEmptyState v-if="showEmpty" text="暂无金币规则。" /> <CoinEmptyState v-if="showEmpty" :text="t('no_coin_rules_yet')" />
<template v-else> <template v-else>
<view <view
v-for="rule in coinRules" v-for="rule in coinRules"
@@ -98,7 +100,7 @@ onLoad((options = {}) => {
</view> </view>
</template> </template>
<view v-if="loading" class="rules-page__status"> <view v-if="loading" class="rules-page__status">
<text>加载中...</text> <text>{{ t('loading') }}</text>
</view> </view>
</view> </view>
</Container> </Container>
+50
View File
@@ -0,0 +1,50 @@
<script setup>
import { t } from "@/locales";
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="t('about_experience_center_vip')" /></template>
<view class="vip-intro">
<text v-if="loading">{{ t('loading') }}</text>
<text v-else-if="failed" @click="loadIntroduction">{{ t('could_not_load_tap_to_retry') }}</text>
<text v-else-if="content.trim()">{{ content }}</text>
<text v-else>{{ t('no_information_available') }}</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>
@@ -1,4 +1,6 @@
<script setup> <script setup>
import { t } from "@/locales";
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount } from "vue";
import { onShow, onHide } from "@dcloudio/uni-app"; import { onShow, onHide } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
@@ -10,15 +12,15 @@ import { MESSAGETYPES } from "@/constants";
const guides = [ const guides = [
{ {
title: "箭头面向靶子", title: t('point_the_arrow_at_the_target'),
src: "https://static.shelingxingqiu.com/attachment/2025-10-30/ddv9p5fk5wscg7hrfo.png", src: "https://static.shelingxingqiu.com/attachment/2025-10-30/ddv9p5fk5wscg7hrfo.png",
}, },
{ {
title: "摆出拉弓姿势", title: t('take_your_shooting_stance'),
src: "https://static.shelingxingqiu.com/attachment/2025-10-30/ddv9p5fk5b7ljrhx3o.png", src: "https://static.shelingxingqiu.com/attachment/2025-10-30/ddv9p5fk5b7ljrhx3o.png",
}, },
{ {
title: "调整瞄准器", title: t('adjust_the_sight'),
src: "https://static.shelingxingqiu.com/attachment/2025-10-29/dduexjgrcxf9wjaiv4.png", src: "https://static.shelingxingqiu.com/attachment/2025-10-29/dduexjgrcxf9wjaiv4.png",
}, },
]; ];
@@ -112,7 +114,7 @@ onBeforeUnmount(() => {
</script> </script>
<template> <template>
<Container title="校准智能弓"> <Container :title="t('calibrate_smart_bow')">
<view class="container"> <view class="container">
<view v-for="(guide, index) in guides" :key="guide.title" class="guide"> <view v-for="(guide, index) in guides" :key="guide.title" class="guide">
<view> <view>
@@ -121,15 +123,13 @@ onBeforeUnmount(() => {
</view> </view>
<image :src="guide.src" mode="widthFix" /> <image :src="guide.src" mode="widthFix" />
</view> </view>
<text>请完成以上步骤校准智能弓</text> <text>{{ t('complete_the_steps_above_to_calibrate_your_smart_bow') }}</text>
<SButton <SButton
:onClick="onComplete" :onClick="onComplete"
width="60vw" width="60vw"
:rounded="40" :rounded="40"
:disabled="!done" :disabled="!done"
> >{{ t('i_ve_calibrated_it') }}</SButton>
我已校准
</SButton>
</view> </view>
</Container> </Container>
</template> </template>
@@ -0,0 +1,95 @@
import { t } from "@/locales";
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: t('invalid_qr_code_please_scan_again'), icon: "none" });
},
});
};
const showAlreadyBoundPage = () => {
uni.navigateTo({
url: "/pages/device/device-already-bound",
fail: (error) => {
console.error("打开设备已绑定页失败", error);
uni.showToast({ title: t('this_device_is_bound_to_another_account_unbind_it_first'), 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: t('bound_successfully_go_back_to_view_your_device'), icon: "none" });
},
});
} catch (error) {
console.error("绑定设备失败", error);
confirmBindTip.value = false;
token.value = "";
showBindFailurePage();
} finally {
binding.value = false;
}
};
return { confirmBind, handleScan, showBindFailurePage };
}
@@ -0,0 +1,235 @@
import { t, translateStatic } from "@/locales";
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 t('disconnected');
return isDeviceCharging.value ? t('connected_charging') : t('connected');
});
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 ? t('valueh_valuemin', { p0: hours, p1: minutes }) : t('valuemin', { p0: 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 ? t('online') : t('disconnected');
});
const maskedDeviceId = computed(() => {
const id = String(device.value.deviceId || "");
if (!id) return t('no_device_number');
return "*****";
});
const deviceRows = computed(() => [
{ label: t('model'), value: deviceDetails.value.model || t('sheling_smart_bow') },
{ label: t('battery_434'), value: translateStatic(batteryText.value) },
{ label: t('connection'), value: networkText.value },
{ label: t('device_number'), 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: t('device_unbound'), 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,
};
}

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