From 4b5d6c169c3d8b617eee99aa24a93c418cd68142 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Fri, 26 Apr 2024 16:27:30 +0800
Subject: [PATCH] edit

---
 src/views/merchant/deposit/index.vue           | 14 +++++++++++++-
 src/views/merchant/list/handle/merEditForm.vue |  6 +++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/merchant/deposit/index.vue b/src/views/merchant/deposit/index.vue
index a2d2c9d..b622d06 100644
--- a/src/views/merchant/deposit/index.vue
+++ b/src/views/merchant/deposit/index.vue
@@ -554,8 +554,13 @@
         </el-table-column>
         <el-table-column prop="pay_price" label="支付金额" min-width="60"></el-table-column>
         <el-table-column label="备注" min-width="100" prop="mark" />
+        <el-table-column prop="status" label="审核状态" min-width="80">
+          <template scope="scope">
+            <span>{{ statusMode[scope.row.status] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" min-width="100" prop="refuse" />
-        <el-table-column prop="pay_time" label="申请时间" min-width="120" />
+        <el-table-column prop="pay_time" label="审核时间" min-width="120" />
       </el-table>
       <div class="acea-row row-right page">
         <el-pagination
@@ -621,6 +626,13 @@ export default {
         total: 0,
         data: []
       },
+      statusMode:{
+       '0':'待审核',
+        '1':'审核通过',
+        '-1':'失败',
+        '-2':'审核拒绝',
+        '20':'已退款'
+      },
       headeNum: [
         {
           count: "",
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 91b4638..cfb1d92 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -230,7 +230,7 @@
             <el-col :span="24">
               <el-form-item label="店铺保证金：" label-width="146px">
                 <el-radio-group v-model="merData.is_margin">
-                  <el-radio :label="0" class="radio">无</el-radio>
+                  <el-radio :disabled="merData.is_margin==10" :label="0" class="radio">无</el-radio>
                   <el-radio v-if="merData.is_margin!=10" :label="1">有</el-radio>
                   <el-radio v-else :label="10">有</el-radio>
                 </el-radio-group>
@@ -254,7 +254,7 @@
             <el-col :span="24">
               <el-form-item label="技术服务费：" label-width="146px">
                 <el-radio-group v-model="merData.is_service">
-                  <el-radio :label="0" class="radio">无</el-radio>
+                  <el-radio :disabled="merData.is_service==10" :label="0" class="radio">无</el-radio>
                   <el-radio v-if="merData.is_service!=10" :label="1">有</el-radio>
                   <el-radio v-else :label="10">有</el-radio>
                 </el-radio-group>
@@ -278,7 +278,7 @@
             <el-col :span="24">
               <el-form-item label="上架费：" label-width="146px">
                 <el-radio-group v-model="merData.is_goods">
-                  <el-radio :label="0" class="radio">无</el-radio>
+                  <el-radio :disabled="merData.is_goods==10" :label="0" class="radio">无</el-radio>
                   <el-radio v-if="merData.is_goods!=10" :label="1">有</el-radio>
                   <el-radio v-else :label="10">有</el-radio>
                 </el-radio-group>