页面添加商品结算比例

app/common/repositories/system/merchant/MerchantCategoryRepository.php

@@ -83,7 +83,7 @@ class MerchantCategoryRepository extends BaseRepository
 
         $form = Elm::createForm($action, [
             Elm::input('category_name', '分类名称')->required(),
-            Elm::number('commission_rate', '手续费(%)', 0)->required()->max(100)->precision(2)
+            Elm::number('commission_rate', '平台结算比例(%)', 0)->required()->max(100)->precision(2)
         ]);
 
         return $form->formData($formData)->setTitle(is_null($id) ? '添加商户分类' : '编辑商户分类');

app/common/repositories/system/merchant/MerchantRepository.php

@@ -139,7 +139,7 @@ class MerchantRepository extends BaseRepository
             Elm::password('mer_password', '登录密码')->required()->disabled(!is_null($id))->required(!is_null($id)),
             Elm::input('real_name', '商户姓名'),
             Elm::input('mer_phone', '商户手机号')->col(12)->required(),
-            Elm::number('commission_rate', '手续费(%)')->col(12),
+            Elm::number('commission_rate', '平台结算(%)')->col(12),
             Elm::input('mer_keyword', '商户关键字')->col(12),
             Elm::input('mer_address', '商户地址'),
             Elm::input('sub_mchid', '微信分账商户号'),
@@ -147,7 +147,7 @@ class MerchantRepository extends BaseRepository
             Elm::number('sort', '排序', 0)->precision(0)->max(99999),
             $id ? Elm::hidden('status', 1) : Elm::switches('status', '是否开启', 1)->activeValue(1)->inactiveValue(0)->inactiveText('关')->activeText('开')->col(12),
 //            Elm::switches('is_bro_room', '直播间审核', $config['broadcast_room_type'] == 1 ? 0 : 1)->activeValue(1)->inactiveValue(0)->inactiveText('关')->activeText('开')->col(12),
-//            Elm::switches('is_audit', '产品审核', 1)->activeValue(1)->inactiveValue(0)->inactiveText('关')->activeText('开')->col(12),
+            Elm::switches('is_audit', '产品审核', 1)->activeValue(1)->inactiveValue(0)->inactiveText('关')->activeText('开')->col(12),
 //            Elm::switches('is_bro_goods', '直播间商品审核', $config['broadcast_goods_type'] == 1 ? 0 : 1)->activeValue(1)->inactiveValue(0)->inactiveText('关')->activeText('开')->col(12),
             Elm::switches('is_best', '是否推荐')->activeValue(1)->inactiveValue(0)->inactiveText('关')->activeText('开')->col(12),
             Elm::switches('is_trader', '是否自营')->activeValue(1)->inactiveValue(0)->inactiveText('关')->activeText('开')->col(12),

app/controller/admin/store/StoreProduct.php

@@ -158,7 +158,7 @@ class StoreProduct extends BaseController
      */
     public function checkParams(validate $validate)
     {
-        $data = $this->request->params(['is_hot','is_best','is_benefit','is_new','store_name','content','rank','star', 'base', 'cash_rate']);
+        $data = $this->request->params(['is_hot','is_best','is_benefit','is_new','store_name','content','rank','star', 'base', 'cash_rate', 'commission_rate']);
         $validate->check($data);
         return $data;
     }

app/validate/merchant/StoreProductAdminValidate.php

@@ -27,5 +27,6 @@ class StoreProductAdminValidate extends Validate
         "refusal|拒绝理由" => "requireIf:status,-1",
         "base|奖励基数" => "number|between:0,999999",
         "cash_rate|现金支付比例" => "number|between:1,100",
+        "commission_rate|平台比例" => "number|between:0,100",
     ];
 }

view/admin/src/views/merchant/classify/index.vue

@@ -23,7 +23,7 @@
         />
         <el-table-column
           prop="commission_rate"
-          label="手续费"
+          label="平台结算比例（%）"
           min-width="130"
         />
         <el-table-column

view/admin/src/views/product/productExamine/index.vue

@@ -199,6 +199,9 @@
         <el-form-item label="现金支付比例(%)：" prop="cash_rate">
           <el-input v-model="formValidate.cash_rate" placeholder="现金支付比例" />
         </el-form-item>
+        <el-form-item label="平台结算比例(%)：" prop="commission_rate">
+          <el-input v-model="formValidate.commission_rate" placeholder="平台结算比例" />
+        </el-form-item>
         <el-form-item label="排序：">
           <el-input-number v-model="formValidate.rank" placeholder="请输入排序序号" style="width: 200px;" />
         </el-form-item>
@@ -366,6 +369,7 @@ export default {
         star: '',
         base: '',
         cash_rate: '',
+        commission_rate: '',
       },
       productStatusList: [
         { label: "上架显示", value: 1 },
@@ -526,6 +530,7 @@ export default {
           star: info.star,
           base: info.base,
           cash_rate: info.cash_rate,
+          commission_rate: info.commission_rate,
         }
         if(info.is_benefit === 1) this.checkboxGroup.push('is_benefit')
         if(info.is_hot === 1) this.checkboxGroup.push('is_hot')