From 904e568d70445e24174b8f4a58baaf16e50af29a Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 4 Jan 2024 10:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8B=AC=E7=AB=8B=E8=AE=BE=E7=BD=AE=E6=8A=BD?=
 =?UTF-8?q?=E6=88=90=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commissionRecord/index.vue                |  3 +-
 src/views/product/productExamine/index.vue    | 55 +++++++++++++++++--
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/views/marketing/platformCommission/commissionRecord/index.vue b/src/views/marketing/platformCommission/commissionRecord/index.vue
index da2ce19..90290bf 100644
--- a/src/views/marketing/platformCommission/commissionRecord/index.vue
+++ b/src/views/marketing/platformCommission/commissionRecord/index.vue
@@ -74,7 +74,8 @@
             <template slot-scope="scope">
               <el-tag type="info" effect="plain" size="small">{{ scope.row.platform_commission_money || '0.00' }}元</el-tag>
               <br />
-              <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.platform_commission_rate || '0' }}%</el-tag>
+              <el-tag effect="plain" class="rate-num" size="small" v-if="scope.row.platform_commission_rate >= 0">{{ scope.row.platform_commission_rate || '0' }}%</el-tag>
+              <el-tag effect="plain" class="rate-num" size="small" v-else>固定金额</el-tag>
               <br />
               <el-tag type="danger" effect="plain" class="rate-num" size="small">{{ scope.row.refund_platform_commission_money || '0' }}元</el-tag>
               <br />
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index 4292842..333116c 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -205,13 +205,13 @@
     </el-card>
     <info-from ref="infoFrom" :is-show="isShow" :ids="OffId" @subSuccess="subSuccess" />
     <el-dialog title="商品编辑" :visible.sync="dialogVisible" width="1000px" :before-close="handleClose" :append-to-body='append'>
-      <el-form ref="formValidate" v-loading="fullscreenLoading" class="formValidate mt20" :rules="ruleValidate" :model="formValidate" label-width="100px" @submit.native.prevent>
+      <el-form ref="formValidate" v-loading="fullscreenLoading" class="formValidate mt20" :rules="ruleValidate" :model="formValidate" label-width="150px" @submit.native.prevent>
         <el-form-item label="商品名称：" prop="store_name">
           <el-input v-model="formValidate.store_name" placeholder="请输入商品名称" />
         </el-form-item>
         <el-form-item label="星级推荐：">
           <el-rate class="rate_star" v-model="formValidate.star" :colors="colors" style="margin-top: 4px;"></el-rate>
-          <span style="margin-top: 4px; font-size: 12px;">备注：5星为最高推荐级别，1星为最低推荐级别，设置后会在商城商品列表、搜索商品列表中体现。</span>
+          <span style="margin-top: 4px; font-size: 12px;color: #b5b5b5;">备注：5星为最高推荐级别，1星为最低推荐级别，设置后会在商城商品列表、搜索商品列表中体现。</span>
         </el-form-item>
         <el-form-item label="商品推荐：">
           <el-checkbox-group v-model="checkboxGroup" size="small" @change="onChangeGroup">
@@ -221,6 +221,32 @@
         <el-form-item label="排序：">
           <el-input-number v-model="formValidate.rank" placeholder="请输入排序序号" style="width: 200px;" />
         </el-form-item>
+        <!-- 平台抽成独立设置 START -->
+        <el-form-item label="平台抽成独立设置：">
+          <el-radio-group v-model="formValidate.platform_commission_switch">
+            <el-radio :label="0" class="radio">关闭</el-radio>
+            <el-radio :label="1">开启</el-radio>
+          </el-radio-group>
+          <span class="form-item-tip">关闭后使用商品所在商户统一抽成比例，开启后当前商品独立设置抽成金额或比例</span>
+        </el-form-item>
+        <template v-if="formValidate.platform_commission_switch">
+          <el-form-item label="抽成类型：">
+            <el-radio-group v-model="formValidate.platform_commission_type">
+              <el-radio :label="0" class="radio">按比例抽成</el-radio>
+              <el-radio :label="1">按固定金额抽成</el-radio>
+            </el-radio-group>
+            <span class="form-item-tip">比例抽成：实际支付金额+豆豆积分抵扣金额总和的比例进行抽成，固定金额：指定抽成金额</span>
+          </el-form-item>
+          <el-form-item label="抽成比例：" v-if="formValidate.platform_commission_type != 1">
+            <el-input-number :step="0.01" :min="0" :max="100" v-model.number="formValidate.platform_commission_rate" placeholder="请输入抽成比例" />
+            <span class="form-item-tip">请输入0~100的抽成比例，单位：%</span>
+          </el-form-item>
+          <el-form-item label="抽成金额：" v-else>
+            <el-input-number :step="0.01" v-model="formValidate.platform_commission_money" placeholder="请输入抽成金额" />
+            <span class="form-item-tip">请输入抽成金额，单位：元</span>
+          </el-form-item>
+        </template>
+        <!-- 平台抽成独立设置 END -->
         <el-col :span="24">
           <el-form-item label="商品详情：">
             <ueditor-from v-model="formValidate.content" :content="formValidate.content" />
@@ -385,7 +411,11 @@ export default {
         store_name: '',
         rank: '',
         us_status: '',
-        star: ''
+        star: '',
+        platform_commission_switch: 0,
+        platform_commission_type: 0,
+        platform_commission_rate: 0.00,
+        platform_commission_money: 0.00,
       },
       productStatusList: [
         { label: "上架显示", value: 1 },
@@ -419,7 +449,11 @@ export default {
         hot_type: '',
         star: '',
         svip_price_type: '',
-        product_id: this.$route.query.id ? this.$route.query.id : ""
+        product_id: this.$route.query.id ? this.$route.query.id : "",
+        platform_commission_switch: 0,
+        platform_commission_type: 0,
+        platform_commission_rate: 0.00,
+        platform_commission_money: 0.00,
       },
       categoryList: [],
       merCateList: [],
@@ -561,7 +595,11 @@ export default {
           content: info.content,
           store_name: info.store_name,
           rank: info.rank,
-          star: info.star
+          star: info.star,
+          platform_commission_switch: info.platform_commission_switch || 0,
+          platform_commission_type: info.platform_commission_type || 0,
+          platform_commission_rate: info.platform_commission_rate || 0.00,
+          platform_commission_money: info.platform_commission_money || 0.00
         }
         if(info.is_benefit === 1) this.checkboxGroup.push('is_benefit')
         if(info.is_hot === 1) this.checkboxGroup.push('is_hot')
@@ -749,6 +787,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.form-item-tip{
+  display: block;
+  height: 20px;
+  line-height: 20px;
+  font-size: 13px;
+  color: #b5b5b5;
+}
 /deep/.el-select-dropdown__item{
   max-width: 350px!important;
 }