diff --git a/assets/img/fail.png b/assets/img/fail.png index 406cda1..698614a 100644 Binary files a/assets/img/fail.png and b/assets/img/fail.png differ diff --git a/assets/img/guoqi.jpg b/assets/img/guoqi.jpg deleted file mode 100644 index ddbfc91..0000000 Binary files a/assets/img/guoqi.jpg and /dev/null differ diff --git a/assets/img/guoqi.png b/assets/img/guoqi.png deleted file mode 100644 index c4f0fa9..0000000 Binary files a/assets/img/guoqi.png and /dev/null differ diff --git a/assets/img/shiyong.jpg b/assets/img/shiyong.jpg deleted file mode 100644 index d57f90e..0000000 Binary files a/assets/img/shiyong.jpg and /dev/null differ diff --git a/assets/img/tui.jpg b/assets/img/tui.jpg deleted file mode 100644 index 733f0c7..0000000 Binary files a/assets/img/tui.jpg and /dev/null differ diff --git a/assets/img/wm01.jpg b/assets/img/wm01.jpg index 8e9c670..c36df7d 100644 Binary files a/assets/img/wm01.jpg and b/assets/img/wm01.jpg differ diff --git a/assets/img/wm02.jpg b/assets/img/wm02.jpg index eda9ae1..b6ad053 100644 Binary files a/assets/img/wm02.jpg and b/assets/img/wm02.jpg differ diff --git a/assets/img/wm03.jpg b/assets/img/wm03.jpg index 16d4290..0840ef7 100644 Binary files a/assets/img/wm03.jpg and b/assets/img/wm03.jpg differ diff --git a/components/banner/index.js b/components/banner/index.js index 27376c7..ee42217 100644 --- a/components/banner/index.js +++ b/components/banner/index.js @@ -6,35 +6,33 @@ Component({ properties: { list: { value: [], - type: Array, - }, + type: Array + } }, /** * 组件的初始数据 */ data: { - swiperCurrent: 0, + swiperCurrent: 0 }, - /** * 组件的方法列表 */ - ready(){ - }, + ready() {}, methods: { - swiperChange: function (e) { + swiperChange: function(e) { this.setData({ swiperCurrent: e.detail.current - }) + }); }, - gotobannerdetail:function(e){ - console.log("我要点击进入banner详情页面") + gotobannerdetail: function(e) { + console.log("我要点击进入banner详情页面"); console.log(e.currentTarget.dataset.id); wx.navigateTo({ - url: `/pages/bannerdetail/index?id=${e.currentTarget.dataset.id}`, - }) + url: `/pages/bannerdetail/index?id=${e.currentTarget.dataset.id}` + }); } } -}) +}); diff --git a/config/config.js b/config/config.js index 0b12fcd..4b30cad 100755 --- a/config/config.js +++ b/config/config.js @@ -31,11 +31,7 @@ var config = { * 优惠券详情 */ couponDetail: "/wxCoupon/detail", - - /** - * bannerlist优惠券的详情页面 - */ - bannercoupondetai:"/wxCoupon/detailC", + /** * 业态查询 */ diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml index 2e80f76..333cecb 100644 --- a/pages/bannerdetail/index.wxml +++ b/pages/bannerdetail/index.wxml @@ -37,7 +37,7 @@ --> - + diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 7670e18..f172f1d 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -24,9 +24,9 @@ Page({ onLoad(options) { let that = this; console.log(options); - console.log(options.couponChannelId); - console.log(options.couponId); - console.log("传的变量的名字叫Id"); + console.log("couponChannelId" + options.couponChannelId); + console.log("couponId" + options.couponId); + console.log("传的变量的名字叫couponId"); /** * 首页banner detail couponlist传过来的值 * iambannercoupon @@ -43,32 +43,17 @@ Page({ // // this.orderFunc(); // } // else { - if (options.couponChannelId == "iambannercoupon") { - that.setData({ - couponId: options.couponId - }); - /** - * 待解决 - */ - var parmer = { - url: config.api.bannercoupondetai, - data: { - couponId: options.couponId - } - }; - } else { - that.setData({ - couponChannelId: options.couponChannelId, - couponId: options.couponId - }); - var parmer = { - url: config.api.couponDetail, - data: { - couponChannelId: options.couponChannelId - } - }; - } - + // } + that.setData({ + couponChannelId: options.couponChannelId, + couponId: options.couponId + }); + var parmer = { + url: config.api.couponDetail, + data: { + couponChannelId: options.couponChannelId + } + }; Http.get(parmer).then(res => { console.log(res); console.log("details"); @@ -234,14 +219,11 @@ Page({ if (res.errMsg == "requestPayment:ok") { wx.showToast({ title: "购买成功", - duration: 2500 + duration: 2500, }); /** * 用户支付成功以后跳转到券包列表 */ - wx.redirectTo({ - url: '/pages/couponorder/index/index', - }) } }, @@ -256,21 +238,6 @@ Page({ // var url = res.data.url; // console.log("get url", url); if (res.errMsg == "requestPayment:ok") { - wx.showModal({ - title: "提示", - content: "支付成功" - }); - // if (url) { - // setTimeout(function () { - // wx.redirectTo({ - // url: "/pages" + url - // }); - // }, 2000); - // } else { - // setTimeout(() => { - // wx.navigateBack(); - // }, 2000); - // } } else { wx.showToast({ title: "支付失败", diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index ce55a80..45fa3ed 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -40,8 +40,8 @@ Page({ }); }); } - util.barcode("barcode", options.quancode, 680, 100); - util.qrcode("qrcode", options.quancode, 400, 400); + util.barcode("barcode", options.quancode, 510, 100); + util.qrcode("qrcode", options.quancode,350, 350); }, phone: function() { let that = this; diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index dc50ff3..9e47fd6 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -16,7 +16,7 @@ 有效期至: {{expiredTime}} - + + + + + + + + + + + + + + + 兑换码:{{code}} + + + + 适用门店 diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss index d345503..efcc547 100644 --- a/pages/couponorder/detail/index.wxss +++ b/pages/couponorder/detail/index.wxss @@ -2,17 +2,16 @@ padding-bottom: 10rpx; } -.panel { - display: flex; - flex-direction: column; - justify-content: space-between; - align-items: stretch; - box-sizing: border-box; - width: 710rpx; - margin-top: 40rpx; +.panel,.zhuangtai image{ + width: 510rpx; + height: 581rpx; + display: block; border-radius: 10rpx; background-color: #fff; - margin: 30rpx auto 0; + margin: 22rpx auto 0; + padding: 30rpx 0; + position: relative; + z-index: 10000000000; } .pane2{ background: #fff; @@ -24,58 +23,55 @@ margin: 40rpx auto 0; } +.buy { + background: #fff; + height: 88rpx; + width: 98%; + margin: 30rpx auto 0; + color: #7e7e7e; + line-height: 88rpx; + border-radius: 16rpx; + border: 1px solid #eee; +} + .barcode { - display: flex; height: 100rpx; - flex-direction: column; - justify-content: center; - align-items: center; + width: 510rpx; + margin: 0 auto; } .barnum { - width: 670rpx; - height: 46rpx; - line-height: 46rpx; - font-size: 30rpx; + font-size: 24rpx; text-align: center; + letter-spacing: 2rpx; white-space: nowrap; - color: #999; + color: #7f7f7f; } .barnum text { - color: #333; + color: #767676; } .barcode > canvas { - width: 680rpx; + width: 510rpx; height: 100rpx; } .qrcode { - height: 370rpx; + position: relative; + height: 350rpx; + width: 350rpx; display: flex; flex-direction: column; justify-content: flex-end; align-items: center; + margin: 0 auto; } -.qrcode image{ - position: absolute; - width: 160rpx; - height: 160rpx; - right:0; - bottom: 0; - top: 0; - left: 0; - margin: auto; - z-index: 1000000000; - border-radius:50%; -} + .qrcode > canvas { - position: relative; - width: 400rpx; - height: 400rpx; + width: 350rpx; + height: 350rpx; } - .coupon_detail { padding: 0 20rpx; } @@ -152,7 +148,6 @@ width: 100%; display: flex; flex-direction: column; - margin-top: 50rpx; background: #fff; border-bottom: 20rpx solid #f5f5f5; border-top: 20rpx solid #f5f5f5; diff --git a/pages/index/coupons/index.js b/pages/index/coupons/index.js index e8b0c2c..ff31dc1 100644 --- a/pages/index/coupons/index.js +++ b/pages/index/coupons/index.js @@ -75,13 +75,13 @@ Component({ if (key == 0) { var param = { pageNum: pageNum, - pageSize: 8, + pageSize: 16, targetAd: 1 }; } else { var param = { pageNum: pageNum, - pageSize: 8, + pageSize: 16, business: key, targetAd: 1 }; diff --git a/pages/index/coupons/index.wxss b/pages/index/coupons/index.wxss index a2b04a6..d3f6a45 100644 --- a/pages/index/coupons/index.wxss +++ b/pages/index/coupons/index.wxss @@ -1,3 +1,3 @@ .index-coupons{ - height:2036rpx; + height:820rpx; } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 338b1e1..8e9d363 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -22,8 +22,6 @@ Page({ var scene = decodeURIComponent(options.scene); if (app.globalData.token && app.globalData.token != null) { } else { - // 由于是网络请求,可能会在 Page.onLoad 之后才返回 - // 所以此处加入 callback 以防止这种情况 wx.login({ success: ({ code }) => { console.log(code); diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index ed41afe..be0637b 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -106,9 +106,6 @@ Page({ duration: 2500 }); } - wx.navigateBack({ - delta: 2 - }); }, fail: res => { that.payOrderUpdate(that.data.orderId, payOrderId, 2); // 支付失败 @@ -117,25 +114,7 @@ Page({ }, complete: res => { console.log(res); - console.log("支付完成"); - // var url = res.data.url; - // console.log("get url", url); if (res.errMsg == "requestPayment:ok") { - wx.showModal({ - title: "提示", - content: "支付成功" - }); - // if (url) { - // setTimeout(function () { - // wx.redirectTo({ - // url: "/pages" + url - // }); - // }, 2000); - // } else { - // setTimeout(() => { - // wx.navigateBack(); - // }, 2000); - // } } else { wx.showToast({ title: "支付失败", diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index b3ad6c5..bc6c13c 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -38,7 +38,7 @@ --> diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 37a19b9..99e1fff 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -35,17 +35,7 @@ Page({ gotopay:function(e){ console.log("orderId"+e.currentTarget.dataset.id); wx.navigateTo({ - url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}&flag='pay'`, - success: function(res){ - // success - }, - fail: function() { - // fail - }, - complete: function() { - // complete - } - }) + url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}&flag='pay'`}) }, getList(key, pageNum) { let that = this; @@ -59,13 +49,13 @@ Page({ if (key == 'all') { var variable = { pageNum: pageNum, - pageSize: 5, + pageSize: 15, paymentType:0 }; } else { var variable = { pageNum: pageNum, - pageSize: 5, + pageSize: 15, orderStatus: key, paymentType:0 }; diff --git a/pages/youhuiquanma/index.wxml b/pages/youhuiquanma/index.wxml index 09ae6db..f8e9283 100644 --- a/pages/youhuiquanma/index.wxml +++ b/pages/youhuiquanma/index.wxml @@ -9,18 +9,22 @@ 2 已过期 3 已经退款 --> - - - + + + + + + + + + + + + + 兑换码:{{code}} - - - - - - - 兑换码:{{code}} + 购买须知: {{remark}} diff --git a/pages/youhuiquanma/index.wxss b/pages/youhuiquanma/index.wxss index e35643c..eef75cc 100644 --- a/pages/youhuiquanma/index.wxss +++ b/pages/youhuiquanma/index.wxss @@ -32,8 +32,9 @@ page { margin-top: 16rpx; text-align: center; } -.panel { - width: 600rpx; +.panel,.zhuangtai image{ + width: 510rpx; + height: 581rpx; border-radius: 10rpx; background-color: #fff; margin: 22rpx auto 0; @@ -41,6 +42,7 @@ page { position: relative; z-index: 10000000000; } + .pane2 { background: #fff; opacity: 0.6; @@ -84,18 +86,6 @@ page { justify-content: flex-end; align-items: center; } -.qrcode image{ - position: absolute; - width: 160rpx; - height: 160rpx; - right:0; - bottom: 0; - top: 0; - left: 0; - margin: auto; - z-index: 1000000000; - border-radius:50%; -} .qrcode > canvas { width: 350rpx; @@ -125,7 +115,6 @@ page { line-height: 88rpx; border-radius: 16rpx; border: 1px solid #eee; - margin-top:40rpx; } .gou{ width: 87%;