From 6a609f027613ac789840a49ea5c4ed3d6335566c Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 16 Mar 2019 16:12:13 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF=E9=A6=96=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:[=E9=A6=96=E9=A1=B5=E5=89=8D=E7=AB=AF=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E7=9A=84=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cardorder/detail/index.js | 2 +- pages/couponorder/detail/index.js | 2 +- pages/main/index.js | 27 +++++++++++++++++----- pages/main/index.wxml | 31 ++++++++++++++----------- pages/main/index.wxss | 17 +++++++------- pages/order/detail/index.js | 2 +- utils/imgurl.js | 38 ++++++++++++++++++++++--------- 7 files changed, 78 insertions(+), 41 deletions(-) diff --git a/pages/cardorder/detail/index.js b/pages/cardorder/detail/index.js index 13c5c41..ebbd09a 100644 --- a/pages/cardorder/detail/index.js +++ b/pages/cardorder/detail/index.js @@ -12,7 +12,7 @@ Page({ wm02Url: imgurl.wm02.url, wm03Url: imgurl.wm03.url, teljpgUrl: imgurl.teljpg.url, - newUrl: imgurl.new.url, + newUrl: imgurl.new1.url, data: { salePrice: null, price: null, diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index ad2eb7f..f6e8314 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -13,7 +13,7 @@ Page({ wm03Url: imgurl.wm03.url, wm04Url: imgurl.wm04.url, teljpgUrl: imgurl.teljpg.url, - newUrl: imgurl.new.url, + newUrl: imgurl.new1.url, data: { salePrice: null, price: null, diff --git a/pages/main/index.js b/pages/main/index.js index 5b25f74..8a76e0d 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -5,12 +5,15 @@ const QR = require("../../utils/memberqrcode.js"); let app = getApp(); Page({ data: { - newUrl: imgurl.new.url, - icon001: imgurl.icon001.url, - icon002: imgurl.icon002.url, - icon003: imgurl.icon003.url, - icon004: imgurl.icon004.url, - sapellgroup: imgurl.sapellgroup.url, + newUrl: imgurl.new1.url, + icon0001: imgurl.icon0001.url, + icon0002: imgurl.icon0002.url, + icon0003: imgurl.icon0003.url, + icon0004: imgurl.icon0004.url, + icon0005: imgurl.icon0005.url, + icon0006: imgurl.icon0006.url, + icon0007: imgurl.icon0007.url, + icon0008: imgurl.icon0008.url, market: app.globalData.market, list: [], loading: true, @@ -28,6 +31,18 @@ Page({ showPages: false, page: 1 // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 }, + // 我的卡包 + mycard:function(){ + wx.navigateTo({ + url: '/pages/cardorder/index/index', + }) + }, + //我的券包 + mycoupon:function(){ + wx.navigateTo({ + url: '/pages/couponorder/index/index', + }) + }, gotodiscountCardList: function() { wx.navigateTo({ url: '/pages/discountCardList/discountCardList' diff --git a/pages/main/index.wxml b/pages/main/index.wxml index 8cf20c8..4145a0b 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -1,32 +1,37 @@ - - - - 门店> - - - - + 限时抢购 - + 消费卡 - + 拼团专场 - + 砍价专场 - - + + + 品牌门店 + + + + 我的卡包 + + + + 我的券包 + + + 会员权益 diff --git a/pages/main/index.wxss b/pages/main/index.wxss index ff14b2e..9444b6c 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -25,8 +25,7 @@ page { .game-entry { width: 690rpx; - height: 140rpx; - margin: 57rpx auto 0; + margin: 37rpx auto 0; } .gameimg { @@ -37,23 +36,25 @@ page { .section { padding: 0 20rpx; - display: flex; justify-content: space-around; text-align: center; - margin-top: 40rpx; + margin-top: 25rpx; +} +.section >view{ + width: 25%; + display: inline-block; } - .section >view image { display: block; margin: 0 auto; } .section >view image { - width: 80rpx; - height: 80rpx; + width: 55rpx; + height: 55rpx; + margin-top: 20rpx; margin-bottom: 14rpx; } .section text { - height: 23rpx; font-size: 24rpx; color: rgba(51, 51, 51, 1); display: block; diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 2a8276b..12d7d4b 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -11,7 +11,7 @@ Page({ succUrl: imgurl.succ.url, spcodeUrl: imgurl.spcode.url, teljpgUrl: imgurl.teljpg.url, - newUrl: imgurl.new.url, + newUrl: imgurl.new1.url, weixinTitle: imgurl.weixinTitle.url, showModalStatus: false, flag: 0, diff --git a/utils/imgurl.js b/utils/imgurl.js index 9c36beb..ec4a212 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -180,9 +180,9 @@ module.exports = { 'url': baseUrl + 'myspeacial.jpg', 'name': '' }, - 'new': { - 'url': baseUrl + 'new.png', - 'name': '' + 'new1': { + 'url': baseUrl + 'new1.png', + 'name': '游戏' }, 'orbg': { 'url': baseUrl + 'orbg.png', @@ -328,20 +328,36 @@ module.exports = { 'url': baseUrl + 'wm04.jpg', 'name': '' }, - 'icon001': { - 'url': baseUrl + 'icon001.png', + 'icon0001': { + 'url': baseUrl + 'icon0001.png', + 'name': '' + }, + 'icon0002': { + 'url': baseUrl + 'icon0002.png', + 'name': '' + }, + 'icon0003': { + 'url': baseUrl + 'icon0003.png', + 'name': '' + }, + 'icon0004': { + 'url': baseUrl + 'icon0004.png', + 'name': '' + }, + 'icon0005': { + 'url': baseUrl + 'icon0005.png', 'name': '' }, - 'icon002': { - 'url': baseUrl + 'icon002.png', + 'icon0006': { + 'url': baseUrl + 'icon0006.png', 'name': '' }, - 'icon003': { - 'url': baseUrl + 'icon003.png', + 'icon0007': { + 'url': baseUrl + 'icon0007.png', 'name': '' }, - 'icon004': { - 'url': baseUrl + 'icon004.gif', + 'icon0008': { + 'url': baseUrl + 'icon0008.png', 'name': '' }, 'canTransferred': {