Merge branch 'dev' into d_ls

src/views/Marketing/goods/commodityManageMent/index.vue

@@ -20,9 +20,9 @@
       rowKey="goodsId"
     >
       <template slot="customize">
-        <el-button size="medium" @click="handelBatch(1)" type="success"
+        <el-button size="medium" @click="handelBatch(0)" type="success"
           >批量上架</el-button
-        ><el-button size="medium" @click="handelBatch(0)" type="success"
+        ><el-button size="medium" @click="handelBatch(1)" type="success"
           >批量下架</el-button
         ><el-button size="medium" @click="handelBatch(2)" type="warning"
           >批量删除</el-button