From 7c7c583008152ed9c2ad6e32ffc16709b2940cc6 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Mon, 26 Apr 2021 19:37:16 +0800
Subject: [PATCH] v2.0.2

---
 application/admin/controller/Index.php        |   9 +
 application/tags.php                          | 213 ++----------------
 changelog.txt                                 |   2 +-
 config/app.php                                |   2 +-
 extend/payment/QQ.php                         |   4 +-
 extend/payment/Weixin.php                     |   3 +-
 public/static/common/css/common.css           |  16 +-
 .../lib/amazeui-dialog/amazeui.dialog.js      |   6 +-
 .../common/lib/ueditor/dialogs/map/map.html   |   2 +-
 .../common/lib/ueditor/dialogs/map/show.html  |   2 +-
 10 files changed, 49 insertions(+), 210 deletions(-)

diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index 41be299bb..6146e65d3 100755
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -133,6 +133,9 @@ class Index extends Common
             return $this->error('非法访问');
         }
 
+        // 权限校验
+		$this->IsPower();
+
         // 开始处理
         $params = $this->data_request;
         return StoreService::SiteStoreAccountsBind($params);
@@ -154,6 +157,9 @@ class Index extends Common
             return $this->error('非法访问');
         }
 
+        // 权限校验
+		$this->IsPower();
+
         // 开始处理
         $params = $this->data_request;
         return StoreService::SiteInspectUpgrade($params);
@@ -175,6 +181,9 @@ class Index extends Common
             return $this->error('非法访问');
         }
 
+        // 权限校验
+		$this->IsPower();
+
         // 开始处理
         $params = $this->data_request;
         return SystemUpgradeService::Run($params);
diff --git a/application/tags.php b/application/tags.php
index 73875f755..2e7510830 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -32,122 +32,29 @@ return array (
   'log_write' => 
   array (
   ),
+  'plugins_admin_css' => 
+  array (
+    0 => 'app\\plugins\\shop\\Hook',
+  ),
   'plugins_css' => 
   array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\shop\\Hook',
-    2 => 'app\\plugins\\multilingual\\Hook',
-    3 => 'app\\plugins\\store\\Hook',
-    4 => 'app\\plugins\\distribution\\Hook',
+    0 => 'app\\plugins\\shop\\Hook',
   ),
   'plugins_js' => 
   array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\shop\\Hook',
-    2 => 'app\\plugins\\multilingual\\Hook',
-    3 => 'app\\plugins\\store\\Hook',
-    4 => 'app\\plugins\\distribution\\Hook',
+    0 => 'app\\plugins\\shop\\Hook',
   ),
   'plugins_service_navigation_header_handle' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\shop\\Hook',
-    2 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_service_quick_navigation_pc' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\multilingual\\Hook',
-    2 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_quick_navigation_h5' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\multilingual\\Hook',
-    2 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_quick_navigation_weixin' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_quick_navigation_alipay' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_quick_navigation_baidu' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_quick_navigation_qq' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_quick_navigation_toutiao' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_goods_handle_end' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\shop\\Hook',
-    2 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_view_buy_form_inside' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_view_buy_base_confirm_top' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_service_buy_group_goods_handle' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\newuserreduction\\Hook',
-  ),
-  'plugins_service_buy_order_insert_end' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\shop\\Hook',
-    2 => 'app\\plugins\\store\\Hook',
-    3 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_order_status_change_history_success_handle' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-    1 => 'app\\plugins\\shop\\Hook',
-    2 => 'app\\plugins\\store\\Hook',
-    3 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_base_data_return_api_buy_index' => 
-  array (
-    0 => 'app\\plugins\\points\\Hook',
-  ),
-  'plugins_admin_css' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\orderpricerevision\\Hook',
-    2 => 'app\\plugins\\store\\Hook',
   ),
   'plugins_service_users_center_left_menu_handle' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
-    2 => 'app\\plugins\\distribution\\Hook',
   ),
   'plugins_service_header_navigation_top_right_handle' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\multilingual\\Hook',
