From 6e78d2b1b00eceac3ee6222b713f749e21428f9a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 十月 2023 09:09:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
admin/src/views/business/goodsorder.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index 0cf5dd2..ef5d8ef 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -87,8 +87,8 @@
>
<template slot-scope="{row}">
<el-button type="text" @click="showDetail(row)">璁㈠崟璇︽儏</el-button>
- <el-button type="text" @click="statement(row)" v-if="row.status != 4" style="color: red">缁撶畻</el-button>
- <el-button type="text" @click="refenMoney(row)" v-else>閫�娆�</el-button>
+ <el-button type="text" @click="statement(row)" v-if="row.status != 4 && (row.memberRidesStatus>1 || !row.memberRidesStatus)" style="color: red">缁撶畻</el-button>
+ <el-button type="text" @click="refenMoney(row)" v-if="row.status == 4">閫�娆�</el-button>
</template>
</el-table-column>
</el-table>
@@ -184,7 +184,7 @@
},
statement({id}) {
- this.$dialog.messageWaring('褰撳墠璁㈠崟鍙兘鏈夋湭瀹屾垚鐨勯獞琛岋紝纭畾寮哄埗缁撶畻锛�', '寮哄埗缁撶畻')
+ this.$dialog.messageWaring('纭畾寮哄埗缁撶畻鐮侊紵缁撶畻鍚庤鍗曡嚜鍔ㄥ畬鎴�', '寮哄埗缁撶畻')
.then(() => {
closerGoodsorder(id)
.then(() => {
--
Gitblit v1.9.3