Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin

src/views/secondHandMall/commodityManagement/form.vue

@@ -16,7 +16,7 @@
         @click="copyGoods">克隆商品</el-button>
       <el-button v-if="formData.id && ~['ON'].indexOf(formData.status)" type="primary" size="small"
         @click="setStatus('OFF')">下架</el-button>
-      <el-button v-if="formData.id && ~['ON', 'OFF'].indexOf(formData.status)" type="primary" size="small"
+      <el-button v-if="formData.id && ~['ON'].indexOf(formData.status)" type="primary" size="small"
         @click="zhuanxiaoshou">转销售</el-button>
       <el-button v-if="formData.id && ~['OFF'].indexOf(formData.status)" type="primary" size="small"
         @click="setStatus('ON')">重新上架</el-button>