diff --git a/components/bargain/index.js b/components/bargain/index.js deleted file mode 100644 index e69de29..0000000 diff --git a/components/merchantcoupons/index.js b/components/merchantcoupons/index.js deleted file mode 100644 index c40b1f7..0000000 --- a/components/merchantcoupons/index.js +++ /dev/null @@ -1,21 +0,0 @@ -// pages/index/sw/index.js -Component({ - /** - * 组件的属性列表 - */ - properties: { - paramAtoB: String, - data: { - value: {}, - type: Object - }, - }, - - /** - * 组件的初始数据 - */ - data: {}, - methods: { - - } -}); diff --git a/components/merchantcoupons/index.json b/components/merchantcoupons/index.json deleted file mode 100644 index 34e4209..0000000 --- a/components/merchantcoupons/index.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "component": true, - "usingComponents": { - "i-button": "../../dist/button/index" - } -} \ No newline at end of file diff --git a/components/merchantcoupons/index.wxml b/components/merchantcoupons/index.wxml deleted file mode 100644 index 0afb4a1..0000000 --- a/components/merchantcoupons/index.wxml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - {{data.title}} - {{data.subTitle}} - - - {{data.salePriceStr}} - - {{data.priceStr}}元 - {{data.priceStr}}小时 - - - - {{data.priceStr}}元 - {{data.priceStr}}小时 - - - - - - - - - 免费领 - 马上购 - 已售罄 - 已下架 - - - - diff --git a/components/merchantcoupons/index.wxss b/components/merchantcoupons/index.wxss deleted file mode 100644 index 98e8e35..0000000 --- a/components/merchantcoupons/index.wxss +++ /dev/null @@ -1,259 +0,0 @@ -@import "../../app.wxss"; -.coupons { - width: 335rpx; - display: inline-block; - position: relative; - -} -.coupons-border { - height: 1rpx; - left: 30rpx; - right: 30rpx; - background: #f5f5f5; - position: absolute; - bottom: 0; -} - - -.coupons-img { - border-radius: 10rpx; -} - -.coupons-img image { - display: block; - width: 335rpx; - height: 203rpx; - border-top-left-radius: 10rpx; - border-top-right-radius: 10rpx; -} - -.coupons-info { - width: 335rpx; - height: 152rpx; - border-radius:0rpx 0rpx 10rpx 10rpx; - background: #fff; -} - -.coupons-info-name { - font-size: 28rpx; - color: #333333; - letter-spacing: 0; - line-height: 38rpx; -} - -.coupons-info-price { - padding: 16rpx 0 0; -} - -.i { - font-size: 24rpx; - font-style: normal; -} - -.coupons-info-price-p { - display: block; - font-size: 50rpx; - color: #FF4949; -} -.price{ - font-size:34rpx; - font-family:PingFang-SC-Bold; - font-weight:bold; - color:rgba(255,50,50,1); - line-height:44rpx; - margin-left: 16rpx; - padding-top: 16rpx; -} -.tit { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - font-size: 28rpx; - line-height: 30rpx; - padding-top: 20rpx; - padding-left: 10rpx; - color: #333; - letter-spacing: 0; -} - -.coupons-info-price-o { - display: block; - text-align: center; - font-size: 26rpx; - color: #b4b4b4; - letter-spacing: 0.96rpx; - text-decoration: line-through; - line-height: 24rpx; -} - -.coupons-info-distance { - font-size: 22rpx; - color: #c0c0c0; - letter-spacing: 0; - padding-bottom: 10rpx; - line-height: 30rpx; -} - -.coupons-info-address { - font-size: 22rpx; - color: #585858; - letter-spacing: 0; - line-height: 30rpx; -} - -.coupons-btn { - position: absolute; - bottom: 0; - right: 0; -} - -.coupons-btn-gm { - background: #AF6E34 !important; - border-radius: 10px 0px 5px 0px !important; - margin: 0 !important; - padding: 0 !important; - font-size: 26rpx; - color: #fff !important; - letter-spacing: 0; - height: 51rpx !important; - width: 100rpx !important; - line-height: 51rpx !important; -} - -.coupons-btn-gms { - background: #b9b9b9 !important; - border-radius: 10px 0px 10px 0px !important; - opacity: 0.6; - margin: 0 !important; - padding: 0 !important; - font-family: PingFangSC-Semibold; - font-size: 26rpx; - font-weight: 400; - color: #fff !important; - letter-spacing: 0; - height: 51rpx !important; - width: 100rpx !important; - line-height: 51rpx !important; -} - -.subtitle { - font-size: 24rpx; - color: #999999; - overflow: hidden; - height: 24rpx; - padding-left: 10rpx; - line-height: 24rpx; - white-space: nowrap; - text-overflow: ellipsis; - margin-top: 12rpx; -} - -.coupons-info-manjian { - font-weight: normal; - font-size: 20rpx; - line-height: 34rpx; - display: inline-block; - color: #FF4949; - letter-spacing: 0; -} - -.coupons-info-manjian1 { - font-weight: normal; - font-size: 20rpx; - line-height: 22rpx; - color: #919191; - letter-spacing: 0; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - width: 300rpx; - margin-top: 16rpx; -} -.coupons-info-manjian text{ - display: block; - line-height: 20rpx; -} -.coupons-info-manjian > text:nth-of-type(1){ - display: block; - /* color: #FF4949; */ - opacity: .6; -} -.view01{ - text-decoration:line-through; - color: #999999 !important; -} -.txt2{ - display: block; - color: #ccc; -} -/**上拉加载更多**/ - -.userinfo { - display: flex; - flex-direction: column; - align-items: center; -} - -.userinfo-avatar { - width: 128rpx; - height: 128rpx; - margin: 20rpx; - border-radius: 50%; -} - -.userinfo-nickname { - color: #aaa; -} - -.sy { - display: block; - text-align: right; - width: 181rpx; - font-size: 24rpx; - color: #999; - height: 40rpx; - margin-top: 106rpx; -} - -.usermotto { - margin-top: 200px; -} - -scroll-view { - width: 100%; -} - -.item { - width: 90%; - height: 300rpx; - margin: 20rpx auto; - background: brown; - overflow: hidden; -} - -.item .img { - width: 430rpx; - margin-right: 20rpx; - float: left; -} - -.title { - font-size: 30rpx; - display: block; - margin: 30rpx auto; -} - -.description { - font-size: 26rpx; - line-height: 15rpx; -} -.navigator-hover{ - opacity: 1!important; - background: #fff; -} -navigator{ - display: inline-block; -} -navigator:nth-of-type(2n+1){ - margin-right: 10rpx; -} \ No newline at end of file diff --git a/config/config.js b/config/config.js index 3d2b3dc..e5f8699 100755 --- a/config/config.js +++ b/config/config.js @@ -29,7 +29,7 @@ var config = { /** * 商户优惠信息 */ - merchantCouponList: "/wxCoupon/findByMerchant", + listByMerchant: "/wxCouponChannel/listByMerchant", /** * 优惠券详情 */ diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 31070c6..d2e98ae 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -369,6 +369,8 @@ Page({ * 获取用户信息 */ onLoad(options) { + console.log(options) + debugger let that = this; wx.showLoading({ title: "加载中..." diff --git a/pages/index/searchbar/detail/index.js b/pages/index/searchbar/detail/index.js index 5bfe860..6c6b8c4 100644 --- a/pages/index/searchbar/detail/index.js +++ b/pages/index/searchbar/detail/index.js @@ -11,39 +11,39 @@ Page({ teljpgUrl: imgurl.teljpg.url, share01: imgurl.share01.url, actUrl: imgurl.act.url, - poster:'./../../../../assets/images/picture.png', + poster: './../../../../assets/images/picture.png', page: 1, - imglist:null, - shopVoList:[], - couponList:[],//活动劵列表 - data:{ + imglist: null, + shopVoList: [], + couponList: [], //活动劵列表 + data: { currentTab: 0, - isshare:false, + isshare: false, showpost: false, imgHeight: 0, }, - id:null, + id: null, windowWidth: 0, windowHeight: 0, totalHeight: 0, - canvasScale: 1.0,// 画布放大的倍数,因为如果保存的是一倍的分享图片的话,分享图会有点虚。所以保存的时候,canvasScale设置为2.0,wxss 里面的left: 500%;打开注释。就可保存两倍的分享图 + canvasScale: 1.0, // 画布放大的倍数,因为如果保存的是一倍的分享图片的话,分享图会有点虚。所以保存的时候,canvasScale设置为2.0,wxss 里面的left: 500%;打开注释。就可保存两倍的分享图 }, - /** + /** * 分享海报的生成 */ - //关闭海报 - closePoste: function() { - this.setData({ - showpost: false - }) - }, + //关闭海报 + closePoste: function() { + this.setData({ + showpost: false + }) + }, /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { - let that=this; - if (options && options.id){ + onLoad: function(options) { + let that = this; + if (options && options.id) { this.setData({ id: options.id }); @@ -54,7 +54,7 @@ Page({ }) } // 获取到屏幕的宽高等信息 - wx.getSystemInfo({ + wx.getSystemInfo({ success: function(res) { that.setData({ windowWidth: res.windowWidth, @@ -70,8 +70,10 @@ Page({ var that = this // 适配屏幕 let scale = this.data.windowWidth / 375.0 - - this.setData({ totalHeight: 767* scale}) + + this.setData({ + totalHeight: 767 * scale + }) // 获取Canvas let ctx = wx.createCanvasContext('myCanvas') @@ -90,7 +92,7 @@ Page({ wx.getImageInfo({ src: src1, success: function(res) { - ctx.drawImage(res.path, 0, 0, topImageWidth, topImageHeight) + ctx.drawImage(res.path, 0, 0, topImageWidth, topImageHeight) // 覆盖黑色蒙层 ctx.setFillStyle('rgba(0,0,0,0.3)') ctx.fillRect(0, 0, topImageWidth, topImageHeight) @@ -98,7 +100,7 @@ Page({ ctx.draw(true) that.drawOtherContent(ctx, scale) - that.drawOtherImage(ctx,scale) + that.drawOtherImage(ctx, scale) } }) }, @@ -118,7 +120,7 @@ Page({ // address ctx.setFillStyle('#000'); ctx.setFontSize(18 * scale); - this.canvasTextAutoLine("地址:"+this.data.data.shopVoList[0].floorName+this.data.data.shopVoList[0].buildingName+this.data.data.shopVoList[0].shopNumber, ctx, 20 * scale, 270 * scale, 22 * scale, 305 * scale, 1) + this.canvasTextAutoLine("地址:" + this.data.data.shopVoList[0].floorName + this.data.data.shopVoList[0].buildingName + this.data.data.shopVoList[0].shopNumber, ctx, 20 * scale, 270 * scale, 22 * scale, 305 * scale, 1) // this.drawNormalText(ctx, '探索新鲜好去处', 82 * scale, 596 * scale, 14 * scale, '#3C3C3C', 'left', 'middle', scale); // this.drawNormalText(ctx, '长按右侧小程序码', 82 * scale, 620 * scale, 12 * scale, '#9A9CAC', 'left', 'middle', scale); @@ -133,30 +135,30 @@ Page({ let that = this // 如果该商户有活动商品 - if(this.data.couponList.length>0){ - let cotentImageWidth = parseInt(136 * scale) - let cotentImageHeight = parseInt(136 * scale) - for (let i = 0; i < this.data.couponList.length; i++){ - let imageItem = this.data.couponList[i].coverImg - let src1 = imageItem + `?imageView/2/w/${cotentImageWidth}/h/${cotentImageHeight}` - wx.getImageInfo({ - src: src1, - success: function (res) { - ctx.drawImage(res.path, 15 * scale + i*180*scale, 300 * scale, cotentImageWidth, cotentImageHeight) - ctx.draw(true) - } - }) - } - //没有活动商品生成小程序码 - }else{ - if(this.data.qrCode){ + if (this.data.couponList.length > 0) { + let cotentImageWidth = parseInt(136 * scale) + let cotentImageHeight = parseInt(136 * scale) + for (let i = 0; i < this.data.couponList.length; i++) { + let imageItem = this.data.couponList[i].coverImg + let src1 = imageItem + `?imageView/2/w/${cotentImageWidth}/h/${cotentImageHeight}` + wx.getImageInfo({ + src: src1, + success: function(res) { + ctx.drawImage(res.path, 15 * scale + i * 180 * scale, 300 * scale, cotentImageWidth, cotentImageHeight) + ctx.draw(true) + } + }) + } + //没有活动商品生成小程序码 + } else { + if (this.data.qrCode) { let coImageWidth = parseInt(336 * scale) let coImageHeight = parseInt(336 * scale) let src1 = this.data.qrCode + `?imageView/2/w/${topImageWidth}/h/${topImageHeight}` wx.getImageInfo({ src: src1, success: function(res) { - ctx.drawImage(res.path, 0, 0, coImageWidth, coImageHeight) + ctx.drawImage(res.path, 0, 0, coImageWidth, coImageHeight) ctx.draw(true) } }) @@ -216,24 +218,24 @@ Page({ } } }, - // 保存图片 - saveImage() { - var _this = this - var image = _this.data.poster + // 保存图片 + saveImage() { + var _this = this + var image = _this.data.poster wx.getImageInfo({ src: image, - success: function (sres) { + success: function(sres) { var imgSrc = sres.path; - + wx.showLoading({ title: '保存中', mask: true }) - setTimeout(function () { + setTimeout(function() { wx.saveImageToPhotosAlbum({ filePath: imgSrc, - success: function (data) { + success: function(data) { // wx.showToast({ // title: '保存成功', // icon: 'success', @@ -245,15 +247,15 @@ Page({ content: '图片保存成功,请到相册查找分享', success(res) { if (res.confirm) { - + } else if (res.cancel) { - + } } }) }, - fail: function (err) { + fail: function(err) { // console.log(err); if (err.errMsg === "saveImageToPhotosAlbum:fail auth deny") { console.log("当初用户拒绝,再次发起授权") @@ -275,85 +277,81 @@ Page({ }) wx.hideLoading(); }, 2000) - - - - - - } - }) - }, - /** + /** * 获取access_token */ - getaccess_token:function(access_token){ + getaccess_token: function(access_token) { wx.request({ - url:"https://api.weixin.qq.com/wxa/getwxacode?access_token=" + access_token, + url: "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + access_token, method: 'POST', data: { - path: 'pages/index/index', // 必须是已经发布的小程序存在的页面(否则报错) - width: 430, - auto_color: false,// 自动配置线条颜色,如果颜色依然是黑色,则说明不建议配置主色调 - line_color: {"r":"0","g":"0","b":"0"} // auto_color 为 false 时生效,使用 rgb 设置颜色 例如 {"r":"xxx","g":"xxx","b":"xxx"} 十进制表示 + path: 'pages/index/index', // 必须是已经发布的小程序存在的页面(否则报错) + width: 430, + auto_color: false, // 自动配置线条颜色,如果颜色依然是黑色,则说明不建议配置主色调 + line_color: { + "r": "0", + "g": "0", + "b": "0" + } // auto_color 为 false 时生效,使用 rgb 设置颜色 例如 {"r":"xxx","g":"xxx","b":"xxx"} 十进制表示 }, - success:function(res){ - console.log(res); + success: function(res) { + console.log(res); } - }) - }, - /** + }) + }, + /** * 拨打电话 */ - phone: function (e) { + phone: function(e) { let that = this; wx.makePhoneCall({ phoneNumber: e.target.dataset.merchantlinkphone }); }, - /** + /** * 显示分享弹框 */ - showshare:function(){ + showshare: function() { this.setData({ - isshare:true, + isshare: true, }) }, - /** + /** * 隐藏分享弹框 */ - hidemodal:function(){ + hidemodal: function() { this.setData({ isshare: false, }) }, //滑动切换 - swiperTabView: function (e) { + swiperTabView: function(e) { this.setData({ currentTab: e.detail.current }); }, - /** + /** * 隐藏分享海报 */ - hideposter:function(){ + hideposter: function() { this.setData({ showpost: false, }) }, - /** + /** * 显示分享海报 */ - showPoster:function(){ + showPoster: function() { this.setData({ showpost: true, }) this.begainDrawShareImage(); }, //点击切换 - clickTab: function (e) { + clickTab: function(e) { if (this.data.currentTab === e.target.dataset.current) { return false; } else { @@ -365,24 +363,24 @@ Page({ /** * 获取商户详情 */ - getList: function (id) { + getList: function(id) { let that = this; let data; - data = { - pageNum: that.data.page, - pageSize: 15, - id:id - } + data = { + pageNum: that.data.page, + pageSize: 15, + id: id + } Http.get({ - url: config.api.merchantList, - data: data - }).then(res => { - that.setData({ - data: res.data.list[0], - shopVoList: res.data.list[0].shopVoList, - imglist: JSON.parse(res.data.list[0].coverPicture) ? JSON.parse(res.data.list[0].coverPicture) : res.data.list[0].merchantImgUrl, + url: config.api.merchantList, + data: data + }).then(res => { + that.setData({ + data: res.data.list[0], + shopVoList: res.data.list[0].shopVoList, + imglist: JSON.parse(res.data.list[0].coverPicture) ? JSON.parse(res.data.list[0].coverPicture) : res.data.list[0].merchantImgUrl, + }) }) - }) .catch(err => { wx.showToast({ title: err.errMsg, @@ -393,26 +391,26 @@ Page({ }) }, /** - * 获取商户活动信息 券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券 100.消费卡) - * 投放频道:(1.列表, 2.限时抢购, 3. banner图 4. 游戏 5.卡频道 6.砍价频道 7.拼团频道 8专题) - */ - getCouponList: function (id) { + * 获取商户活动信息 券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券 100.消费卡) + * 投放频道:(1.列表, 2.限时抢购, 3. banner图 4. 游戏 5.卡频道 6.砍价频道 7.拼团频道 8专题) + */ + getCouponList: function(id) { let that = this; let data; data = { - status:0, - merchantId:id, + status: 0, + merchantId: id, pageNum: that.data.page, pageSize: 15, } Http.get({ - url: config.api.merchantCouponList, - data: data - }).then(res => { - that.setData({ - couponList: res.data.list, + url: config.api.listByMerchant, + data: data + }).then(res => { + that.setData({ + couponList: res.data.list, + }) }) - }) .catch(err => { wx.showToast({ title: err.errMsg, @@ -425,41 +423,29 @@ Page({ /** * 获取多商铺列表 */ - shopList:function(e){ + shopList: function(e) { wx.navigateTo({ url: `/pages/index/merchantList/index?id=${e.currentTarget.dataset.id}` }) }, - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - onShareAppMessage: function (res) { - var that = this; - var shareObj = { - title: that.data.data.title, - path: `/pages/index/index?couponChannelId=${that.data.couponChannelId}`, - success: function (res) { - if (res.errMsg == 'shareAppMessage:ok') { } - }, - fail: function (error) { - if (res.errMsg == 'shareAppMessage:fail cancel') { } else if (res.errMsg == 'shareAppMessage:fail') { } - } - }; - // 来自页面内的按钮的转发 - if (res.from === 'button') { - var eData = res.target.dataset.id; - shareObj.path = `/pages/index/index?couponChannelId=${eData}`; - } - // 返回shareObj - return shareObj; - }, - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, + // onShareAppMessage: function(res) { + // var that = this; + // var shareObj = { + // title: that.data.data.title, + // path: `/pages/index/index?couponChannelId=${that.data.couponChannelId}`, + // success: function(res) { + // if (res.errMsg == 'shareAppMessage:ok') {} + // }, + // fail: function(error) { + // if (res.errMsg == 'shareAppMessage:fail cancel') {} else if (res.errMsg == 'shareAppMessage:fail') {} + // } + // }; + // // 来自页面内的按钮的转发 + // if (res.from === 'button') { + // var eData = res.target.dataset.id; + // shareObj.path = `/pages/index/index?couponChannelId=${eData}`; + // } + // // 返回shareObj + // return shareObj; + // }, }) \ No newline at end of file diff --git a/pages/index/searchbar/detail/index.json b/pages/index/searchbar/detail/index.json index a6f2974..1399980 100644 --- a/pages/index/searchbar/detail/index.json +++ b/pages/index/searchbar/detail/index.json @@ -4,6 +4,6 @@ "enablePullDownRefresh": true, "usingComponents": { "c-banner": "../../../../components/banner/index", - "c-coupons": "../../../../components/merchantcoupons/index" + "c-coupons": "../../../../components/coupons/index" } } \ No newline at end of file diff --git a/pages/index/searchbar/detail/index.wxml b/pages/index/searchbar/detail/index.wxml index c9397b6..2761dd7 100644 --- a/pages/index/searchbar/detail/index.wxml +++ b/pages/index/searchbar/detail/index.wxml @@ -57,7 +57,6 @@ 商家简介 - @@ -78,7 +77,7 @@ {{data.summary}} - {{"信息完善中,敬请期待。"}} + 信息完善中,敬请期待。 diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss index b050b17..917ab1e 100644 --- a/pages/index/searchbar/detail/index.wxss +++ b/pages/index/searchbar/detail/index.wxss @@ -44,12 +44,12 @@ } .merchant-detail { - width:92%; - padding:30rpx 4% 0; - background:#fff; - border-top-left-radius:20rpx; - border-top-right-radius:20rpx; - margin-top:-25rpx; + width: 92%; + padding: 30rpx 4% 0; + background: #fff; + border-top-left-radius: 20rpx; + border-top-right-radius: 20rpx; + margin-top: -25rpx; } .merchant-brand, .merchant-shop, .merchant-phone { @@ -95,20 +95,22 @@ color: #333; } -.merchant-shop view:nth-child(2){ +.merchant-shop view:nth-child(2) { font-size: 30rpx; } .merchant-info { - display: block!important; + display: block !important; color: #999; font-size: 28rpx; } -.merchant-phones{ + +.merchant-phones { padding: 20rpx 0; display: block; font-size: 30rpx; } + .tel { right: 0; top: 0; @@ -132,49 +134,59 @@ position: absolute; right: 10rpx; } -.merchants text{ + +.merchants text { display: block; text-align: left; - font-size:26rpx; + font-size: 26rpx; margin-bottom: 6rpx; + line-height: 15rpx; } -.merchants{ - display: block!important; + +.merchants { + display: block !important; } -.merchant-brand{ - border: none!important; + +.merchant-brand { + border: none !important; } + .tabs-item.selected { - color:rgba(171,149,109,.8); - border-bottom:2px solid rgba(171,149,109,.8); + color: rgba(171, 149, 109, 0.8); + border-bottom: 2px solid rgba(171, 149, 109, 0.8); } + .tabs-item { - width:33.3%; - color:#C7C7CB; - font-size:28rpx; - display:flex; - align-items:center; - justify-content:center; - border-bottom:1rpx solid #D0D0D7; -} -.swiper-tab{ + width: 33.3%; + color: #c7c7cb; + font-size: 28rpx; + display: flex; + align-items: center; + justify-content: center; + border-bottom: 1rpx solid #d0d0d7; +} + +.swiper-tab { text-align: left; width: 100%; - display: flex; - flex-flow: row; - height: 88rpx; - line-height: 88rpx; - margin-bottom: 20rpx; + display: flex; + flex-flow: row; + height: 88rpx; + line-height: 88rpx; + margin-bottom: 40rpx; } + .swiper-tab-item { - color: #434343; - font-size: 30rpx; - margin-right:50rpx; + color: #434343; + font-size: 30rpx; + margin-right: 50rpx; } + .active-tab { - color: #1693FC; - border-bottom: 10rpx solid #1693FC; + color: #1693fc; + border-bottom: 10rpx solid #1693fc; } + .fenxiang { position: absolute; right: 0; @@ -188,88 +200,105 @@ top: 0; right: 0; } + .user-motto { -width:270rpx; -border:0; -background:none; -height:260rpx; -color:#fff; -position:fixed; + width: 270rpx; + border: 0; + background: none; + height: 260rpx; + color: #fff; + position: fixed; } .user-motto::after { border: none; } + /* 商户活动列表 */ -.coupons c-coupons{ + +.coupons c-coupons { width: 335rpx; height: 354rpx; margin-bottom: 22rpx; } -.coupons c-coupons:nth-of-type(2n+1){ + +.coupons c-coupons:nth-of-type(2n+1) { float: left; } -.coupons c-coupons:nth-of-type(2n){ + +.coupons c-coupons:nth-of-type(2n) { float: right; } + .loading image { width: 60rpx; height: 60rpx; vertical-align: middle; margin-right: 10rpx; } -.dingdan text{ + +.dingdan text { display: block; text-align: center; + color: #999; } -.swiperactive{ + +.swiperactive { min-height: 300rpx; - margin-bottom:20rpx; + margin-bottom: 20rpx; } + /* modal */ -.modal{ - width: 100%; - height: 100%; - position: fixed; - top: 0; - left: 0; - background: rgba(0,0,0,0.5); - overflow: hidden; - z-index: 10; - color: #fff; -} -.modal-content{ - width: 540rpx; - height: 260rpx; - line-height: 60rpx; - overflow: hidden; - position: fixed; - top: 50%; - left: 0; - z-index: 11; - background: #f9f9f9; - margin: -130rpx 105rpx; - border-radius: 36rpx; - display: flex; -} -.modal-content view{ + +.modal { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: rgba(0, 0, 0, 0.5); + overflow: hidden; + z-index: 10; + color: #fff; +} + +.modal-content { + width: 540rpx; + height: 260rpx; + line-height: 60rpx; + overflow: hidden; + position: fixed; + top: 50%; + left: 0; + z-index: 11; + background: #f9f9f9; + margin: -130rpx 105rpx; + border-radius: 36rpx; + display: flex; +} + +.modal-content view { display: inline-block; flex: 1; text-align: center; } -.modal-content view>text{ - color: #000; - display: block; - height: 80rpx; - line-height: 80rpx; + +.modal-content view>text { + color: #000; + display: block; + height: 80rpx; + line-height: 80rpx; } -.modal-content view>image{ + +.modal-content view>image { margin-top: 30rpx; width: 100rpx; height: 100rpx; } + /*分享海报样式*/ -.canvas-content{ + +.canvas-content { display: flex; top: 0; left: 0; @@ -294,15 +323,23 @@ position:fixed; width: 36rpx; height: 36rpx; } + /*分享海报蒙层*/ -.postermodal{ - width: 100%; - height: 100%; - position: fixed; - top: 0; - left: 0; - background: rgba(0,0,0,0.5); - overflow: hidden; - z-index: 50; - color: #fff; -} \ No newline at end of file + +.postermodal { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: rgba(0, 0, 0, 0.5); + overflow: hidden; + z-index: 50; + color: #fff; +} + +.dingdan image { + display: block; + width: 300rpx; + margin: 30rpx auto 0; +}