| @@ -16,12 +16,12 @@ | |||
| .i-tabs-tab-bar { | |||
| display: block; | |||
| width: 72%; | |||
| height: 6rpx; | |||
| height: 8rpx; | |||
| background: 0 0; | |||
| position: absolute; | |||
| bottom: 0; | |||
| left: 15%; | |||
| background: #af6e34; | |||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||
| border-radius: 100px; | |||
| } | |||
| @@ -30,17 +30,17 @@ | |||
| line-height: 30rpx; | |||
| text-align: center; | |||
| box-sizing: border-box; | |||
| color: #666666; | |||
| color: #3C3C3C; | |||
| } | |||
| .i-tabs-tab-title-current { | |||
| color: #af6e34; | |||
| font-size: 36rpx; | |||
| color: #FD782D; | |||
| font-size: 30rpx; | |||
| } | |||
| .i-tabs-tab-scroll { | |||
| display: inline-block; | |||
| width: auto; | |||
| min-width:75rpx; | |||
| min-width:96rpx; | |||
| margin-right:33rpx; | |||
| } | |||
| @@ -1,8 +1,8 @@ | |||
| .i-tabs { | |||
| display: flex; | |||
| width: 100%; | |||
| height: 42px; | |||
| line-height: 42px; | |||
| height: 48px; | |||
| line-height: 48px; | |||
| box-sizing: border-box; | |||
| position: relative; | |||
| justify-content: space-around; | |||
| @@ -1,8 +1,16 @@ | |||
| <view class='order' wx:if="{{showPage}}"> | |||
| <view wx:if="{{order.orderStatus==1}}" class='tips'> | |||
| <image class='success' src='{{succUrl}}' mode='widthFix'></image> | |||
| <text wx:if="{{order.salePrice/100==0}}">领取成功,请尽快到门店使用</text> | |||
| <text wx:if="{{order.salePrice/100!=0}}">付款成功,请尽快到门店使用</text> | |||
| <!-- <text wx:if="{{order.salePrice/100==0}}">领取成功,请尽快到门店使用</text> | |||
| <text wx:if="{{order.salePrice/100!=0}}">付款成功,请尽快到门店使用</text> --> | |||
| <view wx:if="{{order.salePrice/100==0}}" class='msg' > | |||
| <text>领取成功</text> | |||
| <text>请尽快到门店使用,有效期至{{}}</text> | |||
| </view> | |||
| <view wx:if="{{order.salePrice/100!=0}}" class='msg'> | |||
| <text>付款成功</text> | |||
| <text>请尽快到门店使用,有效期至{{}}</text> | |||
| </view> | |||
| </view> | |||
| <view class='section'> | |||
| <view class='detail_msg'> | |||
| @@ -13,27 +13,32 @@ page { | |||
| vertical-align: middle; | |||
| width: 40rpx; | |||
| margin-right: 10rpx; | |||
| float: left; | |||
| } | |||
| .tips { | |||
| width: 92%; | |||
| height: 88rpx; | |||
| background: #00c0ff; | |||
| height: 120rpx; | |||
| background: #2C8DFF; | |||
| color: #fff; | |||
| padding: 0 4%; | |||
| line-height: 88rpx; | |||
| /* line-height: 88rpx; */ | |||
| } | |||
| .merchantName { | |||
| color: #666!important; | |||
| } | |||
| .tips text:nth-child(2) { | |||
| .tips view{ | |||
| } | |||
| .tips view:nth-child(2) { | |||
| font-size: 32rpx; | |||
| padding-left: 16rpx; | |||
| float: left; | |||
| } | |||
| .tips text:nth-child(1) { | |||
| .tips view:nth-child(1) { | |||
| width: 32rpx; | |||
| height: 32rpx; | |||
| background: #fff; | |||
| @@ -41,9 +46,12 @@ page { | |||
| color: #00c0ff; | |||
| line-height: 32rpx; | |||
| text-align: center; | |||
| display: inline-block; | |||
| /* display: inline-block; */ | |||
| font-size: 28rpx; | |||
| } | |||
| .msg text{ | |||
| width: 32rpx; | |||
| } | |||
| .section { | |||
| margin-top: 2%; | |||
| @@ -3,5 +3,6 @@ | |||
| "i-tab": "../../../dist/tab/index", | |||
| "i-tabs": "../../../dist/tabs/index" | |||
| }, | |||
| "navigationBarTitleText": "我的订单" | |||
| "navigationBarTitleText": "我的订单", | |||
| "navigationBarBackgroundColor": "#F4F5F9" | |||
| } | |||
| @@ -5,37 +5,39 @@ | |||
| </i-tabs> | |||
| <view style='padding-top:90rpx;'> | |||
| <view wx:for='{{list}}' wx:if="{{list.length!=0}}" class='section' wx:key='{{index}}' > | |||
| <view class='detail_top'> | |||
| <view> | |||
| <image wx:if="{{item.orderStatus == 6 || item.orderStatus == 7 || item.orderStatus == 8 || item.orderStatus == 9}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image> | |||
| <image wx:if="{{item.orderStatus == 1&& item.type == 8}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image> | |||
| <text>{{item.title}}</text> | |||
| <text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text> | |||
| <text class='wait' wx:if="{{item.orderStatus==10}}">拼团中</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==3}}">待退款</text> | |||
| <text class='close' wx:if="{{item.orderStatus==2}}">交易关闭</text> | |||
| <text class='close' wx:if="{{item.orderStatus==6}}">砍价中</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==7}}">砍价成功</text> | |||
| <text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text> | |||
| <text class='close' wx:if="{{item.orderStatus==9}}">砍价取消</text> | |||
| <text class='close' wx:if="{{item.orderStatus==12}}">拼团已过期</text> | |||
| <text class='close' wx:if="{{item.orderStatus==12}}">拼团失败</text> | |||
| <text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text> | |||
| <text class='close' wx:if="{{item.orderStatus==4}}">已退款</text> | |||
| <text class='wait' wx:if="{{item.orderStatus==5}}">退款失败</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==11}}">拼团成功</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&item.type!=50&&item.type!=51}}">免费领取</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&(item.type==50||item.type==51)}}">积分兑换</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text> | |||
| </view> | |||
| </view> | |||
| <view class='detail_msg'> | |||
| <view class='logo'> | |||
| <image mode="aspectFill" src='{{item.coverImg}}'></image> | |||
| </view> | |||
| <view class='info'> | |||
| <view> | |||
| <image wx:if="{{item.orderStatus == 6 || item.orderStatus == 7 || item.orderStatus == 8 || item.orderStatus == 9}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image> | |||
| <image wx:if="{{item.orderStatus == 1&& item.type == 8}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image> | |||
| <text>{{item.title}}</text> | |||
| <text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text> | |||
| <text class='wait' wx:if="{{item.orderStatus==10}}">拼团中</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==3}}">待退款</text> | |||
| <text class='close' wx:if="{{item.orderStatus==2}}">交易关闭</text> | |||
| <text class='close' wx:if="{{item.orderStatus==6}}">砍价中</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==7}}">砍价成功</text> | |||
| <text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text> | |||
| <text class='close' wx:if="{{item.orderStatus==9}}">砍价取消</text> | |||
| <text class='close' wx:if="{{item.orderStatus==12}}">拼团已过期</text> | |||
| <text class='close' wx:if="{{item.orderStatus==12}}">拼团失败</text> | |||
| <text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text> | |||
| <text class='close' wx:if="{{item.orderStatus==4}}">已退款</text> | |||
| <text class='wait' wx:if="{{item.orderStatus==5}}">退款失败</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==11}}">拼团成功</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&item.type!=50&&item.type!=51}}">免费领取</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&(item.type==50||item.type==51)}}">积分兑换</text> | |||
| <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text> | |||
| </view> | |||
| <view class="sub">{{item.subTitle}}</view> | |||
| <view class="value" wx:if="{{item.type != 8}}">面额:<text wx:if="{{item.unit==0}}">{{item.price/100}}元</text><text wx:if="{{item.unit==1}}">{{item.price/100}}小时</text></view> | |||
| <view class="value" wx:if="{{item.type == 8}}">原价:<text wx:if="{{item.unit==0}}">{{item.price/100}}元</text><text wx:if="{{item.unit==1}}">{{item.price/100}}小时</text></view> | |||
| <image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='{{wmgive}}' mode='widthFix'></image> | |||
| <!-- <image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='{{wmgive}}' mode='widthFix'></image> --> | |||
| <view class="value">下单时间:<text>{{item.createDate}}</text> | |||
| </view> | |||
| @@ -51,8 +53,8 @@ | |||
| 1完成 | |||
| 2取消 | |||
| --> | |||
| <view wx:if="{{item.orderStatus==1||item.orderStatus==11}}" class="btn" data-id="{{item.id}}" bindtap="gotopay"> | |||
| <text>查看详情</text> | |||
| <view wx:if="{{item.orderStatus==1||item.orderStatus==11}}" class="btnZf" data-id="{{item.id}}" bindtap="gotopay"> | |||
| <text>去查看</text> | |||
| </view> | |||
| <view wx:if="{{item.orderStatus == 6}}" class="btn" data-id="{{item.id}}" bindtap="gotoDiscount"> | |||
| <text>砍价详情</text> | |||
| @@ -66,6 +68,9 @@ | |||
| <view wx:if="{{item.orderStatus==5}}" style="background:#999;opacity: .6;" class="btn"> | |||
| <text>退款失败</text> | |||
| </view> | |||
| <view wx:if="{{item.orderStatus==2}}" class="btnGm" data-id="{{item.id}}" bindtap=""> | |||
| <text class='txGm'>再次购买</text> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| <view class="dingdan" wx:if="{{list.length==0}}"> | |||
| @@ -1,32 +1,36 @@ | |||
| .market { | |||
| width: 100%; | |||
| height: 100%; | |||
| background: #F4F5F9; | |||
| margin-top: 20rpx; | |||
| } | |||
| .tabs { | |||
| position: fixed; | |||
| width: 100% !important; | |||
| height: 88rpx; | |||
| height: 96rpx; | |||
| top: 0; | |||
| left: 0; | |||
| right: 0; | |||
| text-align: center; | |||
| z-index: 10000000; | |||
| font-size: 26rpx; | |||
| } | |||
| .i-tab { | |||
| width: 30% !important; | |||
| display: inline-block; | |||
| } | |||
| .section{ | |||
| background: #FFFFFF; | |||
| } | |||
| .detail_msg { | |||
| position: relative; | |||
| width: 92%; | |||
| background: #fff; | |||
| display: flex; | |||
| margin: 0 30rpx; | |||
| padding-bottom: 30rpx; | |||
| padding-top: 30rpx; | |||
| padding-bottom: 20rpx; | |||
| padding-top: 20rpx; | |||
| border-bottom: 1rpx solid #eee; | |||
| } | |||
| .sendImg{ | |||
| @@ -38,23 +42,29 @@ | |||
| .logo { | |||
| display: block; | |||
| width: 180rpx; | |||
| height: 180rpx; | |||
| width: 120rpx; | |||
| height: 120rpx; | |||
| border: 1px solid #f8f8f8; | |||
| border-radius: 16rpx; | |||
| border-radius: 20rpx; | |||
| } | |||
| .logo image { | |||
| display: block; | |||
| width: 180rpx; | |||
| height: 180rpx; | |||
| border-radius: 16rpx; | |||
| width: 120rpx; | |||
| height: 120rpx; | |||
| border-radius: 20rpx; | |||
| } | |||
| .info view:nth-child(1) { | |||
| .detail_top{ | |||
| width: 100%; | |||
| height: 40rpx; | |||
| line-height: 40rpx; | |||
| font-size: 30rpx; | |||
| padding-top: 30rpx; | |||
| } | |||
| .detail_top view:nth-child(1) { | |||
| display: flex; | |||
| justify-content: space-between; | |||
| padding: 0 0 0 4%; | |||
| padding: 0 4% 0 4%; | |||
| } | |||
| .info { | |||
| @@ -67,10 +77,10 @@ | |||
| letter-spacing: 0; | |||
| line-height: 33rpx; | |||
| padding-left: 4%; | |||
| height: 66rpx; | |||
| height: 33rpx; | |||
| overflow: hidden; | |||
| white-space: wrap; | |||
| text-overflow: ellipsis; | |||
| text-overflow: ellipsis; | |||
| } | |||
| .info view:nth-child(1) text { | |||
| @@ -90,12 +100,14 @@ text-overflow: ellipsis; | |||
| top:86rpx; | |||
| right:2rpx; | |||
| } | |||
| .info .sucess { | |||
| .detail_top .sucess { | |||
| display: inline-block; | |||
| width: 123rpx !important; | |||
| /* overflow: hidden; */ | |||
| font-size: 26rpx; | |||
| color: #02c0ff; | |||
| font-family:PingFangSC-Regular; | |||
| font-size: 28rpx; | |||
| font-weight:400; | |||
| color: #2C8DFF; | |||
| letter-spacing: 0; | |||
| text-align: right; | |||
| line-height: 26px; | |||
| @@ -106,7 +118,7 @@ text-overflow: ellipsis; | |||
| width: 123rpx !important; | |||
| overflow: visible!important; | |||
| font-size: 28rpx; | |||
| color: #ff4949; | |||
| color: #FD832D; | |||
| letter-spacing: 0; | |||
| text-align: right; | |||
| line-height: 28rpx!important; | |||
| @@ -148,13 +160,15 @@ text-overflow: ellipsis; | |||
| } | |||
| .info view:nth-child(3) { | |||
| margin-top: 20rpx; | |||
| margin-top: 16rpx; | |||
| } | |||
| .info view:nth-child(2) { | |||
| margin-top: 16rpx; | |||
| } | |||
| .payment { | |||
| position: relative; | |||
| width: 92%; | |||
| height: 88rpx; | |||
| height: 80rpx; | |||
| line-height: 88rpx; | |||
| padding: 0 4%; | |||
| display: flex; | |||
| @@ -188,7 +202,39 @@ text-overflow: ellipsis; | |||
| bottom: 0; | |||
| margin: auto; | |||
| right: 20rpx; | |||
| width: 180rpx; | |||
| width: 118rpx; | |||
| height: 52rpx; | |||
| line-height: 52rpx; | |||
| text-align: center; | |||
| color: #fff; | |||
| float: right; | |||
| font-size: 26rpx; | |||
| border-radius: 20rpx; | |||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||
| } | |||
| .btnZf{ | |||
| position: absolute; | |||
| top: 0; | |||
| bottom: 0; | |||
| margin: auto; | |||
| right: 20rpx; | |||
| width: 118rpx; | |||
| height: 52rpx; | |||
| line-height: 52rpx; | |||
| text-align: center; | |||
| color: #fff; | |||
| float: right; | |||
| font-size: 26rpx; | |||
| border-radius: 20rpx; | |||
| background:linear-gradient(130deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%); | |||
| } | |||
| .btnGm{ | |||
| position: absolute; | |||
| top: 0; | |||
| bottom: 0; | |||
| margin: auto; | |||
| right: 20rpx; | |||
| width: 140rpx; | |||
| height: 52rpx; | |||
| line-height: 52rpx; | |||
| text-align: center; | |||
| @@ -201,9 +247,12 @@ text-overflow: ellipsis; | |||
| .payment view:nth-child(2) text { | |||
| font-size: 30rpx; | |||
| color: #02c0ff; | |||
| color: #FFFFFF; | |||
| } | |||
| .txGm{ | |||
| font-size: 24rpx; | |||
| color: #2C8DFF!important; | |||
| } | |||
| .dingdan { | |||
| margin-top: 33rpx; | |||
| } | |||
| @@ -4,7 +4,7 @@ | |||
| <canvas canvas-id="mycanvas2" style="width: 1200rpx; height: 800rpx;" /> | |||
| </view> | |||
| <image src="{{tempFilePath}}" mode="aspectFit" /> | |||
| <text class='memCode'>会员码:{{memberId}}</text> | |||
| <view class='memCode'><text>会员码:</text><text class="memNum">{{memberId}}</text></view> | |||
| <view class='con'> | |||
| <view class="title">会员等级为<text class='level'>[{{level}}]</text>对应门店的优惠折扣</view> | |||
| </view> | |||
| @@ -31,6 +31,6 @@ | |||
| </view> | |||
| </view> | |||
| <view class='none' wx:if="{{discountMerchantList.length==0}}"> | |||
| 此等级暂未开放折扣 | |||
| 此等级暂未开放折扣,敬请期待! | |||
| </view> | |||
| </view> | |||
| @@ -5,10 +5,10 @@ Page { | |||
| } | |||
| .none { | |||
| font-size: 28rpx; | |||
| font-size: 24rpx; | |||
| text-align: center; | |||
| margin-top: 30rpx; | |||
| color: #fff; | |||
| margin-top: 38rpx; | |||
| color: #FFFFFF; | |||
| float: none !important; | |||
| } | |||
| @@ -123,7 +123,7 @@ Page { | |||
| } | |||
| .level { | |||
| color: yellow; | |||
| color: #FD832D; | |||
| } | |||
| #mycanvas2 { | |||
| @@ -169,12 +169,16 @@ Page { | |||
| height: 150rpx; | |||
| margin: 0 auto 10rpx; | |||
| } | |||
| .canWrap{ | |||
| width: 358rpx; | |||
| height: 358rpx; | |||
| } | |||
| .code image { | |||
| display: block; | |||
| width: 358rpx; | |||
| height: 358rpx; | |||
| margin: 142rpx 178rpx 72rpx; | |||
| display: block; | |||
| margin:142rpx auto 72rpx; | |||
| } | |||
| .memCode{ | |||
| width: 562rpx; | |||
| @@ -182,10 +186,17 @@ Page { | |||
| line-height: 88rpx; | |||
| border-radius:16rpx; | |||
| border:1px solid rgba(225,225,225,1); | |||
| margin: 0 auto; | |||
| margin: 36rpx auto 0; | |||
| color: #666; | |||
| display: block; | |||
| font-size: 28rpx; | |||
| font-size: 24rpx; | |||
| text-align: center; | |||
| } | |||
| .memNum{ | |||
| font-weight:600; | |||
| font-size: 32rpx; | |||
| color: #3C3C3C; | |||
| font-family:PingFangSC-Medium; | |||
| text-align: center; | |||
| } | |||
| .building{ | |||