格式化电话号码

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7731 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -421,7 +421,7 @@
             <li class="line01">
                 <div class="fl">
                     <span class="fl">固定电话<em></em>：</span>
-                    <span class="fr"><input type="text" ng-model="ship.phone"/></span>
+                    <span class="fr"><input type="text" ng-model="ship.phone"  ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"/></span>
                 </div>
                 <div class="fr">
                     <span class="fl">邮箱：</span>

src/main/webapp/resources/tpl/index/approvalFlow/shipaddress_modal.html

@@ -0,0 +1,68 @@
+<link rel="stylesheet" href="static/css/add.css "/>
+<style>
+.bomb-box .box {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 440px;
+    bottom: 0;
+    margin: auto;
+    box-shadow: 0 0 3px #888;
+}
+</style>
+<div class="bomb-box">
+    <form class="box04 box" name="shipAddress" id="shipAddress">
+        <i class="off" ng-click="cancel()"><img src="resources/img/purc/close.png" alt="" /></i>
+        <p>收货人资料</p>
+        <ul>
+            <li class="line01">
+                <div class="fl">
+                    <span class="fl">收货人<em>*</em>：</span>
+                    <span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver" required="true"/></span>
+                </div>
+                <div class="fr">
+                    <span class="fl">手机<em>*</em>：</span>
+                    <span class="fr"><input type="text" ng-model="ship.usertel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/"/></span>
+                </div>
+            </li>
+            <li class="line01">
+                <div class="fl">
+                    <span class="fl">固定电话<em></em>：</span>
+                    <span class="fr"><input type="text" ng-model="ship.phone"  ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"/></span>
+                </div>
+                <div class="fr">
+                    <span class="fl">邮箱：</span>
+                    <span class="fr emaill"><input type="text" ng-model="ship.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><i>用于接收订单提醒邮件，便于您及时了解订单状态</i></span>
+                </div>
+            </li>
+            <li class="line02 margin-top40">
+                <div class="fl">所在地址<em>*</em>：</div>
+                <!--<div class="select fr"><input type="text" placeholder="请选择" ng-model="ship.address" required="true"/><i class="fa fa-angle-down"></i></div>-->
+				 <div class="select fr">
+                    <select required="" class="area-select" ng-model="ship.province" ng-options="key as key for (key,value) in provinces"
+                            ng-change="ship.city='';ship.district='';" required="true">  
+                        <option value="">省</option>  
+                    </select>
+                    <select class="area-select" ng-model="ship.city" ng-options="key as key for (key,value) in provinces[ship.province]"
+                            ng-change="ship.district='';" required="true">  
+                        <option value="">市</option>  
+                    </select>
+                    <select class="area-select" ng-model="ship.district" ng-options="value as value for value in provinces[ship.province][ship.city]" required="true">
+                        <option value="">区</option>  
+                    </select>  
+				</div>
+            </li>
+            <li class="line02">
+                <div class="fl">详细地址<em>*</em>：</div>
+                <div class="fr"><input type="text" ng-model="ship.addressdet" required="true"/></div>
+            </li>
+            <li class="line02">
+                <div class="fl">地址别名：</div>
+                <div class="fr address"><input type="text" ng-model="ship.addalias"/><i>建议填写常用名称：家里/父母家/公司</i></div>
+            </li>
+        </ul>
+        <div class="many-file-btn">
+            <button class="btn01" ng-click="saveShipAddress(ship)" ng-disabled="shipAddress.$invalid">保存</button><a class="btn02" ng-click="cancel()">取消</a>
+        </div>
+    </form>
+</div>

src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -223,7 +223,7 @@
             <li class="line01">
                 <div class="fl">
                     <span class="fl">固定电话<em></em>：</span>
-                    <span class="fr"><input type="text" ng-model="ship.phone"/></span>
+                    <span class="fr"><input type="text" ng-model="ship.phone"  ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"/></span>
                 </div>
                 <div class="fr">
                     <span class="fl">邮箱：</span>

src/main/webapp/resources/tpl/index/purc/modal/contact_person_modal.html

@@ -25,7 +25,7 @@
 				</li>
 				<li><em>职位</em><input type="text" placeholder="职位"  ng-model="contact.position"></li>
 				<li><em>手机</em><input type="text" placeholder="手机" ng-model="contact.tel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/"><span>联系人手机号（必填）</span></li>
-				<li><em>电话</em><input type="text" placeholder="电话" ng-model="contact.phone"><span>联系人电话号码</span></li>
+				<li><em>电话</em><input type="text" placeholder="电话" ng-model="contact.phone" ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"><span>联系人电话号码</span></li>
 				<li><em>邮箱</em><input type="email" placeholder="邮箱" ng-model="contact.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><span>联系人邮箱</span></li>
 				<li class="per-btn"><button ng-click="save(contact)" class="save"  ng-disabled="contactInfo.$invalid">保存</button><a ng-click="cancel()" class="mod-psd">取消</a></li>
 			</ul>