Skip to content

I
integral-mall
Commit 33c41d46 by damodmg
Options

退款中不可关闭订单

parent cc601d30
Showing with 7 additions and 6 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.d78930a718db311c1810788163427866.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.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.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-info.1.0.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.bca0155083daca926db1.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.fef57b68641c8264c767a8eab79fe60a.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.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.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-info.1.0.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.51d776c5d7cf136d1f21.js></script></body></html>
\ No newline at end of file
dist/static/js/app.51d776c5d7cf136d1f21.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.bca0155083daca926db1.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/order/couponExchange.vue
......@@ -98,7 +98,7 @@
<span v-if="scope.row.status === 11">待付款</span>
</p>
<p style="line-height:18px">
<el-button type="text" v-if="scope.row.status === 11" @click="closeOrderNoPay(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status === 11 && scope.row.refundStatus !== 2" @click="closeOrderNoPay(scope.row)">关闭订单</el-button>
</p>
</template>
</el-table-column>
......@@ -309,7 +309,7 @@ export default {
closeOrderNoPay(item) {
let params = {
integralMallProExchangeId: item.integralMallProExchangeId,
opType: 4
optType: 4
};
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
......
src/views/order/giftExchange.vue
......@@ -103,9 +103,10 @@
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 2" @click="handleDeliver(scope.row)">物流发货</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 3" @click="handleDeliver(scope.row)">在线发货</el-button>
<el-button type="text" v-if="scope.row.status === 3" @click="getDeliverInfo(scope.row)">查看物流</el-button>
<el-button type="text" v-if="scope.row.status === 1" @click="closeOrder(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.refundStatus !== 2" @click="closeOrder(scope.row)">关闭订单</el-button>
<!-- 待付款关闭订单 -->
<el-button type="text" v-if="scope.row.status === 11" @click="closeOrderNoPay(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status === 11 && scope.row.refundStatus !== 2" @click="closeOrderNoPay(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status <= 0" @click="getCloseInfo(scope.row)">查看详情</el-button>
</p>
</template>
......
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