diff --git a/src/components/EditOption.vue b/src/components/EditOption.vue
index 398fe2b..26deab4 100644
--- a/src/components/EditOption.vue
+++ b/src/components/EditOption.vue
@@ -78,7 +78,7 @@ const onSelectItem = (index) => {
} else if (props.itemIndex === 3 && secondSelectIndex.value !== -1) {
props.onSelect(
props.itemIndex,
- `${selectedIndex.value + 1}组/${groupArrows[secondSelectIndex.value]}箭`
+ `${selectedIndex.value}/${groupArrows[secondSelectIndex.value]}`
);
}
};
@@ -87,7 +87,7 @@ const onSelectSecondItem = (index) => {
if (selectedIndex.value !== -1) {
props.onSelect(
props.itemIndex,
- `${selectedIndex.value + 1}组/${groupArrows[secondSelectIndex.value]}箭`
+ `${selectedIndex.value}/${groupArrows[secondSelectIndex.value]}`
);
}
};
diff --git a/src/components/Header.vue b/src/components/Header.vue
index fa366e3..ef6b917 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -24,6 +24,7 @@ const onClick = () => {
const loading = ref(false);
const showLoader = ref(false);
+const pointBook = ref(null);
const updateLoading = (value) => {
loading.value = value;
};
@@ -33,6 +34,9 @@ onMounted(() => {
isIos.value = deviceInfo.osName === "ios";
const pages = getCurrentPages();
const currentPage = pages[pages.length - 1];
+ if (currentPage.route === "pages/point-book-edit") {
+ pointBook.value = uni.getStorageSync("point-book");
+ }
if (
currentPage.route === "pages/battle-room" ||
currentPage.route === "pages/team-match" ||
@@ -92,6 +96,21 @@ onUnmounted(() => {
mode="widthFix"
class="loading"
/>
+
+ {{ pointBook.bowType }}
+ {{ pointBook.distance }} 米
+ {{
+ pointBook.bowtargetType.substring(
+ 0,
+ pointBook.bowtargetType.length - 3
+ )
+ }}
+ {{
+ pointBook.bowtargetType.substring(pointBook.bowtargetType.length - 3)
+ }}
+
@@ -104,6 +123,8 @@ onUnmounted(() => {
height: 100rpx;
/* margin-top: var(--status-bar-height); */
padding-left: 15px;
+}
+.container > view:nth-child(2) {
font-size: 16px;
font-weight: bold;
}
@@ -141,4 +162,19 @@ onUnmounted(() => {
background-blend-mode: darken;
animation: rotate 2s linear infinite;
}
+.point-book-info {
+ color: #333;
+ position: fixed;
+ width: 60%;
+ left: 20%;
+ display: flex;
+ justify-content: center;
+}
+.point-book-info > text {
+ border-radius: 6px;
+ background-color: #fff;
+ font-size: 10px;
+ padding: 5px 10px;
+ margin: 3px;
+}
diff --git a/src/pages/point-book-create.vue b/src/pages/point-book-create.vue
index 2b7c151..48b6a06 100644
--- a/src/pages/point-book-create.vue
+++ b/src/pages/point-book-create.vue
@@ -4,7 +4,7 @@ import Container from "@/components/Container.vue";
import EditOption from "@/components/EditOption.vue";
import SButton from "@/components/SButton.vue";
-const clickable = ref(true);
+const clickable = ref(false);
const expandIndex = ref(-1);
const bowType = ref("");
const distance = ref(0);
@@ -30,6 +30,12 @@ const onSelect = (itemIndex, value) => {
bowtargetType.value &&
amountGroup.value
) {
+ uni.setStorageSync("point-book", {
+ bowType: bowType.value,
+ distance: distance.value,
+ bowtargetType: bowtargetType.value,
+ amountGroup: amountGroup.value,
+ });
clickable.value = true;
}
};
diff --git a/src/pages/point-book-edit.vue b/src/pages/point-book-edit.vue
index d735a93..cdf44b7 100644
--- a/src/pages/point-book-edit.vue
+++ b/src/pages/point-book-edit.vue
@@ -1,16 +1,62 @@
@@ -20,7 +66,39 @@ const onClick = () => {};
:whiteBackArrow="false"
:onBack="() => (showTip = true)"
>
-
+
+
+
+
+
+
+ 第 {{ currentGroup }} 组
+
+
+ {{ arrow === null ? "" : arrow + " 环" }}
+
+ 输入分值的情况下,系统不提供落点稳定性分
+
+ onClickRing(11)">X
+ onClickRing(11 - i)"
+ :style="{ backgroundColor: ringColors[i] || '#d8d8d8' }"
+ >{{ 11 - i }}
+ onClickRing(0)">M
+
现在离开会导致
@@ -37,17 +115,57 @@ const onClick = () => {};
- 记完了,提交看分析
+ {{ currentGroup === groups ? "记完了,提交看分析" : "下一组" }}