20200623 代码提交

xiaoyong931011

2020-06-23 8c7c2cadd5ec68b66b9a0c6afc0434c4513c1135

20200623   代码提交

 src/main/java/com/xcong/excoin/modules/systemSetting/controller/SystemSettingController.java

@@ -17,6 +17,7 @@
import com.xcong.excoin.common.entity.FebsResponse;

import com.xcong.excoin.common.entity.QueryRequest;

import com.xcong.excoin.modules.systemSetting.entity.PlatformBannerEntity;

import com.xcong.excoin.modules.systemSetting.entity.PlatformNoticeEntity;

import com.xcong.excoin.modules.systemSetting.entity.PlatformSymbolsSkuEntity;

import com.xcong.excoin.modules.systemSetting.entity.PlatformTradeSettingEntity;

import com.xcong.excoin.modules.systemSetting.service.SystemSettingService;

@@ -101,10 +102,49 @@
    /**

     * 轮播图---新增

     */

    @GetMapping("platformBannerAdd")

    @PostMapping("platformBannerAdds")

    @ControllerEndpoint(operation = "轮播图---新增", exceptionMessage = "新增失败")

    public FebsResponse platformBannerAdd() {

        systemSettingService.platformBannerAdd();

    public FebsResponse platformBannerAdds(@Valid PlatformBannerEntity platformBannerEntity) {

        systemSettingService.platformBannerAdd(platformBannerEntity);

        return new FebsResponse().success();

    }

    
    /**

     * 公告管理---列表

     */

    @GetMapping("noticeManage")

    public FebsResponse noticeManage(PlatformNoticeEntity platformNoticeEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(systemSettingService.findNoticeManageInPage(platformNoticeEntity, request));

        return new FebsResponse().success().data(data);

    }

    
    /**

     * 公告管理---确认

     * @return

     */

    @PostMapping("noticeManageConfirm")

    @ControllerEndpoint(operation = "公告管理---确认", exceptionMessage = "设置失败")

    public FebsResponse noticeManageConfirm(@Valid PlatformNoticeEntity platformNoticeEntity) {

        return systemSettingService.noticeManageConfirm(platformNoticeEntity);

    }

    
    /**

     * 公告管理---删除

     * @return

     */

    @GetMapping("noticeManageDelete/{id}")

    @ControllerEndpoint(operation = "公告管理---删除", exceptionMessage = "删除失败")

    public FebsResponse noticeManageDelete(@NotNull(message = "{required}") @PathVariable Long id) {

        return systemSettingService.noticeManageDelete(id);

    }

    
    /**

     * 公告管理---新增

     */

    @PostMapping("noticeManageAdds")

    @ControllerEndpoint(operation = "公告管理---新增", exceptionMessage = "新增失败")

    public FebsResponse noticeManageAdds(@Valid PlatformNoticeEntity platformNoticeEntity) {

        systemSettingService.noticeManageAdds(platformNoticeEntity);

        return new FebsResponse().success();

    }

    


 src/main/java/com/xcong/excoin/modules/systemSetting/controller/ViewController.java

@@ -3,6 +3,7 @@
import com.xcong.excoin.common.entity.FebsConstant;
import com.xcong.excoin.common.utils.FebsUtil;
import com.xcong.excoin.modules.systemSetting.entity.PlatformBannerEntity;
import com.xcong.excoin.modules.systemSetting.entity.PlatformNoticeEntity;
import com.xcong.excoin.modules.systemSetting.entity.PlatformSymbolsSkuEntity;
import com.xcong.excoin.modules.systemSetting.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.modules.systemSetting.service.SystemSettingService;
@@ -87,4 +88,42 @@
        return FebsUtil.view("modules/systemSetting/platformBannerDetail");
    }
    
    /**
     * 轮播图---新增
     */
    @GetMapping("platformBannerAdd")
    @RequiresPermissions("platformBannerAdd:add")
    public String platformBannerAdd() {
        return FebsUtil.view("modules/systemSetting/platformBannerAdd");
    }
    
    /**
     * 公告管理---列表
     */
    @GetMapping("noticeManage")
    @RequiresPermissions("noticeManage:view")
    public String noticeManage() {
        return FebsUtil.view("modules/systemSetting/noticeManage");
    }
    
    /**
     * 公告管理---修改
     */
    @GetMapping("noticeManageUpdate/{id}")
    @RequiresPermissions("noticeManageUpdate:update")
    public String noticeManageUpdate(@PathVariable long id, Model model) {
        PlatformNoticeEntity data = systemSettingService.selectNoticeManageById(id);
        model.addAttribute("member", data);
        return FebsUtil.view("modules/systemSetting/noticeManageDetail");
    }
    
    /**
     * 公告管理---新增
     */
    @GetMapping("noticeManageAdd")
    @RequiresPermissions("noticeManageAdd:add")
    public String noticeManageAdd() {
        return FebsUtil.view("modules/systemSetting/noticeManageAdd");
    }
    
}

 src/main/java/com/xcong/excoin/modules/systemSetting/entity/PlatformNoticeEntity.java

