Merge branch 'master' of ssh://193.112.35.168:29418/tejia

admin

2021-05-29 48440de7da08e5aedbaafbf43a250bbb944e5b80

Merge branch 'master' of ssh://193.112.35.168:29418/tejia

 app/src/main/resources/static/index.html

@@ -86,11 +86,11 @@
                            <i class="iconfont">&#xe6a7;</i>
                            <cite>供应商管理</cite></a>
                    </li>
                    <li>
                   <!-- <li>
                        <a onclick="xadmin.add_tab('供应商账户','welcome.html')">
                            <i class="iconfont">&#xe6a7;</i>
                            <cite>供应商账户</cite></a>
                    </li>
                    </li>-->
                </ul>
            </li>


 app/src/main/resources/static/views/lijin/provider-list.html

@@ -61,8 +61,7 @@
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">
                                <i class="layui-icon">&#xe615;</i></button>
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
                    </form>
                </div>
@@ -174,16 +173,12 @@
            }
        });

        app.key = ksapp.getQueryParam("appname") != null ? ksapp.getQueryParam("appname") : '';
        app.start = ksapp.getQueryParam("start");
        app.end = ksapp.getQueryParam("end");


        var url = "/admin/api/lijin/provider/listByPage?pageSize=20";

        var table = layui.table;

        var url = "/admin/api/lijin/provider/listByPage?page=1&pageSize=20&key=" + encodeURIComponent(app.key) + "&startDate=" + app.start + "&endDate=" + app.end;


        table.render({
        var tableIns = table.render({
            elem: '#table_list',
            url: url,
            toolbar: "#toolbar",
@@ -252,5 +247,29 @@
            app.update(this.value, params);
        });

        layui.use("form", function (e) {
            var form = layui.form;
            form.render();
            form.on('submit', function (data) {
                console.log(data)
                var params = new Array();
                for (var key in data.field)
                    params[key] = data.field[key];

                params["pageSize"]=20
                console.log(params);
                //数据重载
                tableIns.reload({
                    where: params,
                    page: {
                        curr: 1 //重新从第 1 页开始
                    }
                });
                return false;
            });
            //$("#searchForm").submit();
        });


    });</script>
</html>

 app/src/main/resources/static/views/lijin/providerAccount-list.html

@@ -62,7 +62,7 @@
                            <input type="text" id="key" name="key" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <button type="submit" class="layui-btn">搜索</button>
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
                    </form>
                </div>
@@ -166,30 +166,14 @@
            }
        });

        // app.key = ksapp.getQueryParam("appname") != null ? ksapp.getQueryParam("appname") : '';
        // app.start = ksapp.getQueryParam("start");
        // app.end = ksapp.getQueryParam("end");
        var url = "/admin/api/lijin/providerLink/listByPage?pageSize=20";
        if (providerId != null && providerId != undefined) {
            url = url + "&providerId="+ providerId;
        }

        app.key = $("#key").val();
        // app.start = ksapp.getQueryParam("start");
        // app.end = ksapp.getQueryParam("end");

        var table = layui.table;

        var url = "/admin/api/lijin/providerAccount/listByPage";
        // var url = "/admin/api/lijin/providerAccount/listByPage?key=" + encodeURIComponent(app.key) + "&startDate=" + app.start + "&endDate=" + app.end;
        // if (providerId != null && providerId != undefined) {
        //     url = url + "&providerId=" + providerId;
        // }

        // var data = new FormData("#searchForm");
        // var formData = new FormData($('#searchForm')[0]);
        // var formData = $('#searchForm').serializeArray();
        // Array.push('pageSize', 20);
        // formData.append('pageSize', 20);
        // formData.append('page', 1);

        table.render({
        var tableIns =  table.render({
            id: 'testReload',
            elem: '#table_list',
            url: url,
@@ -209,7 +193,6 @@
                    {field: 'todayConsumeNumber',  width: 120,title: "今日已用商品数"},
                    {fixed: 'right', width: 150, title: "操作", toolbar: '#barAction'},
                ]

            ],
            page: true,
            parseData: function (res) { //res 即为原始返回的数据
@@ -254,24 +237,6 @@
            });


        // var $ = layui.$, active = {
        //     reload: function(){
        //         var dataForm = $('#searchForm').serialize();
        //
        //         //执行重载
        //         table.reload('testReload', {
        //             page: {
        //                 curr: 1 //重新从第 1 页开始
        //             }
        //         });
        //     }
        // };
        // $('.demoTable .layui-btn').on('click', function(){
        //     var type = $(this).data('type');
        //     active[type] ? active[type].call(this) : '';
        // });


        //监听状态操作
        layui.form.on('switch(stateBox)', function(obj){
            var state = 0;
@@ -282,5 +247,36 @@
            app.update(this.value, params);
        });

    });</script>

        layui.use("form", function (e) {
            var form = layui.form;
            form.render();
            form.on('submit', function (data) {
                console.log(data)
                var params = new Array();
                for (var key in data.field)
                    params[key] = data.field[key];

                params["pageSize"]=20
                console.log(params);
                //数据重载
                tableIns.reload({
                    where: params,
                    page: {
                        curr: 1 //重新从第 1 页开始
                    }
                });
                return false;
            });
            //$("#searchForm").submit();
        });

    });






