Compare commits
2
Commits
9a06dcf942
...
45bc324f70
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45bc324f70 | ||
|
|
2eba5f87d7 |
@@ -30,7 +30,13 @@ const getDisplayText = (arrow = {}) => {
|
||||
|
||||
const isFailed = (arrow = {}) => {
|
||||
if (!arrow) return false;
|
||||
if (props.recordMode && props.trainingType !== "precision") return false;
|
||||
if (
|
||||
props.recordMode &&
|
||||
props.trainingType !== "precision" &&
|
||||
props.trainingType !== "rhythm"
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
return arrow.ok !== true;
|
||||
};
|
||||
|
||||
|
||||
@@ -28,6 +28,10 @@ const props = defineProps({
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
trainingType: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -72,6 +76,7 @@ const props = defineProps({
|
||||
:rowCount="total === 12 ? 6 : 9"
|
||||
:total="total"
|
||||
:arrows="arrows"
|
||||
:trainingType="trainingType"
|
||||
:margin="total === 12 ? 4 : 1"
|
||||
:fontSize="total === 12 ? 25 : 22"
|
||||
/>
|
||||
|
||||
@@ -21,6 +21,10 @@ const props = defineProps({
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
trainingType: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
});
|
||||
const items = ref(new Array(props.total).fill(9));
|
||||
const bgImages = [
|
||||
@@ -34,7 +38,9 @@ const getDisplayText = (arrow) => {
|
||||
};
|
||||
|
||||
const isLowScore = (arrow) => {
|
||||
if (!arrow || arrow.ringX) return false;
|
||||
if (!arrow) return false;
|
||||
if (props.trainingType === "rhythm") return arrow.ok !== true;
|
||||
if (arrow.ringX) return false;
|
||||
const ring = Number(arrow.ring);
|
||||
return Number.isFinite(ring) && ring < 6;
|
||||
};
|
||||
|
||||
@@ -454,7 +454,7 @@ const calories = computed(
|
||||
</view>
|
||||
</view>
|
||||
</ScreenHint>
|
||||
<BowData :total="details.length" :arrows="details" :show="showBowData"
|
||||
<BowData :total="details.length" :arrows="details" :show="showBowData" :trainingType="resultTrainingType"
|
||||
:onClose="() => (showBowData = false)" />
|
||||
<UserUpgrade :show="showUpgrade" :onClose="() => (showUpgrade = false)" :lvl="userLevel" />
|
||||
</view>
|
||||
|
||||
@@ -484,7 +484,7 @@ onShow(async () => {
|
||||
<text class="record-sub-text">我的训练记录</text>
|
||||
<image
|
||||
class="record-arrow"
|
||||
src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_7.png"
|
||||
src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_right.png"
|
||||
mode="widthFix"
|
||||
/>
|
||||
</view>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 348 B |
Reference in New Issue
Block a user