Merge branch 'dev' into 'master'

【优化】(获取用户信息):判断请求成功后,赋值

See merge request jianweie/coreshoppro!46
This commit is contained in:
花城
2024-10-19 10:56:46 +00:00
2 changed files with 10 additions and 6 deletions

View File

@@ -82,7 +82,9 @@
/** 获取用户信息 */
const getUserInfo = async () => {
const userInfo : Response<UserInfoType> = await queryUserInfo();
userInfoStore.setUserInfo(userInfo?.data);
if(userInfo.status){
userInfoStore.setUserInfo(userInfo?.data);
}
}
/** 搜索 */

View File

@@ -32,10 +32,10 @@
</template>
<script setup lang="ts">
import { onPageScroll, onload } from '@dcloudio/uni-app';
import { onPageScroll, onLoad } from '@dcloudio/uni-app';
import { reactive } from 'vue';
import { queryPageConfig, queryUserInfo } from '@/core/api';
import type { Response, PageConfigType, PageConfigItemsType, UserInfoType, UserInfoStoreType } from '@/core/models';
import type { Response, PageConfigType, PageConfigItemsType, UserInfoType } from '@/core/models';
import CustomPage from '@/pages/components/custom-page/index.vue';
import HomeAdpop from '@/pages/components/custom-page/components/home-adpop/home-adpop.vue';
import { handleStaticResources } from '@/core/utils';
@@ -50,7 +50,7 @@
/** 获取自定义导航栏高度 */
const { statusBarHeight } = useSystemInfo();
/** 获取 用户数据 */
const userInfoStore : UserInfoStoreType = useUserInfoStore();
const userInfoStore = useUserInfoStore();
const state = reactive<{
coreshopData : Array<PageConfigItemsType>;
@@ -68,7 +68,7 @@
}
})
onload((query : QueryParams) => {
onLoad((query : QueryParams) => {
getPageConfig(query?.code);
if (uni.getStorageSync(UserToken)) {
getUserInfo();
@@ -83,7 +83,9 @@
/** 获取用户信息 */
const getUserInfo = async () => {
const userInfo : Response<UserInfoType> = await queryUserInfo();
userInfoStore.setUserInfo(userInfo?.data);
if(userInfo.status){
userInfoStore.setUserInfo(userInfo?.data);
}
}
</script>