Browse Source

修改文字及样式及提示消息

jack 8 years ago
parent
commit
44ef76cffe
5 changed files with 10 additions and 6 deletions
  1. 0 1
      app/html/loginTelNew.html
  2. 1 0
      app/js/login.js
  3. 3 2
      app/js/loginTelNew.js
  4. 1 0
      app/js/pwdSet.js
  5. 5 3
      app/js/weChatlogin.js

+ 0 - 1
app/html/loginTelNew.html

@ -35,7 +35,6 @@
35 35
				<button id='login' class="mui-btn mui-btn-block frmbtn frmactive2" disabled="">登&nbsp;录</button>
36 36
				<p class="otherWordNew">
37 37
					<span class="mui-pull-left" id="accountLogin">帐号登录</span>
38
					<span id='forgetPassword' class="mui-pull-right">忘记密码?</span>
39 38
				</p>
40 39
			</div>
41 40
			<!--第三方登录-->

+ 1 - 0
app/js/login.js

@ -111,6 +111,7 @@ mui.ready(function() {
111 111
					if(data.data != "null" && data.data != null) {
112 112
						var userId = data.data.id;
113 113
						plus.storage.setItem('userid', userId);
114
						plus.nativeUI.toast("登录成功", toastStyle);
114 115
						var article = plus.webview.currentWebview();
115 116
						if(article.flag==1){
116 117
							var proAiticle =plus.webview.getWebviewById('professorArticle.html')

+ 3 - 2
app/js/loginTelNew.js

@ -23,7 +23,7 @@ mui.ready(function() {
23 23
		})
24 24
		
25 25
		/*点击忘记密码按钮*/
26
		forgetPassword.addEventListener("tap", function() {
26
		/*forgetPassword.addEventListener("tap", function() {
27 27
			mui.openWindow({
28 28
				url: '../html/pwdFind.html',
29 29
				id: '../html/pwdFind.html',
@ -31,7 +31,7 @@ mui.ready(function() {
31 31
					aniShow: "slide-in-right"
32 32
				}
33 33
			});
34
		})
34
		})*/
35 35
36 36
		/*校验登录按钮显示状态*/
37 37
		mui('.frmboxNew').on('keyup', "#username,#setCode", function() {
@ -142,6 +142,7 @@ mui.ready(function() {
142 142
					if(data.success){
143 143
						var userId = data.data.id;
144 144
						plus.storage.setItem('userid', userId);
145
						plus.nativeUI.toast("登录成功", toastStyle)
145 146
						var article = plus.webview.currentWebview();
146 147
						if(article.flag==1){
147 148
							var proAiticle =plus.webview.getWebviewById('professorArticle.html')

+ 1 - 0
app/js/pwdSet.js

@ -51,6 +51,7 @@ mui.ready(function() {
51 51
				async: false,
52 52
				success: function(data) {
53 53
					if(data.success&&data.data) {
54
						plus.nativeUI.toast("密码修改成功,请重新登录", toastStyle);
54 55
						goLoginFun();
55 56
						plus.webview.close(self);
56 57
					}

+ 5 - 3
app/js/weChatlogin.js

@ -15,13 +15,13 @@ mui.plusReady(function() {
15 15
		if(s) {
16 16
			if(!s.authResult) {
17 17
				s.login(function(e) {
18
					mui.toast("登录认证成功");
18
					mui.toast("登录成功");
19 19
					authUserInfo(s);
20 20
				}, function(e) {
21
					mui.toast("登录认证失败");
21
					mui.toast("登录失败");
22 22
				});
23 23
			} else {
24
				mui.toast("已经登录认证");
24
				mui.toast("已经登录认证");
25 25
				authLogout();
26 26
			}
27 27
		} else {
@ -94,6 +94,8 @@ mui.plusReady(function() {
94 94
							id: data.id
95 95
						});	
96 96
					}
97
				}else{
98
					console.log(JSON.stringify(data));
97 99
				}
98 100
			},
99 101
			error: function(x) {