Merge branch 'dev' into 'test'

调整

See merge request quanshu/mp-ui-user!76

src/packageGoods/order/settlement.vue

@@ -298,7 +298,7 @@
 									// #ifdef H5
 									let data = ele.data
 									sessionStorage.setItem('viewUrlData', JSON.stringify(data))
-									uni.navigateTo({
+									uni.redirectTo({
 										url: `/packageGoods/order/payOrder?orderId=${ res.data.orderId }`
 									})
 									// uni.redirectTo({