From c0c8a9b92b8650ad5fee0dff07938fe96c2095a4 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sun, 23 Sep 2018 16:05:06 +0800
Subject: [PATCH] address

---
 service/Application/Common/Lang/zh-cn.php     |  3 +-
 .../Home/Lang/zh-cn/useraddress.php           | 11 +++++++
 .../Home/View/Default/Lib/RegionLinkage.html  |  2 +-
 .../View/Default/UserAddress/SaveInfo.html    | 29 +++++++++++++++--
 service/Public/Home/Default/Css/Common.css    | 31 ++-----------------
 5 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/service/Application/Common/Lang/zh-cn.php b/service/Application/Common/Lang/zh-cn.php
index 75d2828e6..63634ca98 100755
--- a/service/Application/Common/Lang/zh-cn.php
+++ b/service/Application/Common/Lang/zh-cn.php
@@ -251,6 +251,7 @@ return array(
 
 	'common_view_gender_name'			=>	'性别',
 	'common_view_enable_title'			=>	'是否启用',
+	'common_view_default_title'			=>	'是否默认',
 	'common_view_name_title'			=>	'名称',
 	'common_view_status_title'			=>	'状态',
 	'common_view_is_show_title'			=>	'是否显示',
@@ -300,10 +301,10 @@ return array(
 	'common_favor_not_text'				=>	'收藏',
 	'common_not_install_text'			=>	'未安装',
 
+	'common_linkage_text'    			=> '省市区',
 	'common_linkage_province_text'      => '省份',
     'common_linkage_city_text'          => '城市',
     'common_linkage_county_text'        => '区/县',
-
     'common_linkage_province_format'    => '请选择省份',
     'common_linkage_city_format'        => '请选择城市',
     'common_linkage_county_format'      => '请选择区/县',
diff --git a/service/Application/Home/Lang/zh-cn/useraddress.php b/service/Application/Home/Lang/zh-cn/useraddress.php
index 0051c7d06..5c4974570 100644
--- a/service/Application/Home/Lang/zh-cn/useraddress.php
+++ b/service/Application/Home/Lang/zh-cn/useraddress.php
@@ -8,5 +8,16 @@
  * @datetime 2016-12-01T21:51:08+0800
  */
 return array(
+    'useraddress_name_text'         => '姓名',
+    'useraddress_name_format'       => '姓名格式 2~16 个字符之间',
+
+    'useraddress_alias_text'         => '别名',
+    'useraddress_alias_format'       => '别名格式最多 16 个字符',
+
+    'useraddress_tel_text'          => '电话',
+    'useraddress_tel_format'        => '电话格式有误',
+
+    'useraddress_address_text'      => '详细地址',
+    'useraddress_address_format'    => '详细地址格式 1~80 个字符之间',
 );
 ?>
\ No newline at end of file
diff --git a/service/Application/Home/View/Default/Lib/RegionLinkage.html b/service/Application/Home/View/Default/Lib/RegionLinkage.html
index b0f7ab68b..2c8ddb5c3 100644
--- a/service/Application/Home/View/Default/Lib/RegionLinkage.html
+++ b/service/Application/Home/View/Default/Lib/RegionLinkage.html
@@ -1,5 +1,5 @@
 <div class="am-form-group region-linkage" data-url="{{:U('Home/Region/Index')}}">
-    <label class="block">{{:L('common_linkage_province_text')}}</label>
+    <label class="block">{{:L('common_linkage_text')}}</label>
     <select name="province" data-next="city" class="am-radius c-p chosen-select" data-placeholder="{{:L('common_linkage_province_text')}}" data-validation-message="{{:L('common_linkage_province_format')}}" required>
         <option value="">{{:L('common_linkage_province_text')}}</option>
     </select>
diff --git a/service/Application/Home/View/Default/UserAddress/SaveInfo.html b/service/Application/Home/View/Default/UserAddress/SaveInfo.html
index e36236821..53c606dee 100644
--- a/service/Application/Home/View/Default/UserAddress/SaveInfo.html
+++ b/service/Application/Home/View/Default/UserAddress/SaveInfo.html
@@ -4,9 +4,34 @@
 <div class="am-g my-content">
     <!-- form start -->
     <form class="am-form form-validation" method="post" action="{{:U('Home/User/Login')}}" request-type="ajax-fun" request-value="ViewModalBack">
-        <include file="Lib/RegionLinkage" />
-        
+        <div class="am-form-group">
+            <label>{{:L('useraddress_name_text')}}</label>
+            <input type="text" name="name" placeholder="{{:L('useraddress_name_text')}}" minlength="2" maxlength="16" data-validation-message="{{:L('useraddress_name_format')}}" class="am-radius" <present name="data"> value="{{$data.name}}"</present> required />
+        </div>
+        <div class="am-form-group">
+            <label>{{:L('useraddress_tel_text')}}</label>
+            <input type="text" name="tel" placeholder="{{:L('useraddress_tel_text')}}" minlength="6" maxlength="30" data-validation-message="{{:L('useraddress_tel_format')}}" class="am-radius" <present name="data"> value="{{$data.tel}}"</present> required />
+        </div>
 
+        <include file="Lib/RegionLinkage" />
+        <div class="am-form-group">
+            <label>{{:L('useraddress_address_text')}}</label>
+            <input type="text" name="address" class="am-radius" minlength="1" maxlength="80" placeholder="{{:L('useraddress_address_text')}}" data-validation-message="{{:L('useraddress_address_format')}}" <present name="data"> value="{{$data.address}}"</present> required />
+        </div>
+
+        <div class="am-form-group">
+            <label>{{:L('useraddress_alias_text')}}</label>
+            <input type="text" name="alias" placeholder="{{:L('useraddress_alias_text')}}" minlength="0" maxlength="16" data-validation-message="{{:L('useraddress_alias_format')}}" class="am-radius" <present name="data"> value="{{$data.alias}}"</present> />
+        </div>
+        <div class="am-form-group">
+            <label class="block">{{:L('common_view_default_title')}}</label>
+            <input name="is_default" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_is_text')}}" data-on-text="{{:L('common_operation_on_is_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="49" data-am-switch <if condition="isset($data['is_default']) and $data['is_default'] eq 1">checked="true"</if> />
+        </div>
+
+        <div class="am-form-group">
+            <input type="hidden" name="id" <notempty name="data"> value="{{$data.id}}"</notempty> />
+            <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'{{:L('common_form_loading_tips')}}'}">{{:L('common_operation_save')}}</button>
+        </div>
     </form>
     <!-- form end -->
 </div>
diff --git a/service/Public/Home/Default/Css/Common.css b/service/Public/Home/Default/Css/Common.css
index 3e111e4de..d4fb121ea 100755
--- a/service/Public/Home/Default/Css/Common.css
+++ b/service/Public/Home/Default/Css/Common.css
@@ -1,8 +1,4 @@
-@charset "utf-8";
-/* CSS Document */
-
-/*公共*/
-html, body, div, span, applet, object, iframe,
+div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
 del, dfn, em, img, ins, kbd, q, s, samp,
@@ -22,29 +18,8 @@ time, mark, audio, video {
     vertical-align: baseline;
     font-family: arial,"Lantinghei SC","Microsoft Yahei";  
 }
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section, main {
-    display: block;
-}
-ul,li,ol{ list-style:none;}
-dl,dd{ margin:auto;}
 
-html{width:100%;
-     height:100%;
-    -ms-text-size-adjust:none;
-    -webkit-text-size-adjust:none;
-    -moz-text-size-adjust:none;
-    -o-text-size-adjust:none;
-}
-/*text-size-adjust不管屏幕怎么变文字大小不变*/
-
-*, body, html, .am-btn { font-size: 12px; }
-body{margin:0;
-    padding:0;
-    width:100%;
-    font-family: arial,"Lantinghei SC","Microsoft Yahei";
-}
+*, body, .am-btn { font-size: 12px; }
 
 .am-form select, .am-form textarea, .am-form input[type="text"], .am-form input[type="password"], .am-form input[type="datetime"], .am-form input[type="datetime-local"], .am-form input[type="date"], .am-form input[type="month"], .am-form input[type="time"], .am-form input[type="week"], .am-form input[type="number"], .am-form input[type="email"], .am-form input[type="url"], .am-form input[type="search"], .am-form input[type="tel"], .am-form input[type="color"], .am-form-field {
     font-size: 14px;
@@ -575,4 +550,4 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
     background-color: #d13b49;
 }
 
-.am-popup-hd .am-popup-title { font-size: 18px; }
\ No newline at end of file
+.am-popup-hd .am-popup-title { font-size: 18px; }