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(0)" type="success"
+        <el-button size="medium" @click="handelBatch(1)" type="success"
           >批量上架</el-button
-        ><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(2)" type="warning"
           >批量删除</el-button
@@ -421,7 +421,7 @@ export default {
       if (!len) {
         return this.$message.warning("请先勾选商品");
       }
-      let name = ["上架", "下架", "删除"][type];
+      let name = ["下架", "上架", "删除"][type];
       this.$confirm(`此操作将所勾选的${len}条商品${name}, 是否继续?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",