From e507a2ede97bfa645f96f19623cc706869e74f50 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Fri, 7 Apr 2023 14:17:19 +0800 Subject: [PATCH] upoad --- pages/cardorder/index/index.wxml | 8 +++--- pages/topicDetail/index.js | 29 ++++++++++--------- pages/topicDetail/index.wxml | 8 +++--- pages/topicDetail/index.wxss | 49 ++++++++++++++++++++------------ 4 files changed, 54 insertions(+), 40 deletions(-) diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index b6f67aa..326cfee 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -19,11 +19,11 @@ - - + + - - + + diff --git a/pages/topicDetail/index.js b/pages/topicDetail/index.js index c272dc4..924071a 100644 --- a/pages/topicDetail/index.js +++ b/pages/topicDetail/index.js @@ -10,7 +10,7 @@ Page({ mouldConfig: {}, navigationBarHeight, data: { - bgColor:"#fff" + bgColor: "#fff" }, wmhome: imgurl.wmhome.url, couponId: null, @@ -19,30 +19,31 @@ Page({ hour: "", minute: "", nodes: '', - id:'', - goHomeUrl:"" + id: '', + goHomeUrl: "", + winHeight: "100%" }, - onLoad(options){ + onLoad(options) { this.setData({ mouldType: app.globalData.mouldType, mouldConfig: app.globalData.mouldConfig, goHomeUrl: app.globalData.goHomeUrl, }) console.log(options) - if(options&&options.id){ + if (options && options.id) { this.setData({ - id:options.id + id: options.id }) this.topicShow(options.id) } }, - goback: function () { + goback: function () { let this_ = this wx.switchTab({ url: this_.data.goHomeUrl, }) }, - topicShow(id){ + topicShow(id) { let that = this; Http.get({ url: config.api.topicFindById, @@ -51,7 +52,7 @@ Page({ } }).then(res => { console.log(res) - if (res&&res.data) { + if (res && res.data) { that.setData({ data: res.data }); @@ -65,9 +66,9 @@ Page({ query.exec((res) => { let listHeight = res[0].height; // 获取list高度 let windowHeight = wx.getSystemInfoSync().windowHeight; - if (windowHeight >= listHeight){ + if (windowHeight >= listHeight) { that.setData({ - winHeight:'100%' + winHeight: '100%' }) } }) @@ -81,13 +82,13 @@ Page({ }); }) }, - gotoDetail:function(e){ - if (e.currentTarget.dataset.type == 9){ + gotoDetail: function (e) { + if (e.currentTarget.dataset.type == 9) { console.log("平团") wx.navigateTo({ url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${e.currentTarget.dataset.couponchannelid}`, }) - }else{ + } else { console.log("优惠卷") wx.navigateTo({ url: `/pages/coupon/detail/index?couponChannelId=${e.currentTarget.dataset.couponchannelid}&couponId=${e.currentTarget.dataset.couponid}`, diff --git a/pages/topicDetail/index.wxml b/pages/topicDetail/index.wxml index 80efb95..83431f4 100644 --- a/pages/topicDetail/index.wxml +++ b/pages/topicDetail/index.wxml @@ -14,7 +14,7 @@ {{data.content}} - + @@ -37,11 +37,11 @@ - - + + - 免费领 + 免费领 马上购 diff --git a/pages/topicDetail/index.wxss b/pages/topicDetail/index.wxss index 50b4549..4840ada 100644 --- a/pages/topicDetail/index.wxss +++ b/pages/topicDetail/index.wxss @@ -1,8 +1,13 @@ @import "../../app.wxss"; + +page { + padding: 0; +} + .coupons { width: 100%; position: relative; - padding-bottom:57rpx; + padding-bottom: 57rpx; } .coupons-body { @@ -66,7 +71,7 @@ letter-spacing: 0; line-height: 42rpx; margin-bottom: 20rpx; - text-align: left!important; + text-align: left !important; /* width: 60rpx; */ /* height: 64rpx; */ } @@ -76,7 +81,7 @@ /* width: 498rpx; */ /* height: 63rpx; */ /* overflow: hidden; */ - word-wrap:break-word; + word-wrap: break-word; /* text-overflow: ellipsis; */ font-size: 22rpx; color: #6f6f6f; @@ -172,14 +177,16 @@ width: 344rpx; } -.navigator-hover{ - opacity: 1!important; - background: #fff!important; - border-radius:16rpx; +.navigator-hover { + opacity: 1 !important; + background: #fff !important; + border-radius: 16rpx; } -.active{ + +.active { opacity: .6; } + .navigator:nth-of-type(2n) { float: right; } @@ -311,7 +318,7 @@ .buy { display: block; - background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); + background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%); border-radius: 30rpx; height: 48rpx; width: 112rpx; @@ -515,7 +522,7 @@ scroll-view { width: 90%; height: 300rpx; margin: 20rpx auto; - background: brown; + background: #a52a2a; overflow: hidden; } @@ -530,24 +537,30 @@ scroll-view { display: block; margin: 30rpx auto; } + .description { font-size: 26rpx; line-height: 15rpx; } -button::after{ border: none; } -.goback{ + +button::after { + border: none; +} + +.goback { position: fixed; right: 50rpx; bottom: 60rpx; - width:100rpx!important; - height:100rpx; + width: 100rpx !important; + height: 100rpx; z-index: 100; - background:rgba(255,255,255,1); + background: rgba(255, 255, 255, 1); line-height: 95rpx; - border:1rpx solid rgba(227,227,227,1); - border-radius:50%; + border: 1rpx solid rgba(227, 227, 227, 1); + border-radius: 50%; } -.goback image{ + +.goback image { position: absolute; width: 60rpx; left: 0;