</script>
</html>

 app/src/main/resources/static/views/lijin/providerLink-list.html

@@ -62,8 +62,7 @@
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">
                                <i class="layui-icon">&#xe615;</i></button>
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
                    </form>
                </div>
@@ -197,19 +196,16 @@
            }
        });

        app.key = ksapp.getQueryParam("appname") != null ? ksapp.getQueryParam("appname") : '';
        app.start = ksapp.getQueryParam("start");
        app.end = ksapp.getQueryParam("end");

        var table = layui.table;

        var url = "/admin/api/lijin/providerLink/listByPage?page=1&pageSize=20&key=" + encodeURIComponent(app.key) + "&startDate=" + app.start + "&endDate=" + app.end;

        var url = "/admin/api/lijin/providerLink/listByPage?pageSize=20";
        if (providerId != null && providerId != undefined) {
            url = url + "&providerId="+ providerId;
        }


        table.render({
        var table = layui.table;
        var tableIns = table.render({
            elem: '#table_list',
            url: url,
            toolbar: "#toolbar",
@@ -278,5 +274,29 @@
            app.update(this.value, params);
        });


        layui.use("form", function (e) {
            var form = layui.form;
            form.render();
            form.on('submit', function (data) {
                console.log(data)
                var params = new Array();
                for (var key in data.field)
                    params[key] = data.field[key];

                params["pageSize"]=20
                console.log(params);
                //数据重载
                tableIns.reload({
                    where: params,
                    page: {
                        curr: 1 //重新从第 1 页开始
                    }
                });
                return false;
            });
            //$("#searchForm").submit();
        });

    });</script>
</html>

 app/src/main/resources/static/views/vip/combo-list.html

@@ -51,18 +51,17 @@
                <div class="layui-card-body ">
                    <form class="layui-form layui-col-space5" id="searchForm">
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="开始日" name="start" id="start"
                            <input class="layui-input" autocomplete="off" placeholder="开始日" name="startDate" id="startDate"
                                   :value="start">
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="截止日" name="end" id="end"
                            <input class="layui-input" autocomplete="off" placeholder="截止日" name="startDate" id="startDate"
                                   :value="end"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                            <input type="text" name="key" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">
                                <i class="layui-icon">&#xe615;</i></button>
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
                    </form>
                </div>
