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 @@ -