From 0ff79d66dc29fad1fa6c9ce9798973aed55fcb85 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Fri, 3 Mar 2023 18:07:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=86=E9=A2=91=E6=89=AB?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Common.php | 3 + app/admin/controller/Order.php | 4 +- app/admin/view/default/order/index.html | 17 ++- app/admin/view/default/public/footer.html | 26 +++- app/index/controller/Common.php | 3 + app/index/view/default/agreement/index.html | 2 +- app/index/view/default/public/footer.html | 26 +++- app/index/view/default/public/header.html | 1 - app/lang/en.php | 1 + app/lang/zh.php | 3 +- public/static/admin/default/css/order.css | 35 +++-- public/static/common/css/common.css | 135 +++++++++++++----- public/static/common/js/common.js | 114 +++++++++++++++ public/static/common/lib/ZXing/ZXing.min.js | 15 ++ public/static/common/media/scan-success.mp3 | Bin 0 -> 7567 bytes public/static/index/default/css/agreement.css | 18 +++ 16 files changed, 342 insertions(+), 61 deletions(-) mode change 100755 => 100644 public/static/admin/default/css/order.css create mode 100644 public/static/common/lib/ZXing/ZXing.min.js create mode 100644 public/static/common/media/scan-success.mp3 diff --git a/app/admin/controller/Common.php b/app/admin/controller/Common.php index af7f93e6e..217bb13c2 100755 --- a/app/admin/controller/Common.php +++ b/app/admin/controller/Common.php @@ -325,6 +325,9 @@ class Common extends BaseController // 默认不加载打印组件 $assign['is_load_hiprint'] = 0; + // 默认不加载视频扫码组件 + $assign['is_load_video_scan'] = 0; + // 默认不加载echarts图表组件 $assign['is_load_echarts'] = 0; diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php index c3e678de6..e7fce3e4c 100755 --- a/app/admin/controller/Order.php +++ b/app/admin/controller/Order.php @@ -38,7 +38,9 @@ class Order extends Base // 模板数据 $assign = [ // 快递公司 - 'express_list' => ExpressService::ExpressList(), + 'express_list' => ExpressService::ExpressList(), + // 默认不加载视频扫码组件 + 'is_load_video_scan' => 1, ]; // 发起支付 - 支付方式 diff --git a/app/admin/view/default/order/index.html b/app/admin/view/default/order/index.html index 5276895b4..6984bba68 100755 --- a/app/admin/view/default/order/index.html +++ b/app/admin/view/default/order/index.html @@ -4,8 +4,8 @@ {{block name="form_extend"}} -
-
+
+
×
@@ -13,7 +13,10 @@
- +
+ + +
@@ -21,6 +24,14 @@
+
diff --git a/app/admin/view/default/public/footer.html b/app/admin/view/default/public/footer.html index fcb70ba6a..f8c01ed1c 100755 --- a/app/admin/view/default/public/footer.html +++ b/app/admin/view/default/public/footer.html @@ -50,9 +50,28 @@
- + + + + {{if !empty($plugins_admin_view_common_bottom_data) and is_array($plugins_admin_view_common_bottom_data)}} {{foreach $plugins_admin_view_common_bottom_data as $hook}} @@ -160,6 +179,11 @@ {{/if}} + +{{if isset($is_load_video_scan) and $is_load_video_scan eq 1}} + +{{/if}} + {{/if}} + +{{if isset($is_load_video_scan) and $is_load_video_scan eq 1}} + +{{/if}} +