Merge branch 'iteration_201218' into online

src/views/categroyManager/insideSetting/branchActive.vue

@@ -92,10 +92,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
-                    :sync="true"
+                    sync
                     :page-sizes="pageInfo.page_size"
                     @pagination="getList" />
       </div>

src/views/categroyManager/vipActiveList.vue

@@ -165,7 +165,8 @@
         </el-table>
         <!-- 分页器 -->
         <pagination
-          :total="rules.total"
+          :total.sync="rules.total"
+          sync
           :page.sync="rules.page"
           :limit.sync="rules.limit"
           :page-sizes="rules.page_size"