diff --git a/pages/index/index.vue b/pages/index/index.vue index 6bfbe3f..c6a0e66 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -209,7 +209,8 @@ } from "@/api/cart.js"; import { productLogApi, - userInfoApi + userInfoApi, + getStoreInfo } from "@/api/user.js"; import viewPopup from "@/components/viewPopup.vue" import goodPopup from "@/components/goodPopup.vue" @@ -225,19 +226,26 @@ const userStore = useUserStore(); const STORE_INFO = reactive({}) - const getStoreInfo = () => { - if (uni.getStorageSync('STORE_INFO')) { + const getStoreInfoFn = () => { + if (uni.getStorageSync('STORE_INFO').length) { let data = JSON.parse(uni.getStorageSync('STORE_INFO')) for (let key in data) { STORE_INFO[key] = data[key] } + } else { + getStoreInfo().then(res => { + uni.setStorageSync("STORE_INFO", JSON.stringify(res.data)) + }) } } - getStoreInfo() + getStoreInfoFn() + + + + // 分享给好友 onShareAppMessage(() => { - let shareStr = '?id=' + STORE_INFO.id; if (userStore.userInfo.user_ship == 1) { shareStr = shareStr + '&spread_uid=' + userStore.userInfo.id + '&real_name=' + (userStore.userInfo @@ -308,7 +316,7 @@ cart_num: cart_num, is_new: 0, // 是否直接购买0否1是 // goods_id: id, - store_id: STORE_INFO.value.id || 5, + store_id: STORE_INFO.id, product_id: product_id }).then(res => { getCartList(); @@ -336,7 +344,7 @@ name: '', order: '', store_name: '', - store_id: STORE_INFO.value.id || '5' + store_id: STORE_INFO.id }) const loading = ref(true); @@ -361,16 +369,15 @@ if (loadmore) goodList.value.push(...res.data.lists); else goodList.value = res.data.lists; // 补充店铺信息 - if (!STORE_INFO.value.name || !STORE_INFO.value.detailed_address) { - STORE_INFO.value.name = res.data.store.name; - STORE_INFO.value.detailed_address = res.data.store.detailed_address; - } + // if (!STORE_INFO.store_name || !STORE_INFO.detailed_address) { + // STORE_INFO.store_name = res.data.store.name; + // STORE_INFO.value.detailed_address = res.data.store.detailed_address; + // } }) } // 商品列表触底 const loadMoreGood = () => { - console.log('触底了'); getGoodList(true); } @@ -385,7 +392,7 @@ page_no: page_no, page_size: 30, level: three, - store_id: STORE_INFO.value.id || '5' // 店铺id,用于获取店铺分类列表,如果为空则获取全部分类列表,否则获取店铺分类列表。 + store_id: STORE_INFO.id // 店铺id,用于获取店铺分类列表,如果为空则获取全部分类列表,否则获取店铺分类列表。 }).then(res => { if (pid == 0) { // 加载一级分类时设置全部分类 if (!res.data?.lists?.length) return; @@ -493,7 +500,7 @@ productLogApi({ product_id: item.product_id, cate_id: item.cate_id, - store_id: STORE_INFO.value.id || '5' + store_id: STORE_INFO.id }); }; const changeGood = (data) => { // 确定选择商品重量 @@ -560,34 +567,23 @@ onLoad(async (opt) => { // 店铺id if (opt.id) { - where.value.store_id = 5; + where.value.store_id = opt.id; const info = await shopDetailApi({ - store_id: 5 + store_id: opt.id }); - - STORE_INFO.value = info.data; - uni.setStorageSync('STORE_INFO', JSON.stringify(info.data)); - // 分享参数至当前用户参数 if (opt.spread_uid) { shareInfo.value.uid = opt.spread_uid; shareInfo.value.real_name = opt.real_name; shareInfo.value.store_id = opt.id; uni.setStorageSync('SHARE_INFO', shareInfo.value); - } else { - // 分享信息 - const i = uni.getStorageSync('SHARE_INFO'); - if (i) - shareInfo.value = i; } } else { // 店铺信息 const info = uni.getStorageSync('STORE_INFO'); if (info) { - STORE_INFO.value = JSON.parse(info); - where.value.store_id = 5; + where.value.store_id = STORE_INFO.id; } - // 分享信息 const i = uni.getStorageSync('SHARE_INFO'); if (i) @@ -596,7 +592,6 @@ getgoodClassList(0); getGoodList(); - // 胶囊布局信息 btns.value = uni.getMenuButtonBoundingClientRect(); })