-    2 => 'app\\plugins\\store\\Hook',
-    3 => 'app\\plugins\\distribution\\Hook',
   ),
   'plugins_service_goods_save_handle' => 
   array (
@@ -156,27 +63,22 @@ return array (
   'plugins_service_editor_path_type_admin_goods_saveinfo' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
   ),
   'plugins_view_goods_detail_right_content_bottom' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
   ),
   'plugins_view_goods_detail_base_bottom' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
   ),
   'plugins_view_goods_detail_base_buy_nav_min_inside_begin' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
   ),
   'plugins_service_warehouse_handle_end' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
   ),
   'plugins_service_buy_handle' => 
   array (
@@ -185,119 +87,38 @@ return array (
   'plugins_service_buy_order_insert_begin' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
   ),
-  'plugins_service_order_aftersale_audit_handle_end' => 
+  'plugins_service_buy_order_insert_end' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
-    2 => 'app\\plugins\\distribution\\Hook',
   ),
-  'plugins_view_admin_goods_save' => 
+  'plugins_service_order_status_change_history_success_handle' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
   ),
-  'plugins_module_form_admin_goods_index' => 
+  'plugins_service_order_aftersale_audit_handle_end' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
   ),
-  'plugins_module_form_admin_goods_detail' => 
+  'plugins_view_admin_goods_save' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
   ),
