From d26736697059b67b84f3a5acc14099cb33afa1e0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 26 Sep 2021 19:00:44 +0800
Subject: [PATCH] 20210926

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java |    2 
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java         |   14 ++
 src/main/resources/templates/febs/views/modules/product/categoryAdd.html          |   55 +++++++-
 src/main/resources/templates/febs/views/modules/product/categoryUpdate.html       |   69 +++++++++--
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java         |   13 ++
 src/main/resources/templates/febs/views/modules/order/refundList.html             |   10 +
 src/main/resources/templates/febs/views/modules/product/categoryList.html         |   26 ----
 src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCategoryVo.java                |    2 
 src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java             |    2 
 src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java                |    2 
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsCategoryController.java |    2 
 src/main/resources/templates/febs/views/modules/order/refundPayInfo.html          |  117 +++++++++++++++++++
 src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberRefundPayInfoVo.java          |   40 ++++++
 13 files changed, 304 insertions(+), 50 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsCategoryController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsCategoryController.java
index fe7a54e..1ea688b 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsCategoryController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsCategoryController.java
@@ -54,7 +54,7 @@
     @RequiresPermissions("categoryUpdate:update")
     public String detail(@PathVariable long id, Model model) {
         AdminMallGoodsCategoryVo data = mallGoodsCategoryService.getMallGoodsCategoryInfoById(id);
-        model.addAttribute("member", data);
+        model.addAttribute("goodsCategoryVo", data);
         return FebsUtil.view("modules/product/categoryUpdate");
     }
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
index f631e57..635b5e5 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -181,4 +181,18 @@
         return FebsUtil.view("modules/order/refundOrderDetail");
     }
 
+    /**
+     * 退款记录-收款方式
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("refundPayInfo/{id}")
+    @RequiresPermissions("refundPayInfo:update")
+    public String refundPayInfo(@PathVariable long id, Model model) {
+        AdminMallMemberPaymentVo data = adminMallOrderService.getMallMemberRefundPayInfoByFlowId(id);
+        model.addAttribute("refundPayInfo", data);
+        return FebsUtil.view("modules/order/refundPayInfo");
+    }
+
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
index a8aac95..1214367 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
@@ -54,4 +54,6 @@
     FebsResponse payMethodEdit(PayMethodEditDto payMethodEditDto);
 
     FebsResponse cancelOrder(Long id);
+
+    AdminMallMemberPaymentVo getMallMemberRefundPayInfoByFlowId(long id);
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
index 0ebe802..4a57128 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
@@ -51,6 +51,7 @@
 
         MallGoodsCategory goodsCategory = new MallGoodsCategory();
         goodsCategory.setName(name);
+        goodsCategory.setImage(mallGoodsCategory.getImage());
         if(ObjectUtil.isNotEmpty(mallGoodsCategory.getParentId())){
             Long parentId = mallGoodsCategory.getParentId();
             MallGoodsCategory mallGoodsCategoryParent = mallGoodsCategoryMapper.selectById(parentId);
@@ -101,6 +102,7 @@
         Long id = mallGoodsCategoryParam.getId();
         MallGoodsCategory mallGoodsCategory = mallGoodsCategoryMapper.selectById(id);
         mallGoodsCategory.setName(mallGoodsCategoryParam.getName());
+        mallGoodsCategory.setImage(mallGoodsCategoryParam.getImage());
         if(ObjectUtil.isNotEmpty(mallGoodsCategoryParam.getParentId())){
             Long parentId = mallGoodsCategoryParam.getParentId();
             MallGoodsCategory mallGoodsCategoryParent = mallGoodsCategoryMapper.selectById(parentId);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index c184959..7919c46 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -41,6 +41,8 @@
 
     private final IApiMallMemberWalletService iApiMallMemberWalletService;
 
+    private final MallMemberPaymentMapper mallMemberPaymentMapper;
+
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
 
     @Override
@@ -344,5 +346,16 @@
         return new FebsResponse().success();
     }
 
+    @Override
+    public AdminMallMemberPaymentVo getMallMemberRefundPayInfoByFlowId(long id) {
+        AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
+        MallOrderRefund mallOrderRefund = mallOrderRefundMapper.selectById(id);
+        AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallOrderRefund.getMemberId());
+        if(ObjectUtil.isNotEmpty(adminMallMemberPaymentVoa)){
+            adminMallMemberPaymentVo = adminMallMemberPaymentVoa;
+        }
+        return adminMallMemberPaymentVo;
+    }
+
 
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCategoryVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCategoryVo.java
index de093f8..da9a471 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCategoryVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCategoryVo.java
@@ -13,6 +13,8 @@
 
     private Long parentId;
 
+    private String image;
+
     private Integer isRecommend;
 
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
index 803ba01..5645bdf 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
@@ -4,7 +4,7 @@
 import lombok.Data;
 
 @Data
-@ApiModel(value = "AdminMallMemberPaymentVo", description = "商城商品列表")
+@ApiModel(value = "AdminMallMemberPaymentVo", description = "")
 public class AdminMallMemberPaymentVo {
 
     private Long id;
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberRefundPayInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberRefundPayInfoVo.java
new file mode 100644
index 0000000..7a55eef
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberRefundPayInfoVo.java
@@ -0,0 +1,40 @@
+package cc.mrbird.febs.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AdminMallMemberRefundPayInfoVo", description = "")
+public class AdminMallMemberRefundPayInfoVo {
+
+    private Long id;
+
+    private Long memberId;
+
+    private String wxQrcode;
+
+    private String wxName;
+
+    private String wxAccount;
+
+    private String aliQrcode;
+
+    private String aliName;
+
+    private String aliAccount;
+
+    /**
+     * 持卡人姓名
+     */
+    private String bankName;
+
+    /**
+     * 银行卡号
+     */
+    private String bankNo;
+
+    /**
+     * 开户行
+     */
+    private String bank;
+}
diff --git a/src/main/resources/templates/febs/views/modules/order/refundList.html b/src/main/resources/templates/febs/views/modules/order/refundList.html
index 1692e17..9015dbf 100644
--- a/src/main/resources/templates/febs/views/modules/order/refundList.html
+++ b/src/main/resources/templates/febs/views/modules/order/refundList.html
@@ -121,6 +121,11 @@
                     refundConfirm(data.id);
                 });
             }