New file
@@ -0,0 +1,39 @@
package com.xcong.excoin.modules.systemSetting.entity;



import java.io.Serializable;

import java.util.Date;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import com.fasterxml.jackson.annotation.JsonFormat;



import lombok.Data;



/**

 * 公告表

 */

@Data

@TableName("platform_notice")

public class PlatformNoticeEntity implements Serializable {/**

     * 
     */

    private static final long serialVersionUID = 1L;

    @TableId(value = "id",type = IdType.AUTO)

    private Long id;

    /**

     * 标题

     */

    private String title;

    /**

     * 类别

     */

    private int categoryid;

    private String categoryname;

    private String source;

    private String content;

	
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

    private Date createTime;



}


 src/main/java/com/xcong/excoin/modules/systemSetting/mapper/PlatformNoticeMapper.java

New file
@@ -0,0 +1,15 @@
package com.xcong.excoin.modules.systemSetting.mapper;



import org.apache.ibatis.annotations.Param;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.xcong.excoin.modules.systemSetting.entity.PlatformNoticeEntity;



public interface PlatformNoticeMapper extends BaseMapper<PlatformNoticeEntity> {



    IPage<PlatformNoticeEntity> findPlatformNoticeInPage(Page<PlatformNoticeEntity> page,

            @Param("record")PlatformNoticeEntity platformNoticeEntity);

	
}


 src/main/java/com/xcong/excoin/modules/systemSetting/service/Impl/SystemSettingServiceImpl.java

@@ -1,9 +1,6 @@
package com.xcong.excoin.modules.systemSetting.service.Impl;



import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.validation.Valid;

import javax.validation.constraints.NotNull;

@@ -17,9 +14,11 @@
import com.xcong.excoin.common.entity.FebsResponse;

import com.xcong.excoin.common.entity.QueryRequest;

import com.xcong.excoin.modules.systemSetting.entity.PlatformBannerEntity;

import com.xcong.excoin.modules.systemSetting.entity.PlatformNoticeEntity;

import com.xcong.excoin.modules.systemSetting.entity.PlatformSymbolsSkuEntity;

import com.xcong.excoin.modules.systemSetting.entity.PlatformTradeSettingEntity;

import com.xcong.excoin.modules.systemSetting.mapper.PlatformBannerMapper;

import com.xcong.excoin.modules.systemSetting.mapper.PlatformNoticeMapper;

import com.xcong.excoin.modules.systemSetting.mapper.PlatformSymbolsSkuMapper;

import com.xcong.excoin.modules.systemSetting.mapper.PlatformTradeSettingMapper;

import com.xcong.excoin.modules.systemSetting.service.SystemSettingService;

