Merge branch 'master' of http://git.cc-lotus.info/live-platform/live-cms

src/views/role/index.vue

@@ -60,7 +60,7 @@ export default {
       let res = await this.query();
       console.log(res.data);
       this.$set(this, `list`, res.data);
-        this.$set(this, `total`, res.total);
+      this.$set(this, `total`, res.total);
     },
     toEdit({ data }) {
       console.log('1');