Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

 zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html

@@ -244,7 +244,7 @@
                <el-table
                        :data="currentNode.ads"
                        :default-sort="{prop: '', order: 'descending'}"
                        style="width: 100%" max-height="250">
                        style="width: 100%" >

                    <el-table-column
                            label="排序"
@@ -518,7 +518,10 @@

            //改变编辑页面，切换页面元素
            changePage(index){

                this.currentPage=this.pageList[index];
                this.currentPageCode=this.pageList[index].code;
                console.log(this.currentPageCode);
                this.loadPageAds();
            },
            loadPageAds() {