diff --git a/assets/images/picture.png b/assets/images/picture.png new file mode 100644 index 0000000..95672c3 Binary files /dev/null and b/assets/images/picture.png differ diff --git a/assets/images/wechat.png b/assets/images/wechat.png new file mode 100644 index 0000000..fc4a727 Binary files /dev/null and b/assets/images/wechat.png differ diff --git a/components/merchantcoupons/index.wxml b/components/merchantcoupons/index.wxml index c1e332f..0a45920 100644 --- a/components/merchantcoupons/index.wxml +++ b/components/merchantcoupons/index.wxml @@ -1,6 +1,41 @@ - + - + + + + + + {{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 index f148a33..074be8b 100644 --- a/components/merchantcoupons/index.wxss +++ b/components/merchantcoupons/index.wxss @@ -257,3 +257,8 @@ navigator{ navigator:nth-of-type(2n+1){ margin-right: 10rpx; } +/* 限时抢购样式 */ +.xianshicoupons{ + width: 100%; + position: relative +} \ No newline at end of file diff --git a/pages/index/detail/index.js b/pages/index/detail/index.js index 354de10..d5c366d 100644 --- a/pages/index/detail/index.js +++ b/pages/index/detail/index.js @@ -10,12 +10,14 @@ Page({ data: { teljpgUrl: imgurl.teljpg.url, share01: imgurl.share01.url, + actUrl: imgurl.act.url, page: 1, imglist:null, shopVoList:[], couponList:[],//活动劵列表 data:{ - currentTab: 0 + currentTab: 0, + isshare:false }, id:null }, @@ -31,6 +33,9 @@ Page({ }); that.getList(options.id); that.getCouponList(options.id); + this.setData({ + currentTab: 0 + }) } }, /** @@ -41,6 +46,22 @@ Page({ wx.makePhoneCall({ phoneNumber: e.target.dataset.merchantlinkphone }); + }, + /** + * 显示分享弹框 + */ + showshare:function(){ + this.setData({ + isshare:true, + }) + }, + /** + * 隐藏分享弹框 + */ + hidemodal:function(){ + this.setData({ + isshare: false, + }) }, //滑动切换 swiperTabView: function (e) { @@ -132,7 +153,8 @@ Page({ onHide: function () { }, - onShareAppMessage: function (options) { + onShareAppMessage: function (res) { + debugger var that = this; var shareObj = { title: that.data.data.title, @@ -145,8 +167,8 @@ Page({ } }; // 来自页面内的按钮的转发 - if (options.from == 'button') { - var eData = options.target.dataset.id; + if (res.from === 'button') { + var eData = res.target.dataset.id; shareObj.path = `/pages/index/index?couponChannelId=${eData}`; } // 返回shareObj diff --git a/pages/index/detail/index.json b/pages/index/detail/index.json index 0bd72dc..92dce2e 100644 --- a/pages/index/detail/index.json +++ b/pages/index/detail/index.json @@ -4,6 +4,6 @@ "enablePullDownRefresh": true, "usingComponents": { "c-banner": "../../../components/banner/index", - "c-coupons": "../../../components/coupons/index" + "c-coupons": "../../../components/merchantcoupons/index" } } \ No newline at end of file diff --git a/pages/index/detail/index.wxml b/pages/index/detail/index.wxml index 896b0b8..60275a6 100644 --- a/pages/index/detail/index.wxml +++ b/pages/index/detail/index.wxml @@ -3,7 +3,7 @@ - + @@ -17,10 +17,10 @@ {{data.merchantName}} {{data.title}} - - - - + + + + @@ -48,37 +48,55 @@ - -    优惠信息 -    商家简介 - -    -      - - - - - 请您敬请期待 - 我们正在筹备一大波优惠活动 - - {{content}} - {{loadingtext}} -    -    -      - {{data.summary}} - {{"信息完善中,敬请期待。"}} + + 优惠信息 + 商家简介 -    - - + + + + + + + 微信好友 + + + + 生成海报 + + + \ No newline at end of file diff --git a/pages/index/detail/index.wxss b/pages/index/detail/index.wxss index 3c5dcfe..57428af 100644 --- a/pages/index/detail/index.wxss +++ b/pages/index/detail/index.wxss @@ -164,12 +164,12 @@ flex-flow: row; height: 88rpx; line-height: 88rpx; - margin-left: -30rpx; + margin-bottom: 20rpx; } .swiper-tab-item { color: #434343; font-size: 30rpx; - margin-right:30rpx; + margin-right:50rpx; } .active-tab { color: #1693FC; @@ -188,6 +188,18 @@ top: 0; right: 0; } +.user-motto { +width:270rpx; +border:0; +background:none; +height:260rpx; +color:#fff; +position:fixed; +} + +.user-motto::after { + border: none; +} /* 商户活动列表 */ .coupons c-coupons{ width: 335rpx; @@ -205,4 +217,53 @@ height: 60rpx; vertical-align: middle; margin-right: 10rpx; +} +.dingdan text{ + display: block; + text-align: center; +} +.swiperactive{ + min-height: 300rpx; +} +/* 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{ + display: inline-block; + flex: 1; + text-align: center; +} +.modal-content view>text{ + color: #000; + display: block; + height: 80rpx; + line-height: 80rpx; +} +.modal-content view>image{ + margin-top: 30rpx; + width: 100rpx; + height: 100rpx; } \ No newline at end of file