From bc233a4bf4da2fb157d05eecd05fb17fe24313e1 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Thu, 27 May 2021 00:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BB=B7=E6=A0=BC=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=B08=E4=BD=8D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Common.php        |  3 +++
 application/admin/view/default/goods/spec.html | 12 ++++++------
 application/index/controller/Common.php        |  3 +++
 application/lang/zh-cn.php                     |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php
index a4ae2dc40..8d57278c5 100755
--- a/application/admin/controller/Common.php
+++ b/application/admin/controller/Common.php
@@ -244,6 +244,9 @@ class Common extends Controller
         $module_js .= file_exists(ROOT_PATH.'static'.DS.$module_js.'.'.$this->action_name.'.js') ? '.'.$this->action_name.'.js' : '.js';
         $this->assign('module_js', file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : '');
 
+        // 价格正则
+        $this->assign('default_price_regex', lang('common_regex_price'));
+
 		// 附件host地址
         $this->assign('attachment_host', config('shopxo.attachment_host'));
 
diff --git a/application/admin/view/default/goods/spec.html b/application/admin/view/default/goods/spec.html
index 38c71de78..3b6dd6df6 100644
--- a/application/admin/view/default/goods/spec.html
+++ b/application/admin/view/default/goods/spec.html
@@ -91,7 +91,7 @@
                 {{if empty($specifications['value'])}}
                     <tr class="line-0" data-line-tag=".line-0">
                         <td class="am-text-middle value-start">
-                            <input type="text" name="specifications_price[]" placeholder="价格" class="am-radius" pattern="^([0-9]{1}\d{0,6})(\.\d{1,2})?$" data-validation-message="请填写有效的销售金额" required />
+                            <input type="text" name="specifications_price[]" placeholder="价格" class="am-radius" pattern="{{$default_price_regex}}" data-validation-message="请填写有效的销售金额" required />
                         </td>
                         <td class="am-text-middle">
                             <input type="number" name="specifications_weight[]" placeholder="重量" class="am-radius" maxlength="80" min="0.00" max="100000000.00" step="0.01" data-validation-message="规格重量 0.00~100000000.00" />
@@ -103,7 +103,7 @@
                             <input type="text" name="specifications_barcode[]" placeholder="条形码" class="am-radius" maxlength="80" data-validation-message="条形码最多80个字符" />
                         </td>
                         <td class="am-text-middle">
-                            <input type="text" name="specifications_original_price[]" placeholder="原价" class="am-radius" pattern="^([0-9]{1}\d{0,6})(\.\d{1,2})?$" data-validation-message="请填写有效的原价" />
+                            <input type="text" name="specifications_original_price[]" placeholder="原价" class="am-radius" pattern="{{$default_price_regex}}" data-validation-message="请填写有效的原价" />
                         </td>
                         <td class="am-text-middle">
                             <input type="hidden" name="specifications_extends[]" value="" class="line-extend-input" />
@@ -132,7 +132,7 @@
 
                                     {{case base}}
                                         <td class="am-text-middle value-start">
-                                            <input type="text" name="specifications_price[]" placeholder="价格" class="am-radius" pattern="^([0-9]{1}\d{0,6})(\.\d{1,2})?$" data-validation-message="请填写有效的销售金额" value="{{$v.data.price}}" required />
+                                            <input type="text" name="specifications_price[]" placeholder="价格" class="am-radius" pattern="{{$default_price_regex}}" data-validation-message="请填写有效的销售金额" value="{{$v.data.price}}" required />
                                         </td>
                                         <td class="am-text-middle">
                                             <input type="number" name="specifications_weight[]" placeholder="重量" class="am-radius" min="0.00" max="100000000.00" step="0.01" data-validation-message="规格重量 0.00~100000000.00" value="{{if $v['data']['weight'] gt 0}}{{$v.data.weight}}{{/if}}" />
@@ -144,7 +144,7 @@
                                             <input type="text" name="specifications_barcode[]" placeholder="条形码" class="am-radius" maxlength="80" data-validation-message="条形码最多80个字符" value="{{$v.data.barcode}}" />
                                         </td>
                                         <td class="am-text-middle">
-                                            <input type="text" name="specifications_original_price[]" placeholder="原价" class="am-radius" pattern="^([0-9]{1}\d{0,6})(\.\d{1,2})?$" data-validation-message="请填写有效的原价" value="{{if $v['data']['original_price'] gt 0}}{{$v.data.original_price}}{{/if}}" />
+                                            <input type="text" name="specifications_original_price[]" placeholder="原价" class="am-radius" pattern="{{$default_price_regex}}" data-validation-message="请填写有效的原价" value="{{if $v['data']['original_price'] gt 0}}{{$v.data.original_price}}{{/if}}" />
                                         </td>
                                         <td class="am-text-middle">
                                             <input type="hidden" name="specifications_extends[]" value="{{$v.data.extends}}" class="line-extend-input" />
@@ -212,7 +212,7 @@
             <div class="am-alert am-alert-secondary spec-title-container"></div>
             <div class="am-form-group">
                 <label class="block">销售价格</label>
-                <input type="text" placeholder="价格" class="am-radius popup_all_price" pattern="^([0-9]{1}\d{0,6})(\.\d{1,2})?$" data-validation-message="请填写有效的销售金额" />
+                <input type="text" placeholder="价格" class="am-radius popup_all_price" pattern="{{$default_price_regex}}" data-validation-message="请填写有效的销售金额" />
             </div>
             <div class="am-form-group">
                 <label class="block">重量</label>
@@ -228,7 +228,7 @@
             </div>
             <div class="am-form-group">
                 <label class="block">原价</label>
-                <input type="text" placeholder="原价" class="am-radius popup_all_original_price" pattern="^([0-9]{1}\d{0,6})(\.\d{1,2})?$" data-validation-message="请填写有效的原价" />
+                <input type="text" placeholder="原价" class="am-radius popup_all_original_price" pattern="{{$default_price_regex}}" data-validation-message="请填写有效的原价" />
             </div>
             <div class="am-form-group am-form-group-refreshing am-text-center">
                 <button type="button" class="am-btn am-btn-warning am-radius am-btn-sm am-margin-right-lg" data-am-modal-close>取消</button>
diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php
index 5f60030dc..1e8fa1f1d 100755
--- a/application/index/controller/Common.php
+++ b/application/index/controller/Common.php
@@ -358,6 +358,9 @@ class Common extends Controller
         $this->assign('is_header', 1);
         $this->assign('is_footer', 1);
 
+        // 价格正则
+        $this->assign('default_price_regex', lang('common_regex_price'));
+
         // 附件host地址
         $this->assign('attachment_host', config('shopxo.attachment_host'));
 
diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php
index 40a8c50df..54903b95f 100755
--- a/application/lang/zh-cn.php
+++ b/application/lang/zh-cn.php
@@ -405,7 +405,7 @@ return [
     'common_regex_id_card'              =>  '^(\d{15}$|^\d{18}$|^\d{17}(\d|X|x))$',
 
     // 价格格式
-    'common_regex_price'                =>  '^([0-9]{1}\d{0,6})(\.\d{1,2})?$',
+    'common_regex_price'                =>  '^([0-9]{1}\d{0,7})(\.\d{1,2})?$',
 
     // ip
     'common_regex_ip'                   =>  '^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$',
-- 
GitLab