+            if (layEvent === 'paymentInfo') {
+                febs.modal.open( '收款信息', 'modules/order/refundPayInfo/' + data.id, {
+                    maxmin: true,
+                });
+            }
         });
 
         function agreeRefund(id) {
@@ -224,24 +229,29 @@
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
                             }else if(d.type === 2){
                                 return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agreeWithAddress" shiro:hasPermission="user:update">同意</button>'
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
                             }else{
                                 return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">同意</button>'
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
                             }
                         }else if(d.status === 4){
                             return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
                                 +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundConfirm" shiro:hasPermission="user:update">退款确认</button>'
                                 +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+                                +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
                         }else{
                             return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
                                 +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+                                +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
                         }
 
                         },minWidth: 300,align:'center'}
diff --git a/src/main/resources/templates/febs/views/modules/order/refundPayInfo.html b/src/main/resources/templates/febs/views/modules/order/refundPayInfo.html
new file mode 100644
index 0000000..2c5f8c1
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/order/refundPayInfo.html
@@ -0,0 +1,117 @@
+<style>
+    #user-refundPayInfo-info {
+        padding: 20px 25px 25px 0;
+    }
+
+    #user-refundPayInfo-info .layui-treeSelect .ztree li a, .ztree li span {
+        margin: 0 0 2px 3px !important;
+    }
+    #user-refundPayInfo-info #data-permission-tree-block {
+        border: 1px solid #eee;
+        border-radius: 2px;
+        padding: 3px 0;
+    }
+    #user-refundPayInfo-info .layui-treeSelect .ztree li span.button.switch {
+        top: 1px;
+        left: 3px;
+    }
+
+</style>
+<div class="layui-fluid" id="user-refundPayInfo-info">
+    <form class="layui-form" action="" lay-filter="user-refundPayInfo-info-form">
+        <div class="layui-row layui-col-space10 layui-form-item">
+            <div class="layui-col-lg6">
+                <label class="layui-form-label">微信姓名：</label>
+                <div class="layui-input-block">
+                    <input type="text" name="wxName" class="layui-input" readonly>
+                </div>
+            </div>
+            <div class="layui-col-lg6">
+                <label class="layui-form-label">微信账号：</label>
+                <div class="layui-input-block">
+                    <input type="text" name="wxAccount" class="layui-input" readonly>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">微信收款码：</label>
+            <div class="layui-input-block">
+                <img alt="微信收款码" data-th-src="${refundPayInfo.wxQrcode}"  style="width: 200px">
+            </div>
+        </div>
+        <div class="layui-row layui-col-space10 layui-form-item">
+            <div class="layui-col-lg6">
+                <label class="layui-form-label">支付宝姓名：</label>
+                <div class="layui-input-block">
+                    <input type="text" name="aliName" class="layui-input" readonly>
+                </div>
+            </div>
+            <div class="layui-col-lg6">
+                <label class="layui-form-label">支付宝账号：</label>
+                <div class="layui-input-block">
+                    <input type="text" name="aliAccount" class="layui-input" readonly>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">支付宝收款码：</label>
+            <div class="layui-input-block">
+                <img alt="支付宝收款码" data-th-src="${refundPayInfo.aliQrcode}"  style="width: 200px">
+            </div>
+        </div>
+        <div class="layui-row layui-col-space10 layui-form-item">
+            <div class="layui-col-lg6">
+                <label class="layui-form-label">持卡人姓名：</label>
+                <div class="layui-input-block">
+                    <input type="text" name="bankName" class="layui-input" readonly>
+                </div>
+            </div>
+            <div class="layui-col-lg6">
+                <label class="layui-form-label">开户行：</label>
+                <div class="layui-input-block">
+                    <input type="text" name="bank" class="layui-input" readonly>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">银行卡号：</label>
+            <div class="layui-input-block">
+                <input type="text" name="bankNo" class="layui-input" readonly>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script data-th-inline="javascript">
+    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree'], function () {
+        var $ = layui.$,
+            febs = layui.febs,
+            layer = layui.layer,
+            formSelects = layui.formSelects,
+            treeSelect = layui.treeSelect,
+            form = layui.form,
+            eleTree = layui.eleTree,
+            refundPayInfo = [[${refundPayInfo}]],
+            $view = $('#user-refundPayInfo-info'),
+            validate = layui.validate,
+            _deptTree;
+
+        form.render();
+
+        initUserValue();
+
+        function initUserValue() {
+            form.val("user-refundPayInfo-info-form", {
+                "wxName": refundPayInfo.wxName,
+                "wxAccount": refundPayInfo.wxAccount,
+                "wxQrcode": refundPayInfo.wxQrcode,
+                "aliName": refundPayInfo.aliName,
+                "aliAccount": refundPayInfo.aliAccount,
+                "aliQrcode": refundPayInfo.aliQrcode,
+                "bankName": refundPayInfo.bankName,
+                "bankNo": refundPayInfo.bankNo,
+                "bank": refundPayInfo.bank
+            });
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/product/categoryAdd.html b/src/main/resources/templates/febs/views/modules/product/categoryAdd.html
index e1b4237..6803957 100644
--- a/src/main/resources/templates/febs/views/modules/product/categoryAdd.html
+++ b/src/main/resources/templates/febs/views/modules/product/categoryAdd.html
@@ -1,29 +1,32 @@
 <style>
-    #user-add {
+    #categary-add {
         padding: 20px 25px 25px 0;
     }
 
