首页 探索 帮助
注册 登录
bulomakaka
/
ekexiu.app
关注 2
点赞 1
派生 0
代码 工单管理 0 合并请求 0 提交历史 989 版本发布 0 Wiki
浏览代码

Merge remote-tracking branch 'origin/dev' into test

Conflicts:
	app/js/public/base.js
luyanan 7 年之前
父节点
ffabcaacfd ba36e7311a
当前提交
5b4c7078a2
共有 3 个文件被更改，包括 80 次插入 和 74 次删除
分列视图 显示文件统计
  1. 67 67
      app/html/backBindUn.html
  2. 6 6
      app/js/public/base.js
  3. 7 1
      app/js/updateBasic-city.js

+ 67 - 67
app/html/backBindUn.html
查看文件 

@ -1,68 +1,68 @@
1 
<!doctype html>
2 
<html>
3
4 
	<head>
5 
		<meta charset="UTF-8">
6 
		<title>微信绑定-无账号</title>
7 
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
8 
		<link href="../css/mui.min.css" rel="stylesheet" />
9 
		<link href="../css/iconfont.css" rel="stylesheet" />
10 
		<link href="../css/app.css" rel="stylesheet" />
11 
	</head>
12
13 
	<body>
14 
		<header class="mui-bar mui-bar-nav toptitbox">
15 
		    <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left topback"></a>
16 
		    <h1 class="mui-title toptit">绑定手机</h1>
17 
		</header>
18 
		<div class="mui-content">
19 
			<div class="bindtip"><img src="../images/login_bg_tishi_1_nor@3x.png" width="100%" /></div>
20 
		    <form class="mui-input-group frmboxNew">
21 
		    	<div class="mui-input-row frm-input">
22 
		            <input type="text" class="mui-input-clear frmtype" value="此处回填微信名" id="weiChatName">
23 
		        </div>
24 
		        <div class="mui-input-row frm-input">
25 
		            <input type="tel" class="mui-input-clear frmtype" placeholder="请输入手机号码" id="phone">
26 
		        </div>
27 
		        <div class="mui-row mui-input-row frm-input">
28 
		        	<div class="mui-col-xs-8">
29 
		        		<input type="text" class="frmtype" placeholder="请输入图形验证码" id="imgCode">
30 
		        	</div>
31 
					<div class="mui-col-xs-4">
32 
						<img src="http://www.ekexiu.com/ajax/PictureVC" alt="" id="changImage" width="100%" height="48"/>
33 
					</div>
34 
				</div>
35 
		        <div class="mui-row mui-input-row frm-input">
36 
		        	<div class="mui-col-xs-8">
37 
		        		<input type="number" class="frmtype" placeholder="请输入验证码" id="phoneCode">
38 
		        	</div>
39 
					<div class="mui-col-xs-4">
40 
						<input type="button" class="frmtype getCode" disabled value="获取验证码" id="getPhoneCode">
41 
						<input type="button" class="frmtype getCode" value="" style="display: none;" id="getcodeoff">
42 
					</div>
43 
				</div>
44 
				<div class="mui-input-row frm-input">
45 
					<input type="password" class="frmtype" placeholder="请设置登录密码" id="setpassword">
46 
				</div>
47 
		    </form>
48
49 
		    <div class="mui-content-padded frmboxNew" style="margin-top: -4px">
50 
		    	<div class="protocolbox">
51 
			    	<label checked="true">
52 
			    		<span class="mui-icon iconfont icon-yuanxingxuanzhongfill"></span>
53 
	                    <input type="checkbox" name="checkbox" checked="true" style="display:none;">我已阅读并同意<a class="protocollink" id="protocollink">科袖用户协议</a>
54 
	               </label>
55 
		    	</div>
56 
				<button class="mui-btn mui-btn-block frmbtn frmactive" id="binding" disabled>绑&nbsp;定</button>
57 
				<p class="otherWordNew">
58 
					<span class="mui-pull-right" id="alreadyAccount">已有账号?</span>
59 
				</p>
60 
			</div>
61
62 
		</div>
63 
		<script src="../js/public/mui.min.js"></script>
64 
		<script src="../js/public/base.js"></script>
65 
		<script src="../js/backBindUn.js"></script>
66 
	</body>
67
1 
<!doctype html>
2 
<html>
3
4 
	<head>
5 
		<meta charset="UTF-8">
6 
		<title>微信绑定-无账号</title>
7 
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
8 
		<link href="../css/mui.min.css" rel="stylesheet" />
9 
		<link href="../css/iconfont.css" rel="stylesheet" />
10 
		<link href="../css/app.css" rel="stylesheet" />
11 
	</head>
12
13 
	<body>
