From eb58e3cb747fd91748d211401896c930b59103cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A5=E9=93=A7=E6=95=8F?= <1445509994@qq.com>
Date: Wed, 24 Jun 2020 14:08:20 +0800
Subject: [PATCH] fix(Sku): scroll issue and add default picture (#6605)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 水墨 <laihuamin@youzan.com>
---
 src/sku/components/SkuRow.js     | 4 +---
 src/sku/components/SkuRowItem.js | 6 +++++-
 src/sku/index.less               | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/sku/components/SkuRow.js b/src/sku/components/SkuRow.js
index 072504769..ce7265d9a 100644
--- a/src/sku/components/SkuRow.js
+++ b/src/sku/components/SkuRow.js
@@ -2,7 +2,6 @@
 import { createNamespace } from '../../utils';
 import { BORDER_BOTTOM } from '../../utils/constant';
 import { BindEventMixin } from '../../mixins/bind-event';
-import { getScroller } from '../../utils/dom/scroll';
 
 const [createComponent, bem, t] = createNamespace('sku-row');
 
@@ -14,7 +13,7 @@ export default createComponent({
       }
 
       if (!this.scrollCon) {
-        this.scrollCon = getScroller(this.$refs.skuContent);
+        this.scrollCon = this.$refs.skuContent;
       }
 
       bind(this.scrollCon, 'scroll', this.onScroll);
@@ -60,7 +59,6 @@ export default createComponent({
       });
     },
   },
-  mounted() {},
   render() {
     const { skuRow, largePicturePreview, hasScrollTab } = this;
     const multipleNode = skuRow.is_multiple && (
diff --git a/src/sku/components/SkuRowItem.js b/src/sku/components/SkuRowItem.js
index e2d7f12b4..a3624b106 100644
--- a/src/sku/components/SkuRowItem.js
+++ b/src/sku/components/SkuRowItem.js
@@ -19,7 +19,11 @@ export default createComponent({
 
   computed: {
     imgUrl() {
-      return this.skuValue.imgUrl || this.skuValue.img_url;
+      const url = this.skuValue.imgUrl || this.skuValue.img_url;
+      return this.largePicturePreview
+        ? url ||
+            'https://img.yzcdn.cn/upload_files/2020/06/24/FmKWDg0bN9rMcTp9ne8MXiQWGtLn.png'
+        : url;
     },
 
     choosable() {
diff --git a/src/sku/index.less b/src/sku/index.less
index cac961414..040360651 100644
--- a/src/sku/index.less
+++ b/src/sku/index.less
@@ -283,6 +283,7 @@
 
     &__content {
       overflow-x: scroll;
+      overflow-y: hidden;
       -webkit-overflow-scrolling: touch;
 
       &::-webkit-scrollbar {