diff --git a/src/App.vue b/src/App.vue index 276694b..64ddd86 100644 --- a/src/App.vue +++ b/src/App.vue @@ -69,6 +69,7 @@ onMounted(() => { }).catch(() => { document.title = 'Yolo终端' }) + console.log('[App]', !isDev, isElectronEnv, !updateReady.value) // Check Login try { @@ -156,7 +157,7 @@ const startHealthCheck = () => { try { const result = await window.electronAPI.checkHealth() if (result.success && result.code === 40400) { - alert('当前账号已在其他地方登录,请重新登录') + alert(result.message) localStorage.removeItem(USER_KEY) // 隐藏所有 BrowserView 并停止自动化,防止视图悬浮在登录页上方 try { diff --git a/src/api/pk-mini.js b/src/api/pk-mini.js index 84d1484..f671281 100644 --- a/src/api/pk-mini.js +++ b/src/api/pk-mini.js @@ -226,3 +226,12 @@ export function resendEmail(data) { export function logout(data) { return postAxios({ url: 'user/logout', data }) } +// 获取商品列表 +export function getPkItemList(data) { + return getAxios({ url: 'pkItem/list', params: data }) +} + +// 购买商品 +export function buyPkItem(data) { + return postAxios({ url: 'pkItem/buy', data }) +} \ No newline at end of file diff --git a/src/components/pk-mini/mine/PointsList.vue b/src/components/pk-mini/mine/PointsList.vue index d5bb950..004f76e 100644 --- a/src/components/pk-mini/mine/PointsList.vue +++ b/src/components/pk-mini/mine/PointsList.vue @@ -6,6 +6,7 @@
我的积分: {{ currentUser.points || 0 }}
+
@@ -18,14 +19,51 @@
您还没有积分记录!
+ + +
+
+
+
+
积分兑换
+
×
+
+
+ +
+
+
+
+
{{ item.itemName }}
+
+ 积分 + {{ item.itemPrice }} +
+
+
{{ item.itemDesc }}
+ +
+
+
+
暂无商品
+
加载中...
+
+
+
@@ -339,10 +321,7 @@ watch(autoDmMode, async (newVal) => { /* Material Icons support - simplistic import, ideal to put in index.html or main.js */ @import url('https://fonts.googleapis.com/icon?family=Material+Icons+Round'); -.yolo-logo{ +.yolo-logo { width: 70%; } - - - diff --git a/src/views/tk/Workbenches.vue b/src/views/tk/Workbenches.vue index a0c57d3..87c1b91 100644 --- a/src/views/tk/Workbenches.vue +++ b/src/views/tk/Workbenches.vue @@ -276,16 +276,23 @@
- - +
+ + + +

到期时间: {{ timestampToTime(expiredTime) }}

@@ -297,7 +304,8 @@