Merge branch 'master' into leng_dev

src/const/crud/admin/token.js

@@ -28,12 +28,14 @@ export const tableOption = {
   searchMenuSpan: 6,
   column: [{
     label: '用户ID',
-    prop: 'user_id',
-    align: 'center'
+    prop: 'id',
+    align: 'center',
+    slot: true,
   }, {
     label: '用户名',
     prop: 'username',
-    align: 'center'
+    align: 'center',
+    slot: true,
   }, {
     label: '令牌',
     prop: 'access_token',

src/views/admin/token/index.vue

@@ -29,7 +29,18 @@
         @refresh-change="refreshChange"
         @size-change="sizeChange"
         @current-change="currentChange"
-        @row-del="handleDel"/>
+        @row-del="handleDel">
+      <template
+        slot="id"
+        slot-scope="scope">
+        <span>{{ scope.row.user_info.id }}</span>
+      </template>
+        <template
+          slot="username"
+          slot-scope="scope">
+          <span>{{ scope.row.user_info.username }}</span>
+        </template>
+      </avue-crud>
     </basic-container>
   </div>
 </template>