Merge branch 'master' of ssh://git.xingtongworld.com:10022/xioayue/why_in_h5

pages/goods/detail.vue

@@ -492,7 +492,8 @@
           if (res.resultCode === "00000000") {
 
             // 跳转至付款界面
-            this.$navTo('pages/goods/payment/orderPayment', { batchcode:res.data.batchcode, img: app.goods.img, time: new Date().getTime() })
+            uni.navigateTo({url: "/pages/goods/payment/orderPayment?batchcode="+res.data.batchcode+"&img="+app.goods.img+"&time="+new Date().getTime()})
+            //this.$navTo('pages/goods/payment/orderPayment', { batchcode:res.data.batchcode, img: app.goods.img, time: new Date().getTime() })
           } else {
             app.$error(res.errMsg);
           }