From fa5da47f4613dc17dc593c2e69c15cea15dcfa1d Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 7 Sep 2022 16:25:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96=E3=80=81?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E8=AF=BB=E5=8F=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Common.php               |  3 ++
 app/admin/view/default/brand/save_info.html   |  4 +-
 app/admin/view/default/goods/save_info.html   | 10 ++--
 .../default/goodscomments/module/operate.html |  6 +--
 .../default/lib/module/goods_category.html    |  6 +--
 .../view/default/lib/region_linkage.html      |  8 +--
 app/admin/view/default/navigation/index.html  |  8 +--
 .../view/default/site/siteset/index.html      |  8 +--
 .../view/default/warehousegoods/index.html    |  8 +--
 app/common.php                                |  4 --
 app/index/controller/Common.php               |  3 ++
 .../view/default/lib/region_linkage.html      |  6 +--
 app/service/AdminService.php                  |  4 +-
 app/service/BrandService.php                  |  7 +--
 app/service/GoodsService.php                  | 53 +++++++++++++------
 app/service/UserService.php                   |  4 +-
 public/static/admin/default/css/common.css    | 18 -------
 public/static/admin/default/js/goods.js       |  4 +-
 public/static/common/css/common.css           | 38 ++++++++++---
 public/static/common/js/common.js             |  6 +--
 .../static/common/lib/assets/css/amazeui.css  |  2 -
 21 files changed, 119 insertions(+), 91 deletions(-)

diff --git a/app/admin/controller/Common.php b/app/admin/controller/Common.php
index ceb80609d..1ca43ced9 100755
--- a/app/admin/controller/Common.php
+++ b/app/admin/controller/Common.php
@@ -314,6 +314,9 @@ class Common extends BaseController
         // 页面语言
         $assign['lang_data'] = SystemService::PageViewLangData();
 
+        // 省市联动是否必选选择
+        $assign['is_force_region_choice'] = 1;
+
         // 模板赋值
         MyViewAssign($assign);
 	}
diff --git a/app/admin/view/default/brand/save_info.html b/app/admin/view/default/brand/save_info.html
index 5fcae6216..93a2ee1d5 100755
--- a/app/admin/view/default/brand/save_info.html
+++ b/app/admin/view/default/brand/save_info.html
@@ -23,8 +23,8 @@
 			</div>
 
 			<div class="am-form-group">
-				<label>官网地址<span class="am-form-group-label-tips">带http://或https://</span></label>
-				<input type="url" placeholder="官网地址" name="website_url"  data-validation-message="官网地址格式有误" class="am-radius" {{if !empty($data['website_url'])}} value="{{$data.website_url}}"{{/if}} />
+				<label>官网地址<span class="am-form-group-label-tips">选填</span></label>
+				<input type="url" placeholder="官网地址、以http://或https://开头" name="website_url"  data-validation-message="官网地址格式有误" class="am-radius" {{if !empty($data['website_url'])}} value="{{$data.website_url}}"{{/if}} />
 			</div>
 
 			<div class="am-form-group">
diff --git a/app/admin/view/default/goods/save_info.html b/app/admin/view/default/goods/save_info.html
index da8982a1f..3db22284b 100755
--- a/app/admin/view/default/goods/save_info.html
+++ b/app/admin/view/default/goods/save_info.html
@@ -80,13 +80,13 @@
 						<select name="category_id" class="am-radius chosen-select" multiple="multiple" minchecked="1" data-placeholder="请选择..." data-validation-message="请至少选择一个商品分类" data-base-template-url="{{:MyUrl('admin/goods/basetemplate')}}" required>
 							{{if !empty($goods_category_list)}}
 								{{foreach $goods_category_list as $v}}
-									<option value="{{$v.id}}" {{if !empty($data['category_ids']) and in_array($v['id'], $data['category_ids'])}}selected{{/if}}>一级 - {{$v.name}}</option>
+									<option value="{{$v.id}}" {{if !empty($data['category_ids']) and in_array($v['id'], $data['category_ids'])}}selected{{/if}}>{{$v.name}}</option>
 									{{if !empty($v['items'])}}
 										{{foreach $v.items as $vs}}
