BJ_web_developers / webportal

Commit 20974aa874be063347c921d8d0b61dd75ba071e3

Authored by Andy
2 parents 3e9d49bd 38f11dfc

Merge branch 'test' 

# Conflicts:
#	js/config.js
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
js/config.js
  View file @20974aa
1 1
2 //阿里云测试环境，别删 2 //阿里云测试环境，别删
3 -// parkcloudbaseUrl = 'http://39.98.54.240:8093/';// url公用地址  
4 -// authUrl = 'http://39.98.54.240:8088/';// 鉴权URL公用地址 3 +var parkcloudbaseUrl = 'http://test.renniting.cn/bcp/';// url公用地址
  4 +var authUrl = 'http://test.renniting.cn/sys/';// 鉴权URL公用地址
5 5
6 // 阿里云正式环境，别删 6 // 阿里云正式环境，别删
7 var parkcloudbaseUrl ='http://bcp.service.renniting.cn/';// url公用地址 7 var parkcloudbaseUrl ='http://bcp.service.renniting.cn/';// url公用地址
js/joinous.js
  View file @20974aa
@@ -32,10 +32,10 @@ $('#write-submit').on('click', function () { @@ -32,10 +32,10 @@ $('#write-submit').on('click', function () {
32 else if(userTel == '' || userTel == undefined || userTel == null) { 32 else if(userTel == '' || userTel == undefined || userTel == null) {
33 $('#write_rule').removeClass('display-none').text('请输入手机号'); 33 $('#write_rule').removeClass('display-none').text('请输入手机号');
34 return; 34 return;
35 - }/*else if(!/^1[3|4|5|7|8][0-9]\d{4,8}$/.test(userTel)||userTel.length!=11) { 35 + }else if(!/^1[3|4|5|7|8][0-9]\d{4,8}$/.test(userTel)||userTel.length!=11) {
36 $('#write_rule').removeClass('display-none').text('请输入正确手机号'); 36 $('#write_rule').removeClass('display-none').text('请输入正确手机号');
37 return; 37 return;
38 - }else if(userEmail == '' || userEmail == undefined || userEmail == null) { 38 + }/*else if(userEmail == '' || userEmail == undefined || userEmail == null) {
39 $('#write_rule').removeClass('display-none').text('请输入邮箱'); 39 $('#write_rule').removeClass('display-none').text('请输入邮箱');
40 return; 40 return;
41 }else if(!/^[A-Za-z\d]+([-_.][A-Za-z\d]+)*@([A-Za-z\d]+[-.])+[A-Za-z\d]{2,4}$/.test(userEmail)) { 41 }else if(!/^[A-Za-z\d]+([-_.][A-Za-z\d]+)*@([A-Za-z\d]+[-.])+[A-Za-z\d]{2,4}$/.test(userEmail)) {