Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

dist/static/css/chunk-8f99d096.2d73fa8e.css

@@ -0,0 +1 @@
+.m-core[data-v-115ef00c]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-115ef00c]{width:180px}.m-core h4[data-v-115ef00c]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-115ef00c],.m-core .right[data-v-115ef00c],.m-core .vipLeft[data-v-115ef00c]{width:400px}.planList[data-v-115ef00c]{padding:0 25px}.planList .planTop[data-v-115ef00c]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-115ef00c]{font-size:14px}.planList .planCore .row[data-v-115ef00c]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px}.okBtn[data-v-115ef00c]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

src/views/categroyManager/insideSetting/adminManager.vue

@@ -61,6 +61,7 @@ export default {
         if(res.code == 200 && res.data && res.data.rows.length > 0) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
+          
         }
       })
     },