母婴产品加入轮播图

miniapp/app/pages/goodsList/index.js

@@ -4,12 +4,21 @@ new $.Page({
     data: {
         tabs: [],
         goods: [],
-        selected: 0
+        selected: 0,
+        list: []
     },
     onLoad() {
         this.init();
     },
     init() {
+        $.request('product/home', 'GET', {}).then((res) => {
+            const list = res.top;
+            if (list && list.length > 0) {
+                this.setData({
+                    list
+                });
+            }
+        });
         $.request('products', 'GET', {}).then((res) => {
             if (res.data) {
                 const tabs = [];
@@ -45,6 +54,19 @@ new $.Page({
         }
     },
     toDetail(e) {
+        const {
+            id
+        } = e.target.dataset;
+        if (id) {
+            $.router.goto({
+                path: `/pages/detail/index`,
+                query: {
+                    id
+                }
+            });
+        }
+    },
+    toProduct(e) {
         const {
             id
         } = e.currentTarget.dataset;

miniapp/app/pages/goodsList/index.wxml

@@ -1,22 +1,34 @@
 <view class="page">
+    <view class="page-hd">
+        <swiper indicator-dots="true" indicator-color="#ffffff" indicator-active-color="#00a0e9" autoplay="true"
+            interval="5000" duration="500">
+            <block wx:for="{{list}}">
+                <swiper-item>
+                    <image src="{{item.photo}}" class="slide-image" data-id="{{item.id}}" bindtap="toDetail" />
+                </swiper-item>
+            </block>
+        </swiper>
+    </view>
     <view class="page-bd">
         <view class="goods">
             <view class="tabs" bindtap="changeTab">
                 <view class="tab {{selected === index ? 'active' : ''}}" data-name="{{item}}" wx:for="{{tabs}}">{{item}}</view>
             </view>
             <view class="details">
-                <view class="cards">
-                    <view class="card" wx:for="{{goods}}" bindtap="toDetail" data-id="{{item.id}}">
-                        <image class="goods-img" src="{{item.photo}}"></image>
-                        <view class="card-name">{{item.name}}</view>
-                        <view class="price">￥{{item.price}}</view>
+                <scroll-view scroll-y scroll-with-animation="true" style="height:{{systemInfo.windowHeight*systemInfo.pixelRatio - 300}}rpx">
+                    <view class="cards">
+                        <view class="card" wx:for="{{goods}}" bindtap="toProduct" data-id="{{item.id}}">
+                            <image class="goods-img" src="{{item.photo}}"></image>
+                            <view class="card-name">{{item.name}}</view>
+                            <view class="price">￥{{item.price}}</view>
+                        </view>
+                        <!-- <view class="card">
+                            <image class="goods-img" src="/img/demo/order-img.png"></image>
+                            <view class="card-name">婴儿抱娃神器</view>
+                            <view class="price">￥79.00</view>
+                        </view> -->
                     </view>
-                    <!-- <view class="card">
-                        <image class="goods-img" src="/img/demo/order-img.png"></image>
-                        <view class="card-name">婴儿抱娃神器</view>
-                        <view class="price">￥79.00</view>
-                    </view> -->
-                </view>
+                </scroll-view>
             </view>
         </view>
     </view>

miniapp/app/pages/goodsList/index.wxss

@@ -2,11 +2,16 @@ page {
     background-color: #fff;
 }
 
+.page-hd {
+    position: relative;
+    z-index: 9;
+}
+
 .tabs {
-    position: fixed;
+    position: absolute;
     left: 0;
     width: 226rpx;
-    top: 0;
+    top: 300rpx;
     bottom: 0;
     background-color: #f6f6f8;
     padding-top: 20rpx;
@@ -29,6 +34,9 @@ page {
 
 .details {
     padding-left: 226rpx;
+}
+
+.cards {
     padding-top: 20rpx;
     padding-bottom: 20rpx;
 }
@@ -40,7 +48,7 @@ page {
     margin-top: 18rpx;
     padding-bottom: 14rpx;
     border-radius: 4rpx;
-    border:solid 2rpx #efefef;
+    border: solid 2rpx #efefef;
 }
 
 .goods-img {
@@ -59,4 +67,9 @@ page {
     color: #fe2e48;
     padding-left: 14rpx;
     margin-top: 10rpx;
+}
+
+.slide-image {
+    width: 100%;
+    height: 300rpx;
 }

miniapp/app/pages/service/index.js

@@ -5,18 +5,22 @@ new $.Page({
 
     },
     toPay() {
+        $.wx.showToast({
+            title: '加载中'
+        }, 'loading');
         $.request('reward', 'POST', {}).then((res) => {
             const {
                 timestamp,
                 paySign,
-                nonceStr
+                nonceStr,
+                signType
             } = res.msg;
             const pck = res.msg.package;
             wx.requestPayment({
                 timeStamp: timestamp + '',
                 nonceStr,
                 package: pck,
-                signType: 'MD5',
+                signType,
                 paySign,
                 success(res) {
                     $.wx.showToast({