-    #user-add .layui-treeSelect .ztree li a, .ztree li span {
+    #categary-add .layui-treeSelect .ztree li a, .ztree li span {
         margin: 0 0 2px 3px !important;
     }
-    #user-add #data-permission-tree-block {
+    #categary-add #data-permission-tree-block {
         border: 1px solid #eee;
         border-radius: 2px;
         padding: 3px 0;
     }
-    #user-add .layui-treeSelect .ztree li span.button.switch {
+    #categary-add .layui-treeSelect .ztree li span.button.switch {
         top: 1px;
         left: 3px;
     }
+    #categary-add img{
+        max-width:100px
+    }
 
 </style>
-<div class="layui-fluid" id="user-add">
-    <form class="layui-form" action="" lay-filter="user-add-form">
+<div class="layui-fluid" id="categary-add">
+    <form class="layui-form" action="" lay-filter="categary-add-form">
         <div class="layui-form-item">
             <label class="layui-form-label febs-form-item-require">名称：</label>
             <div class="layui-input-block">
                 <input type="text" name="name"
-                       lay-verify="name" autocomplete="off" class="layui-input" >
+                       lay-verify="required" autocomplete="off" class="layui-input" >
             </div>
         </div>
 
@@ -34,6 +37,23 @@
                         <option value="">请选择</option>
                     </select>
                 </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label febs-form-item-require">图片：</label>