14 
		<header class="mui-bar mui-bar-nav toptitbox">
15 
		    <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left topback"></a>
16 
		    <h1 class="mui-title toptit">绑定手机</h1>
17 
		</header>
18 
		<div class="mui-content">
19 
			<div class="bindtip"><img src="../images/login_bg_tishi_1_nor@3x.png" width="100%" /></div>
20 
		    <form class="mui-input-group frmboxNew">
21 
		    	<div class="mui-input-row frm-input">
22 
		            <input type="text" class="mui-input-clear frmtype" value="此处回填微信名" id="weiChatName">
23 
		        </div>
24 
		        <div class="mui-input-row frm-input">
25 
		            <input type="tel" class="mui-input-clear frmtype" placeholder="请输入手机号码" id="phone">
26 
		        </div>
27 
		        <div class="mui-row mui-input-row frm-input">
28 
		        	<div class="mui-col-xs-8">
29 
		        		<input type="text" class="frmtype" placeholder="请输入图形验证码" id="imgCode">
30 
		        	</div>
31 
					<div class="mui-col-xs-4">
32 
						<img src="http://www.ekexiu.com/ajax/PictureVC" alt="" id="changImage" width="100%" height="48"/>
33 
					</div>
34 
				</div>
35 
		        <div class="mui-row mui-input-row frm-input">
36 
		        	<div class="mui-col-xs-8">
37 
		        		<input type="number" class="frmtype" placeholder="请输入验证码" id="phoneCode">
38 
		        	</div>
39 
					<div class="mui-col-xs-4">
40 
						<input type="button" class="frmtype getCode" disabled value="获取验证码" id="getPhoneCode">
41 
						<input type="button" class="frmtype getCode" value="" style="display: none;" id="getcodeoff">
42 
					</div>
43 
				</div>
44 
				<div class="mui-input-row frm-input">
45 
					<input type="password" class="frmtype" placeholder="请设置登录密码" id="setpassword">
46 
				</div>
47 
		    </form>
48
49 
		    <div class="mui-content-padded frmboxNew" style="margin-top: -4px">
50 
		    	<div class="protocolbox">
51 
			    	<label checked="true">
52 
			    		<span class="mui-icon iconfont icon-yuanxingxuanzhongfill"></span>
53 
	                    <input type="checkbox" name="checkbox" checked="true" style="display:none;">我已阅读并同意<a class="protocollink" id="protocollink">科袖用户协议</a>
54 
	               </label>
55 
		    	</div>
56 
				<button class="mui-btn mui-btn-block frmbtn frmactive" id="binding" disabled>绑&nbsp;定</button>
57 
				<p class="otherWordNew">
58 
					<span class="mui-pull-right" id="alreadyAccount">已有账号?</span>
59 
				</p>
60 
			</div>
61
62 
		</div>
63 
		<script src="../js/public/mui.min.js"></script>
64 
		<script src="../js/public/base.js"></script>
65 
		<script src="../js/backBindUn.js"></script>
66 
	</body>
67
68 68 
</html>

+ 6 - 6
app/js/public/base.js
查看文件 

@ -1,10 +1,10 @@
1 1 
//公共文件
2 
mui.init();
3 
var baseUrl = "http://www.ekexiu.com",
4 
//var baseUrl = "http://192.168.3.233",
5 
//var baseUrl = "http:192.168.3.233:81",
6 
//var wlogurl="http://192.168.3.233:8080"
7 
var wlogurl="http://www.ekexiu.com:8082"
2 
mui.init();
3 
var baseUrl = "http://www.ekexiu.com";
4 
//var baseUrl = "http://192.168.3.233";
5 
//var baseUrl = "http:192.168.3.233:81";
6 
//var wlogurl="http://192.168.3.233:8080";
7 
var wlogurl="http://www.ekexiu.com:8082";
8 8
9 9
10 10 
toastStyle = {

+ 7 - 1
app/js/updateBasic-city.js
查看文件 

@ -8,10 +8,16 @@ mui.ready(function() {
8 8
9 9 
		}
10 10 
		plus.geolocation.getCurrentPosition(function(p) {
11 
			console.log(JSON.stringify(p));
11 12 
			plus.nativeUI.closeWaiting();
12 13 
			web.show("slide-in-right", 150);
13 14 
			oadd.address=p.address.city;
14 
			oadd.province=p.address.province;
15 
			if(!p.address.province) {
16 
				oadd.province=p.address.city;
17 
			}else{
18 
				oadd.province=p.address.province;
19 
			}
20
15 21 
		}, function(e) {
16 22 
			plus.nativeUI.closeWaiting();
17 23 
			web.show("slide-in-right", 150);