Merge remote-tracking branch 'origin/master'

miniapp/app/pages/goodsDetail/index.js

@@ -61,7 +61,7 @@ new $.Page({
             address,
             contact: name,
             phone,
-            product_id: 1
+            product_id: this.data.detail.id
         }).then((res) => {
             if (res.data) {
                 this.callWXPay(res.data.id, res.data.order_type || 'product_order');
@@ -76,16 +76,16 @@ new $.Page({
             if (res.msg) {
                 const {
                     timestamp,
-                    sign,
-                    noncestr
+                    paySign,
+                    nonceStr
                 } = res.msg;
                 const pck = res.msg.package;
                 wx.requestPayment({
                     timeStamp: timestamp + '',
-                    nonceStr: noncestr,
+                    nonceStr,
                     package: pck,
                     signType: 'MD5',
-                    paySign: sign,
+                    paySign,
                     success(res) {
                         console.log('支付成功', res);
                         $.wx.showToast({
@@ -101,7 +101,7 @@ new $.Page({
                         setTimeout(function () {
                             $.router.goto({
                                 path: '/pages/order/index',
-                                type: $.ROUTER_TYPE.CLOSE_CURRENT
+                                type: $.ROUTER_TYPE.SWITCH_TAB
                             })
                         }, 2000);
                     }

miniapp/app/pages/goodsList/index.wxss

@@ -30,6 +30,7 @@ page {
 .details {
     padding-left: 226rpx;
     padding-top: 20rpx;
+    padding-bottom: 20rpx;
 }
 
 .card {
@@ -37,9 +38,9 @@ page {
     margin-left: 16rpx;
     display: inline-block;
     margin-top: 18rpx;
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, .3);
     padding-bottom: 14rpx;
     border-radius: 4rpx;
+    border:solid 2rpx #efefef;
 }
 
 .goods-img {

miniapp/app/pages/order/index.js

@@ -50,16 +50,16 @@ new $.Page({
                 if (res.msg) {
                     const {
                         timestamp,
-                        sign,
-                        noncestr
+                        paySign,
+                        nonceStr
                     } = res.msg;
                     const pck = res.msg.package;
                     wx.requestPayment({
                         timeStamp: timestamp + '',
-                        nonceStr: noncestr,
+                        nonceStr,
                         package: pck,
                         signType: 'MD5',
-                        paySign: sign,
+                        paySign,
                         success(res) {
                             console.log('支付成功', res);
                             $.wx.hideToast('loading');

miniapp/app/pages/order/index.wxss

@@ -64,7 +64,7 @@
     background-color: #00a0e9;
 }
 
-.goods {
+/* .goods {
     margin-top: 20rpx;
     border-top: solid 1rpx #dedede;
-}
+} */