From 476dec13e81f594ac0be34fb55b1d73f8d464002 Mon Sep 17 00:00:00 2001
From: gboy <admin@gmail.com>
Date: Mon, 1 Apr 2024 18:56:59 +0800
Subject: [PATCH] edit

---
 src/views/merchant/type/index.vue        |  4 +++
 src/views/merchant/type/typeDetails.vue  |  4 +++
 src/views/merchant/type/typeEditForm.vue | 32 ++++++++++++++++++++++++
 src/views/merchant/type/typeInfo.vue     |  8 ++++++
 4 files changed, 48 insertions(+)

diff --git a/src/views/merchant/type/index.vue b/src/views/merchant/type/index.vue
index df69e29..8597cd7 100644
--- a/src/views/merchant/type/index.vue
+++ b/src/views/merchant/type/index.vue
@@ -137,7 +137,11 @@ export default {
         type_name: "",
         type_info: "",
         is_margin: 1,
+        is_service: 1,
+        is_goods: 1,
         margin: 0,
+        service_cost: 0,
+        goods_cost: 0,
         auth: [],
         description: "",
       },
diff --git a/src/views/merchant/type/typeDetails.vue b/src/views/merchant/type/typeDetails.vue
index c9dff52..cde91b9 100644
--- a/src/views/merchant/type/typeDetails.vue
+++ b/src/views/merchant/type/typeDetails.vue
@@ -145,7 +145,11 @@ export default {
             type_info: info.type_info,
             mark: info.mark,
             is_margin: info.is_margin || 0,
+            is_service: info.is_service || 0,
+            is_goods: info.is_goods || 0,
             margin: info.margin || 0,
+            service_cost: info.service_cost || 0,
+            goods_cost: info.goods_cost || 0,
             auth: info.auth_ids,
             description: info.description,
             update_time: info.update_time,
diff --git a/src/views/merchant/type/typeEditForm.vue b/src/views/merchant/type/typeEditForm.vue
index 222f7d2..8f8b3b0 100644
--- a/src/views/merchant/type/typeEditForm.vue
+++ b/src/views/merchant/type/typeEditForm.vue
@@ -37,6 +37,38 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row class="mt20">
+            <el-col :span="12">
+              <el-form-item label="店铺技术服务费：">
+                <el-radio-group v-model="formValidate.is_service">
+                  <el-radio :label="0" class="radio">无</el-radio>
+                  <el-radio :label="1">有</el-radio>
+                </el-radio-group>
+                <span v-if="formValidate.is_service == 1">
+                  <el-input
+                    v-model="formValidate.service_cost"
+                    placeholder="请填写技术服务费"
+                    style="width:120px;margin-left: 8px;"
+                  /> 元
+                </span>  
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="店铺上架费：">
+                <el-radio-group v-model="formValidate.is_goods">
+                  <el-radio :label="0" class="radio">无</el-radio>
+                  <el-radio :label="1">有</el-radio>
+                </el-radio-group>
+                <span v-if="formValidate.is_goods == 1">
+                  <el-input
+                    v-model="formValidate.goods_cost"
+                    placeholder="请填写上架费"
+                    style="width:120px;margin-left: 8px;"
+                  /> 元
+                </span>  
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="店铺类型要求：">
diff --git a/src/views/merchant/type/typeInfo.vue b/src/views/merchant/type/typeInfo.vue
index 3f1baa4..0598bf8 100644
--- a/src/views/merchant/type/typeInfo.vue
+++ b/src/views/merchant/type/typeInfo.vue
@@ -14,6 +14,14 @@
             <div>店铺保证金：</div>
             <div class="value">{{typeData.is_margin ? typeData.margin+'元' : '无'}}</div>
           </li>
+          <li class="item">
+            <div>店铺技术服务费：</div>
+            <div class="value">{{typeData.is_service ? typeData.service_cost+'元' : '无'}}</div>
+          </li>
+          <li class="item">
+            <div>店铺上架费：</div>
+            <div class="value">{{typeData.is_goods ? typeData.goods_cost+'元' : '无'}}</div>
+          </li>
           <li class="item">
             <div>店铺类型要求：</div>
             <div class="value">{{typeData.type_info}}</div>