From da06719c6ce46ba72dd99665fe2ee06ffcf65fe2 Mon Sep 17 00:00:00 2001 From: syt <854400391@qq.com> Date: Sun, 17 Mar 2024 18:50:01 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/activity/presale.vue | 15 ++++++++++---- pages/goods/list.vue | 27 +++++++++++++++++------- pages/index/index.vue | 2 +- pages/invite/index.vue | 38 ++++++++++++++++++++++++---------- pages/news/rules/rulesList.vue | 11 +++++----- pages/news1/help.vue | 4 ++-- pages/order/detail.vue | 24 ++++++++++++++------- pages/order/index.vue | 7 ++----- 8 files changed, 85 insertions(+), 43 deletions(-) diff --git a/pages/activity/presale.vue b/pages/activity/presale.vue index 7f73539..4609c36 100644 --- a/pages/activity/presale.vue +++ b/pages/activity/presale.vue @@ -32,8 +32,10 @@ - - + + + + @@ -71,7 +73,7 @@ getListgoodData(categoryId) { let app = this; let pamars = { - category_id: categoryId, + category_id: categoryId?categoryId:"", } Api.presaleGoodsList(pamars) .then(result => { @@ -107,7 +109,12 @@ app.timestamp = this.beginTime(result.data.info.p_time); app.info = result.data.info app.menuList = result.data.category; - app.getListgoodData(result.data.category[0].category_id) + if(result.data.category && result.data.category.length > 0) { + app.getListgoodData(result.data.category[0].category_id) + }else{ + app.getListgoodData() + } + }) .finally(() => app.isLoading = false) }, diff --git a/pages/goods/list.vue b/pages/goods/list.vue index 330ef19..785695c 100644 --- a/pages/goods/list.vue +++ b/pages/goods/list.vue @@ -177,7 +177,9 @@ - + + + @@ -205,7 +207,7 @@ return { total: 1, searchText: '', - banrdType: [], + banrdType: [], keyName1: '', isBanrdActive: '', isActive: '', @@ -226,7 +228,10 @@ size: pageSize }, // 数量要大于4条才显示无更多数据 - noMoreSize: 4, + // noMoreSize: 4, + empty: { + use : false , + } }, tabbar: [] } @@ -236,7 +241,7 @@ * 生命周期函数--监听页面加载 */ onLoad(options) { - console.log(options) + console.log("options",options) // 记录options this.options = options this.searchText = options.search @@ -277,7 +282,8 @@ this.isBanrdActive = item.category_id; this.keyName1 = item.name } - } + } + if (type == 2) { if (item.category_id == this.isActive) { this.isActive = ''; @@ -303,7 +309,8 @@ .then(list => { const curPageLen = list.data.length const totalSize = list.data.total - app.mescroll.endBySize(curPageLen, totalSize) + app.mescroll.endBySize(curPageLen, totalSize) + console.log("upCallback",app.upOption) }) .catch(() => app.mescroll.endErr()) }, @@ -395,7 +402,13 @@ /** * 商品搜索 */ - handleSearch() { + handleSearch() { + this.isBanrdActive = ''; + this.keyName1 = ''; + this.isActive = ''; + this.keyName2 = ''; + this.banrdType = []; + this.goodsType = []; const searchPageUrl = 'pages/search/index?category_id=' + this.options.categoryId // 判断来源页面 let pages = getCurrentPages() diff --git a/pages/index/index.vue b/pages/index/index.vue index a5b9699..a6f07a0 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -294,7 +294,7 @@ - + {{cityInfo.shop_name}} diff --git a/pages/invite/index.vue b/pages/invite/index.vue index d2ff2e2..7d493a6 100644 --- a/pages/invite/index.vue +++ b/pages/invite/index.vue @@ -69,11 +69,11 @@ - - - 保存海报图 - - + + + + 取消 + 保存到相册 @@ -159,12 +159,16 @@ } = await newFunApi.InviteUserPoster({}); if (status == 200) { console.log(data) + this.isPopup = true; this.qrcode = data.imageUrl } }, - download() { + download(type) { const app = this app.isPopup = false; + if(type == 1){ + return ; + } uni.showLoading({ title: '加载中' }) @@ -252,7 +256,6 @@ url: "/pages/news/user/withdrawal?balance=" + this.userInfo.pay_money }) } else if (index == 3) { - this.isPopup = true; this.InviteUserPoster(); } else if (index == 4) { uni.navigateTo({ @@ -307,19 +310,32 @@ } .tips { - width: 600rpx; + width: 672rpx; height: 80rpx; position: absolute; text-align: center; font-size: 30rpx; line-height: 80rpx; - border-radius: 10rpx; color: #212121; left: 50%; - margin-left: -300rpx; + margin-left: -336rpx; bottom: -120rpx; z-index: 2; - background-color: #FFFFFF; + display: flex; + align-items: center; + justify-content: space-between; + .cancle{ + flex: 1; + background-color: #FFFFFF; + margin-right: 30rpx; + border-radius: 10rpx; + } + .sure{ + border-radius: 10rpx; + flex: 1; + color: #FFFFFF; + background-color: #FF4A49; + } } .close { diff --git a/pages/news/rules/rulesList.vue b/pages/news/rules/rulesList.vue index 9013aff..dea8ea1 100644 --- a/pages/news/rules/rulesList.vue +++ b/pages/news/rules/rulesList.vue @@ -4,12 +4,11 @@ - - - {{item.title}} - - - + + + {{item.title}} + + diff --git a/pages/news1/help.vue b/pages/news1/help.vue index 4cb3548..2474e66 100644 --- a/pages/news1/help.vue +++ b/pages/news1/help.vue @@ -50,9 +50,9 @@ this.getHelpList() }, methods: { - goListPage(item) { + goListPage(index) { uni.navigateTo({ - url: '/pages/news/rules/rulesList?itemInfo=' + encodeURIComponent(JSON.stringify(item)) + url: '/pages/news/rules/rulesList?itemInfo=' + encodeURIComponent(JSON.stringify(index)) }) }, getHelpList() { diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 4a1e17a..f5ef289 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -1,7 +1,7 @@