Merge branch 'master' of https://gitee.com/longyears/langye-web-start

src/components/XyTable/index.vue

@@ -228,7 +228,10 @@ export default {
               ['select']: selectClick,
               ['cell-click']: cellClick,
               ['select-all']: selectAllClick}}>
-
+              <el-table-column
+                 type="index"
+                 width="50" fixed="left" align="center" >
+               </el-table-column>
 
             {
               tableItem.map((item, index) => {
@@ -492,4 +495,3 @@ export default {
   }
 }
 </style>
-

src/views/activity/activityUser.vue

@@ -29,7 +29,7 @@
     </lx-header>
 
 
-    <xy-table :list="list" :table-item="table" @delete="deleteitem"
+    <xy-table :list="list" :total="total" :table-item="table" @delete="deleteitem"
       @editor="(row)=>{$refs['addActivityUser'].id = row.id;$refs['addActivityUser'].isShow = true;$refs['addActivityUser'].type = 'editor'}">
       <template v-slot:btns v-if="type==0 ">
 

src/views/activity/drawPrize.vue

@@ -29,7 +29,7 @@
     </lx-header>
 
 
-    <xy-table :list="list" :table-item="table" @delete="deleteitem"
+    <xy-table :list="list" :table-item="table" :total="total" @delete="deleteitem"
       @editor="(row)=>{$refs['addDrawPrize'].id = row.id;$refs['addDrawPrize'].isShow = true;$refs['addDrawPrize'].type = 'editor'}">
       <template v-slot:btns v-if="type==0 ">
 
@@ -81,7 +81,7 @@
             prop: 'total',
             label: '总数',
             align: 'right'
-          }, 
+          },
           {
             prop: 'rate',
             label: '概率',

src/views/activity/drawPrizeLog.vue

@@ -28,7 +28,7 @@
     </lx-header>
 
 
-    <xy-table :list="list" :table-item="table" >
+    <xy-table :list="list" :table-item="table" :total="total" >
       <template v-slot:btns>
 
       </template>
@@ -65,11 +65,16 @@
             prop: 'user.name',
             label: '用户名称',
             align: 'left',
+          },{
+            prop: 'user.username',
+            label: '登录名',
+            align: 'center'
           }, {
             prop: 'draw_prize.name',
             label: '中奖信息',
             align: 'center'
-          },
+          },
+
           {
             prop: 'created_at',
             label: '抽奖时间',

src/views/activity/index.vue

@@ -21,7 +21,7 @@
     </lx-header>
 
 
-    <xy-table :list="list" :table-item="table">
+    <xy-table :list="list" :table-item="table" :total="total">
       <template v-slot:btns>
         <el-table-column fixed="right" header-align="center" align="center" label="操作" width="300">
           <template slot-scope="scope">