From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index 56e93c3..a00f74e 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -120,7 +120,7 @@
<select name="goodsLevel" class="goods-level">
<option value="1">会员套餐</option>
<option value="2">代理套餐</option>
- <option value="2">股东套餐</option>
+ <option value="3">股东套餐</option>
</select>
</div>
</div>
@@ -145,7 +145,7 @@
<div class="layui-form-item normal-set">
<label class="layui-form-label febs-form-item-require">分红比例(%)</label>
<div class="layui-input-block">
- <input type="text" name="normalPer" placeholder="请输入分红比例"
+ <input type="text" name="normalBonus" placeholder="请输入分红比例"
autoComplete="off" class="layui-input">
<div class="layui-form-mid layui-word-aux">普通商品分红，输入0则不分红。</div>
</div>
@@ -377,16 +377,16 @@
elem: '#febs-form-group-date'
});
+ var E = window.wangEditor;
formSelects.render();
form.verify({
integer: [
- /^[1-9]\d*$/
- , '只能输入正整数'
+ /^[0-9]\d*$/
+ , '只能大于0'
]
});
- var E = window.wangEditor;
const editorConfig = { MENU_CONF: {} };
editorConfig.MENU_CONF['uploadImage'] = {
server: '/admin/goods/uploadFileBase64',
@@ -700,6 +700,8 @@
"sortCnt": goodsInfo.sortCnt,
"scorePercent": goodsInfo.scorePercent,
"goodsLevel": goodsInfo.goodsLevel,
+ "normalPer": goodsInfo.normalPer,
+ "normalBonus": goodsInfo.normalBonus,
"thumbs": thumbs
});
--
Gitblit v1.9.1