From 55848f89b15b4ef7680344b3951ea94341c8a9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=99=96?= Date: Thu, 14 Feb 2019 16:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E8=BD=AC=E8=B5=A0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ConsumeDetail/ConsumeDetail.js | 7 ++++++- pages/ConsumeDetail/ConsumeDetail.wxml | 5 +++-- pages/ConsumeDetail/ConsumeDetail.wxss | 14 ++++++++++++++ pages/cardorder/index/index.js | 2 ++ pages/cardorder/index/index.wxml | 1 + pages/cardorder/index/index.wxss | 8 ++++++++ pages/order/detail/index.js | 5 +++++ pages/order/detail/index.wxml | 1 + pages/order/detail/index.wxss | 11 +++++++++++ utils/imgurl.js | 10 +++++++++- 10 files changed, 60 insertions(+), 4 deletions(-) diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 5abcaab..b0f7a7b 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -13,6 +13,7 @@ Page({ headbgUrl: imgurl.headbg.url, quesBgUrl: imgurl.ques_bg.url, dingdanUrl: imgurl.dingdan.url, + weixinTitle: imgurl.weixinTitle.url, cardDetail: null, data: { title: null @@ -52,7 +53,8 @@ Page({ hidden: "hidden", height: "", more: "点击查看更多", - showMore: true + showMore: true, + supportTransfer:1 }, phone: function(e) { let that = this; @@ -60,6 +62,9 @@ Page({ phoneNumber: e.target.dataset.merchantlinkphone }); }, + goToTranser(){ + // wx. + }, // 点击查看更多 more: function() { let that = this; diff --git a/pages/ConsumeDetail/ConsumeDetail.wxml b/pages/ConsumeDetail/ConsumeDetail.wxml index 169139c..73bde19 100644 --- a/pages/ConsumeDetail/ConsumeDetail.wxml +++ b/pages/ConsumeDetail/ConsumeDetail.wxml @@ -21,7 +21,7 @@ {{more}} - 交易记录 + 交易记录 {{item.merchantName}} @@ -32,8 +32,9 @@ 余 {{item.cardRemainAmount/100}}元 - + 暂无交易明细 + \ No newline at end of file diff --git a/pages/ConsumeDetail/ConsumeDetail.wxss b/pages/ConsumeDetail/ConsumeDetail.wxss index b09870c..27c81fc 100644 --- a/pages/ConsumeDetail/ConsumeDetail.wxss +++ b/pages/ConsumeDetail/ConsumeDetail.wxss @@ -1,4 +1,7 @@ +.notes{ + padding-bottom: 60rpx; +} .record text:nth-of-type(2n+1) { float: left; } @@ -195,4 +198,15 @@ line-height: 70rpx; color: #999; font-size: 32rpx; +} +.support-tansfer{ + width: 690rpx; + border-radius: 50rpx; + margin-top: 30rpx; + background: #02C0FF!important; +} +.share{ + width: 40rpx; + height: 40rpx; + margin-right: 20rpx; } \ No newline at end of file diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 255759d..54db52b 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -8,6 +8,8 @@ Page({ couponUrl: imgurl.coupon.url, linessUrl: imgurl.liness.url, loadingUrl: imgurl.loading.url, + canTransferred: imgurl.canTransferred.url, + weixinTitle: imgurl.weixinTitle.url, tabs: [{ key: 4, name: "使用中" diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index 2859db6..1741233 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -15,6 +15,7 @@ + diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss index 18feeae..40546d6 100644 --- a/pages/cardorder/index/index.wxss +++ b/pages/cardorder/index/index.wxss @@ -268,4 +268,12 @@ } .yue text:nth-of-type(2){ margin-left: 6rpx; +} +.cantransferred{ + position:absolute; + right:0; + top:0; + width:60rpx; + height:60rpx; + z-index:100; } \ No newline at end of file diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index d510020..4695ac5 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -12,6 +12,7 @@ Page({ spcodeUrl: imgurl.spcode.url, teljpgUrl: imgurl.teljpg.url, newUrl: imgurl.new.url, + weixinTitle: imgurl.weixinTitle.url, showModalStatus: false, flag: 0, order: null, @@ -31,6 +32,10 @@ Page({ wx.makePhoneCall({ phoneNumber: e.currentTarget.dataset.merchantlinkphone }); + }, + //转赠给微信好友 + goToTranser() { + }, powerDrawer: function (e) { let that = this; diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 819c3ee..53d175b 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -79,4 +79,5 @@ + \ No newline at end of file diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 0b8a613..6288918 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -447,4 +447,15 @@ radio { left: 0; border-radius: 10rpx; z-index: 10; +} +.support-tansfer{ + width: 690rpx; + border-radius: 50rpx; + margin-top: 60rpx; + background: #02C0FF!important; +} +.share{ + width: 40rpx; + height: 40rpx; + margin-right: 20rpx; } \ No newline at end of file diff --git a/utils/imgurl.js b/utils/imgurl.js index 3f266ea..1e54e33 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -339,5 +339,13 @@ module.exports = { 'icon004': { 'url': baseUrl + 'icon004.gif', 'name': '' - } + }, + 'canTransferred': { + 'url': baseUrl + 'can-transferred.png', + 'name': '转赠图标' + }, + 'weixinTitle': { + 'url': baseUrl + 'weixin-title.png', + 'name': '微信图标' + }, } \ No newline at end of file