From 5c4200097cdce346eb89885a107bff41bb43dbda Mon Sep 17 00:00:00 2001 From: 15093570141 <141405260+17521612761@users.noreply.github.com> Date: Tue, 15 Oct 2024 16:19:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91(=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83)=EF=BC=9A=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=A4=B4=E9=83=A8=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coreshop-login-modal.vue | 5 +- .../coreshop-page/coreshop-page.vue | 2 +- .../CoreShop/core/store/login.ts | 15 ++- .../classify-five/classify-five.vue | 6 +- .../classify-four/classify-four.vue | 6 +- .../CoreShop/pages/member/member.scss | 43 ++---- .../CoreShop/pages/member/member.vue | 124 +++++++++--------- .../CoreShop/static/images/member/bg.png | Bin 7646 -> 26480 bytes .../static/images/member/member-bg.png | Bin 21863 -> 0 bytes 9 files changed, 104 insertions(+), 97 deletions(-) delete mode 100644 CoreCms.Net.Uni-App/CoreShop/static/images/member/member-bg.png diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue index 2926fee8..8926fbc0 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue @@ -81,7 +81,7 @@ } }); - const emits = defineEmits(['handleChangePopup']); + const emits = defineEmits(['handleChangePopup', 'getUserInfo']); onMounted(() => { if (Object.keys(userInfoStore.userInfo).length == 0 || !uni.getStorageSync(UserToken)) { @@ -162,7 +162,8 @@ uni.setStorageSync(UserToken, phoneNumber.data.token); if (phoneNumber.otherData) { userInfoStore.setUserInfo(phoneNumber.otherData); - handleShowToast('登录成功', 'success'); + handleShowToast('登录成功', 'success'); + emits('getUserInfo') } } else { handleShowToast('登录失败，请重试'); diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue index 682e7c3c..013a4e51 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue @@ -8,7 +8,7 @@ diff --git a/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts b/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts index ce84a158..eae2f630 100644 --- a/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts +++ b/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts @@ -1,6 +1,9 @@ import { defineStore } from 'pinia'; import { UserToken } from '@/core/consts'; -import type { UserLoginStoreType } from '@/core/models'; +import { handleShowToast } from '@/core/utils'; +import { queryUserInfo } from '@/core/api'; +import type { UserLoginStoreType, Response, UserInfoType } from '@/core/models'; +import { useUserInfoStore } from './userInfo'; export const useLoginStore = defineStore('useLoginStore', { state: () : UserLoginStoreType => { @@ -17,6 +20,16 @@ export const useLoginStore = defineStore('useLoginStore', { callBack(); } }, + /** 获取用户数据 */ + async getUserInfo() { + const userInfoStore = useUserInfoStore(); + const userInfo : Response = await queryUserInfo(); + if (userInfo.status) { + userInfoStore.setUserInfo(userInfo?.data); + } else { + handleShowToast(userInfo.msg) + } + }, /** 设置登录弹框打开或者关闭 */ setShowLoginModalTogglePop(showLoginModalTogglePop : boolean) { this.showLoginModalTogglePop = showLoginModalTogglePop; diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue index a73b08cd..618b08d2 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue @@ -234,8 +234,10 @@ limit: 10, where: `{"catId":${state.catId}}` }); - state.totalPages = goodsPageList.data.totalPages; - state.goodsList = state.goodsList.concat(goodsPageList.data.list); + if(goodsPageList.status){ + state.totalPages = goodsPageList.data?.totalPages; + state.goodsList = state.goodsList.concat(goodsPageList.data?.list); + } uni.hideLoading(); } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue index e2d17570..3b8d9803 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue @@ -156,8 +156,10 @@ limit: 10, where: `{"catId":${state.catId}}` }); - state.totalPages = goodsPageList.data.totalPages; - state.goodsList = state.goodsList.concat(goodsPageList.data.list); + if(goodsPageList.status){ + state.totalPages = goodsPageList.data?.totalPages; + state.goodsList = state.goodsList.concat(goodsPageList.data?.list); + } uni.hideLoading(); } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss index 35dd08ad..95388a5c 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss @@ -1,20 +1,17 @@ -:deep(.layout-page-content) { - &::before { - position: absolute; - left: 0; - top: -50px; +.member-head{ + position: relative; + .memeber-bg{ display: block; - content: ''; - width: 100%; - height: 685rpx; - background: #d33123 url(/static/images/member/bg.png); - background-size: cover; + width: 750rpx; + height: 600rpx; } } -.head-box { - position: relative; - margin-top: -20rpx; +.head-box { + position: absolute; + bottom: 13rpx; + left: 0; + width: 100%; .user-info { display: flex; align-items: center; @@ -85,25 +82,13 @@ } } } - .member-box { - position: relative; - - .bg { - display: block; - width: 100%; - height: 100rpx; - } - - .member-content { - position: absolute; - left: 50%; - top: 44%; - transform: translate(-50%, -50%); - width: 88%; + .member-box { + .member-content { + width: 88%; + margin: auto; display: flex; align-items: center; justify-content: space-between; - .content { display: flex; align-items: center; diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue index bf6e33a1..f161ab84 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue @@ -1,66 +1,70 @@