@@ -35,6 +34,8 @@
    private final PlatformSymbolsSkuMapper platformSymbolsSkuMapper;

    

    private final PlatformBannerMapper platformBannerMapper;

	
    private final PlatformNoticeMapper platformNoticeMapper;

    

    @Override

    public IPage<PlatformTradeSettingEntity> findPlatformTradeSettingInPage(

@@ -108,12 +109,9 @@


    @Override

    @Transactional(rollbackFor = Exception.class)

    public void platformBannerAdd() {

        Map<String, Object> columnMap= new HashMap<>();

        List<PlatformBannerEntity> selectByMap = platformBannerMapper.selectByMap(columnMap);

        PlatformBannerEntity platformBannerEntity = selectByMap.get(0);

    public void platformBannerAdd(@Valid PlatformBannerEntity platformBannerEntity) {

        PlatformBannerEntity platformBannerEntityAdd = new PlatformBannerEntity();

        platformBannerEntityAdd.setCreateBy(platformBannerEntity.getCreateBy());

        platformBannerEntityAdd.setCreateBy("admin");

        platformBannerEntityAdd.setCreateTime(new Date());

        platformBannerEntityAdd.setImageUrl(platformBannerEntity.getImageUrl());

        platformBannerEntityAdd.setIsInside(platformBannerEntity.getIsInside());

@@ -123,10 +121,53 @@
        platformBannerEntityAdd.setName(platformBannerEntity.getName());

        platformBannerEntityAdd.setShowPort(platformBannerEntity.getShowPort());

        platformBannerEntityAdd.setSort(platformBannerEntity.getSort());

        platformBannerEntityAdd.setUpdateBy(platformBannerEntity.getUpdateBy());

        platformBannerEntityAdd.setUpdateBy("admin");

        platformBannerEntityAdd.setUpdateTime(new Date());

        platformBannerMapper.insert(platformBannerEntityAdd);

        

    }



    @Override

    @Transactional(rollbackFor = Exception.class)

    public FebsResponse noticeManageConfirm(@Valid PlatformNoticeEntity platformNoticeEntity) {

        platformNoticeMapper.updateById(platformNoticeEntity);

        return new FebsResponse().success();

    }



    @Override

    @Transactional(rollbackFor = Exception.class)

    public FebsResponse noticeManageDelete(@NotNull(message = "{required}") Long id) {

        platformNoticeMapper.deleteById(id);

        return new FebsResponse().success();

    }



    @Override

    @Transactional(rollbackFor = Exception.class)

    public void noticeManageAdds(@Valid PlatformNoticeEntity platformNoticeEntity) {

        PlatformNoticeEntity platformNoticeEntityAdd = new PlatformNoticeEntity();

        platformNoticeEntityAdd.setCreateTime(new Date());

        platformNoticeEntityAdd.setCategoryid(1);

        platformNoticeEntityAdd.setCategoryname("1");

        platformNoticeEntityAdd.setContent("1");

        platformNoticeEntityAdd.setSource(platformNoticeEntity.getSource());

        platformNoticeEntityAdd.setTitle(platformNoticeEntity.getTitle());

        platformNoticeMapper.insert(platformNoticeEntityAdd);

		
    }



    @Override

    public IPage<PlatformNoticeEntity> findNoticeManageInPage(PlatformNoticeEntity platformNoticeEntity,

            QueryRequest request) {

        Page<PlatformNoticeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());

        IPage<PlatformNoticeEntity> platformBannerEntitys = platformNoticeMapper.findPlatformNoticeInPage(page, platformNoticeEntity);

        return platformBannerEntitys;

    }



    @Override

    public PlatformNoticeEntity selectNoticeManageById(long id) {

        PlatformNoticeEntity platformNoticeEntity = platformNoticeMapper.selectById(id);

        return platformNoticeEntity;

    }





}


 src/main/java/com/xcong/excoin/modules/systemSetting/service/SystemSettingService.java

@@ -8,6 +8,7 @@
import com.xcong.excoin.common.entity.FebsResponse;

import com.xcong.excoin.common.entity.QueryRequest;

import com.xcong.excoin.modules.systemSetting.entity.PlatformBannerEntity;

import com.xcong.excoin.modules.systemSetting.entity.PlatformNoticeEntity;

import com.xcong.excoin.modules.systemSetting.entity.PlatformSymbolsSkuEntity;

import com.xcong.excoin.modules.systemSetting.entity.PlatformTradeSettingEntity;