-											<option style="padding-left: 30px;" value="{{$vs.id}}" {{if !empty($data['category_ids']) and in_array($vs['id'], $data['category_ids'])}}selected{{/if}}>二级-{{$vs.name}}</option>
+											<option style="padding-left: 20px;" value="{{$vs.id}}" {{if !empty($data['category_ids']) and in_array($vs['id'], $data['category_ids'])}}selected{{/if}}>{{if empty($vs['items'])}}├{{else /}}└{{/if}}² {{$vs.name}}</option>
 											{{if !empty($vs['items'])}}
-												{{foreach $vs.items as $vss}}
-													<option style="padding-left: 60px;" value="{{$vss.id}}" {{if !empty($data['category_ids']) and in_array($vss['id'], $data['category_ids'])}}selected{{/if}}>三级-{{$vss.name}}</option>
+												{{foreach $vs.items as $kss=>$vss}}
+													<option style="padding-left: 40px;" value="{{$vss.id}}" {{if !empty($data['category_ids']) and in_array($vss['id'], $data['category_ids'])}}selected{{/if}}>{{if $kss eq count($vs['items'])-1}}└{{else /}}├{{/if}}³ {{$vss.name}}</option>
 												{{/foreach}}
 											{{/if}}
 										{{/foreach}}
@@ -356,7 +356,7 @@
                 </div>
                 <div class="am-panel-bd business-form-group">
                 	<div class="am-margin-horizontal-sm">
-                        <textarea class="am-radius am-validate" name="content_web" maxlength="105000" id="editor-tag" data-validation-message="电脑端详情内容最多 105000 个字符" style="width: 100%;">{{if !empty($data['content_web'])}}{{$data.content_web}}{{/if}}</textarea>
+                        <textarea class="am-radius" name="content_web" maxlength="105000" id="editor-tag" data-validation-message="电脑端详情内容最多 105000 个字符">{{if !empty($data['content_web'])}}{{$data.content_web}}{{/if}}</textarea>
                     </div>
                 </div>
             </div>
diff --git a/app/admin/view/default/goodscomments/module/operate.html b/app/admin/view/default/goodscomments/module/operate.html
index 7eab2e698..e7937cc52 100644
--- a/app/admin/view/default/goodscomments/module/operate.html
+++ b/app/admin/view/default/goodscomments/module/operate.html
@@ -12,10 +12,8 @@
         <i class="am-icon-gavel"></i>
         <span>回复</span>
     {{else /}}
-        {{if $module_data['is_show'] eq 0}}
-            <i class="am-icon-pencil"></i>
-            <span>修改</span>
-        {{/if}}
+        <i class="am-icon-pencil"></i>
+        <span>修改</span>
     {{/if}}
 </button>
 <button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block submit-delete" data-url="{{:MyUrl('admin/goodscomments/delete')}}" data-id="{{$module_data.id}}" data-key="ids">
diff --git a/app/admin/view/default/lib/module/goods_category.html b/app/admin/view/default/lib/module/goods_category.html
index dea8962f3..9e80975d1 100644
--- a/app/admin/view/default/lib/module/goods_category.html
+++ b/app/admin/view/default/lib/module/goods_category.html
@@ -5,10 +5,10 @@
             <option value="{{$v.id}}" {{if !empty($module_data['params']) and !empty($module_data['params'][$module_data['form_name_key']]) and is_array($module_data['params'][$module_data['form_name_key']]) and in_array($v['id'], $module_data['params'][$module_data['form_name_key']])}}selected{{/if}}>{{$v.name}}</option>
             {{if !empty($v['items'])}}
                 {{foreach $v.items as $vs}}
