Merge remote-tracking branch 'origin/dev-circle-seven-20200914' into dev-circle-seven-20200914

src/components/yqrange/member-management/addMember.vue

@@ -54,7 +54,7 @@
       </el-table>
       <div class="pagination">
         <el-pagination background @size-change="handleSizeOrganization" @current-change="handleCurrentOrganization"
-          :current-page="formOrganization.pageNum" :page-sizes="[10, 20, 40]" :page-size="formOrganization.pageSize"
+          :current-page="formOrganization.pageNum" :page-sizes="[10, 30, 50, 100, 200]" :page-size="formOrganization.pageSize"
           layout="total, sizes, prev, pager, next, jumper" :total="totalOrganization"></el-pagination>
       </div>
     </div>

src/components/yqrange/member-management/checkOrg.vue

@@ -61,7 +61,7 @@
       </el-table>
       <div class="pagination">
         <el-pagination background @size-change="handleSizeOrganization" @current-change="handleCurrentOrganization"
-          :current-page="formOrganization.pageNum" :page-sizes="[10, 20, 40]" :page-size="formOrganization.pageSize"
+          :current-page="formOrganization.pageNum" :page-sizes="[10, 30, 50, 100, 200]" :page-size="formOrganization.pageSize"
           layout="total, sizes, prev, pager, next, jumper" :total="totalOrganization"></el-pagination>
       </div>
     </div>

src/components/yqrange/member-management/org.vue

@@ -65,7 +65,7 @@
     </el-table>
     <div class="pagination">
       <el-pagination background @size-change="handleSizeOrganization" @current-change="handleCurrentOrganization"
-        :current-page="formOrganization.pageNum" :page-sizes="[10, 20, 40]" :page-size="formOrganization.pageSize"
+        :current-page="formOrganization.pageNum" :page-sizes="[10, 30, 50, 100, 200]" :page-size="formOrganization.pageSize"
         layout="total, sizes, prev, pager, next, jumper" :total="totalOrganization"></el-pagination>
     </div>
     <el-dialog

src/components/yqrange/member-management/renyuan.vue

@@ -66,7 +66,7 @@
     </el-table>
     <div class="pagination">
       <el-pagination background @size-change="handleSizeOrganization" @current-change="handleCurrentOrganization"
-        :current-page="formOrganization.pageNum" :page-sizes="[10, 20, 40]" :page-size="formOrganization.pageSize"
+        :current-page="formOrganization.pageNum" :page-sizes="[10, 30, 50, 100, 200]" :page-size="formOrganization.pageSize"
         layout="total, sizes, prev, pager, next, jumper" :total="totalPeople"></el-pagination>
     </div>
     <el-dialog

src/views/yqrange/blacklist-manage.vue

@@ -58,7 +58,7 @@
           @size-change="handleSizeChange"
           @current-change="handleNumChange"
           :current-page="searchForm.pageNo"
-          :page-sizes="[10, 30, 50, 100]"
+          :page-sizes="[10, 30, 50, 100, 200]"
           :page-size="searchForm.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totalRows"

src/views/yqrange/checkBlackList.vue

@@ -86,7 +86,7 @@
           @size-change="handleSizeOrganization"
           @current-change="handleCurrentOrganization"
           :current-page="formOrganization.pageNum"
-          :page-sizes="[10, 20, 40]"
+          :page-sizes="[10, 30, 50, 100, 200]"
           :page-size="formOrganization.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totalOrganization"

src/views/yqrange/live-manage.vue

@@ -99,7 +99,7 @@
           @size-change="handleSizeChange"
           @current-change="handleNumChange"
           :current-page="searchForm.pageNo"
-          :page-sizes="[10, 30, 50, 100]"
+          :page-sizes="[10, 30, 50, 100, 200]"
           :page-size="searchForm.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totalRows"

src/views/yqrange/yq-range.vue

@@ -74,7 +74,7 @@
             @size-change="handleSizeChange"
             @current-change="handleNumChange"
             :current-page="searchForm.pageNo"
-            :page-sizes="[10, 30, 50, 100]"
+            :page-sizes="[10, 30, 50, 100, 200]"
             :page-size="searchForm.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
             :total="totalRows"