diff --git a/app.wxss b/app.wxss index adb84a6..2ab9d45 100644 --- a/app.wxss +++ b/app.wxss @@ -1,4 +1,4 @@ -@import "weui.wxss"; +/* @import "weui.wxss"; */ @font-face { font-family: "iconfont"; /* project id 777313 */ diff --git a/components/banner/index.json b/components/banner/index.json index 3bd5dd3..32640e0 100644 --- a/components/banner/index.json +++ b/components/banner/index.json @@ -1,6 +1,3 @@ { - "component": true, - "usingComponents": { - - } + "component": true } \ No newline at end of file diff --git a/components/banner/index.wxml b/components/banner/index.wxml index 2cf9e31..6b48405 100644 --- a/components/banner/index.wxml +++ b/components/banner/index.wxml @@ -1,11 +1,4 @@ - diff --git a/components/banner/index.wxss b/components/banner/index.wxss index fadbf3f..8ad3b5d 100644 --- a/components/banner/index.wxss +++ b/components/banner/index.wxss @@ -57,12 +57,12 @@ .itemImg{ position: absolute; width: 640rpx; - height: 248rpx; + height: 227rpx; border-radius: 15rpx; overflow: hidden; z-index: 5; opacity: 0.7; - top: 15%; + top: 20%; margin: 0 20rpx; } .active{ diff --git a/components/navbar/navbar.js b/components/navbar/navbar.js index 60cf7fe..48f045a 100644 --- a/components/navbar/navbar.js +++ b/components/navbar/navbar.js @@ -48,6 +48,5 @@ Component({ back: false }) } - console.debug() } }) diff --git a/components/store/index.js b/components/store/index.js new file mode 100644 index 0000000..f164d79 --- /dev/null +++ b/components/store/index.js @@ -0,0 +1,78 @@ +const imgurl = require("../../utils/imgurl"); +Component({ + /** + * 组件的属性列表 + */ + properties: { + merchantVoList: { + value: [], + type: Array + } + }, + + /** + * 组件的初始数据 + */ + data: { + teljpgUrl: imgurl.teljpg.url, + showMore:true, + more: "点击查看更多", + hidden:"hidden", + height: "" + }, + + /** + * 组件的方法列表 + */ + methods: { + /** + * 跳转到门店列表的详情页面 + */ + gotoDetail(e) { + wx.navigateTo({ + url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}` + }) + }, + // 点击查看更多 + more: function () { + let that = this; + if (that.data.more == '点击查看更多') { + this.setData({ + hidden: "", + height: 'auto!important', + more: "点击收起", + showMore: true + }) + } else { + that.setData({ + hidden: "hidden", + height: 4 * 140 + 'rpx', + more: "点击查看更多", + showMore: true + }) + } + }, + phone: function (e) { + let that = this; + wx.makePhoneCall({ + phoneNumber: e.target.dataset.merchantlinkphone + }); + } + }, + ready: function () { + let merchantVoList = this.properties.merchantVoList; + if (merchantVoList.length>0){ + if (merchantVoList.length <= 4) { + this.setData({ + height: merchantVoList.length * 140 + 'rpx', + showMore: false, + hidden:"hidden" + }) + } else if (merchantVoList && merchantVoList.length > 4) { + this.setData({ + height: 4 * 140 + 'rpx' + }) + } + } + } +}); diff --git a/components/store/index.json b/components/store/index.json new file mode 100644 index 0000000..32640e0 --- /dev/null +++ b/components/store/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/components/store/index.wxml b/components/store/index.wxml new file mode 100644 index 0000000..53728ab --- /dev/null +++ b/components/store/index.wxml @@ -0,0 +1,19 @@ +适用门店 + + + +{{more}} \ No newline at end of file diff --git a/components/store/index.wxss b/components/store/index.wxss new file mode 100644 index 0000000..bc5655c --- /dev/null +++ b/components/store/index.wxss @@ -0,0 +1,78 @@ +.applyshop { + font-size: 30rpx; + height: 70rpx; + line-height: 70rpx; + color: #333; + text-indent: 1em; + background: #fff; +} + +.posi { + position: relative; + width: 100%; + background: #FFF; +} +.posi_logo { + position: relative; + width: 92%; + display: flex; + padding: 20rpx 0; + background: #fff; + z-index: 10; + margin: 0 auto; +} + +.posi_logo view:nth-child(1) { + border-radius: 16rpx; +} + +.posi_logo view:nth-child(1) image { + display: block; + width: 100rpx; + height: 100rpx; + border-radius: 16rpx; + margin-right: 16rpx; + border: 1px solid #e5e5e5; +} +.name{ + font-size: 32rpx; + color: #333; + letter-spacing: 0; + width: 500rpx; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} +.posi_logo view:nth-child(2) view:nth-child(1) { + font-size: 32rpx; + color: #333; + letter-spacing: 0; +} + +.shopVoList { + display: flex !important; + padding-left: 0 !important; + flex-direction: row !important; +} + +.shopVoList text { + font-size: 20rpx !important; + color: #b8b8b8 !important; +} +.bottom{ + background: #fff; + color: #666; + text-align: center; + padding: 20rpx 0; + font-size: 32rpx; +} +.tel { + position: absolute; + right: 0; + top: 0; + bottom: 0; + margin: auto; + width: 50rpx; + height: 50rpx; + z-index: 10; +} \ No newline at end of file diff --git a/pages/acSignIn/index.js b/pages/acSignIn/index.js index 3b290f3..4f2e65d 100644 --- a/pages/acSignIn/index.js +++ b/pages/acSignIn/index.js @@ -23,7 +23,6 @@ Page({ }) } }, - // pages/index/searchbar/index signIn(id){ let that = this; Http.post({ @@ -55,11 +54,10 @@ Page({ title: '此活动报名已结束', }) } - }, goback: function () { wx.switchTab({ url: '/pages/main/index', }) - }, + } }) \ No newline at end of file diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml index 5fe0335..0f4350b 100644 --- a/pages/bannerdetail/index.wxml +++ b/pages/bannerdetail/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml index 8bb9513..16cea2f 100644 --- a/pages/bargain/bargain.wxml +++ b/pages/bargain/bargain.wxml @@ -15,7 +15,10 @@ {{item.title}} - 可砍至¥{{item.salePriceStr}} + + 可砍至¥ + {{item.salePriceStr}} + 原价{{item.priceStr}} 发起砍价 @@ -31,16 +34,16 @@ 进行中 已完成 已失效 - - {{item.title}} - - 已砍至¥ {{item.price/100-(item.price/100-item.salePrice/100-item.pressCurrentValue/100)}}原价{{item.price/100}} - - 已砍价到底价:{{item.salePrice/100}}元 + {{item.title}} + + 已砍至¥ + {{item.price/100-(item.price/100-item.salePrice/100-item.pressCurrentValue/100)}} + + 原价{{item.price/100}} + 已砍价到底价:{{item.salePrice/100}}元 - 邀请好友 diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss index c8c97a9..986f403 100644 --- a/pages/bargain/bargain.wxss +++ b/pages/bargain/bargain.wxss @@ -14,10 +14,7 @@ page{ width: 142rpx; height: 142rpx!important; border-radius: 10rpx; - /* overflow: hidden; */ margin-top:10rpx; - /* word-wrap: break-word; - word-break: break-all; */ display: block; } .listitem .icon{ @@ -66,8 +63,12 @@ page{ width: 100%; font-size:26rpx; color:rgba(253,131,45,1); - line-height:44rpx; + line-height:40rpx; height: 48rpx; + display: flex; +} + .txt04 view:nth-child(1) { + margin-top: 15rpx; } .frImg{ height: 78rpx; @@ -93,7 +94,7 @@ page{ font-size:40rpx; font-weight:500; color:rgba(253,131,45,1); - width:150rpx; + width:200rpx; margin-top: 10rpx; overflow:hidden; white-space: nowrap; diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss index 1427b0a..ce3e585 100644 --- a/pages/bargain/bargainDatail/bargainDatail.wxss +++ b/pages/bargain/bargainDatail/bargainDatail.wxss @@ -331,7 +331,7 @@ page{ line-height: 75rpx; text-align: center; border: none; - font-size: 32rpx; + font-size: 28rpx; margin: 0 auto; } button::after{ border: none; } diff --git a/pages/cardorder/detail/index.js b/pages/cardorder/detail/index.js index ff8c1a8..e9558ff 100644 --- a/pages/cardorder/detail/index.js +++ b/pages/cardorder/detail/index.js @@ -38,7 +38,7 @@ Page({ }, gotogame: function () { let that = this; - wx.navigateTo({ + wx.redirectTo({ url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId, }) }, diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss index 9dfac2a..74f0a65 100644 --- a/pages/cardorder/index/index.wxss +++ b/pages/cardorder/index/index.wxss @@ -6,10 +6,9 @@ .tabs { width: 100% !important; - height: 88rpx; + height: 96rpx; text-align: center; position: fixed; - /* top: 136rpx; */ left: 0; right: 0; z-index: 100000; @@ -247,7 +246,6 @@ } .txt2{ - /* opacity: .99; */ margin-top: 36rpx; } .imgicon { @@ -287,8 +285,6 @@ font-family: PingFang-SC-Regular; font-weight: 400; color: #FD832D; - /* opacity: .99; */ - line-height: 44rpx; margin-top: 30rpx; background: #fff; position: fixed; diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index d6a159a..99dc24f 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -22,12 +22,8 @@ Page({ fail: imgurl.fail.url, wmhome: imgurl.wmhome.url, swiperCurrent: 0, - hidden: "hidden", - height: "", detailPicture:[], coverPicture:[], - more: "点击查看更多", - showMore: true, data: { title: null }, @@ -86,7 +82,8 @@ Page({ minLimit:0, maxLimit:0, dispressEndDate:false, - barTitle:"" + barTitle:"", + activityStatus:"" }, /** * 显示分享弹框 @@ -104,14 +101,7 @@ Page({ isshowposter: false, }) }, - /** - * 跳转到门店列表的详情页面 - */ - gotoDetail(e) { - wx.navigateTo({ - url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}` - }) - }, + /** * 显示分享海报 */ @@ -126,31 +116,8 @@ Page({ swiperCurrent: e.detail.current }); }, - phone: function(e) { - let that = this; - wx.makePhoneCall({ - phoneNumber: e.target.dataset.merchantlinkphone - }); - }, - // 点击查看更多 - more: function() { - let that = this; - if (that.data.more == '点击查看更多') { - this.setData({ - hidden: "", - height: that.data.data.merchantVoList.length * 140 + 'rpx', - more: "点击收起", - showMore: true - }) - } else { - this.setData({ - hidden: "hidden", - height: 4 * 140 + 'rpx', - more: "点击查看更多", - showMore: true - }) - } - }, + + //获取当前登录用户信息 getUserInfo: function() { let that = this; @@ -510,6 +477,7 @@ Page({ that.setData({ begin_time: res.data.beginTime, end_time: res.data.endTime, + activityStatus: res.data.activityStatus ? res.data.activityStatus:'' }) if (res.data.activityStatus == 0 && flag != 'endclock') { that.countdown(res.data.beginTime); @@ -544,19 +512,10 @@ Page({ } wx.hideLoading(); that.setData({ - data: res.data + data: res.data, + merchantVoList: res.data.merchantVoList }); - if (that.data.data.merchantVoList && that.data.data.merchantVoList.length <= 4) { - that.setData({ - height: that.data.data.merchantVoList.length * 140 + 'rpx', - showMore: false - }) - } else if (that.data.data.merchantVoList && that.data.data.merchantVoList.length > 4) { - that.setData({ - height: 4 * 140 + 'rpx' - }) - } if (res.data.validType == 1) { that.setData({ validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"), @@ -957,9 +916,12 @@ Page({ showbutton: false, showbutton1: false }) - if (this.data.end_time) { + if (this.data.end_time && this.data.activityStatus!=0) { this.countdown(this.data.end_time) } + else if (this.data.begin_time && this.data.activityStatus == 0) { + this.countdown(this.data.begin_time) + } }, onUnload: function() { let that = this; diff --git a/pages/coupon/detail/index.json b/pages/coupon/detail/index.json index 9972df0..ef321ac 100644 --- a/pages/coupon/detail/index.json +++ b/pages/coupon/detail/index.json @@ -1,7 +1,8 @@ { "usingComponents": { "c-shareposter": "../../../../components/shareposter/index", - "navbar": "../../../../components/navbar/navbar" + "navbar": "../../../../components/navbar/navbar", + "store": "../../../../components/store/index" }, "navigationBarTitleText": "", "backgroundColor":"#f4f4f4", diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index be1d23f..9d81039 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -4,7 +4,7 @@ - - - - - {{more}} + + 购买须知 diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index 5228d32..1c40764 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -220,74 +220,6 @@ button::after { float: right; } -.posi { - position: relative; - width: 100%; - background: #FFF; - margin: 18rpx 0 0; -} - -/* .posi>view:nth-child(2) text:nth-child(1) { - font-size: 30rpx; - color: #a9a9a9; -} */ - -/* -.posi>view:nth-child(2) text:nth-child(2) { - font-size: 30rpx; - color: #a9a9a9; -} */ - -.posi_logo { - position: relative; - width: 92%; - display: flex; - padding: 20rpx 0; - background: #fff; - z-index: 10; - margin: 0 auto; -} - -.posi_logo view:nth-child(1) { - /* width: 100rpx; *//* margin-right: 16rpx; */ - border-radius: 16rpx; - /* height: 100rpx; */ -} - -.posi_logo view:nth-child(1) image { - display: block; - width: 100rpx; - height: 100rpx; - border-radius: 16rpx; - margin-right: 16rpx; - border: 1px solid #e5e5e5; -} -.name{ - font-size: 32rpx; - color: #333; - letter-spacing: 0; - width: 500rpx; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; -} -.posi_logo view:nth-child(2) view:nth-child(1) { - font-size: 32rpx; - color: #333; - letter-spacing: 0; -} - -.shopVoList { - display: flex !important; - padding-left: 0 !important; - flex-direction: row !important; -} - -.shopVoList text { - font-size: 20rpx !important; - color: #b8b8b8 !important; -} - .notes view:nth-child(1) { height: 87rpx; line-height: 87rpx; @@ -535,8 +467,8 @@ button::after { .elecard { display: inline-block; margin-left: 6rpx; - color: #af6e34; - border: 1px solid #af6e34; + color: rgba(254,70,20,1); + border: 1px solid rgba(254,70,20,1); border-radius: 8rpx; font-style: normal; font-size: 30rpx; @@ -544,14 +476,6 @@ button::after { padding: 0 6rpx; } -.applyshop { - font-size: 30rpx; - height: 70rpx; - line-height: 70rpx; - color: #333; - text-indent: 1em; -} - .btns { /* padding: 0 33rpx; */ position: fixed; @@ -721,7 +645,7 @@ button::after { color: #999; font-size: 32rpx; background: #fff; - + padding-top: 20rpx; } .presslimit { @@ -869,4 +793,7 @@ background: #ccc8c8; } .swiper-box .wx-swiper-dot-active::before{ background:#f6792b; +} +.jifen{ + font-size: 30rpx; } \ No newline at end of file diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 8d318e1..ffcd3c6 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -44,18 +44,10 @@ Page({ }, gotogame: function () { let that = this; - wx.navigateTo({ + wx.redirectTo({ url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId, }) }, - /** - * 跳转到门店列表的详情页面 - */ - gotoDetail(e) { - wx.navigateTo({ - url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}` - }) - }, // 获取游戏 getStaticGame(token) { let _this = this; @@ -108,10 +100,9 @@ Page({ couponOrderId: options.quancode } }).then(res => { - console.log(res); that.setData({ couponorderstatus: res.data.couponOrderStatus, - data: res.data + data: res.data, }); if (res.data.couponOrderStatus == 1) { /** @@ -148,7 +139,7 @@ Page({ }) } }, 2000); - + /** * 页面需要初始渲染的效果 */ diff --git a/pages/couponorder/detail/index.json b/pages/couponorder/detail/index.json index 96e97c5..bd9dfaf 100644 --- a/pages/couponorder/detail/index.json +++ b/pages/couponorder/detail/index.json @@ -1,5 +1,6 @@ { "usingComponents": { - "navbar": "../../../components/navbar/navbar" + "navbar": "../../../components/navbar/navbar", + "store": "../../../components/store/index" } } diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index 621fae4..a415a0f 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -1,6 +1,6 @@ - + @@ -49,26 +49,27 @@ 优惠券码:{{code}} - - - - 适用门店 - - - diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss index d23934a..fba2452 100644 --- a/pages/index/searchbar/detail/index.wxss +++ b/pages/index/searchbar/detail/index.wxss @@ -38,15 +38,6 @@ page{ opacity: 1; } -.bannerbg { - width: 100%; -} - -.bannerbg image { - display: block; - width: 100%; -} - .merchant-detail { width: 100%; background: #fff; @@ -56,14 +47,11 @@ page{ .merchant-brand, .merchant-shop, .merchant-phone { width: 100%; - /* display: flex; */ - /* padding: 10rpx 0; */ background: #fff; } .merchant-brand view:nth-child(1) { width: 88%; - /* height: 700rpx; */ display: flex; flex-direction: column; white-space: nowrap; @@ -77,35 +65,13 @@ page{ color:rgba(60,60,60,1); margin-top: 20rpx; } -/* .merchant-brand view:nth-child(1) image { - display: block; - width: 130rpx; - height: 130rpx; - border-radius: 16rpx; - border: 1px solid #e5e5e5; -} - -.merchant-brand view:nth-child(2) { - display: flex; - flex-direction: column; - width: 61%; - padding-left: 30rpx; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; -} */ - - .merchant-shop text, .merchant-phone text { font-size: 30rpx; - /* color: #A6A6A6; */ } .merchant-shop .fl{ color: #A6A6A6; } .merchant-phone view { - /* display: flex; - flex: 2; */ color: #A6A6A6; } .merchant-activity view{ @@ -118,7 +84,6 @@ page{ display:flex; flex-direction:column; } - .merchant-shop view:nth-child(2) { font-size: 30rpx; color: #A6A6A6; @@ -141,50 +106,18 @@ page{ } .merchant-phones { - /* border-top:8px solid #efefef; */ padding: 20rpx 0; display: block; font-size: 30rpx; background: #F4F5F9; } -.merchant-activity{ - padding: 20rpx 0; - display: block; - font-size: 30rpx; -} - -.tel { - /* right: 0; - top: 0; - bottom: 0; - margin: auto; */ - display: inline-block; - width: 50rpx; - height: 50rpx; - vertical-align: middle; -} - -.shoplists { - display: flex; -} - -.shoplists text { - flex: 2; -} - -.godetail { - color: #999; - font-size: 30rpx; - position: absolute; - right: 10rpx; -} - .merchants text { display: inline-block; font-size: 26rpx; color: #A6A6A6; line-height: 22rpx; + margin-right: 10rpx; } .posi{ color: #FD832D!important; @@ -276,18 +209,16 @@ page{ display: flex; flex-direction: column; } -.merchant-activity{ - padding: 0 4% 10rpx; -} + .fenxiang image { width: 48rpx; height: 48rpx; - margin: 0 auro; -} + margin: 0 auto; +} .gift{ color: #3C3C3C; font-size: 20rpx; - margin: 0 auro; + margin: 0 auto; } .user-motto { width: 270rpx; @@ -302,8 +233,6 @@ page{ border: none; } -/* 商户活动列表 */ - .coupons c-coupons { width: 335rpx; height: 354rpx; @@ -390,32 +319,12 @@ page{ } /*分享海报样式*/ - .canvas-content { display: flex; top: 0; left: 0; /* left: 500%; 分享图不显示在页面上面,就将画布设置在页面之外*/ -} - -.save-button { - position: fixed; - width: 80rpx; - height: 80rpx; - bottom: 40rpx; - right: 40rpx; - border-radius: 50rpx; - z-index: 200; - background: rgba(0, 0, 0, 0.75); -} - -.save-button .share-image { - position: absolute; - top: 22rpx; - left: 22rpx; - width: 36rpx; - height: 36rpx; -} +} .dingdan image { display: block; diff --git a/pages/index/searchbar/index.wxss b/pages/index/searchbar/index.wxss index 92565ab..eb3ec13 100644 --- a/pages/index/searchbar/index.wxss +++ b/pages/index/searchbar/index.wxss @@ -131,222 +131,18 @@ page { padding: 0 0 30rpx; } -.tabTit { - height: 90rpx; - line-height: 82rpx; - position: fixed; - top: 0; - width: 750rpx; - z-index: 1; -} - -.tabTit > view:nth-of-type(1) { - border-left: 0; -} - -.tabTit > view:nth-of-type(4) { - border-right: 0; -} - - -.tabTit .active image { - transform: rotate(180deg); - background: none; -} - -.tabTit image { - width: 18rpx; - height: 9rpx; - vertical-align: middle; - margin-left: 5px; -} - -.tabLayer { - width: 750rpx; - overflow: hidden; - position: fixed; - top: 90rpx; - z-index: 1; - background: #fff; - padding-bottom: 26rpx; - box-shadow:2px 9px 10px rgba(0, 0, 0, 0.05); - bottom: 0; - border-top:1px solid #eee; -} - -.tabLayer a { - float: left; - width: 210rpx; - height: 80rpx; - line-height: 80rpx; - margin: 30rpx 0 0 26rpx; - text-align: center; - color: #888; - font-size: 30rpx; - background: rgba(255, 255, 255, 1); - border: 1px solid rgba(234, 234, 234, 1); - border-radius: 10rpx; -} - -.tabLayer .active { - text-align: center; - height: 80rpx; - background: rgba(255, 255, 255, 1); - border: 1px solid rgba(101, 158, 246, 1); - border-radius: 10rpx; - color: #659ef6; -} -.tabTit .active { - background: #fff; - font-size: 32prx; - font-weight: 500; - color: rgba(101, 158, 246, 1); -} -/*弹性盒模型*/ - -.box { - background: #fff; - border-bottom:1px solid #eee; -} - -.flex1 { - overflow: hidden; - width: 25%; - display: block; - text-align: center; -} -.flex1 text,.text { - font-size: 30rpx; -} .text{ display: block; width: 25%; text-align: center; } -/* 日期选择 */ - -.picker_group { - height: 85rpx; - line-height: 85rpx; - justify-content: center; - display: flex; - align-items: center; - font-size: 30rpx; - color: #888; -} - -.picker_group picker { - height: 55rpx; - line-height: 55rpx; - margin: 0 2%; - padding: 2% 5%; - border-bottom: 1px solid #eee; -} .view view:nth-of-type(1) { font-size: 28rpx; color: #888; } -.list { - width: 644rpx; - border-radius: 16rpx; - padding: 32rpx; - margin: 40rpx auto; - box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.1); -} - -.list >view { - height: 60rpx; - line-height: 60rpx; - font-size: 30rpx; -} - -.txt1 { - font-size: 32rpx; - font-weight: 500; - color: rgba(85, 85, 85, 1); -} - -.txt2 { - font-size: 28rpx; - font-weight: 500; - color: rgba(255, 106, 106, 1); -} - -.money { - font-weight: 500; - color: rgba(85, 85, 85, 1); - font-size: 26rpx; - padding-right: 20rpx; -} - -.time { - font-size: 28rpx; - font-weight: 500; - color: rgba(125, 125, 125, 1); -} - -.status1 { - color: #659ef6; -} - -.status2 { - color: #eea959; -} - -.status3 { - color: #ff6a6a; -} - -.status4 { - color: #8aaa6b; -} - -.btn { - float: right; - height: 52rpx; - line-height: 52rpx; - background: rgba(101, 158, 246, 1); - border-radius: 10rpx; - font-size: 28rpx; - font-weight: 500; - padding: 0 25rpx; - color: rgba(255, 255, 255, 1); -} - - -.btns { - width:137rpx; - margin-top: 21rpx; - background: #52a0fd; - border-radius: 8rpx; - color: #fff; - font-size: 26rpx; - height: 64rpx; - line-height: 64rpx; -} -.active2{ - border: 1px solid #52a0fd!important; - color: #52a0fd!important; -} -.recond{ - text-align: center; - font-size: 30rpx; - margin-top: 60rpx; -} -.active3{ - color: #659ef6; -} -.loading{ - text-align: center; - font-size: 28rpx; - color: #999; -} -.mr{ - margin-top: 200rpx!important; -} .shopVoList{ padding-left: 0!important; display: inline-block!important; diff --git a/pages/integralmall/payIntegcouponStatus/index.wxss b/pages/integralmall/payIntegcouponStatus/index.wxss index 0067d09..1c1779b 100644 --- a/pages/integralmall/payIntegcouponStatus/index.wxss +++ b/pages/integralmall/payIntegcouponStatus/index.wxss @@ -35,8 +35,10 @@ page{ .c-right{ width: 510rpx; float: left; - line-height: 120rpx; + line-height: 50rpx; color: #3C3C3C; + font-size: 32rpx; + margin-top: 10rpx; } .detail-text{ font-size:30rpx; diff --git a/pages/joinFrDpell/index.wxss b/pages/joinFrDpell/index.wxss index 0548019..0720d13 100644 --- a/pages/joinFrDpell/index.wxss +++ b/pages/joinFrDpell/index.wxss @@ -408,7 +408,7 @@ button::after{ border: none; } position: fixed; width: 545rpx; z-index: 300; - top: 200rpx; + top: 300rpx; left: 102rpx; border-radius: 15rpx; } diff --git a/pages/main/index.js b/pages/main/index.js index 11f9a9d..47671ee 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -69,15 +69,7 @@ Page({ display: 'none', display1: 'none', optionsData: null, - credit: 0, - score: '0', - page: 1 ,// 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 - topicTitle:'', - }, - close: function() { - this.setData({ - showIf: false - }) + page: 1 // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 }, alphaClick: function(even) { var animation = wx.createAnimation({}) @@ -272,13 +264,10 @@ Page({ levelName: res.data.levelName, upgradePercent: res.data.upgradePercent, upgradeScore: res.data.upgradeScore, - credit: res.data.credit ? res.data.credit : 0, - score: res.data.score }) if (res.data.nickName) { that.setData({ - ismember: true, memberId: res.data.id }) var initUrl = JSON.stringify({ @@ -528,7 +517,6 @@ Page({ that.setData({ name: res.data.name, cover: res.data.cover, - topicTitle: res.data.title, id: res.data.id, showTopic: true }) diff --git a/pages/main/index.wxml b/pages/main/index.wxml index 2a5eca2..62d8b26 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -16,19 +16,10 @@ - 还需{{upgradeScore}}成长值可升级 - - @@ -70,46 +61,13 @@ 今日好物推荐, '{{xslist[0].title}}'原价 {{xslist[0].priceStr}} 现价... - 抢购 + 抢购 - - - - - - - - - - - diff --git a/pages/main/index.wxss b/pages/main/index.wxss index 70884cd..c91f8cc 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -426,6 +426,7 @@ progress{ border-radius:12rpx; margin-top: 18rpx; margin-bottom:18rpx; + position: relative; } .toutiao view:nth-child(2){ font-size:26rpx; @@ -459,20 +460,21 @@ progress{ .toutiao .qg{ width: 80rpx; height: 44rpx; - line-height: 36rpx; + line-height: 44rpx; border-radius:18rpx; border:2rpx solid; - float: right; - text-align: center; - margin: 20rpx 20rpx 20rpx 0; -} -.toutiao .qg>text{ - width: 100%; + position: absolute; + top: 0; + bottom: 0; + right: 20rpx; + margin: auto; font-size:24rpx; font-family:PingFangSC-Medium; font-weight:500; color:#FD782D; + text-align: center; } + i-tabs i-tabs-scroll{ background: #F4F5F9!important; diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 68dbdb3..8e0bec7 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -114,7 +114,7 @@ Page({ }, gotogame: function () { let that = this; - wx.navigateTo({ + wx.redirectTo({ url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId, }) }, diff --git a/pages/order/detail/index.json b/pages/order/detail/index.json index 6115e0c..616741a 100644 --- a/pages/order/detail/index.json +++ b/pages/order/detail/index.json @@ -1,5 +1,6 @@ { "usingComponents": { - "navbar": "../../../components/navbar/navbar" + "navbar": "../../../components/navbar/navbar", + "store": "../../../components/store/index" } } \ No newline at end of file diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 4b01dd6..0c86021 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -74,18 +74,8 @@ - - - 适用门店 - - - - - {{item.merchantName}} {{item.buildingName}}{{item.floorName}} - - - - + + diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 039b84d..227d1e8 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -165,7 +165,7 @@ page { width: 100%; margin-top: 20rpx; } - +/* .classifShop{ background: #FFFFFF; width: 100%; @@ -185,7 +185,7 @@ page { .classifShop >view:nth-child(1){ height: 88rpx!important; line-height:94rpx; -} +} */ .classif > view:nth-child(2),.classif > view:nth-child(3){ position: relative; @@ -196,9 +196,6 @@ page { padding-left: 5%; padding-right: 5%; /* border-bottom: 1rpx solid #eee; */ -} -.bianhao{ - } .classif > view text:nth-child(2) { font-size: 28rpx; @@ -213,10 +210,6 @@ page { .classif > view:nth-child(1) { display: block; } -.classif > view:nth-child(3) view text:nth-child(2) { - /* padding-left: 15rpx; */ -} - .classif > view:nth-child(6) text:nth-child(2) { color: #666; } @@ -486,10 +479,9 @@ radio { width: 100%; height: 140rpx; } - +/* .merchantVoList { width: 100%; - /* position: relative; */ } .merchantVoList .tel { @@ -498,7 +490,7 @@ radio { float: right; z-index: 10; margin-top: 30rpx; -} +} */ .btns { background: #00c0ff; @@ -510,13 +502,13 @@ radio { line-height: 94rpx; border-radius: 61rpx; } -.merchantImgUrl{ +/* .merchantImgUrl{ width: 90rpx; float: left; border-radius: 10rpx; z-index: 10; margin: 0 auto; -} +} */ .support-tansfer{ width: 690rpx; border-radius: 50rpx; diff --git a/pages/orderquanma/index.wxss b/pages/orderquanma/index.wxss index 94ec7f4..5b95632 100644 --- a/pages/orderquanma/index.wxss +++ b/pages/orderquanma/index.wxss @@ -11,6 +11,7 @@ width: 92%; margin: 0 auto 6%; border-radius: 16rpx; + padding-bottom: 20rpx; } .title { diff --git a/pages/spellGroup/mySpellGroup/index.wxss b/pages/spellGroup/mySpellGroup/index.wxss index 902552f..ad4416c 100644 --- a/pages/spellGroup/mySpellGroup/index.wxss +++ b/pages/spellGroup/mySpellGroup/index.wxss @@ -72,7 +72,10 @@ button::after{ border: none; } font-weight:500; color:rgba(134,134,134,1); line-height: 48rpx; - padding: 0 30rpx; + padding: 0 80rpx 0 30rpx; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .des{ width: 100%; diff --git a/pages/spellGroup/spellGroup.wxss b/pages/spellGroup/spellGroup.wxss index 11042f1..c6940c8 100644 --- a/pages/spellGroup/spellGroup.wxss +++ b/pages/spellGroup/spellGroup.wxss @@ -13,7 +13,6 @@ page { } .content-box{ height: auto; - /* padding-bottom: 200rpx; */ padding: 0 16rpx 200rpx; } .loading { @@ -166,9 +165,6 @@ image{ font-weight:500; color:#FD782D; line-height:44rpx; - width: 50%; - white-space: nowrap; - text-overflow: ellipsis; } .spell-centerH .price02{ font-size: 24rpx; @@ -176,7 +172,7 @@ image{ font-weight:500; text-decoration:line-through; color:rgba(140,140,140,1); - line-height: 30rpx; + line-height: 44rpx; margin-top: 15rpx; } .spell-centerH .price-num{ @@ -192,7 +188,7 @@ image{ .spell-centerHr .price-num{ display: inline-block; font-size: 32rpx; - width: 95rpx; + width: 100rpx; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; @@ -204,7 +200,7 @@ image{ } .spell-centerH .price-numHr{ font-size:32rpx; - line-height: 32rpx; + line-height: 44rpx; } .content .price-unit{ font-size:24rpx; diff --git a/pages/user/index.wxss b/pages/user/index.wxss index c29cf9d..5e9a166 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -46,22 +46,26 @@ page{ .user-name{ font-family: PingFangSC-Medium; height: 42rpx; - margin-left: 310rpx; + margin-top:66rpx; letter-spacing: 0.64rpx; line-height: 44rpx; - margin-top: 66rpx; font-size: 30rpx; color: #3C3C3C; font-weight:600; + display: flex; /*设置显示样式**/ + align-items: center; /**子view垂直居中*/ + vertical-align: center; /**垂直居中*/ + justify-content: center; /**内容居中*/ + flex-direction: row; } .user-phone { font-family: PingFangSC-Regular; - height: 30rpx; letter-spacing: 0.64rpx; line-height: 44rpx; font-size: 36rpx; color: #000; - margin:20rpx 0 50rpx 180rpx; + padding:20rpx; + text-align: center; } .user-avatar { position: absolute; @@ -82,7 +86,6 @@ page{ .view { font-size: 24rpx; - /* color: #FD832D; */ } .view image { @@ -105,7 +108,6 @@ page{ width: 120rpx; height: 120rpx; } - .user-btns{ background: #fff; display: flex; @@ -114,10 +116,9 @@ page{ } .user-btns navigator{ width: 33.3%; + height: 160rpx; } - - .user-btns:nth-of-type(3){ margin-bottom: 0; } @@ -139,7 +140,6 @@ page{ box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); } .btns_bg{ - /* position: relative; */ width: 94%; background: #fff; border-radius: 16rpx; @@ -196,13 +196,7 @@ page{ border: none!important; } .gzh { - /* display: none; */ - /* position: absolute; */ - /* bottom: 70rpx; */ width: 100%; - /* left: 0; - right: 0; */ - /* margin: auto; */ height: 170rpx; z-index: 10; background: #fff; @@ -216,10 +210,6 @@ page{ } .of { - /* position:absolute; - bottom:50rpx; - left:0; - right:0; */ width: 90%; margin: 30rpx auto; height: auto;