@@ -34,6 +35,16 @@


    FebsResponse platformBannerDelete(@NotNull(message = "{required}") Long id);



    void platformBannerAdd();

    void platformBannerAdd(@Valid PlatformBannerEntity platformBannerEntity);



    FebsResponse noticeManageConfirm(@Valid PlatformNoticeEntity platformNoticeEntity);



    FebsResponse noticeManageDelete(@NotNull(message = "{required}") Long id);



    void noticeManageAdds(@Valid PlatformNoticeEntity platformNoticeEntity);



    IPage<PlatformNoticeEntity> findNoticeManageInPage(PlatformNoticeEntity platformNoticeEntity, QueryRequest request);



    PlatformNoticeEntity selectNoticeManageById(long id);



}


 src/main/resources/mapper/modules/PlatformNoticeMapper.xml

New file
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.xcong.excoin.modules.systemSetting.mapper.PlatformNoticeMapper">



    <select id="findPlatformNoticeInPage" resultType="com.xcong.excoin.modules.systemSetting.entity.PlatformNoticeEntity">

        SELECT

            *

        FROM

            platform_notice

            order by create_time desc

    </select>



</mapper>

 src/main/resources/templates/febs/views/modules/member/applyCoin.html

@@ -102,13 +102,14 @@
                elem: $view.find('table'),

                id: 'userTable',

                url: ctx + 'member/memberApplyCoin',

                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left'},

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 60,align:'center'},

                    {field: 'tag', title: 'USDT类型', minWidth: 60,align:'center'},

                    {field: 'amount', title: '充币数量', minWidth: 100,align:'center'},

                    {field: 'amount', title: '充币数量', minWidth: 100,align:'center',totalRow: true},

                    {field: 'lastAmount', title: '本次余额', minWidth: 100,align:'center'},

                    {field: 'address', title: '平台钱包地址', minWidth: 280,align:'center'},

                    {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'},


 src/main/resources/templates/febs/views/modules/member/chargeUsdt.html

@@ -163,12 +163,13 @@
                elem: $view.find('table'),

                id: 'userTable',

                url: ctx + 'member/memberChargeUsdt',

                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left'},

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},

                    {field: 'amountCny', title: '人民币金额', minWidth: 120,align:'center'},

                    {field: 'amountUsdt', title: 'USDT金额', minWidth: 120,align:'center'},

                    {field: 'amountCny', title: '人民币金额', minWidth: 120,align:'center',totalRow: true},

                    {field: 'amountUsdt', title: 'USDT金额', minWidth: 120,align:'center',totalRow: true},

                    {field: 'unitPrice', title: '单价', minWidth: 80,align:'center'},

                    {field: 'createTime', title: '充值时间', minWidth: 180,align:'center'},

                    {title: '付款状态', templet: '#order-Status', minWidth: 100,align:'center'},


 src/main/resources/templates/febs/views/modules/member/extractUsdt.html

@@ -164,12 +164,13 @@
                elem: $view.find('table'),

                id: 'userTable',

                url: ctx + 'member/memberExtractUsdt',

                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left'},

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'amountCny', title: '人民币金额', minWidth: 120,align:'center'},

                    {field: 'amountUsdt', title: 'USDT金额', minWidth: 120,align:'center'},

                    {field: 'amountCny', title: '人民币金额', minWidth: 120,align:'center',totalRowText: '合计'},

                    {field: 'amountUsdt', title: 'USDT金额', minWidth: 120,align:'center',totalRowText: '合计'},

                    {field: 'unitPrice', title: '单价', minWidth: 80,align:'center'},

                    {field: 'createTime', title: '提现时间', minWidth: 180,align:'center'},

                    {title: '提现状态', templet: '#order-Status', minWidth: 100,align:'center'},


 src/main/resources/templates/febs/views/modules/member/withdrawCoin.html

@@ -52,7 +52,7 @@
    </div>

</div>

<!-- 表格字段状态格式化 start -->

<script type="text/html" id="isInside-table">