+            <div class="layui-upload">
+                <button type="button" class="layui-btn" id="test1">上传图片</button>
+                <div class="layui-input-block">
+                    <div class="layui-upload-list">
+                        <img class="layui-upload-img" id="imageUrls" width="100%" >
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label ">图片链接：</label>
+            <div class="layui-input-block">
+                <input type="text" id="imageUrl" lay-verify="required" name="image" class="layui-input" readonly>
+            </div>
         </div>
 <!--        <div class="layui-form-item">-->
 <!--            <label class="layui-form-label ">父类：</label>-->
@@ -59,7 +79,7 @@
 </div>
 
 <script data-th-inline="javascript">
-    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'laydate'], function () {
+    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'laydate','upload'], function () {
         var $ = layui.$,
             febs = layui.febs,
             layer = layui.layer,
@@ -69,7 +89,8 @@
             laydate = layui.laydate,
             eleTree = layui.eleTree,
             member = [[${member}]],
-            $view = $('#user-add'),
+            $view = $('#categary-add'),
+            upload = layui.upload,
             validate = layui.validate;
 
         form.render();
@@ -79,6 +100,22 @@
 
         formSelects.render();
 
+        //普通图片上传
+        var uploadInst = upload.render({
+            elem: '#test1'
+            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+            ,before: function(obj){
+                //预读本地文件示例，不支持ie8
+                obj.preview(function(index, file, result){
+                    $('#imageUrls').attr('src', result); //图片链接（base64）
+                });
+            }
+            ,done: function(res){
+                febs.alert.success(res.data.src);
+                $("#imageUrl").val(res.data.src);
+            }
+        });
+
         //(下拉框)
         $.get(ctx + 'admin/goodsCategory/categorys/tree', function (data) {
             for (var k in data)
diff --git a/src/main/resources/templates/febs/views/modules/product/categoryList.html b/src/main/resources/templates/febs/views/modules/product/categoryList.html
index 7337114..82e37f1 100644
--- a/src/main/resources/templates/febs/views/modules/product/categoryList.html
+++ b/src/main/resources/templates/febs/views/modules/product/categoryList.html
@@ -66,22 +66,12 @@
         table.on('tool(userTable)', function (obj) {
             var data = obj.data,
                 layEvent = obj.event;
-            if (layEvent === 'close') {
-                febs.modal.confirm('禁用', '确认禁用该账号？', function () {
-                    closeAccount(data.id);
-                });
-            }
-            if (layEvent === 'open') {
-                febs.modal.confirm('开启', '确认开启该账号？', function () {
-                    openAccount(data.id);
-                });
-            }
 
             if (layEvent === 'see') {
                 febs.modal.open('编辑', 'modules/product/categoryUpdate/' + data.id, {
                     btn: ['提交', '取消'],
                     yes: function (index, layero) {
-                        $('#user-add').find('#submit').trigger('click');
+                        $('#categary-update').find('#submit').trigger('click');
                     },
                     btn2: function () {
                         layer.closeAll();
@@ -89,18 +79,6 @@
                 });
             }
         });
-        function closeAccount(id) {
-            febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
-                febs.alert.success('禁用成功');
-                $query.click();
-            });
-        }
-        function openAccount(id) {
-            febs.get(ctx + 'admin/mallMember/openAccount/' + id, null, function () {
-                febs.alert.success('开启成功');
-                $query.click();
-            });
-        }
 
 
         // 查询按钮
@@ -120,7 +98,7 @@
             febs.modal.open('新增', 'modules/product/categoryAdd/', {
                 btn: ['提交', '取消'],
                 yes: function (index, layero) {
-                    $('#user-add').find('#submit').trigger('click');
+                    $('#categary-add').find('#submit').trigger('click');
                 },
                 btn2: function () {
                     layer.closeAll();
diff --git a/src/main/resources/templates/febs/views/modules/product/categoryUpdate.html b/src/main/resources/templates/febs/views/modules/product/categoryUpdate.html
index cd8573b..477c14d 100644
--- a/src/main/resources/templates/febs/views/modules/product/categoryUpdate.html
+++ b/src/main/resources/templates/febs/views/modules/product/categoryUpdate.html
@@ -1,28 +1,31 @@
 <style>
-    #user-add {
+    #categary-update {
         padding: 20px 25px 25px 0;
     }
 
-    #user-add .layui-treeSelect .ztree li a, .ztree li span {
+    #categary-update .layui-treeSelect .ztree li a, .ztree li span {
         margin: 0 0 2px 3px !important;
     }
-    #user-add #data-permission-tree-block {
+    #categary-update #data-permission-tree-block {
         border: 1px solid #eee;
         border-radius: 2px;
         padding: 3px 0;
     }
-    #user-add .layui-treeSelect .ztree li span.button.switch {
+    #categary-update .layui-treeSelect .ztree li span.button.switch {
         top: 1px;
         left: 3px;
     }
+    #categary-update img{
+        max-width:100px
+    }
 
 </style>
