diff --git a/App.vue b/App.vue index 3e2ed1e..bdf113c 100644 --- a/App.vue +++ b/App.vue @@ -39,6 +39,18 @@ } /* #endif */ + + /* #ifdef H5 */ + .uni-body{ + line-height: normal; + } + body{ + line-height: normal !important; + } + /* #endif */ + + + .example-info { font-size: 14px; color: #333; diff --git a/components/addressAdd.vue b/components/addressAdd.vue index cf09a51..3e503b8 100644 --- a/components/addressAdd.vue +++ b/components/addressAdd.vue @@ -324,7 +324,7 @@ } - \ No newline at end of file diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue index 7689764..f36b535 100644 --- a/subPackages/order/trades.vue +++ b/subPackages/order/trades.vue @@ -185,6 +185,7 @@ export default { // 设置订单ID并发起支付 setOrderId(id) { this.orderId = id; + // #ifdef MP-WEIXIN this.Post({ order_id: id, pay_platform: "MINI", @@ -205,7 +206,14 @@ export default { }); } }); - }, + // #endif + + // #ifdef H5 + uni.navigateTo({ + url: "/subPackages/order/orderPay?orderId=" +id + }) + // #endif + }, // 确认收货 confirmpost(id, index) { uni.showModal({ diff --git a/subPackages/pointsMall/index.vue b/subPackages/pointsMall/index.vue index 9164b10..6ea0e02 100644 --- a/subPackages/pointsMall/index.vue +++ b/subPackages/pointsMall/index.vue @@ -40,7 +40,7 @@ - @@ -59,7 +59,7 @@ - { if (res.code == 1) { + // #ifdef MP-WEIXIN this.Post( { order_id: res.data.order_id, @@ -818,6 +819,13 @@ export default { }); } }); + // #endif + + // #ifdef H5 + uni.navigateTo({ + url: "/subPackages/order/orderPay?orderId=" +res.data.order_id + }) + // #endif } }); }, diff --git a/subPackages/techan/cartOrder.vue b/subPackages/techan/cartOrder.vue index eeb342a..69cdc77 100644 --- a/subPackages/techan/cartOrder.vue +++ b/subPackages/techan/cartOrder.vue @@ -132,7 +132,7 @@ - + diff --git a/subPackages/techan/index.vue b/subPackages/techan/index.vue index f02f86f..ed2f383 100644 --- a/subPackages/techan/index.vue +++ b/subPackages/techan/index.vue @@ -14,7 +14,7 @@