From c14c817698079029bd2d7edca075d8f6ebb8b03f Mon Sep 17 00:00:00 2001
From: ztt <835303992@qq.com>
Date: Thu, 28 Mar 2024 08:53:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AD=89=E7=BA=A7=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/shopro/commission/Level.php    |  7 +++++++
 .../view/shopro/commission/level/add.html     |  8 ++++----
 .../view/shopro/commission/level/index.html   | 16 ++++++++--------
 .../js/backend/shopro/commission/level.js     | 19 +++++++++++++++++--
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/application/admin/controller/shopro/commission/Level.php b/application/admin/controller/shopro/commission/Level.php
index 07cad25..f780a73 100755
--- a/application/admin/controller/shopro/commission/Level.php
+++ b/application/admin/controller/shopro/commission/Level.php
@@ -78,6 +78,13 @@ class Level extends Common
 
         $params = $this->request->only(['level', 'name', 'image', 'commission_rules', 'upgrade_type', 'upgrade_rules', 'coupon_rules', 'total_consume']);
 
+//        dd($params);
+        if ($params['level'] != 1) {
+            if (empty($params['coupon_rules']['programme_1'])) $this->error('请选择方案一');
+            if (empty($params['coupon_rules']['programme_2'])) $this->error('请选择方案二');
+        }
+
+
         $result = Db::transaction(function () use ($id, $params) {
 
             $this->svalidate($params);
diff --git a/application/admin/view/shopro/commission/level/add.html b/application/admin/view/shopro/commission/level/add.html
index 23cb8d0..6888c74 100755
--- a/application/admin/view/shopro/commission/level/add.html
+++ b/application/admin/view/shopro/commission/level/add.html
@@ -95,12 +95,12 @@
                     <el-form-item label="消费门槛">
                         <el-input class="sa-w-360" v-model="form.model.total_consume" placeholder="请输入消费门槛"></el-input>
                     </el-form-item>
-                    <el-form-item label="方案一" prop="coupon_rules.programme_1" :rules="form.rules.commission_rules.programme_1">
+                    <el-form-item v-if="form.model.level > 1" label="方案一" prop="coupon_rules.programme_1" :rules="form.rules.coupon_rules.programme_1">
                         <el-button type="primary" link
                                    @click="onSelectCoupon1">选择商品券
                         </el-button>
                     </el-form-item>
-                    <el-form-item>
+                    <el-form-item v-if="form.model.level > 1">
                         <div class="sa-template-wrap">
                             <template v-if="form.model.coupon_rules.programme_1.length > 0">
                                 <div class="header sa-flex">
@@ -122,12 +122,12 @@
                     </el-form-item>
 
 
-                    <el-form-item label="方案二" prop="coupon_rules.programme_2" :rules="form.rules.commission_rules.programme_2">
+                    <el-form-item v-if="form.model.level > 1" label="方案二" prop="coupon_rules.programme_2" :rules="form.rules.coupon_rules.programme_2">
                         <el-button type="primary" link
                                    @click="onSelectCoupon2">选择商品券
                         </el-button>
                     </el-form-item>
-                    <el-form-item>
+                    <el-form-item v-if="form.model.level > 1">
                         <div class="sa-template-wrap">
                             <template v-if="form.model.coupon_rules.programme_2.length > 0">
                                 <div class="header sa-flex">
diff --git a/application/admin/view/shopro/commission/level/index.html b/application/admin/view/shopro/commission/level/index.html
index 9aa38b8..896670c 100755
--- a/application/admin/view/shopro/commission/level/index.html
+++ b/application/admin/view/shopro/commission/level/index.html
@@ -55,14 +55,14 @@
                         {if $auth->check('shopro/commission/level/edit')}
                         <el-button type="primary" link @click="onEdit(scope.row.level)">编辑</el-button>
                         {/if}
-                        <el-popconfirm v-if="scope.row.level != 1" width="fit-content" confirm-button-text="确认"
-                            cancel-button-text="取消" title="确认删除这条记录?" @confirm="onDelete(scope.row.level)">
-                            <template #reference>
-                                {if $auth->check('shopro/commission/level/delete')}
-                                <el-button type="danger" link>删除</el-button>
-                                {/if}
-                            </template>
-                        </el-popconfirm>
+<!--                        <el-popconfirm v-if="scope.row.level != 1" width="fit-content" confirm-button-text="确认"-->
+<!--                            cancel-button-text="取消" title="确认删除这条记录?" @confirm="onDelete(scope.row.level)">-->
+<!--                            <template #reference>-->
+<!--                                {if $auth->check('shopro/commission/level/delete')}-->
+<!--                                <el-button type="danger" link>删除</el-button>-->
+<!--                                {/if}-->
+<!--                            </template>-->
+<!--                        </el-popconfirm>-->
                     </template>
                 </el-table-column>
             </el-table>
diff --git a/public/assets/js/backend/shopro/commission/level.js b/public/assets/js/backend/shopro/commission/level.js
index 62fdb25..9de9db4 100755
--- a/public/assets/js/backend/shopro/commission/level.js
+++ b/public/assets/js/backend/shopro/commission/level.js
@@ -120,8 +120,23 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 level: [{ required: true, message: '请选择分销商等级', trigger: 'blur' }],
                             },
                             coupon_rules: [{
-                                programme_1:[{ required: true, message: '方案一', trigger: 'blur' }],
-                                programme_2:[{ required: true, message: '方案二', trigger: 'blur' }],
+                                programme_1:[{
+                                    validator: (rule, value, callback) => {
+                                        console.log(value)
+                                        if (isEmpty(value)) {
+                                            callback(new Error('请选择方案一'));
+                                        } else {
+                                            callback();
+                                        }
+                                    }, trigger: 'blur' }],
+                                programme_2:[{
+                                    validator: (rule, value, callback) => {
+                                        if (isEmpty(value)) {
+                                            callback(new Error('请选择方案二'));
+                                        } else {
+                                            callback();
+                                        }
+                                    }, trigger: 'blur' }],
                             }]
                         },
                     })