- {{:MyLang('form_choice_images_title')}}
+
{{:MyLang('form_choice_file_title')}}
{{:MyLang('theme.form_theme_upload_tips')}}
diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php
index 2365a5145..5fd4e7018 100755
--- a/app/index/controller/Common.php
+++ b/app/index/controller/Common.php
@@ -343,6 +343,9 @@ class Common extends BaseController
// 当前url地址
$assign['my_domain'] = __MY_DOMAIN__;
+ // 当前host地址
+ $assign['my_host'] = __MY_HOST__;
+
// 当前完整url地址
$assign['my_url'] = __MY_URL__;
diff --git a/app/index/controller/Goods.php b/app/index/controller/Goods.php
index 7d5b75aa5..668c92abd 100755
--- a/app/index/controller/Goods.php
+++ b/app/index/controller/Goods.php
@@ -83,13 +83,10 @@ class Goods extends Common
'buy_button' => GoodsService::GoodsBuyButtonList($goods),
// 中间tabs导航
'middle_tabs_nav' => GoodsService::GoodsDetailMiddleTabsNavList($goods),
-
// 面包屑导航
'breadcrumb_data' => GoodsService::GoodsBreadcrumbData($goods),
-
// 加载放大镜
'is_load_imagezoom' => 1,
-
// 加载视频播放器组件
'is_load_ckplayer' => 1,
];
diff --git a/app/index/view/default/cart/index.html b/app/index/view/default/cart/index.html
index 984f157bb..cd86e6a2f 100755
--- a/app/index/view/default/cart/index.html
+++ b/app/index/view/default/cart/index.html
@@ -183,7 +183,7 @@
{{if $goods['is_error'] eq 0}}
-
-
+
+
{{else /}}
diff --git a/app/index/view/default/public/header.html b/app/index/view/default/public/header.html
index a964cbc51..5989c7a1c 100755
--- a/app/index/view/default/public/header.html
+++ b/app/index/view/default/public/header.html
@@ -75,7 +75,7 @@
{{/if}}
{{/foreach}}
{{/if}}
-
+
{{if !empty($plugins_common_header_data) and is_array($plugins_common_header_data)}}
{{foreach $plugins_common_header_data as $hook}}
@@ -95,7 +95,8 @@
var __system_type__ = '{{$system_type}}';
var __root__ = '{{$public_host}}';
var __my_http__ = '{{$my_http}}';
- var __my_url__ = '{{$my_url}}';
+ var __my_host__ = '{{$my_host}}';
+ var __my_url__ = '{{$my_url}}';
var __my_public_url__ = '{{$my_public_url}}';
var __public__ = '{{$public_host}}';
var __default_theme__ = '{{$default_theme}}';
diff --git a/app/lang/cht.php b/app/lang/cht.php
index eb514e38d..490e45db8 100644
--- a/app/lang/cht.php
+++ b/app/lang/cht.php
@@ -399,6 +399,7 @@ return [
'verification_title' => '核驗',
'service_title' => '服務',
'print_title' => '列印',
+ 'confirm_print_title' => '確認列印',
'transfer_order_title' => '轉單',
'transfer_audit_title' => '轉審',
'divider_title' => '分配',
diff --git a/app/lang/en.php b/app/lang/en.php
index a89f4c566..9fcfbff78 100644
--- a/app/lang/en.php
+++ b/app/lang/en.php
@@ -399,6 +399,7 @@ return [
'verification_title' => 'Verification',
'service_title' => 'Service',
'print_title' => 'Print',
+ 'confirm_print_title' => 'Confirm Print',
'transfer_order_title' => 'Transfer Order',
'transfer_audit_title' => 'Transfer Audit',
'divider_title' => 'Divider',
diff --git a/app/lang/spa.php b/app/lang/spa.php
index cd888dacd..b3cc00912 100644
--- a/app/lang/spa.php
+++ b/app/lang/spa.php
@@ -399,6 +399,7 @@ return [
'verification_title' => 'Verificación',
'service_title' => 'Servicios',
'print_title' => 'Imprimir',
+ 'confirm_print_title' => 'Confirmar Imprimir',
'transfer_order_title' => 'Orden de transferencia',
'transfer_audit_title' => 'Remisión',
'divider_title' => 'Distribución',
diff --git a/app/lang/zh.php b/app/lang/zh.php
index 7520c3595..d16602de1 100755
--- a/app/lang/zh.php
+++ b/app/lang/zh.php
@@ -399,6 +399,7 @@ return [
'verification_title' => '核验',
'service_title' => '服务',
'print_title' => '打印',
+ 'confirm_print_title' => '确认打印',
'transfer_order_title' => '转单',
'transfer_audit_title' => '转审',
'divider_title' => '分配',
diff --git a/app/service/BuyService.php b/app/service/BuyService.php
index 9687baf79..e0a441094 100755
--- a/app/service/BuyService.php
+++ b/app/service/BuyService.php
@@ -70,6 +70,8 @@ class BuyService
['is_shelves', '=', 1],
],
'field' => 'id,id AS goods_id,title,images,inventory_unit,is_shelves,buy_min_number,buy_max_number,model,site_type',
+ 'm' => 0,
+ 'n' => 0,
]);
$ret = GoodsService::GoodsList($goods_params);
if(empty($ret['data'][0]))
diff --git a/app/service/DomainService.php b/app/service/DomainService.php
index 5acd22d6b..c9ffc8f48 100644
--- a/app/service/DomainService.php
+++ b/app/service/DomainService.php
@@ -27,9 +27,9 @@ class DomainService
* @version 1.0.0
* @date 2022-05-10
* @desc description
- * @param [array] $params [输入参数]
- * @param [array] $params['domain'] [域名信息key=>val('xxx'=>'search/index')]
- * @param [array] $params['type'] [输入参数(0 移除, 1 增加)]
+ * @param [array] $params [输入参数]
+ * @param [array] $params['inc_domain'] [增加、域名信息key=>val('domain'=>'search/index')]
+ * @param [array] $params['dec_domain'] [移除、域名信息key=>val('domain'=>'search/index')]
*/
public static function DomainUpdate($params = [])
{
diff --git a/public/core.php b/public/core.php
index 737e92df9..1a6722973 100755
--- a/public/core.php
+++ b/public/core.php
@@ -130,6 +130,20 @@ define('IS_POST', isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'
// 是否ajax
define('IS_AJAX', ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && 'xmlhttprequest' == strtolower($_SERVER['HTTP_X_REQUESTED_WITH'])) || isset($_REQUEST['ajax']) && $_REQUEST['ajax'] == 'ajax'));
+// 独立域名页面绑定
+if(!IS_AJAX)
+{
+ $domain_file = ROOT.'config'.DS.'domain.php';
+ if(file_exists($domain_file))
+ {
+ $data = include($domain_file);
+ if(!empty($data) && !empty($data[__MY_HOST__]))
+ {
+ $_GET['s'] = $data[__MY_HOST__];
+ }
+ }
+}
+
// 二级域名页面绑定
if(!IS_AJAX && substr_count(__MY_HOST__, '.') > 1 && !is_numeric(str_replace('.', '', __MY_HOST__)))
{
@@ -138,10 +152,10 @@ if(!IS_AJAX && substr_count(__MY_HOST__, '.') > 1 && !is_numeric(str_replace('.'
if(!empty($second_domain) && file_exists($domain_file) && $second_domain != 'www')
{
$data = include($domain_file);
- if(!empty($data) && (!empty($data[$second_domain]) || !empty($data['s'])))
+ if(!empty($data) && !empty($data[$second_domain]))
{
define('SECOND_DOMAIN', $second_domain);
- $_GET['s'] = empty($data[$second_domain]) ? $data['s'] : $data[$second_domain];
+ $_GET['s'] = $data[$second_domain];
}
}
}
diff --git a/public/static/common/lib/assets/css/amazeui.css b/public/static/common/lib/assets/css/amazeui.css
index 3c2e889d9..ebb4c5156 100755
--- a/public/static/common/lib/assets/css/amazeui.css
+++ b/public/static/common/lib/assets/css/amazeui.css
@@ -2943,6 +2943,7 @@ fieldset[disabled] .am-checkbox-inline {
display: block;
max-width: 100%;
height: auto;
+ margin: 0 auto;
}
/* ==========================================================================
Component: Nav
diff --git a/public/static/index/default/js/cart.js b/public/static/index/default/js/cart.js
index 0a0803f8b..4c5fcf812 100755
--- a/public/static/index/default/js/cart.js
+++ b/public/static/index/default/js/cart.js
@@ -103,7 +103,7 @@ $(function()
// 数量参数
var $parent = $(this).parents('.stock-tag');
var $input = $parent.find('input[type="number"]');
- var min = parseInt($input.data('min-limit'));
+ var min = parseInt($input.data('min-limit') || 1);
var max = parseInt($input.data('max-limit'));
var unit = $input.data('unit') || '';
var stock = parseInt($input.val());
@@ -135,7 +135,7 @@ $(function()
{
// 数量参数
var $input = $(this);
- var min = parseInt($input.data('min-limit'));
+ var min = parseInt($input.data('min-limit') || 1);
var max = parseInt($input.data('max-limit'));
var unit = $input.data('unit') || '';
var stock = parseInt($input.val());