-                    <option style="padding-left: 15px;" value="{{$vs.id}}" {{if !empty($module_data['params']) and !empty($module_data['params'][$module_data['form_name_key']]) and is_array($module_data['params'][$module_data['form_name_key']]) and in_array($vs['id'], $module_data['params'][$module_data['form_name_key']])}}selected{{/if}}>{{$vs.name}}</option>
+                    <option style="padding-left: 15px;" value="{{$vs.id}}" {{if !empty($module_data['params']) and !empty($module_data['params'][$module_data['form_name_key']]) and is_array($module_data['params'][$module_data['form_name_key']]) and in_array($vs['id'], $module_data['params'][$module_data['form_name_key']])}}selected{{/if}}>{{if empty($vs['items'])}}├{{else /}}└{{/if}}² {{$vs.name}}</option>
                     {{if !empty($vs['items'])}}
-                        {{foreach $vs.items as $vss}}
-                            <option style="padding-left: 30px;" value="{{$vss.id}}" {{if !empty($module_data['params']) and !empty($module_data['params'][$module_data['form_name_key']]) and is_array($module_data['params'][$module_data['form_name_key']]) and in_array($vss['id'], $module_data['params'][$module_data['form_name_key']])}}selected{{/if}}>{{$vss.name}}</option>
+                        {{foreach $vs.items as $kss=>$vss}}
+                            <option style="padding-left: 30px;" value="{{$vss.id}}" {{if !empty($module_data['params']) and !empty($module_data['params'][$module_data['form_name_key']]) and is_array($module_data['params'][$module_data['form_name_key']]) and in_array($vss['id'], $module_data['params'][$module_data['form_name_key']])}}selected{{/if}}>{{if $kss eq count($vs['items'])-1}}└{{else /}}├{{/if}}³ {{$vss.name}}</option>
                         {{/foreach}}
                     {{/if}}
                 {{/foreach}}
diff --git a/app/admin/view/default/lib/region_linkage.html b/app/admin/view/default/lib/region_linkage.html
index 45afc9bd6..ed5e3939a 100755
--- a/app/admin/view/default/lib/region_linkage.html
+++ b/app/admin/view/default/lib/region_linkage.html
@@ -1,9 +1,9 @@
-<div class="am-form-group region-linkage" data-url="{{:MyUrl('admin/region/node')}}">
-    <label class="block">省市区<span class="am-form-group-label-tips-must">必选</span></label>
-    <select name="province" data-next="city" class="am-radius chosen-select" data-placeholder="省份" data-validation-message="请选择省份" data-value="{{if isset($data['province'])}}{{$data.province}}{{else /}}0{{/if}}" required>
+<div class="am-form-group region-linkage" data-url="{{:MyUrl('admin/region/index')}}">
+    <label class="block">省市区{{if isset($is_force_region_choice) and $is_force_region_choice eq 1}}<span class="am-form-group-label-tips-must">必选</span>{{else /}}<span class="am-form-group-label-tips">可选</span>{{/if}}</label>
+    <select name="province" data-next="city" class="am-radius chosen-select" data-placeholder="省份" data-validation-message="请选择省份" data-value="{{if isset($data['province'])}}{{$data.province}}{{else /}}0{{/if}}" {{if isset($is_force_region_choice) and $is_force_region_choice eq 1}}required{{/if}}>
         <option value="">省份</option>
     </select>
-    <select name="city" data-next="county" class="am-radius chosen-select" data-placeholder="城市" data-validation-message="请选择城市" data-value="{{if isset($data['city'])}}{{$data.city}}{{else /}}0{{/if}}" required>
+    <select name="city" data-next="county" class="am-radius chosen-select" data-placeholder="城市" data-validation-message="请选择城市" data-value="{{if isset($data['city'])}}{{$data.city}}{{else /}}0{{/if}}" {{if isset($is_force_region_choice) and $is_force_region_choice eq 1}}required{{/if}}>
         <option value="">城市</option>
     </select>
     <select name="county" class="am-radius chosen-select" data-placeholder="区/县" data-validation-message="请选择区/县" data-value="{{if isset($data['county'])}}{{$data.county}}{{else /}}0{{/if}}">