<script type="text/html" id="isInside">

    {{#

    var isInside = {

    Y: {title: '是' , color: 'red'},

@@ -61,7 +61,7 @@
    }}

    <span class="layui-badge febs-tag-{{isInside.color}}">{{ isInside.title }}</span>

</script>

<script type="text/html" id="status-table">

<script type="text/html" id="status">

    {{#

    var status = {

    1: {title: '等待审核' , color: 'blue'},

@@ -163,17 +163,18 @@
                elem: $view.find('table'),

                id: 'userTable',

                url: ctx + 'member/memberWithdrawCoin',

                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left'},

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 100,align:'center'},

                    {field: 'amount', title: '提币数量', minWidth: 120,align:'center'},

                    {field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},

                    {field: 'address', title: '提币地址', minWidth: 300,align:'center'},

                    {field: 'feeAmount', title: '提币手续费', minWidth: 100,align:'center'},

                    {field: 'feeAmount', title: '提币手续费', minWidth: 100,align:'center', totalRow: true},

                    {field: 'createTime', title: '提币时间', minWidth: 180,align:'center'},

                    {title: '内部转账', templet: '#isInside-table', minWidth: 100,align:'center'},

                    {title: '状态', templet: '#status-table', minWidth: 100,align:'center'},

                    {title: '内部转账', templet: '#isInside', minWidth: 100,align:'center'},

                    {title: '状态', templet: '#status', minWidth: 100,align:'center'},

                    {title: '操作', toolbar: '#user-option', minWidth: 150, fixed : 'right'}

                ]]

            });


 src/main/resources/templates/febs/views/modules/systemSetting/noticeManage.html

New file
@@ -0,0 +1,133 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="公告管理">

    <div class="layui-row febs-container">

        <div class="layui-col-md12">

            <div class="layui-card">

                <div class="layui-card-body febs-table-full">

                    <form class="layui-form layui-table-form" lay-filter="user-table-form">

                            <div class="layui-row">

                                <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">

                                    <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add">

                                        新增

                                    </div>

                                    <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">

                                        <i class="layui-icon">&#xe79b;</i>

                                    </div>

                                </div>

                            </div>

                        </form>

                    <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>

                </div>

            </div>

        </div>

    </div>

</div>



<!-- 表格操作栏 start -->

<script type="text/html" id="user-option">

    <span shiro:lacksPermission="user:view,user:update,user:delete">

        <span class="layui-badge-dot febs-bg-orange"></span> 无权限

    </span>

    <a lay-event="edit" shiro:hasPermission="user:update">编辑

        <i class="layui-icon febs-edit-area febs-blue"></i>

     </a>

    <a lay-event="delete" shiro:hasPermission="user:update">删除

        <i class="layui-icon febs-edit-area febs-blue"></i>

     </a>

</script>

<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

    // 引入组件并初始化

    layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs'], function () {

        var $ = layui.jquery,

            laydate = layui.laydate,

            febs = layui.febs,

            form = layui.form,

            table = layui.table,

            dropdown = layui.dropdown,

            $view = $('#febs-user'),

            $reset = $view.find('#reset'),

            $add = $view.find('#add'),

            $searchForm = $view.find('form'),

            sortObject = {field: 'title', type: null},

            tableIns

            ;



        form.render();



        // 表格初始化

        initTable();



        // 初始化表格操作栏各个按钮功能

        table.on('tool(userTable)', function (obj) {

            var data = obj.data,

                layEvent = obj.event;

            
            if (layEvent === 'edit') {

                febs.modal.open('公告设置', 'modules/systemSetting/noticeManageUpdate/' + data.id, {

                    area: $(window).width() <= 1000 ? '100%' : '50%',

                    btn: ['提交', '取消'],

                    yes: function (index, layero) {

                        $('#user-update').find('#submit').trigger('click');

                    },

                    btn2: function () {

                        layer.closeAll();

                    }

                });

            }

            if (layEvent === 'delete') {

                febs.modal.confirm('删除', '您是否确认删除？', function () {

                    deleteUsers(data.id);

                });

            }

        });

        
        function deleteUsers(id) {

            febs.get(ctx + 'systemSetting/noticeManageDelete/' + id, null, function () {

                febs.alert.success('确认删除');

                $reset.click();

            });

        }

        
         // 刷新按钮

        $reset.on('click', function () {

            $searchForm[0].reset();

            sortObject.type = 'null';

            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});

        });

     	
        $add.on('click', function () {

            febs.modal.open('公告新增', 'modules/systemSetting/noticeManageAdd/', {

                area: $(window).width() <= 1000 ? '100%' : '50%',

                btn: ['提交', '取消'],

                yes: function (index, layero) {

                    $('#user-add').find('#submit').trigger('click');

                },

                btn2: function () {

                    layer.closeAll();

                }

            });

        });



     	
         // 获取查询参数

        function getQueryParams() {

            return {};

        }

        
        function initTable() {

            tableIns = febs.table.init({

                elem: $view.find('table'),

                id: 'userTable',

                url: ctx + 'systemSetting/noticeManage',

                cols: [[

                    {field: 'id', title: '', minWidth: 10,align:'center'},

                    {field: 'title', title: '标题', minWidth: 120,align:'center'},

                    {field: 'source', title: '路径', minWidth: 120,align:'center'},

                    {field: 'createTime', title: '发布时间', minWidth: 200,align:'center'},

                    
                    {title: '操作', toolbar: '#user-option', minWidth: 140, fixed : 'right'}

                ]]

            });

        }

    })

