Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_vue_store

src/views/goods/Index.vue

@@ -53,7 +53,7 @@
               <a-input style="margin-left: 5px" v-decorator="['profit_rate_max']" placeholder="请输入" />
             </div>
           </a-form-item>
-          <a-form-item label="京东下架">
+          <a-form-item label="比同款下架">
             <a-select @change="getGoodsJingDong" style="width: 120px" placeholder="请选择">
               <a-select-option :value="item.val" v-for="item in isYesNo" :key="item.val">
                 {{ item.name }}
@@ -158,7 +158,7 @@
           v-if="$module('goods-copy') && $auth('/goods/copy') && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))"
           :to="{ path: '/goods/copy', query: { goodsId: item.goods_id } }"
         >复制</router-link>
-        <a v-if="storeVersion === 0 || (storeVersion === 1 && isSuper === 0)" v-action:delete @click="handleDelete([item.goods_id])">删除</a>
+        <!-- <a v-if="storeVersion === 0 || (storeVersion === 1 && isSuper === 0)" v-action:delete @click="handleDelete([item.goods_id])">删除</a> -->
       </div>
     </s-table>
     <Update ref="UpdateRef" @refresh="refreshParentMethod" />
@@ -255,8 +255,8 @@ const columns = [
     scopedSlots: { customRender: 'status' },
   },
   {
-    title: '京东下架',
-    width: '60px',
+    title: '比同款下架',
+    width: '80px',
     dataIndex: 'is_jd_remove',
     scopedSlots: { customRender: 'is_jd_remove' },
   },