-  'plugins_service_goods_buy_nav_button_handle' => 
+  'plugins_service_goods_handle_end' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_common_page_bottom' => 
-  array (
-    0 => 'app\\plugins\\multilingual\\Hook',
-  ),
-  'plugins_view_common_top' => 
-  array (
-    0 => 'app\\plugins\\multilingual\\Hook',
-  ),
-  'plugins_view_common_bottom' => 
-  array (
-    0 => 'app\\plugins\\multilingual\\Hook',
-  ),
-  'plugins_service_search_goods_list_where' => 
-  array (
-    0 => 'app\\plugins\\multilingual\\Hook',
-  ),
-  'plugins_admin_js' => 
-  array (
-    0 => 'app\\plugins\\orderpricerevision\\Hook',
-  ),
-  'plugins_admin_view_common_bottom' => 
-  array (
-    0 => 'app\\plugins\\orderpricerevision\\Hook',
-  ),
-  'plugins_view_admin_order_list_operate' => 
-  array (
-    0 => 'app\\plugins\\orderpricerevision\\Hook',
-    1 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_service_warehouse_goods_inventory_deduct' => 
-  array (
-    0 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_service_warehouse_goods_inventory_rollback' => 
-  array (
-    0 => 'app\\plugins\\store\\Hook',
   ),
-  'plugins_service_warehouse_goods_inventory_sync' => 
-  array (
-    0 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_service_goods_field_status_update' => 
-  array (
-    0 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_service_goods_delete' => 
-  array (
-    0 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_service_goods_save_end' => 
-  array (
-    0 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_service_system_begin' => 
-  array (
-    0 => 'app\\plugins\\store\\Hook',
-  ),
-  'plugins_service_site_extraction_address_list' => 
-  array (
-    0 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_goods_spec_extends_handle' => 
-  array (
-    0 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_view_admin_user_save' => 
-  array (
-    0 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_user_save_handle' => 
-  array (
-    0 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_goods_spec_base' => 
-  array (
-    0 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_view_goods_detail_panel_price_top' => 
+  'plugins_module_form_admin_goods_index' => 
   array (
-    0 => 'app\\plugins\\distribution\\Hook',
+    0 => 'app\\plugins\\shop\\Hook',
   ),
-  'plugins_module_form_admin_user_index' => 
+  'plugins_module_form_admin_goods_detail' => 
   array (
-    0 => 'app\\plugins\\distribution\\Hook',
+    0 => 'app\\plugins\\shop\\Hook',
   ),
-  'plugins_module_form_admin_user_detail' => 
+  'plugins_service_goods_buy_nav_button_handle' => 
   array (
-    0 => 'app\\plugins\\distribution\\Hook',
+    0 => 'app\\plugins\\shop\\Hook',
   ),
 );
 ?>
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index 45f86fcb6..c4453c8ed 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -13,7 +13,7 @@ web端
 	1. 
 
 插件
-	1. 
+	1. 分销插件优化、增强更多返佣规则
 
 
 +=========================================================+
diff --git a/config/app.php b/config/app.php
index 6d3a2b114..726db50bb 100755
--- a/config/app.php
+++ b/config/app.php
@@ -19,7 +19,7 @@ return [
     // 应用地址
     'app_host'               => '',
     // 应用调试模式
-    'app_debug'              => true,
+    'app_debug'              => false,
     // 应用Trace
     'app_trace'              => false,
     // 是否支持多模块
diff --git a/extend/payment/QQ.php b/extend/payment/QQ.php
index 5c26ea49a..ab2faed02 100644
--- a/extend/payment/QQ.php
+++ b/extend/payment/QQ.php
@@ -331,7 +331,9 @@ class QQ
     public function PayAppID($client_type)
     {
         $arr = [
-            'app'    => $this->config['app_appid'],
+            'app'       => $this->config['app_appid'],
+            'ios'       => $this->config['app_appid'],
+            'android'   => $this->config['app_appid'],
         ];
         return array_key_exists($client_type, $arr) ? $arr[$client_type] : $this->config['appid'];
     }
diff --git a/extend/payment/Weixin.php b/extend/payment/Weixin.php
index 30f659009..ab2b84457 100755
--- a/extend/payment/Weixin.php
+++ b/extend/payment/Weixin.php
@@ -418,7 +418,8 @@ class Weixin
     {
         $arr = [
             'weixin'    => $this->config['mini_appid'],
-            'app'    => $this->config['app_appid'],
+            'ios'       => $this->config['app_appid'],
+            'android'   => $this->config['app_appid'],
         ];
         return array_key_exists($client_type, $arr) ? $arr[$client_type] : $this->config['appid'];
     }
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 8d780a83d..3609bfc45 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -8,6 +8,13 @@ ul { list-style: none; }
 .text-deco-none { text-decoration: none !important; }
 .text-deco-line { text-decoration: underline !important; }
 
+/**
+ * 表单组件
+ */
+.am-form select, .am-form textarea, .am-form input[type="text"], .am-form input[type="password"], .am-form input[type="datetime"], .am-form input[type="datetime-local"], .am-form input[type="date"], .am-form input[type="month"], .am-form input[type="time"], .am-form input[type="week"], .am-form input[type="number"], .am-form input[type="email"], .am-form input[type="url"], .am-form input[type="search"], .am-form input[type="tel"], .am-form input[type="color"], .am-form-field {
+    line-height: 1.4;
+}
+
 /* 没数据 */
 .table-no {text-align:center;padding:115px 0;background:#FFF !important;color: #888; }
 
@@ -39,13 +46,13 @@ form.am-form .am-form-group-refreshing, .plug-file-upload-view { border-bottom:
 .chosen-container { width: 100% !important; }
 .am-tagsinput { display: block; padding: 2px 5px; border-radius: 2px; }
 .chosen-choices, .chosen-single { border-radius: 2px; }
-.chosen-choices li.search-field input[type="text"] { height: 28px !important; }
+.chosen-choices li.search-field input[type="text"] { height: 30px !important; }
 .chosen-choices li.search-field input[type="text"]:hover,
 .am-tagsinput input[type="text"]:hover { box-shadow: 0 0 0 #fff !important; border: 0 !important; }
 .chosen-choices li.search-field input[type="text"]:focus,
 .am-tagsinput input[type="text"]:focus { border-color: #fff; -webkit-box-shadow: inset 0 0 0 0 !important; box-shadow: inset 0 0 0 0 !important; }
-.chosen-choices { padding: 0px 3px !important; min-height: 28px; }
-.chosen-container-single .chosen-single { height: 28px; line-height: 28px; }
+.chosen-choices { padding: 0px 3px !important; min-height: 30px; }
+.chosen-container-single .chosen-single { height: 30px; line-height: 30px; }
 .chosen-container-multi .chosen-choices li.search-field { padding-left: 3px; }
 .chosen-container-single .chosen-single { color: #444 !important; }
 .chosen-container-single .chosen-default { color: #999 !important; }
@@ -148,9 +155,6 @@ form.am-form .am-form-group-refreshing, .plug-file-upload-view { border-bottom:
 .am-modal-dialog {
     width: auto;
 }
-.am-modal-dialog .am-modal-bd {
-    padding: 10px 30px;
-}
 .am-modal-dialog .am-modal-bd span {
     vertical-align: middle;
 }
diff --git a/public/static/common/lib/amazeui-dialog/amazeui.dialog.js b/public/static/common/lib/amazeui-dialog/amazeui.dialog.js
index 966282ece..2f5f0164b 100755
--- a/public/static/common/lib/amazeui-dialog/amazeui.dialog.js
+++ b/public/static/common/lib/amazeui-dialog/amazeui.dialog.js
@@ -72,7 +72,7 @@ dialog.confirm = function(options) {
   html.push('<div class="am-modal am-modal-confirm" tabindex="-1">');
   html.push('<div class="am-modal-dialog">');
   html.push('<div class="am-modal-hd">' + options.title + '</div>');
-  html.push('<div class="am-modal-bd">' + options.content + '</div>');
+  html.push('<div class="am-modal-bd"><div class="am-padding-horizontal-xl am-padding-vertical-xs">' + options.content + '</div></div>');
   html.push('<div class="am-modal-footer">');
   html.push('<span class="am-modal-btn" data-am-modal-cancel>取消</span>');
   html.push('<span class="am-modal-btn" data-am-modal-confirm>确定</span>');
@@ -110,12 +110,14 @@ dialog.loading = function(options) {
       var html = [];
       html.push('<div class="am-modal am-modal-loading am-modal-no-btn" tabindex="-1" id="my-modal-loading">');
       html.push('<div class="am-modal-dialog">');
-      html.push('<div class="am-modal-bd">');
+      html.push('<div class="am-modal-bd am-padding-vertical-0">');
+      html.push('<div class="am-padding-horizontal-sm am-padding-vertical-sm">');
       html.push('<span class="am-icon-spinner am-icon-spin"></span>');
       html.push('<span class="am-margin-left-xs">' + options.title + '</span>');
       html.push('</div>');
       html.push('</div>');
       html.push('</div>');
+      html.push('</div>');
 
       return $(html.join('')).appendTo('body').modal()
         .on('closed.modal.amui', function() {
diff --git a/public/static/common/lib/ueditor/dialogs/map/map.html b/public/static/common/lib/ueditor/dialogs/map/map.html
index 8a6259b1c..58f416bac 100755
--- a/public/static/common/lib/ueditor/dialogs/map/map.html
+++ b/public/static/common/lib/ueditor/dialogs/map/map.html
@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
     <script type="text/javascript" src="../internal.js"></script>
-    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=XSdiGjfg3wOHiKjpYEMG6CYA"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak={{common_baidu_map_ak}}"></script>
     <style type="text/css">
         .content{width:530px; height: 350px;margin: 10px auto;}
         .content table{width: 100%}
diff --git a/public/static/common/lib/ueditor/dialogs/map/show.html b/public/static/common/lib/ueditor/dialogs/map/show.html
index 356804e0c..1d5873e79 100755
--- a/public/static/common/lib/ueditor/dialogs/map/show.html
+++ b/public/static/common/lib/ueditor/dialogs/map/show.html
@@ -14,7 +14,7 @@
             overflow: hidden;
         }
     </style>
-    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=XSdiGjfg3wOHiKjpYEMG6CYA"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak={{common_baidu_map_ak}}"></script>
 </head>
 
 <body onload="initMap();">
-- 
GitLab