</script>

 src/main/resources/templates/febs/views/modules/systemSetting/noticeManageAdd.html

New file
@@ -0,0 +1,74 @@
<style>

    #user-add {

        padding: 20px 25px 25px 0;

    }



    #user-add .layui-treeSelect .ztree li a, .ztree li span {

        margin: 0 0 2px 3px !important;

    }

    #user-add #data-permission-tree-block {

        border: 1px solid #eee;

        border-radius: 2px;

        padding: 3px 0;

    }

    #user-add .layui-treeSelect .ztree li span.button.switch {

        top: 1px;

        left: 3px;

    }



</style>

<div class="layui-fluid" id="user-add">

    <form class="layui-form" action="" lay-filter="user-add-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">

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">标题：</label>

            <div class="layui-input-block">

                <input type="text" name="title" minlength="4" maxlength="10" lay-verify="range|title" 
                        autocomplete="off" class="layui-input" >

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">路径：</label>

            <div class="layui-input-block">

                <input type="text" name="source" minlength="4" maxlength="200" lay-verify="range|source" 
                        autocomplete="off" class="layui-input" >

            </div>

        </div>

        <div class="layui-form-item febs-hide">

            <button class="layui-btn" lay-submit="" lay-filter="user-add-form-submit" id="submit"></button>

        </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,

            $view = $('#user-add'),

            validate = layui.validate,

            _deptTree;



        form.render();



        formSelects.render();



        form.on('submit(user-add-form-submit)', function (data) {

            febs.post(ctx + 'systemSetting/noticeManageAdds', data.field, function () {

                layer.closeAll();

                febs.alert.success('新增成功');

                $('#febs-user').find('#reset').click();

            });

            return false;

        });

    });

</script>

 src/main/resources/templates/febs/views/modules/systemSetting/noticeManageDetail.html

New file
@@ -0,0 +1,85 @@
<style>

    #user-update {

        padding: 20px 25px 25px 0;

    }



    #user-update .layui-treeSelect .ztree li a, .ztree li span {

        margin: 0 0 2px 3px !important;

    }

    #user-update #data-permission-tree-block {

        border: 1px solid #eee;

        border-radius: 2px;

        padding: 3px 0;

    }

    #user-add .layui-treeSelect .ztree li span.button.switch {

        top: 1px;

        left: 3px;

    }



</style>

<div class="layui-fluid" id="user-update">

    <form class="layui-form" action="" lay-filter="user-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}">

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">标题：</label>

            <div class="layui-input-block">

                <input type="text" name="title" minlength="4" maxlength="10" data-th-id="${member.title}"

                       lay-verify="range|title" autocomplete="off" class="layui-input" >

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">路径：</label>

            <div class="layui-input-block">

                <input type="text" name="source" minlength="4" maxlength="200" data-th-id="${member.source}"

                       lay-verify="range|source" autocomplete="off" class="layui-input" >

            </div>

        </div>

        <div class="layui-form-item febs-hide">

            <button class="layui-btn" lay-submit="" lay-filter="user-update-form-submit" id="submit"></button>

        </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,

            member = [[${member}]],

            $view = $('#user-update'),

            validate = layui.validate,

            _deptTree;



        form.render();



        initUserValue();



        formSelects.render();



        function initUserValue() {

            form.val("user-update-form", {

                "id": member.id,

                "source": member.source,

                "title": member.title

            });

        }



        form.on('submit(user-update-form-submit)', function (data) {

            febs.post(ctx + 'systemSetting/noticeManageConfirm', data.field, function () {

                layer.closeAll();

                febs.alert.success('设置成功');

                $('#febs-user').find('#reset').click();

            });

            return false;

        });

    });