diff --git a/app/admin/view/default/navigation/index.html b/app/admin/view/default/navigation/index.html
index 3224c144f..46e9a6de2 100755
--- a/app/admin/view/default/navigation/index.html
+++ b/app/admin/view/default/navigation/index.html
@@ -225,13 +225,13 @@
                         <select class="am-radius chosen-select" name="value" data-placeholder="请选择..." data-validation-message="商品分类选择有误" required>
                             <option value="">请选择...</option>
                             {{foreach $goods_category_list as $v}}
-                                <option value="{{$v.id}}" {{if !empty($data['category_ids']) and in_array($v['id'], $data['category_ids'])}}selected{{/if}}>一级 - {{$v.name}}</option>
+                                <option value="{{$v.id}}" {{if !empty($data['category_ids']) and in_array($v['id'], $data['category_ids'])}}selected{{/if}}>{{$v.name}}</option>
                                 {{if !empty($v['items'])}}
                                     {{foreach $v.items as $vs}}
-                                        <option style="padding-left: 30px;" value="{{$vs.id}}" {{if !empty($data['category_ids']) and in_array($vs['id'], $data['category_ids'])}}selected{{/if}}>二级 - {{$vs.name}}</option>
+                                        <option style="padding-left: 20px;" value="{{$vs.id}}" {{if !empty($data['category_ids']) and in_array($vs['id'], $data['category_ids'])}}selected{{/if}}>{{if empty($vs['items'])}}├{{else /}}└{{/if}}² {{$vs.name}}</option>
                                         {{if !empty($vs['items'])}}
-                                            {{foreach $vs.items as $vss}}
-                                                <option style="padding-left: 60px;" value="{{$vss.id}}" {{if !empty($data['category_ids']) and in_array($vss['id'], $data['category_ids'])}}selected{{/if}}>三级 - {{$vss.name}}</option>
+                                            {{foreach $vs.items as $kss=>$vss}}
+                                                <option style="padding-left: 40px;" value="{{$vss.id}}" {{if !empty($data['category_ids']) and in_array($vss['id'], $data['category_ids'])}}selected{{/if}}>{{if $kss eq count($vs['items'])-1}}└{{else /}}├{{/if}}³ {{$vss.name}}</option>
                                             {{/foreach}}
                                         {{/if}}
                                     {{/foreach}}
diff --git a/app/admin/view/default/site/siteset/index.html b/app/admin/view/default/site/siteset/index.html
index 3734feffd..2eada0b26 100644
--- a/app/admin/view/default/site/siteset/index.html
+++ b/app/admin/view/default/site/siteset/index.html
@@ -223,13 +223,13 @@
                         <option value="">商品分类...</option>
                         {{if !empty($goods_category_list)}}
                             {{foreach $goods_category_list as $v}}
-                                <option value="{{$v.id}}">一级 - {{$v.name}}</option>
+                                <option value="{{$v.id}}">{{$v.name}}</option>
                                 {{if !empty($v['items'])}}
                                     {{foreach $v.items as $vs}}
-                                        <option style="padding-left: 15px;" value="{{$vs.id}}">二级 - {{$vs.name}}</option>
+                                        <option style="padding-left: 15px;" value="{{$vs.id}}">{{if empty($vs['items'])}}├{{else /}}└{{/if}}² {{$vs.name}}</option>
                                         {{if !empty($vs['items'])}}
-                                            {{foreach $vs.items as $vss}}
-                                                <option style="padding-left: 30px;" value="{{$vss.id}}">三级 - {{$vss.name}}</option>
+                                            {{foreach $vs.items as $kss=>$vss}}
+                                                <option style="padding-left: 30px;" value="{{$vss.id}}">{{if $kss eq count($vs['items'])-1}}└{{else /}}├{{/if}}³ {{$vss.name}}</option>
                                             {{/foreach}}
                                         {{/if}}
                                     {{/foreach}}
diff --git a/app/admin/view/default/warehousegoods/index.html b/app/admin/view/default/warehousegoods/index.html
index 4f662558c..58527d1d7 100644
--- a/app/admin/view/default/warehousegoods/index.html
+++ b/app/admin/view/default/warehousegoods/index.html
@@ -34,13 +34,13 @@
                             <option value="">商品分类...</option>
                             {{if !empty($goods_category_list)}}
                                 {{foreach $goods_category_list as $v}}
