Skip to content

I
integral-mall
Commit 51c29ecc by damodmg
Options

订单详情物流信息

parent 33a95609
Showing with 6 additions and 5 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.15f11c6149918c917ec7999465db6edd.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.2f1b6754b18f58a1c79c.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.1f253f59bf71df15fb5088374d43018c.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.9193fd1d643837ca6c3e.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2f1b6754b18f58a1c79c.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.9193fd1d643837ca6c3e.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
......@@ -178,7 +178,7 @@
<th style="width:13%">数量</th>
<th style="width:15%">售后</th>
<th style="width:10%">小计</th>
<th style="width:15%" v-if="(orderStatus === 3 && orderDetail.changeType === 2) || orderDetail.changeType === 3 || ((orderStatus === 4 && orderDetail.changeType === 2) || orderDetail.changeType === 3)">操作</th>
<th style="width:15%" v-if="(orderStatus === 3 && (orderDetail.changeType === 2 || orderDetail.changeType === 3)) || (orderStatus === 4 && (orderDetail.changeType === 2 || orderDetail.changeType === 3))">操作</th>
</tr>
</thead>
<tbody>
......@@ -210,14 +210,15 @@
<td>
<div>￥{{ orderDetail.cashShouldPay }}</div>
</td>
<td v-if="(orderStatus === 3 && orderDetail.changeType === 2) || orderDetail.changeType === 3 || ((orderStatus === 4 && orderDetail.changeType === 2) || orderDetail.changeType === 3)">
<td v-if="(orderStatus === 3 && (orderDetail.changeType === 2 || orderDetail.changeType === 3)) || (orderStatus === 4 && (orderDetail.changeType === 2 || orderDetail.changeType === 3))">
<el-button type="text" @click="getLogistics">{{ showLogistics ? '收起物流信息' : '展开物流信息' }}</el-button>
<i :class="showLogistics ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
</td>
<!-- v-if="(orderStatus === 3 && orderDetail.changeType === 2) || orderDetail.changeType === 3 || ((orderStatus === 4 && orderDetail.changeType === 2) || orderDetail.changeType === 3)" -->
</tr>
</tbody>
</table>
<div v-if="(orderStatus === 3 && orderDetail.changeType === 2) || orderDetail.changeType === 3 || ((orderStatus === 4 && orderDetail.changeType === 2) || orderDetail.changeType === 3)">
<div v-if="(orderStatus === 3 && (orderDetail.changeType === 2 || orderDetail.changeType === 3)) || (orderStatus === 4 && (orderDetail.changeType === 2 || orderDetail.changeType === 3))">
<div class="logistics-info" v-if="showLogistics">
<div class="logistics-item">
<p class="logistics-info-item">
......
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