</script>

 src/main/resources/templates/febs/views/modules/systemSetting/platformBanner.html

@@ -130,11 +130,18 @@
            sortObject.type = 'null';

            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});

        });

         // 新增按钮

     	
         // 刷新按钮

        $add.on('click', function () {

            febs.get(ctx + 'systemSetting/platformBannerAdd/', null, function () {

                febs.alert.success('确认新增');

                $reset.click();

            febs.modal.open('轮播图新增', 'modules/systemSetting/platformBannerAdd/', {

                area: $(window).width() <= 1000 ? '100%' : '50%',

                btn: ['提交', '取消'],

                yes: function (index, layero) {

                    $('#user-add').find('#submit').trigger('click');

                },

                btn2: function () {

                    layer.closeAll();

                }

            });

        });




 src/main/resources/templates/febs/views/modules/systemSetting/platformBannerAdd.html

@@ -1,10 +1,117 @@
<!DOCTYPE html>

<html>

<head>

<meta charset="UTF-8">

<title>Insert title here</title>

</head>

<body>

<style>

    #user-add {

        padding: 20px 25px 25px 0;

    }



</body>

</html>
    #user-add .layui-treeSelect .ztree li a, .ztree li span {

        margin: 0 0 2px 3px !important;

    }

    #user-add #data-permission-tree-block {

        border: 1px solid #eee;

        border-radius: 2px;

        padding: 3px 0;

    }

    #user-add .layui-treeSelect .ztree li span.button.switch {

        top: 1px;

        left: 3px;

    }



</style>

<div class="layui-fluid" id="user-add">

    <form class="layui-form" action="" lay-filter="user-add-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">

            </div>

        </div>

        <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" minlength="4" maxlength="10" lay-verify="range|name" 
                        autocomplete="off" class="layui-input" >

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">图片链接：</label>

            <div class="layui-input-block">

                <input type="text" name="imageUrl" minlength="4" maxlength="10"

                       lay-verify="range|imageUrl" autocomplete="off" class="layui-input" >

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">跳转链接：</label>

            <div class="layui-input-block">

                <input type="text" name="jumpUrl" minlength="4" maxlength="10" 
                       lay-verify="range|jumpUrl" autocomplete="off" class="layui-input" >

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">联系方式：</label>

            <div class="layui-input-block">

                <input type="text" name="sort" minlength="4" maxlength="10" 
                       lay-verify="range|sort" autocomplete="off" class="layui-input" >

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">是否置顶：</label>

            <div class="layui-input-block">

                <input type="radio" name="isTop" value="1" title="是" checked="">

                <input type="radio" name="isTop" value="2" title="否">

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">显示端口：</label>

            <div class="layui-input-block">

                <input type="radio" name="showPort" value="1" title="pc" checked="">

                <input type="radio" name="showPort" value="2" title="手机">

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">是否可跳转：</label>

            <div class="layui-input-block">

                <input type="radio" name="isJump" value="1" title="是" checked="">

                <input type="radio" name="isJump" value="2" title="否">

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">跳转外部或内部：</label>

            <div class="layui-input-block">

                <input type="radio" name="isInside" value="1" title="内" checked="">

                <input type="radio" name="isInside" value="2" title="外">

            </div>

        </div>

        <div class="layui-form-item febs-hide">

            <button class="layui-btn" lay-submit="" lay-filter="user-add-form-submit" id="submit"></button>

        </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,

            member = [[${member}]],

            $view = $('#user-add'),

            validate = layui.validate,

            _deptTree;



        form.render();



        formSelects.render();



        form.on('submit(user-add-form-submit)', function (data) {

            febs.post(ctx + 'systemSetting/platformBannerAdds', data.field, function () {

                layer.closeAll();

                febs.alert.success('新增成功');

                $('#febs-user').find('#reset').click();

            });

            return false;

        });

    });

