From: Xia Kaixiang <kaixiang.xia@supwisdom.com>
Date: Tue, 21 May 2019 05:32:07 +0000 (+0800)
Subject: 图标区分商户组
X-Git-Tag: 1.0.0^2~212
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=dcdf86738a9489dd87656f1ef36267c6b0fe342c;p=epayment%2Ffood_payapi.git

图标区分商户组
---

diff --git a/src/main/java/com/supwisdom/dlpay/system/bean/ZTreeNode.java b/src/main/java/com/supwisdom/dlpay/system/bean/ZTreeNode.java
index 5ad5fd31..cd18d0a3 100644
--- a/src/main/java/com/supwisdom/dlpay/system/bean/ZTreeNode.java
+++ b/src/main/java/com/supwisdom/dlpay/system/bean/ZTreeNode.java
@@ -9,6 +9,7 @@ public class ZTreeNode {
     private boolean open;
 
     private Integer shoptype; //商户类别，商户树用到
+    private String iconSkin; //自定义图标
 
     public boolean isOpen() {
         return open;
@@ -57,4 +58,12 @@ public class ZTreeNode {
     public void setShoptype(Integer shoptype) {
         this.shoptype = shoptype;
     }
+
+    public String getIconSkin() {
+        return iconSkin;
+    }
+
+    public void setIconSkin(String iconSkin) {
+        this.iconSkin = iconSkin;
+    }
 }
diff --git a/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java b/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java
index a06e3346..c8d3fe25 100644
--- a/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java
@@ -46,6 +46,7 @@ public class ShopDataServiceImpl implements ShopDataService {
         node.setChecked(false);
         node.setOpen(true);
         node.setShoptype(shop.getShoptype());
+        node.setIconSkin(shop.getShoptype()==0?"pIcon01":"pIcon02");
         result.add(node);
       }
     }
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_close.png b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_close.png
new file mode 100755
index 00000000..68ccb3c3
Binary files /dev/null and b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_close.png differ
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_open.png b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_open.png
new file mode 100755
index 00000000..d6ff36d3
Binary files /dev/null and b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/1_open.png differ
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/2.png b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/2.png
new file mode 100755
index 00000000..9eff506b
Binary files /dev/null and b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/2.png differ
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/3.png b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/3.png
new file mode 100755
index 00000000..d7ba6d0c
Binary files /dev/null and b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/3.png differ
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/4.png b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/4.png
new file mode 100755
index 00000000..753e2bfd
Binary files /dev/null and b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/4.png differ
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/5.png b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/5.png
new file mode 100755
index 00000000..0c5eccd5
Binary files /dev/null and b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/5.png differ
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/6.png b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/6.png
new file mode 100755
index 00000000..070b8352
Binary files /dev/null and b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/6.png differ
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/7.png b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/7.png
new file mode 100755
index 00000000..532b037f
Binary files /dev/null and b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/7.png differ
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/8.png b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/8.png
new file mode 100755
index 00000000..a8f3a86e
Binary files /dev/null and b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/8.png differ
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/9.png b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/9.png
new file mode 100755
index 00000000..4db73cd4
Binary files /dev/null and b/src/main/resources/static/libs/zTree/css/zTreeStyle/img/diy/9.png differ
diff --git a/src/main/resources/static/libs/zTree/css/zTreeStyle/zTreeStyle.css b/src/main/resources/static/libs/zTree/css/zTreeStyle/zTreeStyle.css
index a9e1b52f..77c27946 100755
--- a/src/main/resources/static/libs/zTree/css/zTreeStyle/zTreeStyle.css
+++ b/src/main/resources/static/libs/zTree/css/zTreeStyle/zTreeStyle.css
@@ -77,6 +77,9 @@ website:	http://code.google.com/p/jquerytree/
 .ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle}
 .ztree li span.button.add {margin-right:2px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
 
+.ztree li span.button.pIcon01_ico_open, .ztree li span.button.pIcon01_ico_close, .ztree li span.button.pIcon01_ico_docu{margin-right:2px; background: url(./img/diy/1_open.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon02_ico_open, .ztree li span.button.pIcon02_ico_close, .ztree li span.button.pIcon02_ico_docu{margin-right:2px; background: url(./img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+
 
 .ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
 
diff --git a/src/main/resources/templates/system/shop/index.html b/src/main/resources/templates/system/shop/index.html
index 558ab568..b056909f 100644
--- a/src/main/resources/templates/system/shop/index.html
+++ b/src/main/resources/templates/system/shop/index.html
@@ -54,7 +54,7 @@
                                 </div>
                             </div>
                             <div class="layui-form-item">
-                                <label class="layui-form-label">商户类型</label>
+                                <label class="layui-form-label" style="color: red;">商户类型</label>
                                 <div class="layui-input-inline">
                                     <select name="shoptype" id="shoptype" lay-filter="shoptype-filter" lay-verify="required">
                                         <option value="0">商户组</option>
@@ -169,7 +169,7 @@
                 view: {
                     dblClickExpand: false,
                     showLine: true,
-                    showIcon: false,
+                    showIcon: true,
                     selectedMulti: false,
                     addHoverDom: addHoverDom,
                     removeHoverDom: removeHoverDom
@@ -274,12 +274,18 @@
                             zTree.updateNode(treeNode); //修改节点
                         } else {
                             var ftreeNode = zTree.getNodeByParam("id", '' + result.shop.fshopid, null);
-                            zTree.addNodes(ftreeNode, {
+                            var newNode = {
                                 id: '' + result.shop.shopid,
                                 pId: '' + result.shop.fshopid,
                                 name: '' + result.shop.shopid + '_' + result.shop.shopname,
                                 shoptype: result.shop.shoptype
-                            }); //新加树节点
+                            }
+                            if (result.shop.shoptype == 1) {
+                                newNode["iconSkin"] = "pIcon02";
+                            } else {
+                                newNode["iconSkin"] = "pIcon01";
+                            }
+                            zTree.addNodes(ftreeNode, newNode); //新加树节点
                         }
                         layer.msg(result.msg, {icon: 1});
                         $("#shop-info").hide();
@@ -313,7 +319,7 @@
                         "shopid":"0",
                         "shopname": "",
                         "fshopid":treeNode.id,
-                        "shoptype":"0",
+                        "shoptype":"1",
                         "zipcode":"",
                         "addr":"",
                         "contactman":"",