From 6f8f88a7b509d1a330ca4b553a20796ad16cdd32 Mon Sep 17 00:00:00 2001
From: shengliang <sligxl@163.com>
Date: Wed, 29 Apr 2020 09:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=9B=B4=E6=8E=A5=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/goods.js                   | 28 +-------------------------
 pages/goods/goods.wxml                 |  4 +---
 pages/ucenter/order-details/index.wxss |  2 +-
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/pages/goods/goods.js b/pages/goods/goods.js
index ad05abf..6d25c8e 100644
--- a/pages/goods/goods.js
+++ b/pages/goods/goods.js
@@ -20,8 +20,6 @@ Page({
         openAttr: false,
         soldout: false,
         disabled: '',
-        is_show: 0,
-        endLoad: true,
         alone_text: '单独购买',
         userId: 0,
         priceChecked: false,
@@ -69,17 +67,6 @@ Page({
             current: current
         })
     },
-    getDetailInfo: function() {
-        let that = this;
-        let goods = that.data.goods;
-        WxParse.wxParse('goodsDetail', 'html', goods.goods_desc, that);
-        that.setData({
-            is_show: 1
-        });
-        that.setData({
-            endLoad: false
-        });
-    },
     inputNumber(event) {
         let number = event.detail.value;
         this.setData({
@@ -138,6 +125,7 @@ Page({
                     galleryImages: galleryImages,
                     loading:1
                 });
+                WxParse.wxParse('goodsDetail', 'html', res.data.info.goods_desc, that);
                 wx.setStorageSync('goodsImage', res.data.info.https_pic_url);
             }
             else{
@@ -554,19 +542,5 @@ Page({
                 disabled: true
             });
         }
-    },
-    onReachBottom: function() {
-        let that = this;
-        let endLoad = that.data.endLoad;
-        if (endLoad == true) {
-            let goods = that.data.goods;
-            WxParse.wxParse('goodsDetail', 'html', goods.goods_desc, that);
-            that.setData({
-                is_show: 1
-            });
-            that.setData({
-                endLoad: false
-            });
-        }
     }
 })
\ No newline at end of file
diff --git a/pages/goods/goods.wxml b/pages/goods/goods.wxml
index eee9bd5..349beb3 100644
--- a/pages/goods/goods.wxml
+++ b/pages/goods/goods.wxml
@@ -13,7 +13,7 @@
             </view>
         </view>
         <block wx:if="{{gallery.length > 0}}">
-            <swiper bindchange="bindchange" class="banner banner-style1" indicator-dots="{{false}}" autoplay="{{autoplay}}" current="{{current}}" circular="{{true}}" interval="3000" duration="1000" display-multiple-items="1">
+            <swiper bindchange="bindchange" class="banner banner-style1" indicator-dots="{{false}}" autoplay="{{false}}" current="{{current}}" circular="{{true}}" interval="3000" duration="1000" display-multiple-items="1">
                 <swiper-item class="item" wx:for="{{gallery}}" wx:key="id">
                     <image bindtap="previewImage" data-src="{{item.img_url}}" src="{{item.img_url}}" class="slide-image" mode="aspectFill" />
                 </swiper-item>
@@ -55,10 +55,8 @@
     </view>
     <view class='details-wrap'>
         <view class="title">商品详情</view>
-        <!-- <ad unit-id="adunit-abf12db5663f60e0" ad-type="video" ad-theme="white"></ad> -->
         <view class="show">
             <view class='details-image-wrap'>
-                <view class='show-detail' bindtap='getDetailInfo' wx:if="{{is_show == 0}}">点击显示详情</view>
                 <import src="../../lib/wxParse/wxParse.wxml" />
                 <template is="wxParse" data="{{wxParseData:goodsDetail.nodes}}" />
             </view>
diff --git a/pages/ucenter/order-details/index.wxss b/pages/ucenter/order-details/index.wxss
index 3c15e56..97c2fc8 100644
--- a/pages/ucenter/order-details/index.wxss
+++ b/pages/ucenter/order-details/index.wxss
@@ -266,7 +266,7 @@ form {
     /* font-weight: bold; */
     margin-bottom: 10rpx;
     text-overflow: ellipsis;
-    white-space: nowrap;
+    /* white-space: nowrap;  群友ef发现的问题*/
     overflow: hidden;
 }