@@ -11,13 +11,13 @@ | |||||
<view class='info'> | <view class='info'> | ||||
<view> | <view> | ||||
<text>{{item.title}}</text> | <text>{{item.title}}</text> | ||||
<text wx:if="{{item.orderStatus==0}}">待付款</text> | |||||
<text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text> | |||||
<text wx:if="{{item.orderStatus==3}}">待退款</text> | <text wx:if="{{item.orderStatus==3}}">待退款</text> | ||||
<text wx:if="{{item.orderStatus==2}}">已取消</text> | |||||
<text class='close' wx:if="{{item.orderStatus==2}}">交易关闭</text> | |||||
<text wx:if="{{item.orderStatus==4}}">已退款</text> | <text wx:if="{{item.orderStatus==4}}">已退款</text> | ||||
<text wx:if="{{item.orderStatus==5}}">退款失败</text> | <text wx:if="{{item.orderStatus==5}}">退款失败</text> | ||||
<text wx:if="{{item.orderStatus==1&&item.salePrice==0}}">免费领取</text> | |||||
<text wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">已付款</text> | |||||
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0}}">免费领取</text> | |||||
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text> | |||||
</view> | </view> | ||||
<view>{{item.subTitle}}</view> | <view>{{item.subTitle}}</view> | ||||
<view> | <view> | ||||
@@ -42,10 +42,10 @@ | |||||
<view wx:if="{{item.orderStatus==0}}" class="btn" data-id="{{item.id}}" bindtap="gotopay"> | <view wx:if="{{item.orderStatus==0}}" class="btn" data-id="{{item.id}}" bindtap="gotopay"> | ||||
<text>去支付</text> | <text>去支付</text> | ||||
</view> | </view> | ||||
<view wx:if="{{item.orderStatus==2}}" style="background:#999;opacity: .6;" class="btn"> | |||||
<!-- <view wx:if="{{item.orderStatus==2}}" style="background:#999;opacity: .6;" class="btn"> | |||||
<text>已取消</text> | <text>已取消</text> | ||||
</view> | |||||
<view wx:if="{{item.orderStatus==3}}" style="background:#999;opacity: .6;" class="btn"> | |||||
</view> --> | |||||
<view wx:if="{{item.orderStatus==3}}" style="background:#999;opacity: .6;color:#fff;" class="btn"> | |||||
<text>待退款</text> | <text>待退款</text> | ||||
</view> | </view> | ||||
<view wx:if="{{item.orderStatus==4}}" style="background:#999;opacity: .6;" class="btn"> | <view wx:if="{{item.orderStatus==4}}" style="background:#999;opacity: .6;" class="btn"> | ||||
@@ -29,16 +29,18 @@ | |||||
} | } | ||||
.logo { | .logo { | ||||
width: 350rpx; | |||||
height: 184rpx; | |||||
display: block; | |||||
width: 180rpx; | |||||
height: 180rpx; | |||||
border: 1px solid #f8f8f8; | border: 1px solid #f8f8f8; | ||||
border-radius: 16rpx; | border-radius: 16rpx; | ||||
overflow: hidden; | overflow: hidden; | ||||
} | } | ||||
.logo image { | .logo image { | ||||
width: 100%; | |||||
height: 100%; | |||||
display: block; | |||||
width: 180rpx; | |||||
height: 180rpx; | |||||
} | } | ||||
.info view:nth-child(1) { | .info view:nth-child(1) { | ||||
@@ -64,13 +66,28 @@ | |||||
text-overflow: ellipsis; */ | text-overflow: ellipsis; */ | ||||
} | } | ||||
.info view:nth-child(1) text:nth-child(2) { | |||||
color: #f96563; | |||||
font-size: 24rpx; | |||||
/* width: 340rpx; | |||||
overflow: hidden; | |||||
white-space: nowrap; | |||||
text-overflow: ellipsis; */ | |||||
.info .sucess { | |||||
font-size: 28rpx; | |||||
color: #02c0ff; | |||||
letter-spacing: 0; | |||||
text-align: right; | |||||
line-height: 28px; | |||||
} | |||||
.wait { | |||||
font-size: 28rpx; | |||||
color: #ff4949; | |||||
letter-spacing: 0; | |||||
text-align: right; | |||||
line-height: 28rpx; | |||||
} | |||||
.close { | |||||
font-size: 28rpx; | |||||
color: #999; | |||||
letter-spacing: 0; | |||||
text-align: right; | |||||
line-height: 28rpx; | |||||
} | } | ||||
.info view:nth-child(2), .info view:nth-child(3) { | .info view:nth-child(2), .info view:nth-child(3) { | ||||
@@ -121,16 +138,16 @@ | |||||
height: 60rpx; | height: 60rpx; | ||||
line-height: 60rpx; | line-height: 60rpx; | ||||
text-align: center; | text-align: center; | ||||
background: #00c0ff; | |||||
color: #fff; | color: #fff; | ||||
float: right; | float: right; | ||||
border-radius: 15rpx; | |||||
font-size: 28rpx; | font-size: 28rpx; | ||||
border: 2rpx solid #02c0ff; | |||||
border-radius: 30rpx; | |||||
} | } | ||||
.payment view:nth-child(2) text { | .payment view:nth-child(2) text { | ||||
font-size: 28rpx; | |||||
color: #fff; | |||||
font-size: 30rpx; | |||||
color: #02C0FF; | |||||
} | } | ||||
.dingdan { | .dingdan { | ||||
@@ -144,13 +161,15 @@ | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
text-align: center; | text-align: center; | ||||
} | } | ||||
.dingdan text:nth-of-type(2) { | .dingdan text:nth-of-type(2) { | ||||
display: block; | display: block; | ||||
font-size: 28rpx; | |||||
color: #999999; | |||||
letter-spacing: 0; | |||||
text-align: center; | |||||
font-size: 28rpx; | |||||
color: #999; | |||||
letter-spacing: 0; | |||||
text-align: center; | |||||
} | } | ||||
.dingdan image { | .dingdan image { | ||||
display: block; | display: block; | ||||
width: 300rpx; | width: 300rpx; | ||||
@@ -16,13 +16,13 @@ | |||||
<view class="user-btns"> | <view class="user-btns"> | ||||
<navigator url="/pages/order/index/index?id=all"> | <navigator url="/pages/order/index/index?id=all"> | ||||
<view class="user-btn app-border-bottom"> | <view class="user-btn app-border-bottom"> | ||||
<view>我的订单</view> | |||||
<view><image class='icons' src="./../../assets/img/ding.png" mode='widthFix'></image>我的订单</view> | |||||
<view><text class='look'>查看全部</text><text class="iconfont icon-right"></text></view> | <view><text class='look'>查看全部</text><text class="iconfont icon-right"></text></view> | ||||
</view> | </view> | ||||
</navigator> | </navigator> | ||||
<navigator url="/pages/order/index/index?id=0"> | <navigator url="/pages/order/index/index?id=0"> | ||||
<view class="user-btn app-border-bottom"> | <view class="user-btn app-border-bottom"> | ||||
<view>待付款</view> | |||||
<view style='padding-left:50rpx;color:#666;'>待付款</view> | |||||
<view> | <view> | ||||
<text class="iconfont icon-right"></text> | <text class="iconfont icon-right"></text> | ||||
</view> | </view> | ||||
@@ -30,7 +30,7 @@ | |||||
</navigator> | </navigator> | ||||
<navigator url="/pages/order/index/index?id=1"> | <navigator url="/pages/order/index/index?id=1"> | ||||
<view class="user-btn app-border-bottom"> | <view class="user-btn app-border-bottom"> | ||||
<view>已完成</view> | |||||
<view style='padding-left:50rpx;color:#666;'>已完成</view> | |||||
<view> | <view> | ||||
<text class="iconfont icon-right"></text> | <text class="iconfont icon-right"></text> | ||||
</view> | </view> | ||||
@@ -38,7 +38,7 @@ | |||||
</navigator> | </navigator> | ||||
<navigator url="/pages/couponorder/index/index"> | <navigator url="/pages/couponorder/index/index"> | ||||
<view class="user-btn app-border-bottom"> | <view class="user-btn app-border-bottom"> | ||||
<view>券包</view> | |||||
<view><image class='icons' src="./../../assets/img/quans.png" mode='widthFix'></image>券包</view> | |||||
<view> | <view> | ||||
<text class="couponnum" wx:if="{{couponNum=='couponNum'}}"></text> | <text class="couponnum" wx:if="{{couponNum=='couponNum'}}"></text> | ||||
<text class="iconfont icon-right"></text> | <text class="iconfont icon-right"></text> | ||||
@@ -47,7 +47,7 @@ | |||||
</navigator> | </navigator> | ||||
<navigator url="/pages/cartest/cartest" open-type="switchTab"> | <navigator url="/pages/cartest/cartest" open-type="switchTab"> | ||||
<view class="user-btn app-border-bottom"> | <view class="user-btn app-border-bottom"> | ||||
<view>智能停车</view> | |||||
<view><image class='icons' src="./../../assets/img/che.png" mode='widthFix'></image>智能停车</view> | |||||
<view> | <view> | ||||
<text class="iconfont icon-right"></text> | <text class="iconfont icon-right"></text> | ||||
</view> | </view> | ||||
@@ -1,12 +1,16 @@ | |||||
.margin { | |||||
/* background: #f8f8f8; *//* height: 20rpx; */ | |||||
.icons{ | |||||
width: 40rpx; | |||||
margin-right: 20rpx; | |||||
vertical-align: middle; | |||||
} | } | ||||
.user { | .user { | ||||
background: #fff; | background: #fff; | ||||
min-height: 100vh; | min-height: 100vh; | ||||
} | } | ||||
.navigator-hover{ | |||||
opacity: 1!important; | |||||
background: #fff; | |||||
} | |||||
.user-title { | .user-title { | ||||
position: relative; | position: relative; | ||||
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | ||||
@@ -36,7 +40,7 @@ | |||||
position: absolute; | position: absolute; | ||||
top: 39rpx; | top: 39rpx; | ||||
bottom: 0; | bottom: 0; | ||||
right: 26px; | |||||
right: 20px; | |||||
width: 16rpx; | width: 16rpx; | ||||
height: 16rpx; | height: 16rpx; | ||||
border-radius: 50%; | border-radius: 50%; | ||||