Merge branch 'bug-wangdy' into dev

src/main/webapp/resources/view/vendor/forstore/vendor_store_maintain.html

@@ -699,7 +699,7 @@
 				<span>电&nbsp;&nbsp;&nbsp;&nbsp;话<strong class="text-inverse">*</strong></span>
 			</div>
 			<div class="col-md-10 custom_col">
-				<input type="text" class="form-control" style="border-radius: inherit;" title="enTel" ng-model="sampleStore.enterprise.enTel" maxlength="20"/>
+				<input type="text" class="form-control" style="border-radius: inherit;" title="enTel"  ng-pattern="/^(\d){8,12}$/" ng-model="sampleStore.enterprise.enTel" maxlength="12"/>
 			</div>
 		</div>
 		<div class="row com_row" style="margin-top: 10px;">
@@ -707,7 +707,7 @@
 				<span>传&nbsp;&nbsp;&nbsp;&nbsp;真<strong class="text-inverse">*</strong></span>
 			</div>
 			<div class="col-md-10 custom_col">
-				<input type="text" class="form-control" style="border-radius: inherit;" title="enFax" ng-model="sampleStore.enterprise.enFax" maxlength="20"/>
+				<input type="text" class="form-control" style="border-radius: inherit;" title="enFax" ng-pattern="/^[\d-]{0,20}$/" ng-model="sampleStore.enterprise.enFax" maxlength="20"/>
 			</div>
 		</div>
 	</div><!-- 店铺基础信息输入 end -->