diff --git a/applet/app.zip b/applet/app.zip index 36f9860d..c0b08ce8 100644 Binary files a/applet/app.zip and b/applet/app.zip differ diff --git a/modules/order/api/IndexController.php b/modules/order/api/IndexController.php index 7d7ad5e7..fc21782a 100644 --- a/modules/order/api/IndexController.php +++ b/modules/order/api/IndexController.php @@ -417,7 +417,7 @@ private function orderGoodsInfo() foreach ($result['goods'] as $goods) { if ($goods['after']) { foreach ($goods['after'] as $after_v) { - if ($after_v['order_goods_id'] === $goods['id']) { + if ($after_v['order_goods_id'] === $goods['id'] && $after_v['status'] != 201) { $goods['goods_number'] -= $after_v['return_number']; break; } @@ -739,7 +739,7 @@ public function send() foreach ($order_goods as &$o_g) { if ($o_g['after']) { foreach ($o_g['after'] as $after_v) { - if ($after_v['order_goods_id'] === $o_g['id']) { + if ($after_v['order_goods_id'] === $o_g['id'] && $after_v['status'] != 201) { $o_g['goods_number'] -= $after_v['return_number']; break; } diff --git a/views/wechat/index.php b/views/wechat/index.php index a4929b78..79b1d360 100644 --- a/views/wechat/index.php +++ b/views/wechat/index.php @@ -1,8 +1,17 @@ -applet
\ No newline at end of file + (coverSupport ? ', viewport-fit=cover' : '') + + '" />' + ); + + + + + + +
+ + + + + + diff --git a/web/version.json b/web/version.json index d3cb31c4..3cabcc8f 100755 --- a/web/version.json +++ b/web/version.json @@ -1 +1 @@ -{"version":"1.4.7"} +{"version":"1.4.8"}