V1.4.8

修复：订单无法发货问题修复：商品列表加载问题
qmpaas · Mar 22, 2022 · 138a5a3 · 138a5a3
1 parent ac2a8c8
commit 138a5a3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/applet/app.zip b/applet/app.zip
diff --git 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
@@ -1,8 +1,17 @@
-<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>applet</title><script>document.addEventListener('DOMContentLoaded', function () {
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>applet</title>
+    <script>
+    document.addEventListener('DOMContentLoaded', function() {
         document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px';
-      });
-      
-      let origin = window.location.origin;
+    });
+
+    let origin = window.location.origin;
     window.siteinfo = {
         "uniacid": "3",
         "acid": "3",
@@ -23,13 +32,26 @@
     <?php if (!empty($tabBar)) {
         echo "window.siteinfo.tabBar = " . json_encode($tabBar);
     }?>
-    
-      var coverSupport =
+
+    var coverSupport =
         'CSS' in window &&
         typeof CSS.supports === 'function' &&
         (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'));
-      document.write(
+    document.write(
         '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-          (coverSupport ? ', viewport-fit=cover' : '') +
-          '" />'
-      );</script><link rel="stylesheet" href="/assets/wechat/static/index.a5c69d49.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script><script src="/assets/wechat/static/js/chunk-vendors.7eebe30b.js"></script><script src="/assets/wechat/static/js/index.3c9e6d46.js"></script></body></html>
+        (coverSupport ? ', viewport-fit=cover' : '') +
+        '" />'
+    );
+
+    </script>
+    <link rel="stylesheet" href="/assets/wechat/static/index.a5c69d49.css">
+</head>
+
+<body><noscript><strong>Please enable JavaScript to continue.</strong></noscript>
+    <div id="app"></div>
+    <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
+    <script src="/assets/wechat/static/js/chunk-vendors.7eebe30b.js"></script>
+    <script src="/assets/wechat/static/js/index.3c9e6d46.js"></script>
+</body>
+
+</html>
diff --git a/web/version.json b/web/version.json
@@ -1 +1 @@
-{"version":"1.4.7"}
+{"version":"1.4.8"}