Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !43

src/pages/productDetail/productDetail.js

@@ -11,6 +11,8 @@ Page({
     reachBottom: false, // 标识是否触底
     showSkuPopup: false,
     btnText: '立即购买',
+    baseImgUrl: app.globalData.imageUrl,
+    swiperCurrent: 0,
 
     imageData: [{
       desc: "string",
@@ -53,6 +55,13 @@ Page({
 
   },
 
+  swiperChange(e) {
+    console.log(e)
+    this.setData({
+      swiperCurrent: e.detail.current
+    })
+  },
+
   addCart: function (event) {
     this.setData({
       showSkuPopup: true,

src/pages/productDetail/productDetail.wxml

@@ -5,7 +5,21 @@
  bindtouchend="pageMoveEnd"
  bindtap="handleCloseSharePopup">
   <view>
-    <buy-image-swiper  image-data="{{imageData}}"/>
+    <!-- <buy-image-swiper  image-data="{{imageData}}"/>
+     -->
+      <swiper  
+    autoplay="true"  style="height: 750rpx;line-height: 100rpx;" bindchange="swiperChange">
+        <block wx:for="{{imageData}}" wx:key="index"> 
+            <swiper-item>
+                <image class="swiper-image"  mode="widthFix" src="{{baseImgUrl}}{{item.imageUrl}}"></image>
+            </swiper-item>
+        </block>
+      </swiper>
+       <view class="dots"> 
+        <block wx:for="{{imageData}}" wx:key="index"> 
+          <view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view> 
+        </block> 
+  </view>
   </view>
 
   <view class="product-detail-wrap">
@@ -28,7 +42,7 @@
     </view>
     <view class="member-price">
       <view class="member-price-info">
-        <image class="member-price-icon"></image>
+        <image class="member-price-icon" src="/assets/imgs/7_1_0/plus.png"></image>
         <text class="before-reduce-price">￥558,</text>
         <text class="reduce-price">本次立减￥60</text>
       </view>

src/pages/productDetail/productDetail.wxss

 /* pages/productDetail/productDetail.wxss */
+.swiper-image{
+  width: 100%;
+}
+.dots{ 
+  position: absolute; 
+  left: 0; 
+  right: 0; 
+  top: 700rpx; 
+  display: flex; 
+  justify-content: center; 
+} 
+.dots .dot{ 
+  margin: 0 8rpx; 
+  width: 10rpx;
+  height: 10rpx;
+  border-radius: 50%;
+  background-color: rgba(0, 0, 0, 0.25);
+  transition: all .6s; 
+} 
+.dots .dot.active{ 
+  width: 22rpx; 
+  height: 10rpx; 
+  background: #C09A74; 
+  border-radius: 20rpx; 
+}
 .product-detail-wrap{
   padding: 0 16rpx 0 24rpx;
 }
@@ -88,6 +113,7 @@
 .member-price-icon{
   width: 88rpx;
   height: 30rpx;
+  vertical-align: middle;
 }
 .before-reduce-price{
   font-size: 40rpx;