-                                    <option value="{{$v.id}}">一级 - {{$v.name}}</option>
+                                    <option value="{{$v.id}}">{{$v.name}}</option>
                                     {{if !empty($v['items'])}}
                                         {{foreach $v.items as $vs}}
-                                            <option style="padding-left: 15px;" value="{{$vs.id}}">二级 - {{$vs.name}}</option>
+                                            <option style="padding-left: 15px;" value="{{$vs.id}}">{{if empty($vs['items'])}}├{{else /}}└{{/if}}² {{$vs.name}}</option>
                                             {{if !empty($vs['items'])}}
-                                                {{foreach $vs.items as $vss}}
-                                                    <option style="padding-left: 30px;" value="{{$vss.id}}">三级 - {{$vss.name}}</option>
+                                                {{foreach $vs.items as $kss=>$vss}}
+                                                    <option style="padding-left: 30px;" value="{{$vss.id}}">{{if $kss eq count($vs['items'])-1}}└{{else /}}├{{/if}}³ {{$vss.name}}</option>
                                                 {{/foreach}}
                                             {{/if}}
                                         {{/foreach}}
diff --git a/app/common.php b/app/common.php
index 7cf8302c4..60a1b54dc 100755
--- a/app/common.php
+++ b/app/common.php
@@ -2926,10 +2926,6 @@ function ParamsChecked($data, $params)
                 {
                     return '长度规则值未定义['.$v['key_name'].']';
                 }
-                if(!is_string($v['checked_data']))
-                {
-                    return '内部调用参数配置有误['.$v['key_name'].']';
-                }
                 if(!isset($data[$v['key_name']]))
                 {
                     return $v['error_msg'];
diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php
index 5ded29839..05ef9e3ea 100755
--- a/app/index/controller/Common.php
+++ b/app/index/controller/Common.php
@@ -393,6 +393,9 @@ class Common extends BaseController
         // 页面语言
         $assign['lang_data'] = SystemService::PageViewLangData();
 
+        // 省市联动是否必选选择
+        $assign['is_force_region_choice'] = 1;
+
         // 模板赋值
         MyViewAssign($assign);
     }
diff --git a/app/index/view/default/lib/region_linkage.html b/app/index/view/default/lib/region_linkage.html
index 4956b35b5..2ccd76204 100755
--- a/app/index/view/default/lib/region_linkage.html
+++ b/app/index/view/default/lib/region_linkage.html
@@ -1,9 +1,9 @@
 <div class="am-form-group region-linkage" data-url="{{:MyUrl('index/region/index')}}">
-    <label class="block">省市区<span class="am-form-group-label-tips-must">必选</span></label>
-    <select name="province" data-next="city" class="am-radius chosen-select" data-placeholder="省份" data-validation-message="请选择省份" data-value="{{if isset($data['province'])}}{{$data.province}}{{else /}}0{{/if}}" required>
+    <label class="block">省市区{{if isset($is_force_region_choice) and $is_force_region_choice eq 1}}<span class="am-form-group-label-tips-must">必选</span>{{else /}}<span class="am-form-group-label-tips">可选</span>{{/if}}</label>
+    <select name="province" data-next="city" class="am-radius chosen-select" data-placeholder="省份" data-validation-message="请选择省份" data-value="{{if isset($data['province'])}}{{$data.province}}{{else /}}0{{/if}}" {{if isset($is_force_region_choice) and $is_force_region_choice eq 1}}required{{/if}}>
         <option value="">省份</option>
     </select>
-    <select name="city" data-next="county" class="am-radius chosen-select" data-placeholder="城市" data-validation-message="请选择城市" data-value="{{if isset($data['city'])}}{{$data.city}}{{else /}}0{{/if}}" required>
+    <select name="city" data-next="county" class="am-radius chosen-select" data-placeholder="城市" data-validation-message="请选择城市" data-value="{{if isset($data['city'])}}{{$data.city}}{{else /}}0{{/if}}" {{if isset($is_force_region_choice) and $is_force_region_choice eq 1}}required{{/if}}>
         <option value="">城市</option>
     </select>
     <select name="county" class="am-radius chosen-select" data-placeholder="区/县" data-validation-message="请选择区/县" data-value="{{if isset($data['county'])}}{{$data.county}}{{else /}}0{{/if}}">
