laoma/shoot-miniprograms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: 优化

Browse Source
This commit is contained in:
zhangyi
2026-08-05 17:38:34 +08:00
parent 4835993639
commit 6a78093d31
9 changed files with 434 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apis.js
+14 -3
View File
@@ -8,7 +8,7 @@ try {
switch (envVersion) {
case "develop": // 开发版
// BASE_URL = "http://192.168.1.2:8000/api/shoot";
// BASE_URL = "http://192.168.1.30:8000/api/shoot";
BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
break;
case "trial": // 体验版
@@ -186,8 +186,19 @@ export const getDailyCountAPI = () => {
return request("GET", "/index/dailyCount", {}, ADDONS_BASE_URL);
};
export const getHomeData = (seasonId) => {
return request("GET", `/user/myHome?seasonId=${seasonId}`);
export const getHomeData = async (seasonId) => {
const data = await request("GET", `/user/myHome?seasonId=${seasonId}`);
if (!data?.user) return data;
// 段位信息由 myHome 接口直接返回，统一并入用户数据供各页面展示。
return {
...data,
user: {
...data.user,
rankIcon: data.rankIcon,
rankName: data.rankName,
},
};
};
export const getProvinceData = () => {
src/components/UserHeader.vue
+26 -3
View File
@@ -10,6 +10,10 @@ const props = defineProps({
type: Boolean,
default: false,
},
fullNickname: {
type: Boolean,
default: false,
},
onSignin: {
type: Function,
default: () => {},
@@ -61,7 +65,13 @@ watch(
</script>
<template>
<view class="container" :style="{ width: containerWidth }">
<view
:class="[
'container',
fullNickname ? 'container--full-nickname' : '',
]"
:style="{ width: containerWidth }"
>
<block v-if="user.id">
<Avatar
:rankLvl="user.rankLvl"
@@ -83,11 +93,11 @@ watch(
user.nickName
}}</text>
</view>
<image
<!-- <image
class="user-name-image"
src="../static/vip1.png"
mode="widthFix"
/>
/> -->
</view>
<view class="user-stats">
<text class="level-tag level-tag-first">段位积分</text>
@@ -165,6 +175,19 @@ watch(
max-width: 180rpx;
}
.container--full-nickname .user-details {
flex: 1;
min-width: 0;
}
.container--full-nickname .user-name {
width: 100%;
}
.container--full-nickname .user-name .member-nickname {
max-width: 80%;
}
.user-name .member-nickname__text,
.user-name .member-nickname__shine {
font-size: 13px;
src/pages/member/be-vip.vue
+2 -2
View File
@@ -35,7 +35,7 @@ const memberTypes = [
heroBadge: "../../static/vip/normal-hero-badge.png",
buttonClass: "activate-btn--normal",
benefits: [
{ label: "专属会员标识", icon: "../../static/vip/vip-badge.png" },
{ label: "黄金昵称", icon: "../../static/vip/vip-badge.png" },
{ label: "教练点评", icon: "../../static/vip/vip-comment.png" },
{ label: "专享VIP客服", icon: "../../static/vip/vip-service.png" },
{ label: "排位赛\n每日+20次", icon: "../../static/vip/vip-rank.png" },
@@ -59,7 +59,7 @@ const memberTypes = [
{ label: "专属落点标识", icon: "../../static/vip/svip-point.png" },
{ label: "专属命中效果", icon: "../../static/vip/svip-hit.png" },
{ label: "专属射箭效果", icon: "../../static/vip/svip-arrow.png" },
{ label: "专属会员标识", icon: "../../static/vip/svip-badge.png" },
{ label: "炫彩昵称", icon: "../../static/vip/svip-badge.png" },
{ label: "教练点评", icon: "../../static/vip/svip-comment.png" },
{ label: "约战无限制", icon: "../../static/vip/svip-battle.png" },
{ label: "排位赛无限制", icon: "../../static/vip/svip-rank.png" },
src/pages/member/vip-intro.vue
+2 -2
View File
@@ -80,8 +80,8 @@ import Container from "@/components/Container.vue";
<view class="table-row">
<text class="table-cell table-cell--feature">昵称美化</text>
<text class="table-cell">无</text>
<text class="table-cell">专享</text>
<text class="table-cell">专享</text>
<text class="table-cell">黄金</text>
<text class="table-cell">炫彩</text>
</view>
<view class="table-row">
<text class="table-cell table-cell--feature">专属客服</text>
src/pages/rank-intro.vue
+344 -105
View File
@@ -1,5 +1,61 @@
<script setup>
import Container from "@/components/Container.vue";
const LEVEL_ICON_BASE_URL = "https://static.shelingxingqiu.com/levelicon";
const rankRows = [
{
name: "倔强青铜",
levels: ["倔强青铜1", "倔强青铜2", "倔强青铜3"],
picNames: ["青铜1", "青铜2", "青铜3"],
score: "每个小段位需要满3颗星才能晋升到下一个段位，共9颗星。",
},
{
name: "秩序白银",
levels: ["秩序白银1", "秩序白银2", "秩序白银3"],
picNames: ["白银1", "白银2", "白银3"],
score: "每个小段位需要满3颗星才能晋升到下一个段位，共9颗星。",
},
{
name: "荣耀黄金",
levels: ["荣耀黄金1", "荣耀黄金2", "荣耀黄金3", "荣耀黄金4"],
picNames: ["黄金1", "黄金2", "黄金3", "黄金4"],
score: "每个小段位需要满4颗星才能晋升到下一个段位，共16颗星。",
},
{
name: "永恒钻石",
levels: ["永恒钻石1", "永恒钻石2", "永恒钻石3", "永恒钻石4", "永恒钻石5"],
picNames: ["钻石1", "钻石2", "钻石3", "钻石4", "钻石5"],
score: "每个小段位需要满5颗星才能晋升到下一个段位，共25颗星。",
},
];
const kingRankRows = [
{ name: "最强王者", score: "0-9" },
{ name: "非凡王者", score: "10-19" },
{ name: "无双王者", score: "20-29" },
{ name: "绝世王者", score: "30-39" },
{ name: "至圣王者", score: "40-49" },
{ name: "荣耀王者", score: "50-99" },
{ name: "传奇王者", score: "100+" },
];
const meleeScoreTables = [
{
title: "5人大乱斗",
rankings: [1, 2, 3, 4, 5],
scores: [150, 75, 0, -100, -100],
},
{
title: "10人大乱斗",
rankings: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
scores: [200, 125, 75, 0, 0, 0, -50, -100, -100, -100],
},
];
// 图片文件名与段位名称一致，统一在这里拼接远程地址。
const getLevelIcon = (levelName) =>
`${LEVEL_ICON_BASE_URL}/${levelName}.png`;
</script>
<template>
@@ -22,25 +78,89 @@ import Container from "@/components/Container.vue";
<view class="sub-section">
<view class="sub-title">（一）基本规则</view>
<view class="rule-item">
<text class="rule-label">重一局：</text>
<text class="rule-value">+100积分</text>
<view class="rule-mode">
<view class="rule-mode-title">1V1、2V2、3V3对抗模式：</view>
<view class="rule-item">
<text class="rule-bullet">●</text>
<text class="rule-content"
>每胜一局，胜方每人+100积分；每负一局，负方每人-100积分</text
>
</view>
<view class="rule-item">
<text class="rule-bullet">●</text>
<text class="rule-content"
>2V2模式：胜方队伍中，总成绩最高且箭均成绩≥7环者，为本局MVP，额外获得40积分。</text
>
</view>
<view class="rule-item">
<text class="rule-bullet">●</text>
<text class="rule-content"
>3V3模式：胜方队伍中，总成绩最高且箭均成绩≥7环者，为本局MVP，额外获得60积分。</text
>
</view>
<view class="rule-item">
<text class="rule-bullet">●</text>
<text class="rule-content"
>在1V1/2V2/3V3三种模式中，连续获得五连胜（三类模式一起算），则从第五场开始，每场胜利可额外再加15分，直至结束连胜。（仅限对抗模式，不含大乱斗模式。）</text
>
</view>
</view>
<view class="rule-item">
<text class="rule-label">输一局：</text>
<text class="rule-value">-100积分</text>
</view>
<view class="rule-item">
<text class="rule-label">全场MVP（2v2）：</text>
<text class="rule-value">额外+40积分</text>
</view>
<view class="rule-item">
<text class="rule-label">全场MVP（3v3）：</text>
<text class="rule-value">额外+60积分</text>
</view>
<view class="rule-item">
<text class="rule-label">五连胜：</text>
<text class="rule-value">每局额外+15积分</text>
<view class="rule-mode">
<view class="rule-mode-title">5人、10人大乱斗模式：</view>
<view class="rule-paragraph">
5人大乱斗和10人大乱斗按个人总环数成绩排序，排名从高到低依次设置系统默认奖励/扣除积分，默认初始排名和积分规则具体如下：
</view>
<view class="melee-score-table">
<view
v-for="table in meleeScoreTables"
:key="table.title"
class="melee-table-section"
>
<view class="melee-table-title">{{ table.title }}</view>
<scroll-view
class="melee-table-scroll"
scroll-x
:enhanced="true"
:show-scrollbar="false"
>
<view
:class="[
'melee-table-body',
table.rankings.length > 5
? 'melee-table-body--wide'
: '',
]"
>
<view class="melee-table-row">
<text class="melee-table-cell melee-table-label"
>排名</text
>
<text
v-for="ranking in table.rankings"
:key="ranking"
class="melee-table-cell"
>
{{ ranking }}
</text>
</view>
<view class="melee-table-row">
<text class="melee-table-cell melee-table-label"
>积分</text
>
<text
v-for="(score, index) in table.scores"
:key="index"
class="melee-table-cell"
>
{{ score }}
</text>
</view>
</view>
</scroll-view>
</view>
</view>
</view>
</view>
@@ -55,77 +175,57 @@ import Container from "@/components/Container.vue";
<view class="section">
<view class="title">三、（表格）</view>
<view class="rank-table">
<view class="table-row">
<text>大段位</text>
<text>小段位</text>
<text>积分（100积分=1星）</text>
<view class="table-row table-header">
<text class="table-cell major-column">大段位</text>
<text class="table-cell minor-column">小段位</text>
<text class="table-cell score-column">积分（100积分=1星）</text>
</view>
<view class="table-row">
<text>倔强青铜</text>
<view>
<text>青铜1</text>
<text>青铜2</text>
<text>青铜3</text>
<view
v-for="rank in rankRows"
:key="rank.name"
class="table-row rank-group-row"
>
<view class="table-cell major-column major-rank-cell">
<image
class="rank-icon"
:src="getLevelIcon(rank.picNames[0])"
mode="aspectFit"
lazy-load
/>
<text class="major-rank-name">{{ rank.name }}</text>
</view>
<text>每个小段位需要满 3星才能晋升到下一个段位，共9颗星。</text>
</view>
<view class="table-row">
<text>秩序白银</text>
<view>
<text>白铜1</text>
<text>白铜2</text>
<text>白铜3</text>
<view class="minor-column minor-rank-cell">
<text
v-for="level in rank.levels"
:key="level"
class="table-cell minor-rank-item"
>
{{ level }}
</text>
</view>
<text>每个小段位需要满 3颗星才能晋升到下一个段位，共9颗星。</text>
<text class="table-cell score-column score-text">
{{ rank.score }}
</text>
</view>
<view class="table-row">
<text>荣耀黄金</text>
<view>
<text>黄金1</text>
<text>黄金2</text>
<text>黄金3</text>
<text>黄金4</text>
<view
v-for="rank in kingRankRows"
:key="rank.name"
class="table-row king-rank-row"
>
<view class="table-cell king-rank-cell">
<image
class="rank-icon"
:src="getLevelIcon(rank.name)"
mode="aspectFit"
lazy-load
/>
<text class="major-rank-name">{{ rank.name }}</text>
</view>
<text>每个小段位需要满4颗星才能晋升到下一个段位，共16颗星。</text>
</view>
<view class="table-row">
<text>永恒钻石</text>
<view>
<text>钻石1</text>
<text>钻石2</text>
<text>钻石3</text>
<text>钻石4</text>
<text>钻石5</text>
</view>
<text>每个小段位需要满5颗星才能晋升到下一个段位，共25颗星。</text>
</view>
<view class="table-row2">
<text>最强王者</text>
<text>0-9</text>
</view>
<view class="table-row2">
<text>非凡王者</text>
<text>10-19</text>
</view>
<view class="table-row2">
<text>无双王者</text>
<text>20-29</text>
</view>
<view class="table-row2">
<text>绝世王者</text>
<text>30-39</text>
</view>
<view class="table-row2">
<text>至圣王者</text>
<text>40-49</text>
</view>
<view class="table-row2">
<text>荣耀王者</text>
<text>50-99</text>
</view>
<view class="table-row2">
<text>传奇王者</text>
<text>100+</text>
<text class="table-cell king-score-cell">{{ rank.score }}</text>
</view>
</view>
</view>
@@ -181,17 +281,103 @@ import Container from "@/components/Container.vue";
.rule-item {
display: flex;
margin-bottom: 8px;
}
.rule-label {
font-size: 14px;
align-items: flex-start;
margin-bottom: 16rpx;
font-size: 28rpx;
color: #666666;
line-height: 1.7;
}
.rule-value {
font-size: 14px;
.rule-mode {
margin-bottom: 24rpx;
}
.rule-mode:last-child {
margin-bottom: 0;
}
.rule-mode-title {
margin-bottom: 12rpx;
font-size: 28rpx;
color: #333333;
font-weight: 600;
line-height: 1.6;
}
.rule-bullet {
flex-shrink: 0;
margin-right: 10rpx;
font-size: 20rpx;
line-height: 2.38;
}
.rule-content {
flex: 1;
}
.rule-paragraph {
font-size: 28rpx;
color: #666666;
line-height: 1.7;
}
.melee-score-table {
margin-top: 20rpx;
border: $uni-border;
color: #333333;
font-size: 26rpx;
}
.melee-table-section + .melee-table-section {
border-top: $uni-border;
}
.melee-table-title {
padding: 14rpx 16rpx;
background-color: #f5f6f7;
color: #e53935;
font-weight: 600;
border-bottom: $uni-border;
}
.melee-table-scroll {
width: 100%;
white-space: nowrap;
}
.melee-table-body {
width: 100%;
}
.melee-table-body--wide {
width: 900rpx;
}
.melee-table-row {
display: flex;
}
.melee-table-row + .melee-table-row {
border-top: $uni-border;
}
.melee-table-cell {
display: flex;
flex: 1;
align-items: center;
min-width: 0;
min-height: 72rpx;
padding: 10rpx 12rpx;
box-sizing: border-box;
border-left: $uni-border;
}
.melee-table-cell:first-child {
border-left: 0;
}
.melee-table-label {
flex: 0 0 86rpx;
}
.rank-table {
@@ -201,41 +387,94 @@ import Container from "@/components/Container.vue";
width: calc(100vw - 20px);
}
.rank-table > view {
.table-row {
display: flex;
}
.rank-table > view > text:last-child {
margin-left: -1rpx;
}
.rank-table text {
.table-cell {
padding: 10rpx 20rpx;
border: $uni-border;
box-sizing: border-box;
display: inline-block;
margin-top: -1rpx;
margin-left: -1rpx;
}
.table-row text {
.major-column,
.minor-column {
width: 25%;
}
.table-row > view {
.score-column {
width: 50%;
}
.table-header .table-cell {
display: flex;
align-items: center;
}
.major-rank-cell,
.minor-rank-cell {
display: flex;
flex-direction: column;
width: 25%;
padding: 0;
}
.table-row > view > text {
.minor-rank-item {
min-height: 70rpx;
box-sizing: border-box;
}
.major-rank-cell {
align-items: center;
justify-content: center;
padding: 12rpx 8rpx;
}
.rank-icon {
width: 120rpx;
height: 120rpx;
flex-shrink: 0;
}
.major-rank-name {
margin-top: 8rpx;
font-size: 24rpx;
line-height: 1.4;
text-align: center;
}
.minor-rank-item {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
margin-left: 0;
padding: 10rpx;
border-right: 0;
}
.table-row > text:nth-child(3) {
.score-text {
display: flex;
align-items: center;
line-height: 1.6;
}
.king-rank-cell,
.king-score-cell {
width: 50%;
}
.table-row2 > text {
width: 50%;
.king-rank-cell {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
min-height: 210rpx;
}
.king-score-cell {
display: flex;
align-items: center;
}
</style>
src/pages/training/components/ScorePanel2.vue
+1 -1
View File
@@ -14,7 +14,7 @@ const props = defineProps({
const getDisplayText = (arrow = {}) => {
if (!arrow) return "";
if (!arrow.ring) return "-";
if (!arrow.ring) return "0";
return arrow.ringX ? "X" : String(arrow.ring);
};
src/pages/user.vue
+35 -12
View File
@@ -77,7 +77,7 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
<template>
<Container title="用户信息">
<view :style="{ width: '100%', height: '100%' }">
<UserHeader />
<UserHeader fullNickname />
<scroll-view
scroll-y
:show-scrollbar="false"
@@ -104,7 +104,20 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
<text v-else :style="{ color: '#CC311F' }">未完成</text>
</UserItem>
<UserItem title="会员" :onClick="toBeVipPage">
已赠送6个月会员
<view
v-if="user.sVip === true"
class="member-nickname member-nickname--svip"
>
<text class="member-nickname__text">已开通SVIP</text>
<text class="member-nickname__shine">已开通SVIP</text>
</view>
<view
v-else-if="user.vip === true"
class="member-nickname member-nickname--vip"
>
<text class="member-nickname__text">已开通VIP</text>
</view>
<text v-else>未开通</text>
</UserItem>
<UserItem title="等级介绍" :onClick="toGradeIntroPage">
<text :style="{ color: '#4C76FF' }">Lv{{ user.lvl }}</text>
@@ -115,7 +128,7 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
}"
>{{ user.lvlPoints }}</text
>
<text>点</text>
<text>经验</text>
</UserItem>
<UserItem
title="段位介绍"
@@ -124,15 +137,16 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
}"
:onClick="toRankIntroPage"
>
<text :style="{ color: '#8E53EA' }">{{ user.lvlName }}</text>
<text
:style="{
color: '#FF7900',
marginLeft: '5px',
}"
>{{ user.scores }}</text
>
<text>点</text>
<view v-if="user.rankIcon || user.rankName" class="rank-info">
<image
v-if="user.rankIcon"
class="rank-info__frame"
:src="user.rankIcon"
mode="aspectFit"
/>
<text>{{ user.rankName || "暂无段位" }}</text>
</view>
<text v-else>暂无段位</text>
</UserItem>
<view class="my-grow" @click="toMyGrowthPage">
<image src="https://static.shelingxingqiu.com/shootmini/static/my-grow.png" mode="widthFix" />
@@ -170,4 +184,13 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
.my-grow > image {
width: 100%;
}
.rank-info {
display: flex;
align-items: center;
}
.rank-info__frame {
width: 64rpx;
height: 64rpx;
margin-right: 8rpx;
}
</style>
src/store.js
+9 -11
View File
@@ -38,17 +38,15 @@ const getDefaultDailyCount = () => ({
});
const getLvlName = (rankLvl, rankList = []) => {
if (!rankList) return;
let lvlName = "";
rankList.some((r, index) => {
lvlName = rankList[index].name;
if (r.rank_id === rankLvl) {
lvlName = rankList[index].name;
return true;
}
return false;
});
return lvlName;
if (!Array.isArray(rankList) || rankLvl === undefined || rankLvl === null) {
return "";
}
// 仅返回真正匹配的段位，避免未加载时误取列表最后一项。
const rankInfo = rankList.find(
(item) => String(item.rank_id) === String(rankLvl)
);
return rankInfo?.name || "";
};
const getLvlNameByScore = (score, rankList = []) => {
src/websocket.js
+1 -1
View File
@@ -24,7 +24,7 @@ function createWebSocket(token, onMessage) {
switch (envVersion) {
case "develop": // 开发版
// url = "ws://192.168.1.2:8000/socket";
// url = "ws://192.168.1.30:8000/socket";
url = "wss://apitest.shelingxingqiu.com/socket";
break;
case "trial": // 体验版