@@ -5,7 +5,7 @@ const imgurl = require("../../../utils/imgurl"); | |||||
let app = getApp(); | let app = getApp(); | ||||
Page({ | Page({ | ||||
data: { | data: { | ||||
couponUrl: imgurl.coupon.url, | |||||
couponUrl: imgurl.noCoupon.url, | |||||
linessUrl: imgurl.liness.url, | linessUrl: imgurl.liness.url, | ||||
loadingUrl: imgurl.loading.url, | loadingUrl: imgurl.loading.url, | ||||
wmhome: imgurl.wmhome.url, | wmhome: imgurl.wmhome.url, | ||||
@@ -4,4 +4,5 @@ | |||||
"i-tabs": "../../../dist/tabs/index" | "i-tabs": "../../../dist/tabs/index" | ||||
}, | }, | ||||
"navigationBarTitleText": "我的券包" | "navigationBarTitleText": "我的券包" | ||||
} | } |
@@ -24,25 +24,24 @@ | |||||
<view class='title'> | <view class='title'> | ||||
<text>{{item.title}}</text> | <text>{{item.title}}</text> | ||||
</view> | </view> | ||||
<view class='subtitle'> | |||||
<text>{{item.subTitle}}</text> | |||||
<view class='expiretime fl'> | |||||
<text class="txt1">有效期至:</text> | |||||
<text class="txt2">{{item.expiredTime}}</text> | |||||
</view> | </view> | ||||
<view hover-class='active' wx:if="{{item.couponOrderStatus==0}}" class="btns">去使用</view> | |||||
<view hover-class='active' wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</view> | |||||
</view> | |||||
</view> | |||||
<image class="liness" src='{{linessUrl}}' mode="widthFix"></image> | |||||
<view class='clearfix'> | |||||
<view class='expiretime fl'> | |||||
<text class="txt1">有效期至:</text> | |||||
<text class="txt2">{{item.expiredTime}}</text> | |||||
</view> | |||||
<view class='fr found'> | |||||
<text class="txt2" wx:if="{{item.autoRefund == 1}}">过期不退款</text> | |||||
<view class='fr found'> | |||||
<text class="txt2" wx:if="{{item.autoRefund == 1}}">过期不退款</text> | |||||
</view> | |||||
<!-- <view class='subtitle'> | |||||
<text>{{item.subTitle}}</text> | |||||
</view> --> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='{{wmgive}}' mode='widthFix'></image> | |||||
<!-- <image></image> --> | |||||
<view class='bGroup'> | |||||
<view hover-class='' wx:if="{{item.couponOrderStatus==0}}" class="btns">去使用</view> | |||||
<view hover-class='' wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btnsL">查看</view> | |||||
</view> | |||||
</view> | </view> | ||||
<view class="loading" wx:if="{{loading}}"> | <view class="loading" wx:if="{{loading}}"> | ||||
<image src="{{loadingUrl}}" mode="widthFix"></image>{{content}} | <image src="{{loadingUrl}}" mode="widthFix"></image>{{content}} | ||||
@@ -1,3 +1,6 @@ | |||||
page{ | |||||
background: #F4F5F9 | |||||
} | |||||
.market { | .market { | ||||
width: 100%; | width: 100%; | ||||
height: 100%; | height: 100%; | ||||
@@ -45,20 +48,29 @@ button::after{ border: none; } | |||||
.section { | .section { | ||||
position: relative; | position: relative; | ||||
display: flex; | |||||
} | } | ||||
.mms { | .mms { | ||||
position: relative; | position: relative; | ||||
width: 690rpx; | |||||
height: 197rpx !important; | |||||
width: 540rpx; | |||||
height: 110rpx !important; | |||||
background: #fff; | background: #fff; | ||||
padding: 30rpx 0 0; | padding: 30rpx 0 0; | ||||
margin: 0 auto 40rpx; | |||||
margin: 0 0 40rpx 40rpx; | |||||
border-radius: 16rpx; | border-radius: 16rpx; | ||||
border-top: 8rpx solid #02b7ff; | |||||
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | |||||
} | } | ||||
.bGroup{ | |||||
width: 140rpx; | |||||
height: 140rpx; | |||||
line-height: 140rpx; | |||||
text-align: center; | |||||
/* padding: 30rpx 0 0; */ | |||||
color: #FFFFFF; | |||||
font-size: 30rpx; | |||||
} | |||||
.detail_msg { | .detail_msg { | ||||
display: flex; | display: flex; | ||||
padding-bottom: 26rpx; | padding-bottom: 26rpx; | ||||
@@ -88,8 +100,8 @@ button::after{ border: none; } | |||||
} | } | ||||
.logo { | .logo { | ||||
width: 60rpx; | |||||
height: 60rpx; | |||||
width: 88rpx; | |||||
height: 88rpx; | |||||
border: 1px solid #f8f8f8; | border: 1px solid #f8f8f8; | ||||
border-radius: 50rpx; | border-radius: 50rpx; | ||||
display: block; | display: block; | ||||
@@ -97,15 +109,15 @@ button::after{ border: none; } | |||||
} | } | ||||
.logo image { | .logo image { | ||||
width: 60rpx; | |||||
height: 60rpx; | |||||
width: 88rpx; | |||||
height: 88rpx; | |||||
border-radius: 50%; | border-radius: 50%; | ||||
} | } | ||||
.info view:nth-child(1) { | .info view:nth-child(1) { | ||||
display: flex; | display: flex; | ||||
justify-content: space-between; | justify-content: space-between; | ||||
padding: 0 2%; | |||||
/* padding: 0 2%; */ | |||||
} | } | ||||
.info { | .info { | ||||
@@ -126,7 +138,6 @@ button::after{ border: none; } | |||||
} | } | ||||
.info view:nth-child(2) { | .info view:nth-child(2) { | ||||
padding-left: 2%; | |||||
font-size: 22rpx; | font-size: 22rpx; | ||||
color: #333; | color: #333; | ||||
letter-spacing: 0; | letter-spacing: 0; | ||||
@@ -135,7 +146,7 @@ button::after{ border: none; } | |||||
white-space: nowrap; | white-space: nowrap; | ||||
text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
overflow: hidden; | overflow: hidden; | ||||
width: 400rpx; | |||||
/* width: 400rpx; */ | |||||
} | } | ||||
.info view:nth-child(3) { | .info view:nth-child(3) { | ||||
@@ -143,19 +154,13 @@ button::after{ border: none; } | |||||
} | } | ||||
.btns { | .btns { | ||||
position: absolute; | |||||
right: 30rpx; | |||||
top: 38rpx; | |||||
width: 120rpx; | |||||
height: 48rpx; | |||||
line-height: 48rpx; | |||||
text-align: center; | |||||
border: 2rpx solid #02c0ff; | |||||
border-radius: 60rpx; | |||||
color: #02c0ff; | |||||
font-size: 28rpx; | |||||
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
border-radius: 16rpx; | |||||
} | |||||
.btnsL{ | |||||
background: #CECECE; | |||||
border-radius: 16rpx; | |||||
} | } | ||||
.active { | .active { | ||||
color: #fff; | color: #fff; | ||||
background: #02c0ff; | background: #02c0ff; | ||||
@@ -193,7 +198,7 @@ button::after{ border: none; } | |||||
} | } | ||||
.nocoupon button { | .nocoupon button { | ||||
background: #00c0ff; | |||||
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
color: #fff; | color: #fff; | ||||
font-style: 30rpx; | font-style: 30rpx; | ||||
width: 100%; | width: 100%; | ||||
@@ -9,5 +9,6 @@ | |||||
"c-rushtobyCard": "./rushtobyCard/index" | "c-rushtobyCard": "./rushtobyCard/index" | ||||
}, | }, | ||||
"navigationBarTitleText": "首页", | "navigationBarTitleText": "首页", | ||||
"enablePullDownRefresh": true | |||||
"enablePullDownRefresh": true, | |||||
"navigationBarBackgroundColor": "#F4F5F9" | |||||
} | } |
@@ -1,35 +1,40 @@ | |||||
<view class="container"> | <view class="container"> | ||||
<c-banner wx:key="unique" list="{{list}}" /> | |||||
<!-- 会员信息 --> | <!-- 会员信息 --> | ||||
<view class='userinfo clearfix' > | <view class='userinfo clearfix' > | ||||
<!-- 头像 --> | <!-- 头像 --> | ||||
<view class="user-avatar"> | |||||
<open-data class="open" type="userAvatarUrl"></open-data> | |||||
</view> | |||||
<!-- 成长值 --> | |||||
<view class="user-data fl" bindtap='gotoChengzhangzhi'> | |||||
<!-- <open-data type="userNickName"></open-data> --> | |||||
<text class='chengzhang'>{{levelName}}</text> | |||||
<text class='remainchengzhangzhi'>还需{{upgradeScore}}成长值可升级</text> | |||||
<view class="view"> | |||||
<!-- 成长值<text class="score">{{score}}</text> --> | |||||
<progress percent="{{upgradePercent}}" stroke-width="6" activeColor="#b2743d" /> | |||||
<view class='infoLeft'> | |||||
<!-- 成长值 --> | |||||
<view class="user-data fl" bindtap='gotoChengzhangzhi'> | |||||
<!-- <open-data type="userNickName"></open-data> --> | |||||
<text class='chengzhang'>{{levelName}}</text> | |||||
<view class="view"> | |||||
<!-- 成长值<text class="score">{{score}}</text> --> | |||||
<progress percent="{{upgradePercent}}" stroke-width="6" activeColor="#FC8B37" /> | |||||
<text class='remainchengzhangzhi'>还需{{upgradeScore}}成长值可升级</text> | |||||
</view> | |||||
</view> | </view> | ||||
<!-- 积分 --> | |||||
<!-- <view class='fl integral' bindtap='gotouser'> | |||||
<view class='clearfix'> | |||||
<text class='jifen fl'>积分</text> | |||||
<text class='jifenNumber fl'>{{credit}}</text> | |||||
</view> | |||||
<image src="{{duihuan}}" class='duihuanimg' mode='widthFix'></image> | |||||
</view> --> | |||||
</view> | </view> | ||||
<!-- 积分 --> | |||||
<view class='fl integral' bindtap='gotouser'> | |||||
<view class='clearfix'> | |||||
<text class='jifen fl'>积分</text> | |||||
<text class='jifenNumber fl'>{{credit}}</text> | |||||
</view> | |||||
<image src="{{duihuan}}" class='duihuanimg' mode='widthFix'></image> | |||||
<view class="user-avatar"> | |||||
<open-data class="open" type="userAvatarUrl"></open-data> | |||||
</view> | </view> | ||||
<!-- 二维码 --> | <!-- 二维码 --> | ||||
<view class='qrcode fr' bindtap='qrcode'> | <view class='qrcode fr' bindtap='qrcode'> | ||||
<image src="{{barcode}}" class='qrcodeimg' mode='widthFix'></image> | <image src="{{barcode}}" class='qrcodeimg' mode='widthFix'></image> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- banner --> | |||||
<c-banner wx:key="unique" list="{{list}}" /> | |||||
<!-- 频道 --> | |||||
<view></view> | |||||
<!-- 砍价专场 --> | <!-- 砍价专场 --> | ||||
<c-bargain id="bargain"/> | <c-bargain id="bargain"/> | ||||
<!-- 专题 --> | <!-- 专题 --> | ||||
@@ -1,4 +1,7 @@ | |||||
@import "../../app.wxss"; | @import "../../app.wxss"; | ||||
page{ | |||||
background: #F4F5F9; | |||||
} | |||||
.index-position { | .index-position { | ||||
background: rgba(0, 0, 0, 0.5); | background: rgba(0, 0, 0, 0.5); | ||||
height: 88rpx; | height: 88rpx; | ||||
@@ -52,13 +55,17 @@ page { | |||||
.userinfo{ | .userinfo{ | ||||
position:relative; | position:relative; | ||||
margin: 30rpx auto 0; | |||||
margin: 0 auto 30rpx; | |||||
width: 690rpx; | width: 690rpx; | ||||
padding: 20rpx 0; | |||||
height: 84rpx; | |||||
box-shadow:0 0 10px 0 rgba(211,211,211,0.50); | |||||
/* padding: 0 0 20rpx; */ | |||||
height: 96rpx; | |||||
border-radius:16rpx; | border-radius:16rpx; | ||||
display: flex; | |||||
} | |||||
.infoLeft{ | |||||
height: 100%; | |||||
border-radius:12rpx; | |||||
background: #FFF; | |||||
} | } | ||||
.section { | .section { | ||||
padding: 0 20rpx; | padding: 0 20rpx; | ||||
@@ -205,6 +212,9 @@ height:100%; | |||||
line-height: 44rpx; | line-height: 44rpx; | ||||
font-size: 30rpx; | font-size: 30rpx; | ||||
color: #333; | color: #333; | ||||
background: #FFF; | |||||
margin-top: 16rpx; | |||||
margin-bottom: 26rpx; | |||||
} | } | ||||
.chengzhang { | .chengzhang { | ||||
font-size: 29rpx; | font-size: 29rpx; | ||||
@@ -231,7 +241,7 @@ height:100%; | |||||
.view { | .view { | ||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #999999; | color: #999999; | ||||
line-height: 24rpx; | |||||
line-height: 12rpx; | |||||
} | } | ||||
.view>.score{ | .view>.score{ | ||||
margin-left:9rpx; | margin-left:9rpx; | ||||
@@ -309,13 +319,15 @@ height:100%; | |||||
.remainchengzhangzhi{ | .remainchengzhangzhi{ | ||||
display: block; | display: block; | ||||
color: #b2743d; | color: #b2743d; | ||||
font-size: 12rpx; | |||||
font-size: 22rpx; | |||||
margin-top: 5rpx; | margin-top: 5rpx; | ||||
line-height: 14rpx; | line-height: 14rpx; | ||||
float: left; | |||||
} | } | ||||
progress{ | progress{ | ||||
display:inline-block; | display:inline-block; | ||||
width:180rpx; | |||||
width:222rpx; | |||||
border-radius:60rpx; | border-radius:60rpx; | ||||
overflow:hidden; | overflow:hidden; | ||||
float: left; | |||||
} | } |
@@ -75,8 +75,8 @@ | |||||
<text>下单时间</text> | <text>下单时间</text> | ||||
<text class='fr'>{{createDate}}</text> | <text class='fr'>{{createDate}}</text> | ||||
</view> --> | </view> --> | ||||
<view> | |||||
<text>订单编号:</text> | |||||
<view class='dhCode'> | |||||
<text class='bianhao'>订单编号:</text> | |||||
<text>{{order.orderNumber}}</text> | <text>{{order.orderNumber}}</text> | ||||
</view> | </view> | ||||
<!-- <view> | <!-- <view> | ||||
@@ -159,6 +159,7 @@ page { | |||||
width: 100%; | width: 100%; | ||||
margin-top: 20rpx; | margin-top: 20rpx; | ||||
} | } | ||||
.classifShop{ | .classifShop{ | ||||
background: #FFFFFF; | background: #FFFFFF; | ||||
width: 100%; | width: 100%; | ||||
@@ -190,7 +191,9 @@ page { | |||||
padding-right: 5%; | padding-right: 5%; | ||||
/* border-bottom: 1rpx solid #eee; */ | /* border-bottom: 1rpx solid #eee; */ | ||||
} | } | ||||
.bianhao{ | |||||
} | |||||
.classif > view text:nth-child(2) { | .classif > view text:nth-child(2) { | ||||
font-size: 28rpx; | font-size: 28rpx; | ||||
color: #3C3C3C; | color: #3C3C3C; | ||||
@@ -6,6 +6,8 @@ const imgurl = require("../../utils/imgurl"); | |||||
const QR = require("../../utils/memberqrcode.js"); | const QR = require("../../utils/memberqrcode.js"); | ||||
Page({ | Page({ | ||||
data: { | data: { | ||||
btomLineUrl: imgurl.btomLine.url, | |||||
topLineUrl: imgurl.topLine.url, | |||||
lineUrl: imgurl.line.url, | lineUrl: imgurl.line.url, | ||||
wm01Url: imgurl.wm01.url, | wm01Url: imgurl.wm01.url, | ||||
wm02Url: imgurl.wm02.url, | wm02Url: imgurl.wm02.url, | ||||
@@ -1,7 +1,7 @@ | |||||
<view class="couponbg"> | <view class="couponbg"> | ||||
<view class="title">{{title}}</view> | <view class="title">{{title}}</view> | ||||
<!-- <view class="subtitle">{{subtitle}}</view> --> | <!-- <view class="subtitle">{{subtitle}}</view> --> | ||||
<image class='line' src='{{lineUrl}}' mode="widthFix"></image> | |||||
<image class='line' src='{{topLineUrl}}' mode="widthFix"></image> | |||||
<!-- | <!-- | ||||
couponorderstatus | couponorderstatus | ||||
@@ -12,19 +12,19 @@ | |||||
--> | --> | ||||
<view class="zhuangtai"> | <view class="zhuangtai"> | ||||
<image wx:if="{{couponorderstatus==1}}" src="{{wm01Url}}" mode='widthFix'></image> | |||||
<image wx:if="{{couponorderstatus==2}}" src="{{wm02Url}}" mode='widthFix'></image> | |||||
<image wx:if="{{couponorderstatus==3}}" src="{{wm03Url}}" mode='widthFix'></image> | |||||
<image wx:if="{{couponorderstatus==0&&validStatus==0}}" src="{{wm04Url}}" mode='widthFix'></image> | |||||
<view class="panel" wx:if="{{couponorderstatus==0&&validStatus!=0}}"> | |||||
<view class="canWrap"> | |||||
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" /> | |||||
</view> | |||||
<image src="{{tempFilePath}}" mode="aspectFit" /> | |||||
<view class="barnum buy"><text>兑换码:</text>{{code}}</view> | |||||
</view> | |||||
<image wx:if="{{couponorderstatus==1}}" src="{{wm01Url}}" mode='widthFix'></image> | |||||
<image wx:if="{{couponorderstatus==2}}" src="{{wm02Url}}" mode='widthFix'></image> | |||||
<image wx:if="{{couponorderstatus==3}}" src="{{wm03Url}}" mode='widthFix'></image> | |||||
<image wx:if="{{couponorderstatus==0&&validStatus==0}}" src="{{wm04Url}}" mode='widthFix'></image> | |||||
<view class="panel" wx:if="{{couponorderstatus==0&&validStatus!=0}}"> | |||||
<view class="canWrap"> | |||||
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" /> | |||||
</view> | |||||
<image src="{{tempFilePath}}" mode="aspectFit" /> | |||||
<view class="barnum buy"><text>兑换码:</text>{{code}}</view> | |||||
</view> | |||||
</view> | </view> | ||||
<image class='line' style='margin-top:0;margin-bottom:16rpx;' src='{{lineUrl}}' mode="widthFix"></image> | |||||
<image class='line' src='{{btomLineUrl}}' mode="widthFix"></image> | |||||
<!-- <view class="gou"> | <!-- <view class="gou"> | ||||
<view class="mai">购买须知:</view> | <view class="mai">购买须知:</view> | ||||
<view class="remark">{{remark}}</view> | <view class="remark">{{remark}}</view> | ||||
@@ -7,7 +7,6 @@ page { | |||||
position: relative; | position: relative; | ||||
background: #fff; | background: #fff; | ||||
overflow: hidden; | overflow: hidden; | ||||
background: #fff; | |||||
width: 92%; | width: 92%; | ||||
margin: 8% auto 6%; | margin: 8% auto 6%; | ||||
border-radius: 16rpx; | border-radius: 16rpx; | ||||
@@ -120,7 +119,7 @@ page { | |||||
background: #fff; | background: #fff; | ||||
height: 88rpx; | height: 88rpx; | ||||
width: 100%; | width: 100%; | ||||
margin: 0 auto 60rpx; | |||||
margin: 0 auto 40rpx; | |||||
line-height: 88rpx; | line-height: 88rpx; | ||||
border: 2rpx solid #ccc; | border: 2rpx solid #ccc; | ||||
border-radius: 10px; | border-radius: 10px; | ||||
@@ -191,7 +190,6 @@ page { | |||||
height: 87rpx; | height: 87rpx; | ||||
line-height: 87rpx; | line-height: 87rpx; | ||||
background: #fff; | background: #fff; | ||||
border-top: 1px solid #f9f9f9; | |||||
} | } | ||||
.notes { | .notes { | ||||
@@ -172,13 +172,12 @@ Page { | |||||
.canWrap{ | .canWrap{ | ||||
width: 358rpx; | width: 358rpx; | ||||
height: 358rpx; | height: 358rpx; | ||||
} | } | ||||
.code image { | .code image { | ||||
width: 358rpx; | width: 358rpx; | ||||
height: 358rpx; | height: 358rpx; | ||||
display: block; | display: block; | ||||
margin:142rpx auto 72rpx; | |||||
margin:100rpx auto 72rpx; | |||||
} | } | ||||
.memCode{ | .memCode{ | ||||
width: 562rpx; | width: 562rpx; | ||||
@@ -76,6 +76,10 @@ module.exports = { | |||||
'url': baseUrl + 'coupon.png', | 'url': baseUrl + 'coupon.png', | ||||
'name': '' | 'name': '' | ||||
}, | }, | ||||
'noCoupon': { | |||||
'url': baseUrl + 'noCoupon.png', | |||||
'name': '' | |||||
}, | |||||
'ding': { | 'ding': { | ||||
'url': baseUrl + 'ding2.png', | 'url': baseUrl + 'ding2.png', | ||||
'name': '' | 'name': '' | ||||
@@ -164,6 +168,14 @@ module.exports = { | |||||
'url': baseUrl + 'jilu.png', | 'url': baseUrl + 'jilu.png', | ||||
'name': '' | 'name': '' | ||||
}, | }, | ||||
'topLine': { | |||||
'url': baseUrl + 'topLine.png', | |||||
'name': '' | |||||
}, | |||||
'btomLine': { | |||||
'url': baseUrl + 'btomLine.png', | |||||
'name': '' | |||||
}, | |||||
'line': { | 'line': { | ||||
'url': baseUrl + 'line.png', | 'url': baseUrl + 'line.png', | ||||
'name': '' | 'name': '' | ||||