diff --git a/config/config.js b/config/config.js index 20eaace..3dc349f 100755 --- a/config/config.js +++ b/config/config.js @@ -110,7 +110,11 @@ var config = { /** * banner */ - bannerlist: "/wxCampaign/list" + bannerlist: "/wxCampaign/list", + /** + * banner详情页面 + */ + bannerDetail:"/wxCampaign/findById" }, weapp: { diff --git a/pages/bannerdetail/index.js b/pages/bannerdetail/index.js index ab95fd2..1b4c066 100644 --- a/pages/bannerdetail/index.js +++ b/pages/bannerdetail/index.js @@ -14,49 +14,17 @@ Page({ onLoad(options) { let that = this; console.log(options.id); - // wx.showLoading({ - // title: "加载中..." - // }); - // Http.get({ - // url: config.api.couponDetail, - // data: { - // couponId: options.id, - // targetAd:options.targetAd - // } - // }).then(res => { - // console.log(res); - // //当前时间与优惠券下架时间做计算 - // var startTime = util.fmtDate(res.data.sendEndDate); - // console.log(startTime); - // var s1 = new Date(startTime.replace(/-/g, "/")); - // var s2 = new Date(); - // var runTime = parseInt((s1.getTime() - s2.getTime()) / 1000); - // var year = Math.floor(runTime / 86400 / 365); - // var runTime = runTime % (86400 * 365); - // var month = Math.floor(runTime / 86400 / 30); - // var runTime = runTime % (86400 * 30); - // var day = Math.floor(runTime / 86400); - // var runTime = runTime % 86400; - // var hour = Math.floor(runTime / 3600); - // var runTime = runTime % 3600; - // var minute = Math.floor(runTime / 60); - // var runTime = runTime % 60; - // var second = runTime; - // console.log(year, month, day, hour, minute, second); - // that.setData({ - // year: year, - // month: month, - // day: day, - // hour: hour, - // minute: minute - // }); - // console.log(that.data.day); - // wx.hideLoading(); - // that.setData({ - // data: res.data, - // couponId: options.id - // }); - // }); - + Http.get({ + url: config.api.bannerDetail, + data: { + id: options.id + } + }).then(res => { + console.log(res); + that.setData({ + data: res.data + }); + console.log(that.data.data) + }); } -}); \ No newline at end of file +}); diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml index 241d619..478a28b 100644 --- a/pages/bannerdetail/index.wxml +++ b/pages/bannerdetail/index.wxml @@ -2,17 +2,13 @@ - 大餐券限购{{data.useLimitQuantity}}件 - 剩余时间:{{day}}天{{hour}}小时{{minute}}分钟 - 剩余件数:{{data.remainInventory}}件 - - - ¥100 - ¥10000 + {{data.title}} + {{data.subTitle}} + @@ -32,11 +28,12 @@ 活动详情 - 有效期2018.01.16 至 2018.09.20的话不得不大半夜的吧大本营的被的夜班的不的夜班的也别的也好不到大本营 + {{data.detail}} + \ No newline at end of file diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss index 00ba845..41797b3 100644 --- a/pages/bannerdetail/index.wxss +++ b/pages/bannerdetail/index.wxss @@ -23,7 +23,7 @@ .coupons_info { width: 92%; - height: 186rpx; + height: 120rpx; display: flex; justify-content: space-between; padding: 0 4%; @@ -142,11 +142,6 @@ color: #b8b8b8; padding-top: 10rpx; } - -.notes { - margin-top: 2%; -} - .notes view:nth-child(1) { width: 92%; height: 87rpx; diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 19d3cf9..5437bf3 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -14,6 +14,9 @@ Page({ onLoad(options) { let that = this; console.log(options.id); + that.setData({ + couponId:options.id + }) console.log(options.targetAd); wx.showLoading({ title: "加载中..." @@ -59,7 +62,6 @@ Page({ wx.hideLoading(); that.setData({ data: res.data, - couponId: options.id }); }); } diff --git a/pages/index/rushToBuy/index.wxml b/pages/index/rushToBuy/index.wxml index 73aa91f..51d79ec 100644 --- a/pages/index/rushToBuy/index.wxml +++ b/pages/index/rushToBuy/index.wxml @@ -6,7 +6,7 @@ {{item.title}} - {{item.subTitle}} + ¥{{item.salePriceStr}} ¥{{item.priceStr}} diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 535e5da..1060f83 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -1,49 +1,90 @@ -let config = require('../../../config/config.js') -let Http = require('../../../utils/HttpBasics') -let app = getApp() +let config = require("../../../config/config.js"); +let Http = require("../../../utils/HttpBasics"); +let app = getApp(); Page({ data: { - tabs: [{ - key: 0, - name: "全部" - }, - { - key: 1, - name: "待付款" - }, - { - key: 2, - name: "已完成" - } + tabs: [ + { + key: 0, + name: "全部" + }, + { + key: 1, + name: "待付款" + }, + { + key: 2, + name: "已完成" + } ], list: [], - current: '', - current_scroll: '1' + current: "", + current_scroll: "1", + page: 2, + allow_load: true }, onLoad(e) { - this.getList(e.id, 1) + this.getList(e.id, 1); this.setData({ current_scroll: e.id }); }, + getList(key, pageNum) { wx.showLoading({ - title: 'loading...', - }) - Http.get({ - url: config.api.orderList, - data: { + title: "loading..." + }); + console.log(key); + + /** + * key==0 + * 不发送该字段 + */ + if (key == 0) { + var variable = { pageNum: pageNum, - pageSize: 3, + pageSize: 5 + }; + } else { + var variable = { + pageNum: pageNum, + pageSize: 5, orderStatus: key - } - }).then((res) => { + }; + } + + if(that.data.allow_load==''){ + + } + Http.get({ + url: config.api.orderList, + data: variable + }).then(res => { + console.log(res); + console.log("姐姐的订单列表"); wx.hideLoading(); - this.setData({ - list: res.data.list - }) - }) + + console.log(res); + if (pageNum >= res.data.pages) { + wx.showToast({ + title: "加载完成喽", + icon: "success" + }); + that.setData({ + allow_load: false + }); + } + /** + * 先赋值后渲染页面 + * concat 不会改变原数组值 + * push 会改变原数组值,但不会一条一条插入,而是整个数组插入 + */ + that.data.list = that.data.list.concat(res.data.list); + that.setData({ + list: that.data.list + }); + }); }, handleChange({ detail }) { this.setData({ @@ -51,9 +92,19 @@ Page({ }); }, handleChangeScroll({ detail }) { - this.getList(detail.key, 1) + this.getList(detail.key, 1); this.setData({ current_scroll: detail.key }); }, -}) \ No newline at end of file + onReachBottom: function() { + var that = this; + console.info("before++ " + that.data.page); + that.data.page++; + console.info("after++ " + that.data.page); + that.setData({ + page: that.data.page + }); + that.getList(0, that.data.page); + } +}); diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index a518ad1..d189285 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -12,18 +12,18 @@ {{item.detail}} 等待付款 + - 购买数量:{{item.tenantId}}件 - - 下单时间:2018-07-10 11:30 + 下单时间:2018-07-10 11:30 + - ¥{{item.payment}}.00 - ¥{{item.paymentType}}.00 + ¥{{item.payment}} + ¥{{item.paymentType}} - + 支付 diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index 03a0eea..dfed73e 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -13,9 +13,11 @@ width: 30% !important; display: inline-block; } + .section { margin-top: 2%; } + .detail_msg { width: 92%; height: 220rpx !important; @@ -48,7 +50,8 @@ } .info view:nth-child(1) { - margin-bottom: 72rpx; + margin-top: 20rpx; + margin-bottom: 15rpx; } .info view:nth-child(1) text { @@ -61,7 +64,7 @@ } .info view:nth-child(2), .info view:nth-child(3) { - color: #ff3434; + color: #f96563; font-size: 24rpx; padding-left: 4%; } @@ -76,19 +79,19 @@ } .payment { + position: relative; width: 92%; height: 120rpx; line-height: 120rpx; padding: 0 4%; display: flex; justify-content: space-between; - border-bottom: 20rpx solid #EDEDED; + border-bottom: 20rpx solid #ededed; } .payment view:nth-child(1) text:nth-child(1) { font-size: 36rpx; - color: #ff3434; - font-weight: bold; + color: #f96563; } .payment view:nth-child(1) text:nth-child(2) { @@ -98,14 +101,21 @@ text-decoration: line-through; } -.payment view:nth-child(2) { - width: 114rpx; - height: 50rpx; - background: #00c0ff; - border-radius: 10px; - line-height: 38rpx; +.btn{ + position: absolute; + top: 0; + bottom: 0; + margin: auto; + right: 20rpx; + width: 200rpx; + height: 60rpx; + line-height: 60rpx; text-align: center; - margin-top: 40rpx; + background: #00c0ff; + color: #fff; + float: right; + border-radius: 15rpx; + font-size: 28rpx; } .payment view:nth-child(2) text {