-<div class="layui-fluid" id="user-add">
+<div class="layui-fluid" id="categary-update">
     <form class="layui-form" action="" lay-filter="categary-update-form">
         <div class="layui-form-item febs-hide">
             <label class="layui-form-label febs-form-item-require">用户id：</label>
             <div class="layui-input-block">
-                <input type="text" name="id" data-th-value="${member.id}">
+                <input type="text" name="id" data-th-value="${goodsCategoryVo.id}">
             </div>
         </div>
         <div class="layui-form-item">
@@ -39,6 +42,23 @@
                 <select name="parentId" class="categary-update-category" id="categarySelect">
                     <option value="">请选择</option>
                 </select>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">图片：</label>
+            <div class="layui-upload">
+                <button type="button" class="layui-btn" id="test1">上传图片</button>
+                <div class="layui-input-block">
+                    <div class="layui-upload-list">
+                        <img class="layui-upload-img" id="imageUrls" width="100%" >
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">图片链接：</label>
+            <div class="layui-input-block">
+                <input type="text" id="imageUrl" name="image" class="layui-input" readonly>
             </div>
         </div>
 <!--        <div class="layui-form-item">-->
@@ -65,7 +85,7 @@
 </div>
 
 <script data-th-inline="javascript">
-    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'laydate'], function () {
+    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'laydate','upload'], function () {
         var $ = layui.$,
             febs = layui.febs,
             layer = layui.layer,
@@ -74,8 +94,9 @@
             form = layui.form,
             laydate = layui.laydate,
             eleTree = layui.eleTree,
-            member = [[${member}]],
-            $view = $('#user-add'),
+            goodsCategoryVo = [[${goodsCategoryVo}]],
+            $view = $('#categary-update'),
+            upload = layui.upload,
             validate = layui.validate;
 
         form.render();
@@ -85,6 +106,22 @@
 
         formSelects.render();
 
+        //普通图片上传
+        var uploadInst = upload.render({
+            elem: '#test1'
+            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+            ,before: function(obj){
+                //预读本地文件示例，不支持ie8
+                obj.preview(function(index, file, result){
+                    $('#imageUrls').attr('src', result); //图片链接（base64）
+                });
+            }
+            ,done: function(res){
+                febs.alert.success(res.data.src);
+                $("#imageUrl").val(res.data.src);
+            }
+        });
+
         //(下拉框)
         $.get(ctx + 'admin/goodsCategory/categorys/tree', function (data) {
             for (var k in data)
@@ -93,7 +130,7 @@
             }
             layui.use('form', function () {
                 var form = layui.form;
-                $("#categarySelect").val(member.parentId)
+                $("#categarySelect").val(goodsCategoryVo.parentId)
                 form.render();
             });
         });
@@ -115,7 +152,7 @@
         //         return result;
         //     },
         //     success: function () {
-        //         formSelects.value('user-update-category', member.parentId);
+        //         formSelects.value('user-update-category', goodsCategoryVo.parentId);
         //     },
         //     error: function (id, url, searchVal, err) {
         //         console.error(err);
@@ -125,11 +162,13 @@
         initUserValue();
 
         function initUserValue() {
+            $('#imageUrls').attr('src', goodsCategoryVo.image);
             form.val("categary-update-form", {
-                "id": member.id,
-                "name": member.name,
-                "parentId": member.parentId,
-                "isRecommend": member.isRecommend
+                "id": goodsCategoryVo.id,
+                "name": goodsCategoryVo.name,
+                "parentId": goodsCategoryVo.parentId,
+                "image": goodsCategoryVo.image,
+                "isRecommend": goodsCategoryVo.isRecommend
             });
         }
 

--
Gitblit v1.9.1