Skip to content

I
integral-mall
Commit d0d27fb8 by 萱草
Options

不支持退款标识

parent 4645ac7a
Showing with 44 additions and 25 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.c11a3cca380aa8067a88ea2d8af9dae7.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.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.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.fec0dbe7b5a8d7bd0a01.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.5715cce3a632fe177fd54c6110484d14.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.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.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.4b18637d6a9bc312f857.js></script></body></html>
\ No newline at end of file
dist/static/css/app.5715cce3a632fe177fd54c6110484d14.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.4b18637d6a9bc312f857.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
......@@ -3,7 +3,9 @@
<div class="mall-content-section">
<div class="mall-content-title">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '' }">
<a href="/report/#/memberSummary">首页</a>
</el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>商品</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/giftExchange' }">礼品</el-breadcrumb-item>
......@@ -88,17 +90,20 @@
<span>{{ orderDetail.definedCode }}</span>
<el-popover placement="bottom" trigger="hover">
<p>
<span>商户支付号：</span><span>{{ orderDetail.payNumber ? orderDetail.payNumber : '--' }}</span>
<span>商户支付号：</span>
<span>{{ orderDetail.payNumber ? orderDetail.payNumber : '--' }}</span>
</p>
<p>
<span>支付流水号：</span><span>{{ orderDetail.transactionId ? orderDetail.transactionId : '--' }}</span>
<span>支付流水号：</span>
<span>{{ orderDetail.transactionId ? orderDetail.transactionId : '--' }}</span>
</p>
<!-- <el-button slot="reference" type="text" class="iconfont icon-icon-"></el-button> -->
<i slot="reference" class="iconfont icon-icon-"></i>
</el-popover>
</p>
<p class="order-mess-item">
<span>会员名称：</span><span class="order-item-detail-mess">{{ orderDetail.memberName }}</span>
<span>会员名称：</span>
<span class="order-item-detail-mess">{{ orderDetail.memberName }}</span>
</p>
<p class="order-mess-item">
<span>买家卡号：</span>
......@@ -116,34 +121,44 @@
<span v-if="orderDetail.changeType === 5" class="order-item-detail-mess">文本卡券</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType !== 4 && orderDetail.changeType !== 5">
<span>收货信息：</span><span class="order-item-detail-mess">{{ orderDetail.receivingAddress }}</span>
<span>收货信息：</span>
<span class="order-item-detail-mess">{{ orderDetail.receivingAddress }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货人：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPerson }}</span>
<span>提货人：</span>
<span class="order-item-detail-mess">{{ orderDetail.goodsPerson }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货手机：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPhone }}</span>
<span>提货手机：</span>
<span class="order-item-detail-mess">{{ orderDetail.goodsPhone }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>自提点：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPoint }}</span>
<span>自提点：</span>
<span class="order-item-detail-mess">{{ orderDetail.goodsPoint }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货地址：</span><span class="order-item-detail-mess">{{ orderDetail.goodsAddress }}</span>
<span>提货地址：</span>
<span class="order-item-detail-mess">{{ orderDetail.goodsAddress }}</span>
</p>
<p class="order-mess-item">
<span>买家留言：</span><span class="order-item-detail-mess">{{ orderDetail.buyerRemark ? orderDetail.buyerRemark : '--' }}</span>
<span>买家留言：</span>
<span class="order-item-detail-mess">{{ orderDetail.buyerRemark ? orderDetail.buyerRemark : '--' }}</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>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>过期时间：</span><span class="order-item-detail-mess">{{ orderDetail.overTime ? getTimeAll(orderDetail.overTime) : '--' }}</span>
<span>过期时间：</span>
<span class="order-item-detail-mess">{{ orderDetail.overTime ? getTimeAll(orderDetail.overTime) : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 5">
<span>卡号：</span><span class="order-item-detail-mess">{{ orderDetail.cardNumber ? orderDetail.cardNumber : '--' }}</span>
<span>卡号：</span>
<span class="order-item-detail-mess">{{ orderDetail.cardNumber ? orderDetail.cardNumber : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 5">
<span>卡密/券码：</span><span class="order-item-detail-mess">{{ orderDetail.cardPassWord ? orderDetail.cardPassWord : '--' }}</span>
<span>卡密/券码：</span>
<span class="order-item-detail-mess">{{ orderDetail.cardPassWord ? orderDetail.cardPassWord : '--' }}</span>
</p>
</div>
<div class="order-operate">
......@@ -199,12 +214,12 @@
<tr>
<td>
<div class="order-goods-info">
<img :src="orderDetail.photoUrl" alt="" />
<img :src="orderDetail.photoUrl" alt />
<div class="order-goods-mess">
<p class="goods-name">{{ orderDetail.proName }}</p>
<p v-for="(item, index) in orderDetail.sku" :key="index" class="goods-sku">
<span>{{ item.proName }}</span
>:{{ item.valueName }}
<span>{{ item.proName }}</span>
:{{ item.valueName }}
</p>
<p class="goods-procode">{{ orderDetail.proCode }}</p>
</div>
......@@ -215,10 +230,10 @@
</td>
<td>{{ orderDetail.goodsNum }}</td>
<td>
<span v-if="orderDetail.refundStatusNowLog === 0">退款中</span>
<span v-if="orderDetail.refundStatus === 0">不支持退款</span>
<span v-else-if="orderDetail.refundStatusNowLog === 0">退款中</span>
<span v-else-if="orderDetail.refundStatusNowLog === 1">退款成功</span>
<span v-else-if="orderDetail.refundStatusNowLog === 2">退款关闭</span>
<!-- <span v-else-if="orderDetail.refundStatusNowLog === -1">--</span> -->
</td>
<td>
<div>￥{{ orderDetail.cashShouldPay }}</div>
......@@ -235,13 +250,16 @@
<div class="logistics-info" v-if="showLogistics">
<div class="logistics-item">
<p class="logistics-info-item">
<span>快递：</span><span>{{ logisticsInfo.changeLog.logisticsCompanyName }}</span>
<span>快递：</span>
<span>{{ logisticsInfo.changeLog.logisticsCompanyName }}</span>
</p>
<p class="logistics-info-item">
<span>物流单号：</span><span>{{ logisticsInfo.changeLog.courierNumber }}</span>
<span>物流单号：</span>
<span>{{ logisticsInfo.changeLog.courierNumber }}</span>
</p>
<p class="logistics-info-item">
<span>发货时间：</span><span>{{ orderDetail.deliveryTime ? getTimeAll(orderDetail.deliveryTime) : '--' }}</span>
<span>发货时间：</span>
<span>{{ orderDetail.deliveryTime ? getTimeAll(orderDetail.deliveryTime) : '--' }}</span>
</p>
</div>
<div class="logisticsList">
......@@ -273,7 +291,8 @@
<!-- 门店自提核销 -->
<el-dialog title="发货并核销" :visible.sync="shopDialogVisible" width="450px">
<p style="margin-bottom:20px">
请确认买家出示的提货码为：<span style="color:#f5222d">{{ orderDetail.writeOffCode }}</span>
请确认买家出示的提货码为：
<span style="color:#f5222d">{{ orderDetail.writeOffCode }}</span>
</p>
<p style="margin-bottom:20px">确认无误后，将商品交付给买家，确认核销，则订单交易完成</p>
<span slot="footer" class="dialog-footer">
......
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