支持顶级域名绑定、下单商品读取数量限制修复、细节优化

app/admin/controller/Common.php

@@ -289,6 +289,9 @@ class Common extends BaseController
         // css/js引入host地址
         $assign['public_host'] = MyConfig('shopxo.public_host');
 
+        // 当前host地址
+        $assign['my_host'] = __MY_HOST__;
+
         // 当前url地址
         $assign['my_domain'] = __MY_DOMAIN__;
 

app/admin/view/default/appmini/upload.html

@@ -15,7 +15,7 @@
             <div class="am-form-group am-form-group-refreshing am-margin-bottom-0">
                 <div class="am-form-file">
                     <button type="button" class="am-btn am-btn-default am-btn-sm am-radius">
-                    <i class="am-icon-cloud-upload"></i> {{:MyLang('form_choice_images_title')}}</button>
+                    <i class="am-icon-cloud-upload"></i> {{:MyLang('form_choice_file_title')}}</button>
                     <input type="file" name="theme" class="file-event" data-tips-tag="#form-theme-tips" data-validation-message="{{:MyLang('form_upload_file_message')}}" accept=".zip" required />
                     <span class="tips am-text-xs">{{:MyLang('appmini.form_theme_upload_tips')}}</span>
                     <div id="form-theme-tips" class="am-margin-top-xs"></div>

app/admin/view/default/design/index.html

@@ -31,7 +31,7 @@
                     {{/if}}
                     <div class="am-form-group am-form-group-refreshing">
                         <div class="am-form-file">
-                            <button type="button" class="am-btn am-btn-default am-btn-sm am-radius"><i class="am-icon-cloud-upload"></i> {{:MyLang('form_choice_images_title')}}</button>
+                            <button type="button" class="am-btn am-btn-default am-btn-sm am-radius"><i class="am-icon-cloud-upload"></i> {{:MyLang('form_choice_file_title')}}</button>
                             <input type="file" name="file" class="file-event" data-tips-tag="#form-payment-tips" data-validation-message="{{:MyLang('form_upload_file_message')}}" accept=".zip" multiple required />
                             <div id="form-payment-tips" class="am-margin-top-xs"></div>
                         </div>

app/admin/view/default/payment/index.html

@@ -40,7 +40,7 @@
                     {{/if}}
                     <div class="am-form-group am-form-group-refreshing">
                         <div class="am-form-file">
-                            <button type="button" class="am-btn am-btn-default am-btn-sm am-radius"><i class="am-icon-cloud-upload"></i> {{:MyLang('form_choice_images_title')}}</button>
+                            <button type="button" class="am-btn am-btn-default am-btn-sm am-radius"><i class="am-icon-cloud-upload"></i> {{:MyLang('form_choice_file_title')}}</button>
                             <input type="file" name="file" class="file-event" data-tips-tag="#form-payment-tips" data-validation-message="{{:MyLang('form_upload_file_message')}}" accept=".zip" multiple required />
                             <div id="form-payment-tips" class="am-margin-top-xs"></div>
                         </div>

app/admin/view/default/pluginsadmin/index.html

@@ -132,11 +132,11 @@
                                         <img src="{{$v.logo}}" class="icon" />
                                         <div class="base">
                                             <h3 class="name">{{$v.name}}</h3>
-                                            <p>{{:MyLang('pluginsadmin.data_list_author_title')}}{{$v.author}}</p>
+                                            <p>{{:MyLang('pluginsadmin.data_list_author_title')}}：{{$v.author}}</p>
                                             {{if empty($site_store_info) or empty($site_store_info['vip']) or !isset($site_store_info['vip']['status']) or $site_store_info['vip']['status'] eq 0}}
-                                                <p>{{:MyLang('pluginsadmin.data_list_author_url_title')}}<a href="{{$v.author_url}}" target="_blank">{{$v.author_url}}</a></p>
+                                                <p>{{:MyLang('pluginsadmin.data_list_author_url_title')}}：<a href="{{$v.author_url}}" target="_blank">{{$v.author_url}}</a></p>
                                             {{/if}}
