xiaoyong931011
2023-02-20 a2a4dd75b0c0e51b325c4fbe89da80dfa4a5d24f
滑动条
9 files modified
71 ■■■■ changed files
src/main/resources/templates/febs/views/modules/goods/carriageRuleList.html 4 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/goods/goodsList.html 4 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/addressAmountList.html 6 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html 32 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html 6 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html 4 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/salesmanAchieveList.html 6 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/order/orderList.html 5 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/product/categoryList.html 4 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/goods/carriageRuleList.html
@@ -30,6 +30,10 @@
                        .layui-table img{
                            max-width:100px
                        }
                        ::-webkit-scrollbar {
                            height: 20px !important;
                            background-color: #f4f4f4;
                        }
                    </style>
                </div>
            </div>
src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -40,6 +40,10 @@
                        .layui-table img{
                            max-width:100px
                        }
                        ::-webkit-scrollbar {
                            height: 20px !important;
                            background-color: #f4f4f4;
                        }
                    </style>
                </div>
            </div>
src/main/resources/templates/febs/views/modules/mallMember/addressAmountList.html
@@ -26,6 +26,12 @@
                        </div>
                    </form>
                    <table lay-filter="addressAmountTable" lay-data="{id: 'addressAmountTable'}"></table>
                    <style type="text/css">
                        ::-webkit-scrollbar {
                            height: 20px !important;
                            background-color: #f4f4f4;
                        }
                    </style>
                </div>
            </div>
        </div>
src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
@@ -49,6 +49,12 @@
                        </div>
                    </form>
                    <table lay-filter="agentApplyTable" lay-data="{id: 'agentApplyTable'}"></table>
                    <style type="text/css">
                        ::-webkit-scrollbar {
                            height: 20px !important;
                            background-color: #f4f4f4;
                        }
                    </style>
                </div>
            </div>
        </div>
@@ -135,7 +141,7 @@
                url: ctx + 'admin/mallMember/getAgentApplyList',
                defaultToolbar:[],
                cols: [[
                    {field:'memberName', title:'微信昵称', width:100, rowspan: 3,align: 'center'}
                    {field:'memberName', title:'微信昵称', width:100, rowspan: 2,align: 'center'}
                    ,{align: 'center', title: '基本信息', colspan: 7}
                    ,{field: 'state', title: '申请状态',
                        templet: function (d) {
@@ -148,8 +154,18 @@
                            }else{
                                return ''
                            }
                        }, minWidth: 100,rowspan: 3,align:'center'},
                    ,{field:'createdTime', title:'申请时间', width:100,rowspan: 3,align: 'center'}
                        }, minWidth: 100,rowspan: 2,align:'center'},
                    ,{field:'createdTime', title:'申请时间', width:100,rowspan: 2,align: 'center'}
                    ,{title: '操作',
                        templet: function (d) {
                            if(d.state === 1 ){
                                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>'
                            }else{
                                return ''
                            }
                        },width:200,rowspan: 2,align:'center', fixed:"right"
                    }
                    ],[
                    // {field: 'memberName', title: '微信昵称', minWidth: 150,align:'left'},
                    {field: 'name', title: '姓名', minWidth: 100,align:'left'},
@@ -172,16 +188,6 @@
                    //         }
                    //     }, minWidth: 100,align:'center'},
                    // {field: 'createdTime', title: '申请时间', minWidth: 180,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                            if(d.state === 1 ){
                                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>'
                            }else{
                                return ''
                            }
                        },minWidth: 200,align:'center', fixed:"right"
                    }
                ]]
            });
        }
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -55,6 +55,12 @@
                        </div>
                    </form>
                    <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
                    <style type="text/css">
                        ::-webkit-scrollbar {
                            height: 20px !important;
                            background-color: #f4f4f4;
                        }
                    </style>
                </div>
            </div>
        </div>
src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html
@@ -30,6 +30,10 @@
                        .layui-table img{
                            max-width:100px
                        }
                        ::-webkit-scrollbar {
                            height: 20px !important;
                            background-color: #f4f4f4;
                        }
                    </style>
                </div>
            </div>
src/main/resources/templates/febs/views/modules/mallMember/salesmanAchieveList.html
@@ -33,6 +33,12 @@
                        </div>
                    </form>
                    <table lay-filter="salesmanAchieveTable" lay-data="{id: 'salesmanAchieveTable'}"></table>
                    <style type="text/css">
                        ::-webkit-scrollbar {
                            height: 20px !important;
                            background-color: #f4f4f4;
                        }
                    </style>
                </div>
            </div>
        </div>
src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -99,6 +99,11 @@
                        .layui-table img{
                            max-width:100px
                        }
                        ::-webkit-scrollbar {
                            height: 20px !important;
                            background-color: #f4f4f4;
                        }
                    </style>
                </div>
            </div>
src/main/resources/templates/febs/views/modules/product/categoryList.html
@@ -38,6 +38,10 @@
                        .layui-table img{
                            max-width:100px
                        }
                        ::-webkit-scrollbar {
                            height: 20px !important;
                            background-color: #f4f4f4;
                        }
                    </style>
                </div>
            </div>