diff --git a/packages/advertising/index/index.vue b/packages/advertising/index/index.vue index f2cdd1bd..922140b5 100644 --- a/packages/advertising/index/index.vue +++ b/packages/advertising/index/index.vue @@ -83,17 +83,17 @@ export default { }, methods: { getGoodsList() { - if (!uni.getStorageSync('userId')) { - uni.showToast({ - title: '请先登录', - icon: 'none' - }) - return - } + // if (!uni.getStorageSync('userId')) { + // uni.showToast({ + // title: '请先登录', + // icon: 'none' + // }) + // return + // } const params = { adver_id: this.idVal, } - return request(shopApi.adverGoodsList, 'POST', params).then(res => { + return request(shopApi.adverGoodsList, 'POST', params, {}, false).then(res => { const list = res.adver_goods_list.map(item => { // 为每个商品初始化quantity return { diff --git a/packages/localLife/detail/index.vue b/packages/localLife/detail/index.vue index 0060234e..fb7b7845 100644 --- a/packages/localLife/detail/index.vue +++ b/packages/localLife/detail/index.vue @@ -148,7 +148,8 @@ {{ item.end_time }}到期 - {{ item.is_received ? '已领' : '领取' }} + {{ item.is_received ? '已领' : '领取' }} + @@ -216,7 +217,7 @@ export default { const params = { mch_id: uni.getStorageSync("merchantInfo").id, } - request(apiArr2.redPackageCenter, "POST", params).then(res => { + request(apiArr2.redPackageCenter, "POST", params, {}, false).then(res => { this.coupons = res.rows this.couponDetails = res.rows }) diff --git a/packages/localLife/index/index.vue b/packages/localLife/index/index.vue index 0330563a..838d0bc1 100644 --- a/packages/localLife/index/index.vue +++ b/packages/localLife/index/index.vue @@ -173,7 +173,6 @@ export default { changeNav(item) { NavgateTo(`/packages/localLife/classify/index?item=${JSON.stringify(item)}`) - }, @@ -254,7 +253,7 @@ export default { //跳转商家详情 Info(e) { uni.setStorageSync("merchantInfo", e); - NavgateTo("../detail/index"); + NavgateTo("../detail/index", { isLogin: false }); }, //跳转点评 toJump(e) { diff --git a/packages/shop/index/index.vue b/packages/shop/index/index.vue index a430108c..02fa758d 100644 --- a/packages/shop/index/index.vue +++ b/packages/shop/index/index.vue @@ -8,8 +8,8 @@ - + + @@ -25,8 +25,7 @@ 展 开 - + @@ -199,8 +198,8 @@ - + + 暂无数据 @@ -389,7 +388,7 @@ export default { }, //分类列表 getCateList() { - request(apiArr.goodsCateList, "POST", {}).then((res) => { + request(apiArr.goodsCateList, "POST", {}, {}, false).then((res) => { console.log(res); this.CateList = res.commodity_category_list; this.firstId = res.commodity_category_list[0].id; @@ -423,9 +422,9 @@ export default { // 确保item有commodity_info_list属性 if (item.commodity_info_list && Array.isArray(item.commodity_info_list)) { // 过滤掉commodity_goods_info_list为空的infoItem - item.commodity_info_list = item.commodity_info_list.filter(infoItem => - infoItem.commodity_goods_info_list && - Array.isArray(infoItem.commodity_goods_info_list) && + item.commodity_info_list = item.commodity_info_list.filter(infoItem => + infoItem.commodity_goods_info_list && + Array.isArray(infoItem.commodity_goods_info_list) && infoItem.commodity_goods_info_list.length > 0 ); // 只有当过滤后的infoItem列表不为空时,才保留该item @@ -433,7 +432,7 @@ export default { } return false; }); - + // 为过滤后的数据中的每个infoItem设置isShow属性 filteredList.forEach((item) => { item.commodity_info_list.forEach((infoItem) => { diff --git a/pages/index/index.vue b/pages/index/index.vue index 36b15d2c..f5e0daec 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -666,6 +666,10 @@ export default { }, async headershopEnterClick() { + if(!uni.getStorageSync('userId')){ + NavgateTo('/packages/shopEnter/index/index', { isLogin: false }); + return + } const res = await request(apiArr2.statusQuery, "POST", {}, { silent: false }); if (res.status) { NavgateTo('/packages/shopEnter/auditStatus/index?itemObj=' + JSON.stringify(res)); @@ -1055,7 +1059,7 @@ export default { //跳转商家详情 Info(e) { uni.setStorageSync("merchantInfo", e); - NavgateTo("/packages/localLife/detail/index"); + NavgateTo("/packages/localLife/detail/index", { isLogin: false }); }, //跳转点评 toJump(e) {