From 17192680d3d6d017fc923a0752020223b0628b3f Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Sun, 4 Aug 2019 10:52:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=80=E8=BF=B0=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/default/goods/save_info.html | 2 +-
 application/service/GoodsService.php                | 4 ++--
 public/static/index/default/js/common.js            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index 403d89271..f5f573290 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -62,7 +62,7 @@
 				</div>
 				<div class="am-form-group">
 					<label>商品简述</label>
-					<input type="text" name="simple_desc" placeholder="商品简述" maxlength="60" data-validation-message="商品简述格式 最多60个字符" class="am-radius" {{if !empty($data)}} value="{{$data.simple_desc}}"{{/if}} />
+					<input type="text" name="simple_desc" placeholder="商品简述" maxlength="160" data-validation-message="商品简述格式 最多160个字符" class="am-radius" {{if !empty($data)}} value="{{$data.simple_desc}}"{{/if}} />
 				</div>
 				<div class="am-form-group">
 					<label>商品型号</label>
diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php
index 09fc3a351..b1a430b09 100755
--- a/application/service/GoodsService.php
+++ b/application/service/GoodsService.php
@@ -989,9 +989,9 @@ class GoodsService
             [
                 'checked_type'      => 'length',
                 'key_name'          => 'simple_desc',
-                'checked_data'      => '60',
+                'checked_data'      => '160',
                 'is_checked'        => 1,
-                'error_msg'         => '商品简述格式 最多60个字符',
+                'error_msg'         => '商品简述格式 最多160个字符',
             ],
             [
                 'checked_type'      => 'length',
diff --git a/public/static/index/default/js/common.js b/public/static/index/default/js/common.js
index aeb97053b..4a3f7f1ac 100755
--- a/public/static/index/default/js/common.js
+++ b/public/static/index/default/js/common.js
@@ -5,7 +5,7 @@ console.log("\u6280\u672f\u652f\u6301\uff1a\u0068\u0074\u0074\u0070\u003a\u002f\
 var store = $.AMUI.store;
 if(!store.enabled)
 {
-  alert('Local storage is not supported by your browser. Please disable "Private Mode", or upgrade to a modern browser.');
+  alert('您的浏览器不支持本地存储。请禁用“专用模式”，或升级到现代浏览器。');
 } else {
     // 选择缓存key
     var store_user_menu_key = 'store-user-menu-active-key';
-- 
GitLab