From c35152900a252740f03a4ed2825e64bc147228b9 Mon Sep 17 00:00:00 2001
From: "1054425342@qq.com" <1054425342@qq.com>
Date: Sun, 24 Aug 2025 11:08:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 2 ++
components/DynamicIsland.vue | 7 ++++++-
components/WaterfallLayout.vue | 23 +++++++++++------------
pages/index/iSoul.vue | 6 ++++--
pages/index/timeShopBank.vue | 30 ++++++++++++++++++++----------
static/js/request.js | 5 +++--
6 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/App.vue b/App.vue
index 3127766..9737bbc 100644
--- a/App.vue
+++ b/App.vue
@@ -43,6 +43,8 @@ export default {
getUserInfo() {
if (!this.getUserId()) return;
this.Post({}, "/framework/user/getInfo", "DES").then((res) => {
+ let token = JSON.parse(uni.getStorageSync("userInfo")).token
+ res.data.token = token
uni.setStorageSync("userInfo", JSON.stringify(res.data));
});
},
diff --git a/components/DynamicIsland.vue b/components/DynamicIsland.vue
index b5f878b..ee030cc 100644
--- a/components/DynamicIsland.vue
+++ b/components/DynamicIsland.vue
@@ -30,7 +30,7 @@
>
欢迎回来~
-
+
2
个
@@ -297,6 +297,11 @@ export default {
this.collapseIsland();
}
},
+ toOrder(){
+ uni.switchTab({
+ url:'/pages/index/iSoul'
+ })
+ },
getCompactName() {
// 从用户信息中获取昵称
if (this.userInfo && this.userInfo.nickname) {
diff --git a/components/WaterfallLayout.vue b/components/WaterfallLayout.vue
index b528c8a..bdfa4ce 100644
--- a/components/WaterfallLayout.vue
+++ b/components/WaterfallLayout.vue
@@ -7,28 +7,27 @@
v-for="(item, index) in leftItems"
:key="item.id || index"
class="waterfall-item"
- @click="handleItemClick(item)"
>
{{ item.title }}
-
@@ -41,28 +40,28 @@
v-for="(item, index) in rightItems"
:key="item.id || index"
class="waterfall-item"
- @click="handleItemClick(item)"
+
>
{{ item.title }}
-
diff --git a/pages/index/iSoul.vue b/pages/index/iSoul.vue
index b038f31..9e36820 100644
--- a/pages/index/iSoul.vue
+++ b/pages/index/iSoul.vue
@@ -385,6 +385,7 @@ export default {
// 页面加载时的初始化逻辑
},
onShow() {
+ console.log(uni.getStorageSync("userInfo"))
this.userInfo =
(uni.getStorageSync("userInfo") &&
JSON.parse(uni.getStorageSync("userInfo"))) ||
@@ -426,6 +427,7 @@ export default {
},
getUserInfo() {
this.Post({}, "/framework/user/getInfo", "DES").then((res) => {
+ res.data.token = this.userInfo.token
uni.setStorageSync("userInfo", JSON.stringify(res.data));
this.userInfo = res.data
});
@@ -1088,7 +1090,8 @@ view {
padding: 40rpx 30rpx 30rpx;
color: white;
backdrop-filter: blur(10rpx);
- border: 1rpx solid rgba(255, 255, 255, 0.1);
+ width: 100%;
+ height: 100%;
}
.asset-badge {
@@ -1125,7 +1128,6 @@ view {
border-radius: 20rpx;
padding: 10rpx 16rpx;
backdrop-filter: blur(10rpx);
- border: 1rpx solid rgba(255, 255, 255, 0.2);
white-space: nowrap;
min-width: 0;
}
diff --git a/pages/index/timeShopBank.vue b/pages/index/timeShopBank.vue
index e261be3..b42f4ce 100644
--- a/pages/index/timeShopBank.vue
+++ b/pages/index/timeShopBank.vue
@@ -24,9 +24,10 @@
-
@@ -77,11 +78,16 @@ export default {
{ name: "关注", id: "follow" },
{ name: "推荐", id: "recommend" },
],
- waterfallItems: [],
+ waterfallItems: [
+ {title:'生命的扶持|风景之旅',image:'/uploads/20250824/2cf1f49920b911c9d14e4abf3b67a59c.png'},
+ {title:'苏州丨园林之美 鱼戏莲叶间心随鱼鸟闲',image:'/uploads/20250824/c209044a821630158f6e6771805682a7.png'},
+ {title:'蘇州｜你一句春不晚，我便出现在真江南',image:'/uploads/20250824/74101a77233375625282209392dc69e3.png'},
+ {title:'收好这天然氧吧',image:'/uploads/20250824/e0ab7fd0483d05742451e8f10ab3ce24.png'},
+ ],
autoAddEnabled: false,
// 图片URL数组
images: [
- "https://images.unsplash.com/photo-1501854140801-50d01698950b?auto=format&fit=crop&w=800",
+ "/uploads/20250824/2cf1f49920b911c9d14e4abf3b67a59c.png",
"https://images.unsplash.com/photo-1470071459604-3b5ec3a7fe05?auto=format&fit=crop&w=800",
"https://images.unsplash.com/photo-1441974231531-c6227db76b6e?auto=format&fit=crop&w=800",
"https://images.unsplash.com/photo-1469474968028-56623f02e42e?auto=format&fit=crop&w=800",
@@ -142,9 +148,12 @@ export default {
JSON.parse(uni.getStorageSync("userInfo"))) ||
this.$store.state.user.userInfo ||
{};
- if (this.userInfo && this.userInfo.token) {
- this.getUserInfo()
- }
+
+ },
+ onShow() {
+ if (this.userInfo && this.userInfo.token) {
+ this.getUserInfo()
+ }
},
@@ -161,6 +170,7 @@ export default {
methods: {
getUserInfo() {
this.Post({}, "/framework/user/getInfo", "DES").then((res) => {
+ res.data.token = this.userInfo.token
uni.setStorageSync("userInfo", JSON.stringify(res.data));
this.userInfo = res.data
this.$nextTick(() =>{
@@ -203,13 +213,13 @@ export default {
for (let i = 0; i < 20; i++) {
initialItems.push(this.getRandomItem());
}
- this.waterfallItems = initialItems;
+ // this.waterfallItems = initialItems;
},
// 添加随机项目
addRandomItem() {
const newItem = this.getRandomItem();
- this.waterfallItems.push(newItem);
+ // this.waterfallItems.push(newItem);
},
// 清空所有项目
@@ -254,7 +264,7 @@ export default {
for (let i = 0; i < 10; i++) {
newItems.push(this.getRandomItem());
}
- this.waterfallItems.push(...newItems);
+ // this.waterfallItems.push(...newItems);
},
// Tab切换方法
diff --git a/static/js/request.js b/static/js/request.js
index f106497..fffa3c7 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -2,8 +2,9 @@ import Vue from 'vue';
import store from '@/store';
// 定义 API URL
-// const DEV_API_URL = 'https://epic.new.js-dyyj.com';
-const DEV_API_URL = 'https://epic.js-dyyj.com';
+const DEV_API_URL = 'https://epic.new.js-dyyj.com';
+// const DEV_API_URL = 'https://epic.js-dyyj.com';
+
// const PROD_API_URL = 'https://epic.js-dyyj.com';
const PROD_API_URL = 'https://epic.new.js-dyyj.com';
const NEWAPIURL = process.env.NODE_ENV === 'development' ? DEV_API_URL : PROD_API_URL;