diff --git a/app/service/AdminService.php b/app/service/AdminService.php
index e78bef706..54b668283 100755
--- a/app/service/AdminService.php
+++ b/app/service/AdminService.php
@@ -670,7 +670,7 @@ class AdminService
                 // 手机号码是否存在
                 if(!self::IsExistAccounts($params['accounts'], 'mobile'))
                 {
-                     return DataReturn('手机号码不存在', -3);
+                     return DataReturn('手机号码不存在、请先注册！', -3);
                 }
                 $field = 'mobile';
                 break;
@@ -686,7 +686,7 @@ class AdminService
                 // 电子邮箱是否存在
                 if(!self::IsExistAccounts($params['accounts'], 'email'))
                 {
-                     return DataReturn('电子邮箱不存在', -3);
+                     return DataReturn('电子邮箱不存在、请先注册！', -3);
                 }
                 $field = 'email';
                 break;
diff --git a/app/service/BrandService.php b/app/service/BrandService.php
index f67875a11..00ad86ab6 100755
--- a/app/service/BrandService.php
+++ b/app/service/BrandService.php
@@ -103,7 +103,7 @@ class BrandService
                 }
             }
 
-            // 数处理
+            // 数据处理
             foreach($data as &$v)
             {
                 // 分类名称
@@ -251,9 +251,10 @@ class BrandService
                 'error_msg'         => '官网地址格式有误',
             ],
             [
-                'checked_type'      => 'length',
+                'checked_type'      => 'max',
                 'key_name'          => 'sort',
-                'checked_data'      => '3',
+                'checked_data'      => 255,
+                'is_checked'        => 1,
                 'error_msg'         => '顺序 0~255 之间的数值',
             ],
             [
diff --git a/app/service/GoodsService.php b/app/service/GoodsService.php
index 2d9466f39..8c9800c8d 100755
--- a/app/service/GoodsService.php
+++ b/app/service/GoodsService.php
@@ -112,26 +112,49 @@ class GoodsService
                 unset($where_base[array_search('pid', $temp_column)]);
                 sort($where_base);
             }
-            foreach($data as &$v)
+
+            // 获取所有二级
+            $two_group = [];
+            $params['where'] = array_merge($where_base, [['pid', 'in', array_column($data, 'id')]]);
+            $two = self::GoodsCategoryList($params);
+            if(!empty($two))
             {
-                $params['where'] = array_merge($where_base, [['pid', '=', $v['id']]]);
-                $v['items'] = self::GoodsCategoryList($params);
-                if(!empty($v['items']))
+                // 二级分组
+                foreach($two as $tv)
                 {
-                    // 一次性查出所有二级下的三级、再做归类、避免sql连接超多
-                    $params['where'] = array_merge($where_base, [['pid', 'in', array_column($v['items'], 'id')]]);
-                    $itemss = self::GoodsCategoryList($params);
-                    if(!empty($itemss))
+                    if(!array_key_exists($tv['pid'], $two_group))
+                    {
+                        $two_group[$tv['pid']] = [];
+                    }
+                    $two_group[$tv['pid']][] = $tv;
+                }
+
+                // 获取所有三级
+                $three_group = [];
+                $params['where'] = array_merge($where_base, [['pid', 'in', array_column($two, 'id')]]);
+                $three = self::GoodsCategoryList($params);
+                if(!empty($three))
+                {
+                    // 三级分组
+                    foreach($three as $tv)
+                    {
+                        if(!array_key_exists($tv['pid'], $three_group))
+                        {
+                            $three_group[$tv['pid']] = [];
+                        }
+                        $three_group[$tv['pid']][] = $tv;
+                    }
+                }
+
+                // 数据组合
+                foreach($data as &$v)
+                {
+                    $v['items'] = (empty($two_group) || !array_key_exists($v['id'], $two_group)) ? [] : $two_group[$v['id']];
+                    if(!empty($v['items']))
                     {
                         foreach($v['items'] as &$vs)
                         {
-                            foreach($itemss as $vss)
-                            {
-                                if($vs['id'] == $vss['pid'])
-                                {
-                                    $vs['items'][] = $vss;
-                                }
-                            }
+                            $vs['items'] = (empty($three_group) || !array_key_exists($vs['id'], $three_group)) ? [] : $three_group[$vs['id']];
                         }
                     }
                 }
diff --git a/app/service/UserService.php b/app/service/UserService.php
index b278890b6..6f6559940 100755
--- a/app/service/UserService.php
+++ b/app/service/UserService.php
@@ -1286,7 +1286,7 @@ class UserService
                 // 手机号码是否不存在
                 if(!self::IsExistAccounts($params['accounts'], 'mobile'))
                 {
-                     return DataReturn('手机号码不存在', -3);
+                     return DataReturn('手机号码不存在、请先注册！', -3);
                 }
                 $field = 'mobile';
                 break;
@@ -1302,7 +1302,7 @@ class UserService
                 // 电子邮箱是否不存在
                 if(!self::IsExistAccounts($params['accounts'], 'email'))
                 {
-                     return DataReturn('电子邮箱不存在', -3);
+                     return DataReturn('电子邮箱不存在、请先注册！', -3);
                 }
                 $field = 'email';
                 break;
diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css
index 1351c8e0b..75b60cfd0 100755
--- a/public/static/admin/default/css/common.css
+++ b/public/static/admin/default/css/common.css
@@ -448,10 +448,6 @@ ul {margin-top:0;}
  * 公共
  */
 .am-container {padding-left:0px;padding-right:0px ;}
-@media only screen and (min-width: 641px) {
-    #tree tr .submit { display: none; }
-    #tree tr:hover .submit { display: block !important; }
-}
 @media only screen and (min-width: 1025px) {
     .am-container { max-width: 1000px;}
 }
@@ -551,20 +547,6 @@ table.am-table .am-btn-danger:hover {
     color: #fff;
 }
 
-/**
- * 分类列表优化
- */
-#tree table.am-table td {
-    line-height: 30px;
-    padding: 0.4rem 0.7rem;
-}
-#tree table.am-table td button.am-btn {
-    vertical-align: unset;
-}
-#tree table.am-table tr.tree-change-item td {
-    border: 1px dashed #FF9800;
-}
-
 /**
  * 警告框下表单最后一个去掉虚线
  */
diff --git a/public/static/admin/default/js/goods.js b/public/static/admin/default/js/goods.js
index 5808cb846..a7f16bf73 100755
--- a/public/static/admin/default/js/goods.js
+++ b/public/static/admin/default/js/goods.js
@@ -173,8 +173,8 @@ $(function()
             $(this).attr('value', $(this).val());
         });
         $parent.after($parent.prop('outerHTML'));
-        $spec_table.find('tbody tr:last').attr('class', 'line-'+index+' line-not-first');
-        $spec_table.find('tbody tr:last').attr('data-line-tag', '.line-'+index);
+        $parent.next().attr('class', 'line-'+index+' line-not-first');
+        $parent.next().attr('data-line-tag', '.line-'+index);
     });
 
     // 规格行移除
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 94573f374..4e6ec4ad6 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -100,8 +100,12 @@ form.am-form .am-form-group,
     padding: 15px 20% 20px 5px;
     margin-bottom: 0;
 }
+.plug-file-upload-view,
 form.am-form .am-form-group-refreshing,
-.plug-file-upload-view {
+form.am-form-pure .am-form-group,
+form.am-form-pure .plug-file-upload-view,
+form.am-form-pure .business-form-group,
+form.am-form-pure .business-form-block {
     border-bottom: 0 !important;
 }
 @media only screen and (min-width: 641px) {
@@ -708,7 +712,8 @@ button.colorpicker-submit img {
     height: auto;
     position: sticky;
 }
-.am-table-scrollable-horizontal .am-table .chosen-container .chosen-drop {
+.am-table-scrollable-horizontal .am-table .chosen-container .chosen-drop,
+.am-table-scrollable-horizontal .am-table .am-dropdown-content {
     z-index: 1;
 }
 .am-table-scrollable-horizontal .am-table tr th {
@@ -893,8 +898,8 @@ button.colorpicker-submit img {
  */
 .form-inside-dl-content dt,
 .form-inside-dl-content dd {
-    line-height: 18px;
-    min-height: 30px;
+    line-height: 14px;
+    min-height: 24px;
     padding-top: 5px;
     padding-bottom: 5px;
 }
@@ -1037,11 +1042,11 @@ form .am-tab-panel .am-form-group:last-child {
  * 仓库信息
  */
 .warehouse-item-container * {
-  vertical-align: middle;
+    vertical-align: middle;
 }
 .warehouse-item-container .warehouse-icon {
-  width: 14px;
-  height: 14px;
+    width: 14px;
+    height: 14px;
 }
 
 /**
@@ -1052,4 +1057,23 @@ form .am-tab-panel .am-form-group:last-child {
 }
 .platform-list-value-container > div.am-input-group button {
     width: 110px;
+}
+
+/**
+ * 分类列表
+ */
+#tree table.am-table td {
+    line-height: 32px;
+    padding: 0.4rem 0.7rem;
+}
+#tree table.am-table td button.am-btn {
+    vertical-align: unset;
+}
+@media only screen and (min-width: 641px) {
+    #tree tr .submit {
+        display: none;
+    }
+    #tree tr:hover .submit {
+        display: block !important;
+    }
 }
\ No newline at end of file
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index 4a47fc45a..ca25272b3 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -735,7 +735,7 @@ function TreeItemHtmlHandle(item, pid, level, is_delete_all)
 	var rank = parseInt($('#tree').attr('data-rank')) || 0;
 	var delete_url = $('#tree').data('del-url');
 	var class_name = $('#data-list-'+pid).attr('class') || '';
-		class_name = class_name.replace('tree-change-item', '').replace('am-active', '');
+		class_name = class_name.replace('am-active', '');
 	var popup_tag = $('#tree').data('popup-tag') || ''+popup_tag+'';
 
 	// 数据 start
@@ -3233,7 +3233,7 @@ $(function()
 	                	// 是否限制数量
 	                    if(max_number > 0 && $tag.find('li').length >= max_number)
 	                    {
-	                    	var temp_msg = upload_video_max_tips || '最多上传{value}个视频';
+	                    	var temp_msg = window['lang_upload_video_max_tips'] || '最多上传{value}个视频';
 	                        Prompt(temp_msg.replace('{value}', max_number));
 	                        break;
 	                    }
@@ -3282,7 +3282,7 @@ $(function()
 	                	// 是否限制数量
 	                    if(max_number > 0 && $tag.find('li').length >= max_number)
 	                    {
-	                    	var temp_msg = upload_annex_max_tips || '最多上传{value}个附件';
+	                    	var temp_msg = window['lang_upload_annex_max_tips'] || '最多上传{value}个附件';
 	                        Prompt(temp_msg.replace('{value}', max_number));
 	                        break;
 	                    }
diff --git a/public/static/common/lib/assets/css/amazeui.css b/public/static/common/lib/assets/css/amazeui.css
index d4e1b6729..d9073e1dc 100755
--- a/public/static/common/lib/assets/css/amazeui.css
+++ b/public/static/common/lib/assets/css/amazeui.css
@@ -9062,7 +9062,6 @@ TODO:
   margin-right: auto;
   width: 270px;
   max-width: 100%;
-  border-radius: 0;
   background: #f8f8f8;
   /*@media @large-up {
     width: @modal-lg;
@@ -9159,7 +9158,6 @@ TODO:
   border-left: 1px solid #dedede;
 }
 .am-modal-no-btn .am-modal-dialog {
-  border-radius: 0;
   border-bottom: none;
 }
 .am-modal-no-btn .am-modal-bd {