Commit 27087219 by 肖康

x

parent 6fa3a2b8
Showing with 66 additions and 85 deletions
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
padding:0.28rem; padding:0.28rem;
padding-bottom: 0.51rem; padding-bottom: 0.51rem;
box-sizing: border-box; box-sizing: border-box;
.t1-box{ .t1-box{
display: flex; display: flex;
font-size: 12px; font-size: 12px;
...@@ -103,8 +104,49 @@ ...@@ -103,8 +104,49 @@
i{font-size: 12px;margin-left: 0.12rem;} i{font-size: 12px;margin-left: 0.12rem;}
} }
} }
.zpbox{
width: 9.6rem;
background: #FFFFFF;
box-shadow: 0rem 0rem 0.09rem 0rem rgba(180, 202, 211, 0.38);
border-radius: 0.08rem;
border: 1px solid #7D1BF0;
margin:0 auto;
margin-top: 0.25rem;
box-sizing: border-box;
padding-left: 0.27rem;
padding-bottom: 0.25rem;
.zptitle{
width:96px;
height:0.65rem;
background: url(../../images/user/zp.png) no-repeat;
background-size: 100% 100%;
color:#fff;
font-size: 14px;
line-height: 0.65rem;
padding-left: 30px;
box-sizing: border-box;
margin-bottom: 10px;
}
.zp-group{
font-size: 12px;
div{
color:#333;
height:0.8rem;
line-height: 0.8rem;
span{width:70%;}
font{width:30%;box-sizing: border-box;padding-left: 10px;}
}
p{
color:#6f6f6f;
}
}
}
.order-sec{ .order-sec{
width:9.6rem; width:94%;
margin:0 auto; margin:0 auto;
margin-top: 0.25rem; margin-top: 0.25rem;
.oda-group{ .oda-group{
......
.order-detail{padding-top:.28rem;padding-bottom:1.32rem}.order-detail .order-top{width:9.6rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;margin:0 auto;padding:.28rem;padding-bottom:.51rem;box-sizing:border-box}.order-detail .order-top .t1-box{display:flex;font-size:12px;padding-bottom:.36rem;border-bottom:1px solid #e5e5e5;line-height:.83rem}.order-detail .order-top .t1-box img{height:.83rem;width:.83rem;margin-right:.4rem}.order-detail .order-top .t1-box .ordersta{height:.83rem;color:#333}.order-detail .order-top .t1-box .ordersta .van-count-down{font-size:12px;color:#FF693D;display:inline}.order-detail .order-top .t1-box.wl{position:relative;cursor:pointer}.order-detail .order-top .t1-box.wl .ordersta{width:6.4rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.order-detail .order-top .t1-box.wl i{font-size:12px;color:#000 !important;position:absolute;right:0}.order-detail .order-top .t2-box{padding-top:.4rem;line-height:.6rem;color:#6F6F6F;font-size:12px;margin-bottom:.1rem}.order-detail .order-top .t2-box font{display:inline-block;cursor:pointer;width:1.12rem;height:.45rem;background:#F9F9F9;border-radius:.03rem;border:.01rem solid #E5E5E5;color:#333;text-align:center;line-height:.45rem;margin-right:.2rem}.order-detail .order-top .t3-box{padding-top:.2rem}.order-detail .order-top .t3-box .t2-gro{height:.6rem;line-height:.6rem;color:#333}.order-detail .order-top .t3-box .cp-t{display:flex;border-top:1px solid #e5e5e5;padding-top:.32rem;margin-top:.71rem;margin-bottom:.71rem}.order-detail .order-top .t3-box .cp-t img{width:1.07rem;height:1.07rem;border-radius:100%;margin-right:.3rem}.order-detail .order-top .t3-box .cp-t .ri-text{color:#6F6F6F;position:relative}.order-detail .order-top .t3-box .cp-t .ri-text p{line-height:.6rem}.order-detail .order-top .show-detail-btn{width:2.53rem;height:.61rem;background:#FFFFFF;border-radius:.3rem;border:1px solid #D2D2D2;text-align:center;line-height:.61rem;color:#6f6f6f;font-size:12px;margin:0 auto}.order-detail .order-top .show-detail-btn i{font-size:12px;margin-left:.12rem}.order-detail .order-sec{width:9.6rem;margin:0 auto;margin-top:.25rem}.order-detail .order-sec .oda-group{display:block;padding:.47rem .28rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;margin-bottom:.35rem}.order-detail .order-sec .oda-group .title-goods{color:#333;font-size:15px;margin-bottom:.33rem}.order-detail .order-sec .oda-group .title-goods span{max-width:8rem;display:inline-block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;vertical-align:middle}.order-detail .order-sec .oda-group .title-goods i{color:#000;font-size:12px;margin-left:.33rem;position:relative;top:.02rem}.order-detail .order-sec .oda-group .attrs{color:#6F6F6F;font-size:12px}.order-detail .order-sec .oda-group .attrs .f-333{color:#333}.order-detail .order-sec .oda-group .attrs .group-trr{line-height:.66rem}.order-detail .order-sec .oda-group .attrs .group-trr div{width:50%}.order-detail .order-footer{width:9.4rem;height:1.32rem;line-height:1.32rem;background:#FFFFFF;border:.01rem solid #D6D6D6;position:fixed;bottom:0px;padding-left:.6rem;left:0px;color:#666;font-size:12px}.order-detail .order-footer font{color:#F3632C}.order-detail .order-footer span{color:#F3632C;font-weight:bold;font-size:21px}.order-detail .order-footer .fl{width:6.32rem;height:1.32rem;overflow:hidden;white-space:nowrap}.order-detail .order-footer .fr{width:3.08rem;height:1.32rem;text-align:center;color:#fff;background:#F3632C;font-size:18px} .order-detail{padding-top:.28rem;padding-bottom:1.32rem}.order-detail .order-top{width:9.6rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;margin:0 auto;padding:.28rem;padding-bottom:.51rem;box-sizing:border-box}.order-detail .order-top .t1-box{display:flex;font-size:12px;padding-bottom:.36rem;border-bottom:1px solid #e5e5e5;line-height:.83rem}.order-detail .order-top .t1-box img{height:.83rem;width:.83rem;margin-right:.4rem}.order-detail .order-top .t1-box .ordersta{height:.83rem;color:#333}.order-detail .order-top .t1-box .ordersta .van-count-down{font-size:12px;color:#FF693D;display:inline}.order-detail .order-top .t1-box.wl{position:relative;cursor:pointer}.order-detail .order-top .t1-box.wl .ordersta{width:6.4rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.order-detail .order-top .t1-box.wl i{font-size:12px;color:#000 !important;position:absolute;right:0}.order-detail .order-top .t2-box{padding-top:.4rem;line-height:.6rem;color:#6F6F6F;font-size:12px;margin-bottom:.1rem}.order-detail .order-top .t2-box font{display:inline-block;cursor:pointer;width:1.12rem;height:.45rem;background:#F9F9F9;border-radius:.03rem;border:.01rem solid #E5E5E5;color:#333;text-align:center;line-height:.45rem;margin-right:.2rem}.order-detail .order-top .t3-box{padding-top:.2rem}.order-detail .order-top .t3-box .t2-gro{height:.6rem;line-height:.6rem;color:#333}.order-detail .order-top .t3-box .cp-t{display:flex;border-top:1px solid #e5e5e5;padding-top:.32rem;margin-top:.71rem;margin-bottom:.71rem}.order-detail .order-top .t3-box .cp-t img{width:1.07rem;height:1.07rem;border-radius:100%;margin-right:.3rem}.order-detail .order-top .t3-box .cp-t .ri-text{color:#6F6F6F;position:relative}.order-detail .order-top .t3-box .cp-t .ri-text p{line-height:.6rem}.order-detail .order-top .show-detail-btn{width:2.53rem;height:.61rem;background:#FFFFFF;border-radius:.3rem;border:1px solid #D2D2D2;text-align:center;line-height:.61rem;color:#6f6f6f;font-size:12px;margin:0 auto}.order-detail .order-top .show-detail-btn i{font-size:12px;margin-left:.12rem}.order-detail .zpbox{width:9.6rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;border:1px solid #7D1BF0;margin:0 auto;margin-top:.25rem;box-sizing:border-box;padding-left:.27rem;padding-bottom:.25rem}.order-detail .zpbox .zptitle{width:96px;height:.65rem;background:url(../../images/user/zp.png) no-repeat;background-size:100% 100%;color:#fff;font-size:14px;line-height:.65rem;padding-left:30px;box-sizing:border-box;margin-bottom:10px}.order-detail .zpbox .zp-group{font-size:12px}.order-detail .zpbox .zp-group div{color:#333;height:.8rem;line-height:.8rem}.order-detail .zpbox .zp-group div span{width:70%}.order-detail .zpbox .zp-group div font{width:30%;box-sizing:border-box;padding-left:10px}.order-detail .zpbox .zp-group p{color:#6f6f6f}.order-detail .order-sec{width:94%;margin:0 auto;margin-top:.25rem}.order-detail .order-sec .oda-group{display:block;padding:.47rem .28rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;margin-bottom:.35rem}.order-detail .order-sec .oda-group .title-goods{color:#333;font-size:15px;margin-bottom:.33rem}.order-detail .order-sec .oda-group .title-goods span{max-width:8rem;display:inline-block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;vertical-align:middle}.order-detail .order-sec .oda-group .title-goods i{color:#000;font-size:12px;margin-left:.33rem;position:relative;top:.02rem}.order-detail .order-sec .oda-group .attrs{color:#6F6F6F;font-size:12px}.order-detail .order-sec .oda-group .attrs .f-333{color:#333}.order-detail .order-sec .oda-group .attrs .group-trr{line-height:.66rem}.order-detail .order-sec .oda-group .attrs .group-trr div{width:50%}.order-detail .order-footer{width:9.4rem;height:1.32rem;line-height:1.32rem;background:#FFFFFF;border:.01rem solid #D6D6D6;position:fixed;bottom:0px;padding-left:.6rem;left:0px;color:#666;font-size:12px}.order-detail .order-footer font{color:#F3632C}.order-detail .order-footer span{color:#F3632C;font-weight:bold;font-size:21px}.order-detail .order-footer .fl{width:6.32rem;height:1.32rem;overflow:hidden;white-space:nowrap}.order-detail .order-footer .fr{width:3.08rem;height:1.32rem;text-align:center;color:#fff;background:#F3632C;font-size:18px}
\ No newline at end of file \ No newline at end of file
...@@ -40,7 +40,9 @@ ...@@ -40,7 +40,9 @@
</div> </div>
</div> </div>
<div class="l-b clr"> <div class="l-b clr">
<span class="fl">{{item.list.length}}件商品</span> <span class="fl">{{item.list.length}}件商品
<br><font v-if="item.exist_gift==1" style="position:relative;top:14px;">另含赠品</font>
</span>
<div class="fl" v-if="item.status==2"> <div class="fl" v-if="item.status==2">
<van-count-down :time="item.self_rest_time" format="还剩DD天HH时mm分ss秒" /> <van-count-down :time="item.self_rest_time" format="还剩DD天HH时mm分ss秒" />
</div> </div>
......
...@@ -82,6 +82,20 @@ ...@@ -82,6 +82,20 @@
<div class="show-detail-btn" v-show="!isShowMore" @click="isShowMore=!isShowMore">展开<i <div class="show-detail-btn" v-show="!isShowMore" @click="isShowMore=!isShowMore">展开<i
class="icon iconfont">&#xe610;</i></div> class="icon iconfont">&#xe610;</i></div>
</div> </div>
<div class="zpbox" v-if="orderDetailInfo.order_gift">
<div class="zptitle">赠品信息</div>
<div class="zp-group" v-for="item in orderDetailInfo.order_gift">
<div class="clr"><span class="fl">赠品:{{item.gift_info.item_name}}</span> <font class="fl"> 数量:{{item.gift_info.num}}</font></div>
<p v-if="item.status==1">
发放状态:待发放(发放奖品将短信通知您)
</p>
<p v-else>
发放状态:已发放(发放奖品将短信通知您)
</p>
</div>
</div>
<div class="order-sec" v-if="orderDetailInfo.list"> <div class="order-sec" v-if="orderDetailInfo.list">
<a class="oda-group" v-for="item in orderDetailInfo.list" @click="toUrl(((item.goods_type==1||item.goods_type==2)?('/goods_'+item.goods_id+'.html'):('/item/'+item.goods_id+'.html')),item.goods_id)" <a class="oda-group" v-for="item in orderDetailInfo.list" @click="toUrl(((item.goods_type==1||item.goods_type==2)?('/goods_'+item.goods_id+'.html'):('/item/'+item.goods_id+'.html')),item.goods_id)"
> >
...@@ -143,6 +157,7 @@ ...@@ -143,6 +157,7 @@
isShowMore: 0 isShowMore: 0
} }
}, },
computed: { computed: {
...mapState({ ...mapState({
loading: state => state.orderDetail.loading, loading: state => state.orderDetail.loading,
......
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
</div> </div>
</div> </div>
<div class="l-b clr"> <div class="l-b clr">
<span class="fl">{{item.list.length}}件商品</span> <span class="fl">{{item.list.length}}件商品
<br><font v-if="item.exist_gift==1" style="position:relative;top:14px;">另含赠品</font>
</span>
<p class="fr"> <p class="fr">
总额: <b>{{item.order_amount_format}}</b> 总额: <b>{{item.order_amount_format}}</b>
<i><font class="mr10">含附加费:{{item.extend_fee_format}}</font><font>运费:{{item.shipping_price_format}}</font></i> <i><font class="mr10">含附加费:{{item.extend_fee_format}}</font><font>运费:{{item.shipping_price_format}}</font></i>
......
{"h":"df7a2c19b6356e52cd6b","c":{"33":true}}
\ No newline at end of file
{"h":"f666077af6485d386b31","c":{"33":true}}
\ No newline at end of file
{"h":"cf01dd02580ff4ec4d06","c":{"app":true}}
\ No newline at end of file
{"h":"242232053f9635e4b110","c":{"33":true}}
\ No newline at end of file
{"h":"57f39c09188ffe4581cd","c":{"33":true}}
\ No newline at end of file
{"h":"d2e540e655b852fdd2a6","c":{"33":true}}
\ No newline at end of file
{"h":"efe66943c200001e0ff8","c":{"33":true}}
\ No newline at end of file
{"h":"b89b6d620e74bd25452e","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"65f45b97c86f3b9c9b78","c":{"33":true}}
\ No newline at end of file
{"h":"b10908d0ac08e43cf953","c":{}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"ab2f73763c6ec98c090d","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"eb894c962c7715402876","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"919918126fac38742505","c":{"33":true}}
\ No newline at end of file
{"h":"ff8bd744f2be85c4e778","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"ad99d2eeb0d0d4548aee","c":{"33":true}}
\ No newline at end of file
{"h":"02c84c08bc7baefd092c","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"97ae6ec3fcd05d28d7f4","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"05b2c09fff42d9d382ec","c":{"app":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"733acd25a4ff3570fbca","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"af01db08e2d3971ff80a","c":{"app":true}}
\ No newline at end of file
{"h":"3204dbed493e9017ee5e","c":{"33":true}}
\ No newline at end of file
{"h":"6c0eeebef60a2936df08","c":{"33":true}}
\ No newline at end of file
{"h":"a4eadf97caa535833b5a","c":{"33":true}}
\ No newline at end of file
{"h":"5cf0bd80ef9ac37041e0","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"b8b825d4a9adf6c86b3f","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"9fc3686f52d4aa04f6a2","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"9fc48a903e5eab6f7254","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"15885e0e2a0d4a9c5bf6","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"0699dd214cfdd741078a","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"ee6fae3f3a5a6f933c52","c":{"33":true}}
\ No newline at end of file
{"h":"14807ae7efb9b9c92471","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"ed2f43ba582d6315f47b","c":{"app":true}}
\ No newline at end of file
{"h":"536400d20c742f2d358e","c":{"app":true}}
\ No newline at end of file
{"h":"a33336ec30d6bb0ebae9","c":{}}
\ No newline at end of file
{"h":"ad91afc6b0b3949d9b4f","c":{"33":true}}
\ No newline at end of file
{"h":"c8d345aaac21b07f1a99","c":{"33":true}}
\ No newline at end of file
{"h":"19e042ec636297fcc409","c":{}}
\ No newline at end of file
{"h":"0974ef252f67d54adcfe","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"e3aa0129c3807842f69e","c":{"app":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"8875f493f941ec8a7d55","c":{"33":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment