diff --git a/src/apis.js b/src/apis.js
index d597fdc..9a02fb9 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -374,7 +374,7 @@ export const savePointBookAPI = async (
targetType,
groups,
arrows,
- group_data = []
+ data = []
) => {
return request("POST", "/user/score/sheet/report", {
bowType,
@@ -382,15 +382,27 @@ export const savePointBookAPI = async (
targetType,
groups,
arrows,
- group_data,
+ group_data: data.map((item) =>
+ item.map((i) => ({
+ ...i,
+ ring: i.ring === "M" ? -1 : i.ring === "X" ? 0 : Number(i.ring),
+ }))
+ ),
});
};
-export const getPointBookListAPI = async (page = 1, size = 10) => {
- return request(
- "GET",
- `/user/score/sheet/list?pageNum=${page}&pageSize=${size}`
- );
+export const getPointBookListAPI = async (
+ page = 1,
+ bowType,
+ distance,
+ targetType
+) => {
+ let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
+ if (bowType) url += `&bowType=${bowType}`;
+ if (distance) url += `&distance=${distance}`;
+ if (targetType) url += `&targetType=${targetType}`;
+ const result = await request("GET", url);
+ return result.list || [];
};
export const getPointBookDetailAPI = async (id) => {
diff --git a/src/components/BowTargetEdit.vue b/src/components/BowTargetEdit.vue
index 25830dc..57ea4ba 100644
--- a/src/components/BowTargetEdit.vue
+++ b/src/components/BowTargetEdit.vue
@@ -17,7 +17,7 @@ const props = defineProps({
},
onChange: {
type: Function,
- default: (arrow) => {},
+ default: null,
},
});
@@ -28,7 +28,7 @@ const dragStartPos = ref({ x: 0, y: 0 });
// 点击靶纸创建新的点
const onClick = async (e) => {
- if (arrow.value !== null) return;
+ if (arrow.value !== null || !props.onChange) return;
const newArrow = {
x: e.detail.x - (rect.value.width * 0.1) / 2,
y: e.detail.y - rect.value.top - 10,
@@ -45,7 +45,8 @@ const onClick = async (e) => {
// 确认添加箭矢
const confirmAdd = () => {
- props.onChange(arrow.value);
+ if (props.onChange)
+ props.onChange({ ...arrow.value, ring: arrow.value.ring || "M" });
arrow.value = null;
};
diff --git a/src/components/EditOption.vue b/src/components/EditOption.vue
index 2450d31..34f7587 100644
--- a/src/components/EditOption.vue
+++ b/src/components/EditOption.vue
@@ -65,7 +65,10 @@ const onMeterChange = (e) => {
watch(
() => props.value,
(newValue) => {
- if (!newValue) return;
+ if (!newValue) {
+ selectedIndex.value = -1;
+ return;
+ }
if (props.itemIndex === 0 || props.itemIndex === 2) {
data.value.forEach((item, index) => {
if (item.name === newValue) {
@@ -93,7 +96,6 @@ onMounted(() => {
} else if (props.itemIndex === 2) {
data.value = config.targetOption;
}
- // props.onSelect(props.itemIndex, config[props.itemIndex]);
}
});
diff --git a/src/components/PointRecord.vue b/src/components/PointRecord.vue
index f9817b1..6b1459b 100644
--- a/src/components/PointRecord.vue
+++ b/src/components/PointRecord.vue
@@ -1,29 +1,49 @@
- 反曲弓
- 5 米
- 40 全环靶
+ {{
+ bowOptions[data.bowType] ? bowOptions[data.bowType].name : ""
+ }}
+ {{ data.distance }} 米
+ {{
+ targetOptions[data.targetType]
+ ? targetOptions[data.targetType].name
+ : ""
+ }}
- 2025-07-10 14:00:00
+ {{ data.createAt }}
共
- 36
+ {{ data.arrows * data.groups }}
箭
diff --git a/src/pages/point-book-detail.vue b/src/pages/point-book-detail.vue
index efcfea2..1dbf105 100644
--- a/src/pages/point-book-detail.vue
+++ b/src/pages/point-book-detail.vue
@@ -2,21 +2,18 @@
import { ref, onMounted, onUnmounted } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
-import BowTarget from "@/components/BowTarget.vue";
+import BowTargetEdit from "@/components/BowTargetEdit.vue";
import ScreenHint2 from "@/components/ScreenHint2.vue";
import { getPointBookDetailAPI } from "@/apis";
-onLoad(async (options) => {
- if (options.id) {
- const result = await getPointBookDetailAPI(options.id);
- console.log(1212, result);
- }
-});
-
const selectedIndex = ref(0);
const showTip = ref(false);
const showTip2 = ref(false);
+const groups = ref([]);
+const data = ref({});
+const targetSrc = ref("");
+const arrows = ref([]);
const openTip = (index) => {
if (index === 1) showTip.value = true;
@@ -27,6 +24,29 @@ const closeTip = () => {
showTip.value = false;
showTip2.value = false;
};
+
+const onSelect = (index) => {
+ selectedIndex.value = index;
+ data.value = groups.value[index];
+ arrows.value = groups.value[index].list.filter((item) => item.x && item.y);
+};
+
+onLoad(async (options) => {
+ if (options.id) {
+ const result = await getPointBookDetailAPI(options.id);
+ const config = uni.getStorageSync("point-book-config");
+ config.targetOption.some((item) => {
+ if (item.id === result.targetType) {
+ targetSrc.value = item.icon;
+ }
+ });
+ if (result.groups) {
+ groups.value = result.groups;
+ data.value = result.groups[0];
+ arrows.value = result.groups[0].list.filter((item) => item.x && item.y);
+ }
+ }
+});
@@ -34,9 +54,9 @@ const closeTip = () => {
- 98.99
+ {{ Number((data.stability || 0).toFixed(2)) }}
黄心率
- 86.3%
+ {{ Number((data.yellowRate * 100).toFixed(2)) }}%
10环数
- 65
+ {{ data.tenRings }}
平均环数
- 8.99
+ {{ Number((data.averageRing || 0).toFixed(2)) }}
总环数
- 700/999
+ {{ data.userTotalRing }}/{{ data.totalRing }}
@@ -96,7 +116,7 @@ const closeTip = () => {
/>
-
+
diff --git a/src/pages/point-book-edit.vue b/src/pages/point-book-edit.vue
index 519070e..64ea321 100644
--- a/src/pages/point-book-edit.vue
+++ b/src/pages/point-book-edit.vue
@@ -46,9 +46,9 @@ const onSubmit = async () => {
amount.value,
Object.values(arrowGroups.value)
);
- if (res.id) {
+ if (res.record_id) {
uni.redirectTo({
- url: `/pages/point-book-detail?id=${res.id}`,
+ url: `/pages/point-book-detail?id=${res.record_id}`,
});
}
}
diff --git a/src/pages/point-book-list.vue b/src/pages/point-book-list.vue
index c1bf3f7..c9eee19 100644
--- a/src/pages/point-book-list.vue
+++ b/src/pages/point-book-list.vue
@@ -7,15 +7,20 @@ import PointRecord from "@/components/PointRecord.vue";
import ScrollList from "@/components/ScrollList.vue";
import { getPointBookListAPI } from "@/apis";
-const bowType = ref("");
+const bowType = ref({});
const distance = ref(0);
-const bowtargetType = ref("");
+const bowtargetType = ref({});
const showModal = ref(false);
const selectorIndex = ref(0);
const list = ref([]);
const onListLoading = async (page) => {
- const result = await getPointBookListAPI(page, 1);
+ const result = await getPointBookListAPI(
+ page,
+ bowType.value.id,
+ distance.value,
+ bowtargetType.value.id
+ );
if (page === 1) {
list.value = result;
} else {
@@ -31,12 +36,14 @@ const openSelector = (index) => {
const onSelectOption = (itemIndex, value) => {
if (itemIndex === 0) {
- bowType.value = value;
+ bowType.value = value.name === bowType.value.name ? {} : value;
} else if (itemIndex === 1) {
- distance.value = value;
+ distance.value = value === distance.value ? 0 : value;
} else if (itemIndex === 2) {
- bowtargetType.value = value;
+ bowtargetType.value = value.name === bowtargetType.value.name ? {} : value;
}
+ showModal.value = false;
+ onListLoading(1);
};
const toDetailPage = (id) => {
uni.navigateTo({
@@ -55,32 +62,32 @@ const toDetailPage = (id) => {
openSelector(0)">
- {{
- bowType || "请选择"
+ {{
+ bowType.name || "请选择"
}}
openSelector(1)">
- {{
+ {{
distance ? distance + " 米" : "请选择"
}}
openSelector(2)">
- {{
- bowtargetType || "请选择"
+ {{
+ bowtargetType.name || "请选择"
}}
-
+
toDetailPage(item.id)"
>
-
+
@@ -99,6 +106,7 @@ const toDetailPage = (id) => {
:expand="true"
:noArrow="true"
:onSelect="onSelectOption"
+ :value="bowType.name"
/>
{
:expand="true"
:noArrow="true"
:onSelect="onSelectOption"
+ :value="distance + ''"
/>
{
:expand="true"
:noArrow="true"
:onSelect="onSelectOption"
+ :value="bowtargetType.name"
/>
@@ -170,5 +180,6 @@ const toDetailPage = (id) => {
}
.point-records {
padding: 15px;
+ height: calc(100% - 30px);
}