diff --git a/src/apis.js b/src/apis.js
index bb40f0b..5ce8a20 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -433,6 +433,14 @@ export const getPointBookDetailAPI = async (id) => {
return request("GET", `/user/score/sheet/detail?id=${id}`);
};
-export const getPractiseDataAPI = async () => {
+export const getPointBookDataAPI = async () => {
return request("GET", "/user/score/sheet/statistics");
};
+
+export const getPractiseDataAPI = async () => {
+ return request("GET", "/user/practice/statistics");
+};
+
+export const getBattleDataAPI = async () => {
+ return request("GET", "/user/fight/statistics");
+};
diff --git a/src/pages/friend-battle.vue b/src/pages/friend-battle.vue
index a0c577c..fc11b89 100644
--- a/src/pages/friend-battle.vue
+++ b/src/pages/friend-battle.vue
@@ -1,12 +1,13 @@
@@ -79,23 +85,33 @@ const onCreateRoom = async () => {
- 1111
+ {{ data.TotalBattle }}
局
约战数量
- 1111
+ {{ data.totalArrow }}
箭
射箭量
-
-
-
+
+
+
+
+
挑战难度
@@ -279,9 +295,9 @@ const onCreateRoom = async () => {
}
.my-data > view:last-child > view > view > text:first-child {
color: #fff;
- font-size: 17px;
+ font-size: 20px;
margin-right: 5px;
- transform: translateY(3px);
+ transform: translateY(4px);
}
.my-data > view:last-child > view:nth-child(2) {
border-left: 1px solid #48494e;
@@ -293,7 +309,7 @@ const onCreateRoom = async () => {
height: 20px;
}
.stars > image {
- width: 5vw;
+ width: 4vw;
margin: 0 1px;
}
diff --git a/src/pages/point-book-create.vue b/src/pages/point-book-create.vue
index 961cfe8..a03f1f7 100644
--- a/src/pages/point-book-create.vue
+++ b/src/pages/point-book-create.vue
@@ -4,7 +4,7 @@ import { onShow } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import EditOption from "@/components/EditOption.vue";
import SButton from "@/components/SButton.vue";
-import { getPractiseDataAPI } from "@/apis";
+import { getPointBookDataAPI } from "@/apis";
const expandIndex = ref(0);
const bowType = ref({});
@@ -60,7 +60,7 @@ const toEditPage = () => {
}
};
onShow(async () => {
- const result = await getPractiseDataAPI();
+ const result = await getPointBookDataAPI();
if (result) {
days.value = result.total_day || 0;
arrows.value = result.total_arrow || 0;
diff --git a/src/pages/practise.vue b/src/pages/practise.vue
index a725889..dc26b61 100644
--- a/src/pages/practise.vue
+++ b/src/pages/practise.vue
@@ -1,12 +1,16 @@
@@ -40,17 +49,23 @@ const toPractiseTwo = () => {
已练习打卡
- 12121
+ {{ data.totalDay }}
天
- 1111组
+
+ {{ data.totalGroup }}
+ 组
+
个人练习量
- 1111箭
+
+ {{ data.totalArrow }}
+ 箭
+
射箭量
@@ -116,7 +131,7 @@ const toPractiseTwo = () => {
.practise-data > view:first-child > view:last-child > text:nth-child(2) {
color: #f7d247;
margin: 0 3px;
- font-size: 18px;
+ font-size: 20px;
font-weight: 600;
transform: translateY(3px);
}
@@ -139,11 +154,11 @@ const toPractiseTwo = () => {
align-items: flex-end;
}
.practise-data > view:last-child > view > view > text:nth-last-child(2) {
- font-size: 18px;
+ font-size: 20px;
font-weight: 600;
color: #fff;
margin: 0 3px;
- transform: translateY(3px);
+ transform: translateY(5px);
}
.practise-data > view:last-child > view > text {
margin-top: 5px;
diff --git a/src/static/star-empty.png b/src/static/star-empty.png
new file mode 100644
index 0000000..33ee3f6
Binary files /dev/null and b/src/static/star-empty.png differ