diff --git a/src/apis.js b/src/apis.js
index 5a12c0f..e0e1d69 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -146,15 +146,16 @@ export const unbindDeviceAPI = (deviceId) => {
});
};
-export const getMyDeviceAPI = () => {
+export const getMyDevicesAPI = () => {
return new Promise((resolve, reject) => {
uni.request({
- url: `${BASE_URL}/user/device/getBinding?deviceId=9ZF9oVXs`,
- // url: `${BASE_URL}/user/device/getBindings`,
+ // url: `${BASE_URL}/user/device/getBinding?deviceId=9ZF9oVXs`,
+ url: `${BASE_URL}/user/device/getBindings`,
method: "GET",
header: getAuthHeader(),
success: (res) => {
- resolve(res.data);
+ const { code, data } = res.data;
+ if (code === 0) resolve(data);
},
fail: (err) => {
reject(err);
diff --git a/src/components/Guide.vue b/src/components/Guide.vue
index c0520cc..f303b8c 100644
--- a/src/components/Guide.vue
+++ b/src/components/Guide.vue
@@ -20,7 +20,7 @@ defineProps({
:src="
tall ? '../static/long-bubble-tall.png' : '../static/long-bubble.png'
"
- :style="{ top: tall ? '-9%' : '-14%' }"
+ :style="{ top: tall ? '-6%' : '-12%' }"
mode="widthFix"
/>
@@ -40,7 +40,7 @@ defineProps({
}
.container > view {
position: relative;
- width: 80%;
+ width: 75%;
padding-right: 25px;
min-height: 55px;
display: flex;
@@ -49,7 +49,7 @@ defineProps({
.container > view > image {
position: absolute;
left: -7%;
- width: 100%;
+ width: 98%;
}
.container > view {
color: #fff;
diff --git a/src/pages.json b/src/pages.json
index b9ca509..f91b703 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -7,9 +7,15 @@
}
},
{
- "path": "pages/add-device",
+ "path": "pages/my-device",
"style": {
- "navigationBarTitleText": "弓箭绑定"
+ "navigationBarTitleText": "我的设备"
+ }
+ },
+ {
+ "path": "pages/device-intro",
+ "style": {
+ "navigationBarTitleText": "智能弓箭"
}
},
{
@@ -107,12 +113,6 @@
"style": {
"navigationBarTitleText": "排位赛"
}
- },
- {
- "path": "pages/equipment-debug",
- "style": {
- "navigationBarTitleText": "弓箭调试"
- }
}
],
"globalStyle": {
diff --git a/src/pages/device-intro.vue b/src/pages/device-intro.vue
new file mode 100644
index 0000000..199ccc0
--- /dev/null
+++ b/src/pages/device-intro.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+ 商品形象图及配图标题
+ 在射灵世界中,等级是衡量您射箭技能的重要指标,而点数则是您提升等级的关键。具体的要求如下
+ 每射出一支箭并上靶:无论您射出的箭命中哪个环数,只要箭成功上靶,您将获得1点基础点数。这是您积累点数的基本方式,每一次射击都是您向更高目标迈进的一步。
+ 射出的箭命中7-9环:当您的箭命中7环、8环或9环时,除了获得1点基础点数外,还将额外获得0.5点基础点数;
+ 射出的箭命中10环:命中10环是射箭中的最高成就,因此,当您的箭命中10环时,除了获得1点基础点数外,还将额外获得1点基础点数.即每次命中10环将总共获得?
+ 加官方企业微信订购(有优惠)
+
+
+
+
+
diff --git a/src/pages/equipment-debug.vue b/src/pages/equipment-debug.vue
deleted file mode 100644
index dc4713a..0000000
--- a/src/pages/equipment-debug.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
- 获取我的设备
-
-
-
-
-
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 67e9614..6f5cb70 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -53,10 +53,10 @@ const toPractisePage = () => {
}
};
-const toQquipmentPage = () => {
+const toMyDevicePage = () => {
if (isLogin()) {
uni.navigateTo({
- url: "/pages/equipment-debug",
+ url: "/pages/my-device",
});
}
};
@@ -94,7 +94,10 @@ onMounted(() => {
-
+
微信登录
@@ -105,9 +108,9 @@ onMounted(() => {
- 我的弓箭
+ 我的弓箭
{
.container {
height: calc(100vh - 220px);
- padding: 20px 10px;
+ padding: 15px 10px;
}
.feature-grid {
diff --git a/src/pages/add-device.vue b/src/pages/my-device.vue
similarity index 69%
rename from src/pages/add-device.vue
rename to src/pages/my-device.vue
index be22e8c..15765c1 100644
--- a/src/pages/add-device.vue
+++ b/src/pages/my-device.vue
@@ -1,22 +1,31 @@
-
+
扫码绑定弓箭
@@ -109,15 +133,19 @@ const toFristTryPage = () => {
-
-
-
+
+
+
{{ device.deviceName }}
-
+
-
+
{{ user.nickName }}
@@ -128,12 +156,31 @@ const toFristTryPage = () => {
进入新手试炼
+
+
+
+
+ {{ device.deviceName }}
+
+
+
+
+ {{ user.nickName }}
+
+
+ 解绑
+
diff --git a/src/static/checked-green.png b/src/static/bind-success.png
similarity index 100%
rename from src/static/checked-green.png
rename to src/static/bind-success.png