-                                            <p>{{:MyLang('pluginsadmin.data_list_version_title')}}{{$v.version}}</p>
+                                            <p>{{:MyLang('pluginsadmin.data_list_version_title')}}：{{$v.version}}</p>
                                         </div>
                                         <div class="desc">{{$v.desc}}</div>
                                         <div class="operation">

app/admin/view/default/pluginsadmin/upload.html

@@ -12,7 +12,7 @@
             <div class="am-form-group am-form-group-refreshing am-margin-bottom-0">
                 <div class="am-form-file">
                     <button type="button" class="am-btn am-btn-default am-btn-sm am-radius">
-                    <i class="am-icon-cloud-upload"></i> {{:MyLang('form_choice_images_title')}}</button>
+                    <i class="am-icon-cloud-upload"></i> {{:MyLang('form_choice_file_title')}}</button>
                     <input type="file" name="file" class="file-event" data-tips-tag="#form-file-tips" data-validation-message="{{:MyLang('form_upload_file_message')}}" accept=".zip" required />
                     <span class="tips am-text-xs">{{:MyLang('common_service.pluginsadmin.form_item_upload_tips')}}</span>
                     <div id="form-file-tips" class="am-margin-top-xs"></div>

app/admin/view/default/public/header.html

@@ -84,6 +84,7 @@
         var __system_type__ = '{{$system_type}}';
         var __root__ = '{{$public_host}}';
         var __my_http__ = '{{$my_http}}';
+        var __my_host__ = '{{$my_host}}';
         var __my_url__ = '{{$my_url}}';
         var __my_public_url__ = '{{$my_public_url}}';
         var __public__ = '{{$public_host}}';

app/admin/view/default/theme/upload.html

@@ -12,7 +12,7 @@
 			<div class="am-form-group am-form-group-refreshing am-margin-bottom-0">
 				<div class="am-form-file">
 					<button type="button" class="am-btn am-btn-default am-btn-sm am-radius">
-					<i class="am-icon-cloud-upload"></i> {{:MyLang('form_choice_images_title')}}</button>
+					<i class="am-icon-cloud-upload"></i> {{:MyLang('form_choice_file_title')}}</button>
 					<input type="file" name="theme" class="file-event" data-tips-tag="#form-theme-tips" data-validation-message="{{:MyLang('form_upload_file_message')}}" accept=".zip" required />
 					<span class="tips am-text-xs">{{:MyLang('theme.form_theme_upload_tips')}}</span>
 					<div id="form-theme-tips" class="am-margin-top-xs"></div>

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__;
 

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,
             ];

app/index/view/default/cart/index.html

@@ -183,7 +183,7 @@
                             {{if $goods['is_error'] eq 0}}
                                 <div class="am-input-group am-input-group-sm stock-tag" data-inventory="{{$goods.inventory}}" data-price="{{$goods.price}}">
                                     <span class="am-input-group-label {{if $goods['is_shelves'] eq 1 and $goods['is_delete_time'] eq 0}}stock-submit{{/if}}" data-type="min">-</span>
-                                    <input type="number" class="am-form-field" value="{{$goods.stock}}" {{if $goods['is_shelves'] neq 1 or $goods['is_delete_time'] neq 0}}disabled{{/if}} data-min-limit="{{$goods.buy_min_number}}" data-max-limit="{{$goods.buy_max_number}}" data-unit="{{$goods.inventory_unit}}" />
+                                    <input type="number" class="am-form-field" value="{{$goods.stock}}" {{if $goods['is_shelves'] neq 1 or $goods['is_delete_time'] neq 0}}disabled{{/if}} data-min-limit="{{$goods.spec_buy_min_number}}" data-max-limit="{{$goods.spec_buy_max_number}}" data-unit="{{$goods.inventory_unit}}" />
                                     <span class="am-input-group-label {{if $goods['is_shelves'] eq 1 and $goods['is_delete_time'] eq 0}}stock-submit{{/if}}" data-type="add">+</span>
                                 </div>
                             {{else /}}

app/index/view/default/public/header.html

@@ -75,7 +75,7 @@
             {{/if}}
         {{/foreach}}
     {{/if}}
-	
+
 	<!-- 公共header内钩子 -->
 	{{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}}';

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'                                         => '分配',

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',

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',

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'                                         => '分配',

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]))

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 = [])
     {

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];
         }
     }
 }

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

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());