</script>

 src/main/resources/templates/febs/views/modules/trademanage/accountInfo.html

@@ -80,18 +80,19 @@
                elem: $view.find('table'),

                id: 'userTable',

                url: ctx + 'tradeManage/memberAccountInfo',

                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'walletCoinAvailableBalance', title: '币币可用', minWidth: 80,align:'center'},

                    {field: 'walletCoinFrozenBalance', title: '币币冻结', minWidth: 80,align:'center'},

                    {field: 'walletCoinTotalBalance', title: '币币总金额', minWidth: 80,align:'center'},

                    {field: 'walletAvailableBalance', title: '合约可用', minWidth: 80,align:'center'},

                    {field: 'walletFrozenBalance', title: '合约冻结', minWidth: 80,align:'center'},

                    {field: 'walletTotalBalance', title: '合约总金额', minWidth: 80,align:'center'},

                    {field: 'walletCoinAvailableBalance', title: '币币可用', minWidth: 80,align:'center',totalRow: true},

                    {field: 'walletCoinFrozenBalance', title: '币币冻结', minWidth: 80,align:'center',totalRow: true},

                    {field: 'walletCoinTotalBalance', title: '币币总金额', minWidth: 80,align:'center',totalRow: true},

                    {field: 'walletAvailableBalance', title: '合约可用', minWidth: 80,align:'center',totalRow: true},

                    {field: 'walletFrozenBalance', title: '合约冻结', minWidth: 80,align:'center',totalRow: true},

                    {field: 'walletTotalBalance', title: '合约总金额', minWidth: 80,align:'center',totalRow: true},

                    {title: '是否是代理', templet: '#isSuAccount', minWidth: 100,align:'center'},

                    {field: 'agentAvailableBalance', title: '代理账户', minWidth: 80,align:'center'}

                    {field: 'agentAvailableBalance', title: '代理账户', minWidth: 80,align:'center',totalRow: true}

                ]]

            });

        }


 src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfo.html

@@ -91,12 +91,13 @@
                elem: $view.find('table'),

                id: 'userTable',

                url: ctx + 'tradeManage/memberAgentReturnInfo',

                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 80,align:'center'},

                    {field: 'amount', title: '金额', minWidth: 80,align:'center'},

                    {field: 'amount', title: '金额', minWidth: 80,align:'center',totalRow: true},

                    {field: 'content', title: '记录内容', minWidth: 80,align:'center'},

                    {field: 'createTime', title: '时间', minWidth: 80,align:'center'},

                    {title: '状态', templet: '#status', minWidth: 100,align:'center'},


 src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html

@@ -89,8 +89,9 @@
                elem: $view.find('table'),

                id: 'userTable',

                url: ctx + 'tradeManage/contractHoldOrder',

                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},

                    {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},

@@ -105,10 +106,10 @@
                            }else {

                                return '<span style="color:red;">' + d.rewardRatio + '</span>'

                            }

                        },minWidth: 120,align:'center'},

                        },minWidth: 120,align:'center',totalRow: true},

                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},

                    {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},

                    {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center'},

                    {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},

                    {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},

                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},

                    {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},


 src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html

@@ -134,8 +134,9 @@
                elem: $view.find('table'),

                id: 'userTable',

                url: ctx + 'tradeManage/historyOrderInfo',

                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},

                    {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},

@@ -154,7 +155,7 @@
                            if (d.rewardAmount == 0 ||  d.rewardAmount == "" || d.rewardAmount == null) {

                                return '<span></span>'

                            }

                        },minWidth: 120,align:'center'},

                        },minWidth: 120,align:'center',totalRow: true},

                    {field: 'openingPrice', title: '开仓价', 

                            templet: function (d) {

                                if (d.closingPrice > 0 || d.closingPrice < 0) {

@@ -179,9 +180,9 @@
                    {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},

                    {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},

                    {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},

                    {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center'},

                    {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center'},

                    {field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center'}

                    {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},

                    {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center',totalRow: true},

                    {field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center',totalRow: true}

                ]]

            });

        }