@@ -164,16 +163,13 @@
            }
        });

        app.key = ksapp.getQueryParam("appname") != null ? ksapp.getQueryParam("appname") : '';
        app.start = ksapp.getQueryParam("start");
        app.end = ksapp.getQueryParam("end");

        var table = layui.table;

        var url = "/admin/api/vip/vipCombo/listByPage?page=1&pageSize=20&key=" + encodeURIComponent(app.key) + "&startDate=" + app.start + "&endDate=" + app.end;
        var url = "/admin/api/vip/vipCombo/listByPage?pageSize=20";


        table.render({
        var tableIns =  table.render({
            elem: '#table_list',
            url: url,
            toolbar: "#toolbar",
@@ -244,5 +240,29 @@
            app.update(this.value, params);
        });


        layui.use("form", function (e) {
            var form = layui.form;
            form.render();
            form.on('submit', function (data) {
                console.log(data)
                var params = new Array();
                for (var key in data.field)
                    params[key] = data.field[key];

                params["pageSize"]=20
                console.log(params);
                //数据重载
                tableIns.reload({
                    where: params,
                    page: {
                        curr: 1 //重新从第 1 页开始
                    }
                });
                return false;
            });
            //$("#searchForm").submit();
        });

    });</script>
</html>

 app/src/main/resources/static/views/vip/grade-list.html

@@ -61,8 +61,7 @@
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">
                                <i class="layui-icon">&#xe615;</i></button>
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
                    </form>
                </div>
@@ -179,7 +178,7 @@
        var url = "/admin/api/vip/vipGrade/listByPage?page=1&pageSize=20&key=" + encodeURIComponent(app.key) + "&startDate=" + app.start + "&endDate=" + app.end;


        table.render({
        var tableIns =  table.render({
            elem: '#table_list',
            url: url,
            toolbar: "#toolbar",
@@ -246,5 +245,30 @@
            app.update(this.value, params);
        });


        layui.use("form", function (e) {
            var form = layui.form;
            form.render();
            form.on('submit', function (data) {
                console.log(data)
                var params = new Array();
                for (var key in data.field)
                    params[key] = data.field[key];

                params["pageSize"]=20
                console.log(params);
                //数据重载
                tableIns.reload({
                    where: params,
                    page: {
                        curr: 1 //重新从第 1 页开始
                    }
                });
                return false;
            });
            //$("#searchForm").submit();
        });


    });</script>
</html>

 app/src/main/resources/static/views/vip/gradePotence-list.html

@@ -63,8 +63,7 @@
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">
                                <i class="layui-icon">&#xe615;</i></button>
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
                    </form>
                </div>
@@ -197,7 +196,7 @@
        var url = "/admin/api/vip/vipGradePotence/listByPage?page=1&pageSize=20&key=" + encodeURIComponent(app.key) + "&startDate=" + app.start + "&endDate=" + app.end;


        table.render({
        var tableIns =   table.render({
            elem: '#table_list',
            url: url,
            toolbar: "#toolbar",
@@ -254,6 +253,29 @@
                };
            });

        layui.use("form", function (e) {
            var form = layui.form;
            form.render();
            form.on('submit', function (data) {
                console.log(data)
                var params = new Array();
                for (var key in data.field)
                    params[key] = data.field[key];

                params["pageSize"]=20
                console.log(params);
                //数据重载
                tableIns.reload({
                    where: params,
                    page: {
                        curr: 1 //重新从第 1 页开始
                    }
                });
                return false;
            });
            //$("#searchForm").submit();
        });


    });</script>
</html>

 app/src/main/resources/static/views/vip/vipCenter-list.html

@@ -67,8 +67,7 @@
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">
                                <i class="layui-icon">&#xe615;</i></button>
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
                    </form>
                </div>
@@ -204,7 +203,7 @@
        var url = "/admin/api/vip/vipCenter/listByPage?page=1&pageSize=20&key=" + encodeURIComponent(app.key) + "&startDate=" + app.start + "&endDate=" + app.end;


        table.render({
        var tableIns =   table.render({
            elem: '#table_list',
            url: url,
            toolbar: "#toolbar",
@@ -299,5 +298,29 @@

        });


        layui.use("form", function (e) {
            var form = layui.form;
            form.render();
            form.on('submit', function (data) {
                console.log(data)
                var params = new Array();
                for (var key in data.field)
                    params[key] = data.field[key];

                params["pageSize"]=20
                console.log(params);
                //数据重载
                tableIns.reload({
                    where: params,
                    page: {
                        curr: 1 //重新从第 1 页开始
                    }
                });
                return false;
            });
            //$("#searchForm").submit();
        });

    });</script>
</html>