From abc37a23b79efcfd86155e73f404c701f31d8510 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 18 Jun 2024 11:17:39 +0800 Subject: [PATCH 1/5] dev --- pages/index/index.vue | 29 ++++++++++++++--------------- pages/my/my.vue | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 6c29770..6bfbe3f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -223,32 +223,31 @@ import useUserStore from "@/store/user"; const userStore = useUserStore(); + const STORE_INFO = reactive({}) - const STORE_INFO = ref({ - name: '', - id: 5, - detailed_address: '', - image: '' - }); - - const test = () => { - uni.navigateTo({ - url: '/pageQuota/quotation/index' - }) + const getStoreInfo = () => { + if (uni.getStorageSync('STORE_INFO')) { + let data = JSON.parse(uni.getStorageSync('STORE_INFO')) + for (let key in data) { + STORE_INFO[key] = data[key] + } + } } + getStoreInfo() // 分享给好友 onShareAppMessage(() => { - let shareStr = '?id=' + STORE_INFO.value.id; + + let shareStr = '?id=' + STORE_INFO.id; if (userStore.userInfo.user_ship == 1) { shareStr = shareStr + '&spread_uid=' + userStore.userInfo.id + '&real_name=' + (userStore.userInfo .real_name || userStore.userInfo.nickname) } let shareInfo = { - title: STORE_INFO.value.name, + title: STORE_INFO.store_name, path: '/pages/index/index' + shareStr, - imageUrl: STORE_INFO.value.image, + imageUrl: STORE_INFO.image || '', success() { uni.$u.toast('分享成功'); }, @@ -550,6 +549,7 @@ left: 0 }); + // 分享信息 const shareInfo = ref({ uid: '', @@ -573,7 +573,6 @@ shareInfo.value.uid = opt.spread_uid; shareInfo.value.real_name = opt.real_name; shareInfo.value.store_id = opt.id; - console.log(shareInfo.value); uni.setStorageSync('SHARE_INFO', shareInfo.value); } else { // 分享信息 diff --git a/pages/my/my.vue b/pages/my/my.vue index 2afeb8c..75a0f7a 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -177,8 +177,8 @@ const logout = () => { userStore.setToken(''); userStore.setUserInfo({}); + uni.removeStorageSync('SHARE_INFO'); uni.setStorageSync("STORE_INFO", '') - uni.reLaunch({ url: '/pages/login/login' }) From a4ac3c2af96ea4d23ec42de8100899c74b16fcae Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 18 Jun 2024 11:41:31 +0800 Subject: [PATCH 2/5] add --- pages/index/index.vue | 53 ++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 29 deletions(-) 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(); }) From d32eb5676f707b721dadc32c4c1f1d4588e1ee71 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 18 Jun 2024 11:52:10 +0800 Subject: [PATCH 3/5] add --- pages/index/index.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index c6a0e66..25df707 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -241,9 +241,6 @@ getStoreInfoFn() - - - // 分享给好友 onShareAppMessage(() => { let shareStr = '?id=' + STORE_INFO.id; From 75f3d75a25140e8ce50998914125b1a12bf3f860 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 18 Jun 2024 13:34:38 +0800 Subject: [PATCH 4/5] add --- pages/index/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 25df707..206b779 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -191,7 +191,6 @@ onLoad, onShow, onShareAppMessage, - onShareTimeline } from "@dcloudio/uni-app" import { reactive, @@ -224,7 +223,10 @@ import useUserStore from "@/store/user"; const userStore = useUserStore(); - const STORE_INFO = reactive({}) + const STORE_INFO = reactive({ + id: 5, + store_name: "测试" + }) const getStoreInfoFn = () => { if (uni.getStorageSync('STORE_INFO').length) { @@ -249,6 +251,8 @@ .real_name || userStore.userInfo.nickname) } + + let shareInfo = { title: STORE_INFO.store_name, path: '/pages/index/index' + shareStr, From e2fc723655b81e4376c372e214d3dd87f1e632c6 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 18 Jun 2024 14:26:48 +0800 Subject: [PATCH 5/5] add --- pages/index/index.vue | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 206b779..e2cd061 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -21,19 +21,17 @@ - @@ -250,11 +248,8 @@ shareStr = shareStr + '&spread_uid=' + userStore.userInfo.id + '&real_name=' + (userStore.userInfo .real_name || userStore.userInfo.nickname) } - - - let shareInfo = { - title: STORE_INFO.store_name, + title: userStore.userInfo.nickname, path: '/pages/index/index' + shareStr, imageUrl: STORE_INFO.image || '', success() { @@ -267,8 +262,6 @@ return shareInfo; }) - - /*商品列表滚动隐藏头部导航 */ const instance = getCurrentInstance(); // 获取组件实例 const targetHeight = ref(0) @@ -566,6 +559,7 @@ }); onLoad(async (opt) => { + where.value.store_id = opt.id || STORE_INFO.id; // 店铺id if (opt.id) { where.value.store_id = opt.id; @@ -579,18 +573,7 @@ shareInfo.value.store_id = opt.id; uni.setStorageSync('SHARE_INFO', shareInfo.value); } - } else { - // 店铺信息 - const info = uni.getStorageSync('STORE_INFO'); - if (info) { - where.value.store_id = STORE_INFO.id; - } - // 分享信息 - const i = uni.getStorageSync('SHARE_INFO'); - if (i) - shareInfo.value = i; } - getgoodClassList(0); getGoodList(); // 胶囊布局信息