From dbf7fa3dc19e0093755f111a048a5eb4acef2eb0 Mon Sep 17 00:00:00 2001
From: retire <wyf372310383@163.com>
Date: Sat, 12 Oct 2019 23:28:42 +0800
Subject: [PATCH 1/2] jpress3

---
 .../src/main/webapp/WEB-INF/views/admin/user/mgroup.html    | 2 +-
 .../main/webapp/WEB-INF/views/admin/user/mgroup_edit.html   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/user/mgroup.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/user/mgroup.html
index 0d763ea16..88b23cd1b 100755
--- a/jpress-web/src/main/webapp/WEB-INF/views/admin/user/mgroup.html
+++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/user/mgroup.html
@@ -75,7 +75,7 @@
                                         </div>
                                     </div>
                                 </td>
-                                <td>#(group.description ??)</td>
+                                <td>#(group.summary ??)</td>
                             </tr>
                             #end
                             </tbody>
diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/user/mgroup_edit.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/user/mgroup_edit.html
index 9d8b4f07e..f54ca0311 100755
--- a/jpress-web/src/main/webapp/WEB-INF/views/admin/user/mgroup_edit.html
+++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/user/mgroup_edit.html
@@ -55,7 +55,7 @@ initEditor('contenteditor', 300);
                                 <label class="col-sm-2 control-label">描述</label>
                                 <div class="col-sm-8">
                                     <textarea rows="5" name="group.content" class="form-control" id="contenteditor"
-                                              placeholder="会员描述，包括会员的权益、福利等">#(group.content ??)</textarea>
+                                              placeholder="会员描述，包括会员的权益、福利等">#CKEditorContent(group.content ??)</textarea>
                                 </div>
                             </div>
 
@@ -138,7 +138,7 @@ initEditor('contenteditor', 300);
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">分销的分成</label>
                                 <div class="col-sm-6">
-                                    <input type="input" name="group.dist_price" class="form-control" value="#(group.dist_price ??)"
+                                    <input class="form-control" name="group.dist_amount" type="input" value="#(group.dist_amount ??)"
                                            placeholder="">
                                     <p class="help-block">单位：元。用户参与分销后，该推广用户所获得的金额。 </p>
                                 </div>
@@ -168,7 +168,7 @@ initEditor('contenteditor', 300);
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">状态</label>
                                 <div class="col-sm-6">
-                                    <select class="form-control" name="categoryId">
+                                    <select class="form-control" name="status">
                                         <option value="1">
                                             启用
                                         </option>
-- 
Gitee


From 7ce35d3b81b567ca1dceb59f68ad9202ae0d7392 Mon Sep 17 00:00:00 2001
From: retire <wyf372310383@163.com>
Date: Sat, 12 Oct 2019 23:39:26 +0800
Subject: [PATCH 2/2] jpress3

---
 .../io/jpress/module/product/directive/ProductDirective.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module-product/module-product-web/src/main/java/io/jpress/module/product/directive/ProductDirective.java b/module-product/module-product-web/src/main/java/io/jpress/module/product/directive/ProductDirective.java
index a0d7ceba8..9f63afd54 100644
--- a/module-product/module-product-web/src/main/java/io/jpress/module/product/directive/ProductDirective.java
+++ b/module-product/module-product-web/src/main/java/io/jpress/module/product/directive/ProductDirective.java
@@ -40,7 +40,7 @@ public class ProductDirective extends JbootDirectiveBase {
     @Override
     public void onRender(Env env, Scope scope, Writer writer) {
         String idOrSlug = getPara(0, scope);
-        Product article = getArticle(idOrSlug);
+        Product article = getProduct(idOrSlug);
 
         if (article == null) {
             return;
@@ -50,7 +50,7 @@ public class ProductDirective extends JbootDirectiveBase {
         renderBody(env, scope, writer);
     }
 
-    private Product getArticle(String idOrSlug) {
+    private Product getProduct(String idOrSlug) {
         return StrUtil.isNumeric(idOrSlug)
                 ? service.findById(idOrSlug)
                 : service.findFirstBySlug(idOrSlug);
-- 
Gitee