Skip to content

I
integral-mall
Commit 8e79cba2 by damodmg
Options

时间为空显示--

parent 8c3f53e6
Showing with 8 additions and 7 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.e49d4b4a7802cad2fbefa1f77c4ca7e1.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.92298d7ec6c20adbee4c.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.8aa350408fea74a55124545b707576af.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.a89fd14056a0cb5878a2.js></script></body></html>
\ No newline at end of file
dist/static/css/app.8aa350408fea74a55124545b707576af.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.e49d4b4a7802cad2fbefa1f77c4ca7e1.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.92298d7ec6c20adbee4c.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.a89fd14056a0cb5878a2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/order/orderDetail.vue
......@@ -17,7 +17,7 @@
<div class="progress-content" v-if="orderStatus > 0">
<div class="progress-info progress-infoed">
<p class="info-title">买家下单</p>
<p class="info-time">{{ getTimeAll(orderDetail.createTime) }}</p>
<p class="info-time">{{ orderDetail.createTime ? getTimeAll(orderDetail.createTime) : '- -' }}</p>
</div>
<div class="progress-img" :class="{ 'progress-ing': orderStatus !== 1 || orderStatus !== 2 || orderStatus !== 3 || orderStatus !== 4, 'progress-ed': orderStatus === 1 || orderStatus === 2 || orderStatus === 4 || orderStatus === 3 }">
<div class="progress-circle"></div>
......@@ -37,7 +37,7 @@
</div>
<div class="progress-info" :class="{ 'progress-infoed': orderStatus === 1 || orderStatus === 2 || orderStatus === 3 || orderStatus === 4 }">
<p class="info-title">买家付款</p>
<p class="info-time" v-if="orderStatus === 1 || orderStatus === 2 || orderStatus === 3 || orderStatus === 4">{{ getTimeAll(orderDetail.payTime) }}</p>
<p class="info-time" v-if="orderStatus === 1 || orderStatus === 2 || orderStatus === 3 || orderStatus === 4">{{ orderDetail.payTime ? getTimeAll(orderDetail.payTime) : '- -' }}</p>
</div>
<div class="progress-img" :class="{ 'progress-ing': orderStatus === 1 || orderStatus === 3, 'progress-ed': orderStatus === 3 || orderStatus === 4 }">
<div class="progress-circle"></div>
......@@ -57,7 +57,7 @@
</div>
<div class="progress-info" :class="{ 'progress-infoed': orderStatus === 3 || orderStatus === 4 }">
<p class="info-title">商家发货</p>
<p class="info-time" v-if="orderStatus === 3 || orderStatus === 4">{{ getTimeAll(orderDetail.deliveryTime) }}</p>
<p class="info-time" v-if="orderStatus === 3 || orderStatus === 4">{{ orderDetail.deliveryTime ? getTimeAll(orderDetail.deliveryTime) : '- -' }}</p>
</div>
<div class="progress-img" :class="{ 'progress-ing': orderStatus === 3 || orderStatus === 4, 'progress-ed': orderStatus === 4 }">
<div class="progress-circle"></div>
......@@ -77,7 +77,7 @@
</div>
<div class="progress-info" :class="{ 'progress-infoed': orderStatus === 4 }">
<p class="info-title">交易成功</p>
<p class="info-time" v-if="orderStatus === 4">{{ getTimeAll(orderDetail.finishTime) }}</p>
<p class="info-time" v-if="orderStatus === 4">{{ orderDetail.finishTime ? getTimeAll(orderDetail.finishTime) : '- -' }}</p>
</div>
</div>
<div class="order-detail">
......@@ -129,7 +129,7 @@
<span>提货地址：</span><span class="order-item-detail-mess">{{ orderDetail.goodsAddress }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货时间：</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '' }}</span>
<span>提货时间：</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
</p>
</div>
<div class="order-operate">
......@@ -463,6 +463,7 @@ export default {
width: 70px;
}
.info-time {
min-width: 110px;
line-height: 18px;
white-space: nowrap;
position: absolute;
......
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 to comment