diff --git a/assets/img/cou.png b/assets/img/cou.png new file mode 100644 index 0000000..f1f34d6 Binary files /dev/null and b/assets/img/cou.png differ diff --git a/assets/img/shiyong.jpg b/assets/img/shiyong.jpg new file mode 100644 index 0000000..d57f90e Binary files /dev/null and b/assets/img/shiyong.jpg differ diff --git a/assets/img/tui.jpg b/assets/img/tui.jpg new file mode 100644 index 0000000..733f0c7 Binary files /dev/null and b/assets/img/tui.jpg differ diff --git a/pages/addPark/addPark.wxss b/pages/addPark/addPark.wxss index 297a9d6..d5776bc 100644 --- a/pages/addPark/addPark.wxss +++ b/pages/addPark/addPark.wxss @@ -98,7 +98,9 @@ margin: 10rpx; } - +.addpark-choose-font p{ + display: block; +} .addpark-choose-font p image{ width:5vmin; height:3.5vmin; diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index d155bd0..045d674 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -7,8 +7,8 @@ Page({ data: { code: "", data: {}, - createDate:'', - expiredTime:'' + createDate: "", + expiredTime: "" }, onLoad: function(options) { console.log(options); @@ -33,9 +33,9 @@ Page({ data: res.data.data }); that.setData({ - expiredTime:util.fmtDate(that.data.data.expiredTime), - createDate:util.fmtDate(that.data.data.createDate) - }) + expiredTime: util.fmtDate(that.data.data.expiredTime), + createDate: util.fmtDate(that.data.data.createDate) + }); }); } util.barcode("barcode", options.quancode, 680, 100); diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index c3e3036..a9e842c 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -16,8 +16,16 @@ 有效期至: {{expiredTime}} - - + + + + + + + + + + @@ -36,7 +44,7 @@ {{data.merchantName}} - 北京市西城区西单北大街131号 + {{data.addr}}{{data.buildingName}}{{data.floorName}} diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss index 2ad9470..ff64261 100644 --- a/pages/couponorder/detail/index.wxss +++ b/pages/couponorder/detail/index.wxss @@ -14,6 +14,15 @@ background-color: #fff; margin: 30rpx auto 0; } +.pane2{ + background: #fff; + opacity: .6; +} +.pane2 image{ + width: 500rpx; + display: block; + margin: 40rpx auto 0; +} .barcode { display: flex; diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index 5b77961..5454db9 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -1,6 +1,6 @@ -let format = require("../../../utils/util.js"); -let config = require("../../../config/config.js"); -let app = getApp(); +const format = require("../../../utils/util.js"); +const config = require("../../../config/config.js"); +const app = getApp(); const Http = require("../../../utils/HttpBasics"); //1535126400000 Page({ @@ -28,17 +28,20 @@ Page({ current_scroll: "1" }, onLoad() { - this.getList(0, 1); + this.getList(1, 1); }, + //点击跳转到券详情页面 gotouse: function(e) { console.log(e.currentTarget.dataset.quancode); console.log("点击跳转到券详情"); wx.navigateTo({ - url: `/pages/couponorder/detail/index?quancode=${e.currentTarget.dataset.quancode}`, - success: function(res){ + url: `/pages/couponorder/detail/index?quancode=${ + e.currentTarget.dataset.quancode + }`, + success: function(res) { // success - console.log("点击跳转到券详情页面") + console.log("点击跳转到券详情页面"); }, fail: function() { // fail @@ -46,16 +49,18 @@ Page({ complete: function() { // complete } - }) + }); }, getList(key, pageNum) { var that = this; + console.log(key); + console.log(pageNum); Http.get({ url: config.api.couponOrderList, data: { pageNum: pageNum, pageSize: 10, - orderStatus: key + couponOrderStatus: key } }).then(res => { console.log(res); @@ -71,12 +76,15 @@ Page({ }); }, handleChange({ detail }) { + console.log(detail); this.setData({ current: detail.key }); }, handleChangeScroll({ detail }) { - this.getList(detail.key); + console.log(detail.key); + console.log("0000"); + this.getList(detail.key,1); this.setData({ current_scroll: detail.key }); diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml index a41332b..6279fd5 100644 --- a/pages/couponorder/index/index.wxml +++ b/pages/couponorder/index/index.wxml @@ -3,20 +3,29 @@ - - - - - - {{item.title}} + + + + + 没有优惠券哦 + + + + + - - 有效期至: - {{item.expiredTime}} + + + {{item.title}} + + + 有效期至: + {{item.expiredTime}} + + 立即使用 + 查看 - 立即使用 diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss index a787e69..3ce1e8c 100644 --- a/pages/couponorder/index/index.wxss +++ b/pages/couponorder/index/index.wxss @@ -17,8 +17,8 @@ .section { margin-top: 2%; } -.section:nth-of-type(1){ - margin-top:30rpx; +.section:nth-of-type(1) { + margin-top: 30rpx; } .detail_msg { @@ -90,3 +90,16 @@ font-size: 22rpx; color: red; } + +.nocoupon image{ + width: 100rpx; + display: block; + margin: 200rpx auto 0; +} +.nocoupon text{ + display: block; + text-align: center; + font-size:30rpx; + color: #999; +} + diff --git a/pages/index/rushToBuy/index.wxss b/pages/index/rushToBuy/index.wxss index 60f2f06..373cf35 100644 --- a/pages/index/rushToBuy/index.wxss +++ b/pages/index/rushToBuy/index.wxss @@ -15,7 +15,6 @@ .index-scroll-view { width: 100%; white-space: nowrap; - padding-right: 30rpx; } .index-scroll-view .commodity {