V1.2.13

修复：公众号商城新客优惠券弹窗位置问题修复：开屏广告未显示问题修复：公众号商城提交订单评价问题
drapre · Jul 1, 2021 · f905454 · f905454
1 parent 663c402
commit f905454
Show file tree

Hide file tree

Showing 52 changed files with 122 additions and 51 deletions.
diff --git a/applet/app.zip b/applet/app.zip
diff --git a/modules/order/app/IndexController.php b/modules/order/app/IndexController.php
@@ -149,7 +149,7 @@ public function tabcount()
                 ])->where($w)->count();
         }
 
-        $data_list['orderafter'] = M('order', 'OrderAfter')::find()->where(['UID' => $UID, 'status' => [100, 102, 111, 121, 122, 131, 132, 133]])->count();
+        $data_list['orderafter'] = M('order', 'OrderAfter')::find()->where(['UID' => $UID, 'is_deleted' => 0, 'status' => [100, 102, 111, 121, 122, 131, 132, 133]])->count();
 
         return $data_list;
     }

diff --git a/views/wechat/index.html b/views/wechat/index.html
@@ -1,27 +1,42 @@
 <!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title></title><script>document.addEventListener('DOMContentLoaded', function() {
         document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
     })
-    let origin = window.location.origin;
-        window.siteinfo = {
-            "uniacid": "3",
-            "acid": "3",
-            "multiid": "0",
-            "version": "1.2.3",
-            "AppURL": origin + "/index.php",
-            "siteroot": origin + "/index.php",
-            "design_method": "3",
-            "tabBar": {
-                "color": "#ccc",
-                "selectedColor": "#ff4c92",
-                "borderStyle": "black",
-                "backgroundColor": "#ffffff",
-                "list": []
-            }
+    let origin = 'https://test.leadshop.vip'
+    window.siteinfo = {
+        "uniacid": "3",
+        "acid": "3",
+        "multiid": "0",
+        "version": "1.1.0",
+        "AppURL": origin + "/index.php",
+        "siteroot": origin + "/index.php",
+        "design_method": "3",
+        "tabBar": {
+            "color": "#ccc",
+            "selectedColor": "#ff4c92",
+            "borderStyle": "black",
+            "backgroundColor": "#ffffff",
+            "list": [{
+                    "pagePath": "/pages/index/index",
+                    "text": "A"
+                },
+                {
+                    "pagePath": "/pages/categories/index",
+                    "text": "B"
+                },
+                {
+                    "pagePath": "/pages/cart/index",
+                    "text": "C"
+                },
+                {
+                    "pagePath": "/pages/goods/list",
+                    "text": "D"
+                },
+                {
+                    "pagePath": "/pages/user/index",
+                    "text": "E"
+                }
+            ]
         }
-
-        <?php if (!empty($tabBar)) {
-            echo "window.siteinfo.tabBar = " . json_encode($tabBar);
-        } ?>
-
+    }
     var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-    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.3e73f18a.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script><script src="/assets/wechat/static/js/chunk-vendors.53977fb4.js"></script><script src="/assets/wechat/static/js/index.f2cd58f1.js"></script></body></html>
+    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.3e73f18a.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script><script src="/assets/wechat/static/js/chunk-vendors.b94c27cd.js"></script><script src="/assets/wechat/static/js/index.1ee721a2.js"></script></body></html>
diff --git a/views/wechat/index.php b/views/wechat/index.php
@@ -1,27 +1,27 @@
 <!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title></title><script>document.addEventListener('DOMContentLoaded', function() {
         document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
     })
-    let origin = window.location.origin;
-        window.siteinfo = {
-            "uniacid": "3",
-            "acid": "3",
-            "multiid": "0",
-            "version": "1.2.3",
-            "AppURL": origin + "/index.php",
-            "siteroot": origin + "/index.php",
-            "design_method": "3",
-            "tabBar": {
-                "color": "#ccc",
-                "selectedColor": "#ff4c92",
-                "borderStyle": "black",
-                "backgroundColor": "#ffffff",
-                "list": []
-            }
-        }
+let origin = window.location.origin;
+window.siteinfo = {
+    "uniacid": "3",
+    "acid": "3",
+    "multiid": "0",
+    "version": "1.2.3",
+    "AppURL": origin + "/index.php",
+    "siteroot": origin + "/index.php",
+    "design_method": "3",
+    "tabBar": {
+        "color": "#ccc",
+        "selectedColor": "#ff4c92",
+        "borderStyle": "black",
+        "backgroundColor": "#ffffff",
+        "list": []
+    }
+}
+
+<?php if (!empty($tabBar)) {
+    echo "window.siteinfo.tabBar = " . json_encode($tabBar);
+} ?>
 
-        <?php if (!empty($tabBar)) {
-            echo "window.siteinfo.tabBar = " . json_encode($tabBar);
-        } ?>
-
     var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-    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.3e73f18a.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script><script src="/assets/wechat/static/js/chunk-vendors.53977fb4.js"></script><script src="/assets/wechat/static/js/index.f2cd58f1.js"></script></body></html>
+    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.3e73f18a.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script><script src="/assets/wechat/static/js/chunk-vendors.b94c27cd.js"></script><script src="/assets/wechat/static/js/index.1ee721a2.js"></script></body></html>
diff --git a/views/wechat/static/js/chunk-vendors.b94c27cd.js b/views/wechat/static/js/chunk-vendors.b94c27cd.js
diff --git a/views/wechat/static/js/index.1ee721a2.js b/views/wechat/static/js/index.1ee721a2.js
diff --git a/views/wechat/static/js/index.f2cd58f1.js → views/wechat/static/js/index.455418a0.js b/views/wechat/static/js/index.f2cd58f1.js → views/wechat/static/js/index.455418a0.js
diff --git a/views/wechat/static/js/index.6eff6f68.js b/views/wechat/static/js/index.6eff6f68.js
diff --git a/views/wechat/static/js/index.963c8947.js b/views/wechat/static/js/index.963c8947.js
diff --git a/views/wechat/static/js/index.b3d3a6e4.js b/views/wechat/static/js/index.b3d3a6e4.js
diff --git a/views/wechat/static/js/pages-cart-index.004de162.js b/views/wechat/static/js/pages-cart-index.004de162.js
diff --git a/...s-index~pages-coupon-detail~pages-goods-detail~pages-goods-list~page~14341ccd.24b72a45.js b/...s-index~pages-coupon-detail~pages-goods-detail~pages-goods-list~page~14341ccd.24b72a45.js
diff --git a/...s-index~pages-coupon-detail~pages-goods-detail~pages-goods-list~page~bc2707a2.13935061.js b/...s-index~pages-coupon-detail~pages-goods-detail~pages-goods-list~page~bc2707a2.13935061.js
diff --git a/views/wechat/static/js/pages-categories-index.6541173d.js b/views/wechat/static/js/pages-categories-index.6541173d.js