Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
This commit is contained in:
@@ -3,7 +3,8 @@ axios.defaults.headers.post['Content-Type'] = 'application/json';
|
||||
|
||||
// 添加请求拦截器
|
||||
axios.interceptors.request.use(function (config) {
|
||||
config.headers.Authorization = '111111111'
|
||||
var token = localStorage.getItem("user_token");
|
||||
config.headers.Authorization = token
|
||||
return config;
|
||||
}, function (error) {
|
||||
return Promise.reject(error);
|
||||
|
||||
@@ -61,7 +61,7 @@ var openw=null,waiting=null;
|
||||
* @param {boolean} ns : 是否不自动显示
|
||||
* @param {JSON} ws : Webview窗口属性
|
||||
*/
|
||||
w.clicked=function(id,wa,ns,ws){
|
||||
w.clicked=function(id,wa,ns,ws, params,callback,callbackParams){
|
||||
if(openw){//避免多次打开同一个页面
|
||||
return null;
|
||||
}
|
||||
@@ -71,7 +71,7 @@ w.clicked=function(id,wa,ns,ws){
|
||||
ws.scrollIndicator||(ws.scrollIndicator='none');
|
||||
ws.scalable||(ws.scalable=false);
|
||||
var pre='';//'http://192.168.1.178:8080/h5/';
|
||||
openw=plus.webview.create(pre+id,id,ws);
|
||||
openw=plus.webview.create(pre+id,id,ws,params);
|
||||
ns||openw.addEventListener('loaded',function(){//页面加载完成后才显示
|
||||
// setTimeout(function(){//延后显示可避免低端机上动画时白屏
|
||||
openw.show(as);
|
||||
@@ -79,6 +79,10 @@ w.clicked=function(id,wa,ns,ws){
|
||||
// },200);
|
||||
},false);
|
||||
openw.addEventListener('close',function(){//页面关闭后可再次打开
|
||||
//可以设置页面关闭时回调的方法,可以对数据进行重新加载操作
|
||||
if(callback){
|
||||
callback(callbackParams);
|
||||
}
|
||||
openw=null;
|
||||
},false);
|
||||
return openw;
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
/**
|
||||
* 获取手机上的信息,比如位置,手机ID
|
||||
* @author yinjihuan
|
||||
*/
|
||||
//扩展API加载完毕后调用onPlusReady回调函数
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
//扩展API加载完毕,现在可以正常调用扩展API
|
||||
function onPlusReady(){
|
||||
getPosition();
|
||||
}
|
||||
// 获取当前用户位置
|
||||
function getPosition(){
|
||||
plus.geolocation.getCurrentPosition(function(p){
|
||||
province = p.address.province;
|
||||
city = p.address.city;
|
||||
region = p.address.district;
|
||||
}, function(e){
|
||||
|
||||
},
|
||||
{
|
||||
provider:'baidu',
|
||||
enableHighAccuracy:true,
|
||||
coordsType:'bd09ll'
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
function getPushInfo(){
|
||||
try {
|
||||
var info = plus.push.getClientInfo();
|
||||
return info.clientid;
|
||||
}catch(error) {
|
||||
console.log( error);
|
||||
}
|
||||
// console.log( "获取客户端推送标识信息:" );
|
||||
// console.log( "token: "+info.token );
|
||||
// alert( "clientid: "+info.clientid );
|
||||
// console.log( "appid: "+info.appid );
|
||||
// console.log( "appkey: "+info.appkey );
|
||||
return "";
|
||||
}
|
||||
@@ -84,6 +84,7 @@ $.config = {router: false}
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
<script type="text/javascript" src="../../js/axios.min.js"></script>
|
||||
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
|
||||
<script type="text/javascript" src="../../js/plus.info.js" ></script>
|
||||
<script>
|
||||
|
||||
timer = {
|
||||
@@ -147,12 +148,40 @@ new Vue({
|
||||
$(".waiting").show();
|
||||
$(".sendCode").hide();
|
||||
timer.start();
|
||||
axios.post("/rest/user/sendMobileCode", {
|
||||
mobile:this.mobile, type:'binding'
|
||||
})
|
||||
.then(function (response) {
|
||||
var resData = response.data;
|
||||
if (resData.status) {
|
||||
$.toast(resData.message);
|
||||
} else {
|
||||
$.toast(resData.message);
|
||||
timer.cancel()
|
||||
}
|
||||
})
|
||||
.catch(function (error) {
|
||||
$.toast(error);
|
||||
});
|
||||
}
|
||||
},
|
||||
// 绑定手机
|
||||
binding: function() {
|
||||
if (this.checkMobile() && this.checkSmsCode()) {
|
||||
|
||||
axios.post("/rest/user/bindMobile", {
|
||||
mobile:this.mobile, smsCode:this.smsCode, province:province, city:city, region:region, pushClientId:getPushInfo()
|
||||
})
|
||||
.then(function (response) {
|
||||
var resData = response.data;
|
||||
if (resData.status) {
|
||||
$.toast(resData.message);
|
||||
} else {
|
||||
$.toast(resData.message);
|
||||
}
|
||||
})
|
||||
.catch(function (error) {
|
||||
$.toast(error);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,159 @@
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<title>账号密码登录</title>
|
||||
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
|
||||
<link rel="shortcut icon" href="/favicon.ico">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||
|
||||
<link rel="stylesheet" href="../../css/sm.css">
|
||||
<link rel="stylesheet" href="../../css/main.css">
|
||||
<link rel="stylesheet" href="../../css/theme-orange.css">
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div class="page-group" id="app">
|
||||
<div class="page page-current">
|
||||
<header class="bar bar-nav">
|
||||
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
|
||||
<span class="icon icon-left"></span>
|
||||
</button>
|
||||
<h1 class="title">账号密码登录</h1>
|
||||
</header>
|
||||
<div class="content">
|
||||
<div class="list-block media-list">
|
||||
<ul>
|
||||
<li>
|
||||
<a class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title-row">
|
||||
<div class="item-title"><i class="icon icon-login01"></i></div>
|
||||
<div class="item-after">
|
||||
<input type="number" v-model="mobile" id="input_phoneNumber" class="textAlignLeft" placeholder="请输入手机号码">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title-row">
|
||||
<div class="item-title"><i class="icon icon-login03"></i></div>
|
||||
<div class="item-after">
|
||||
<input type="password" v-model="pass" id="input_password" class="textAlignLeft" placeholder="请输入密码">
|
||||
<i class="icon icon-eye-grey" @click="show"></i>
|
||||
<i class="icon icon-eye-orange dn" @click="hide"></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="content-block loginBox">
|
||||
<p><a class="button button-big button-fill theme" id="login_btn" @click="passLogin">登录</a></p>
|
||||
<p><a href="05_mine00_login01_codeSms.html">快捷登录</a></p>
|
||||
</div>
|
||||
<div class="content-block loginMode">
|
||||
<p class="line">
|
||||
<span>第三方登录</span>
|
||||
</p>
|
||||
<p>
|
||||
<a href="05_mine00_login04_set.html" class="icon icon-loginMode01"></a>
|
||||
<a href="05_mine00_login04_set.html" class="icon icon-loginMode02"></a>
|
||||
<a href="05_mine00_login04_set.html" class="icon icon-loginMode03"></a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" src="../../js/zepto.js" charset="utf-8"></script>
|
||||
|
||||
<script>
|
||||
|
||||
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
|
||||
Zepto = $
|
||||
$.config = {router: false}
|
||||
|
||||
</script>
|
||||
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/vue.js" ></script>
|
||||
<script type="text/javascript" src="../../js/zepto.md5.js" ></script>
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
<script type="text/javascript" src="../../js/axios.min.js"></script>
|
||||
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
|
||||
<script type="text/javascript" src="../../js/plus.info.js" ></script>
|
||||
|
||||
<script>
|
||||
|
||||
new Vue({
|
||||
el: '#app',
|
||||
data: {
|
||||
mobile: '',
|
||||
pass: ''
|
||||
},
|
||||
methods: {
|
||||
// 手机号码检查
|
||||
checkMobile: function() {
|
||||
if(this.mobile == ""){
|
||||
$.toast("请输入手机号码");
|
||||
return false;
|
||||
}
|
||||
var mobile_reg = /^1\d{10}$/
|
||||
if (!mobile_reg.test(this.mobile)) {
|
||||
$.toast("手机号码格式错误");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
},
|
||||
// 密码登录
|
||||
passLogin: function() {
|
||||
if (this.checkMobile()) {
|
||||
if (this.pass == '') {
|
||||
$.toast("请输入密码");
|
||||
return;
|
||||
}
|
||||
axios.post("/rest/user/passLogin", {mobile:this.mobile, pass: $.md5(this.pass), pushClientId:getPushInfo()})
|
||||
.then(function (response) {
|
||||
var resData = response.data;
|
||||
if (resData.status) {
|
||||
// 用户登录成功的TOKEN
|
||||
var token = resData.data;
|
||||
localStorage.setItem("user_token", token);
|
||||
$.toast(resData.message);
|
||||
} else {
|
||||
$.toast(resData.message);
|
||||
}
|
||||
})
|
||||
.catch(function (error) {
|
||||
$.toast(error);
|
||||
});
|
||||
}
|
||||
},
|
||||
/* 密码显示&隐藏 */
|
||||
show: function() {
|
||||
$(".list-block .item-after .icon-eye-grey").hide();
|
||||
$(".list-block .item-after .icon-eye-orange").show();
|
||||
$("#input_password").attr("type","text");
|
||||
},
|
||||
hide: function() {
|
||||
$(".list-block .item-after .icon-eye-orange").hide();
|
||||
$(".list-block .item-after .icon-eye-grey").show();
|
||||
$("#input_password").attr("type","password");
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -2523,15 +2523,18 @@ function getDistrictList(cityParam,latParam,lngParam,regionParam,order,minPrice,
|
||||
|
||||
mui.init();
|
||||
function openNewsView(newId) {
|
||||
mui.openWindow({
|
||||
url: 'views/news/newsDetail.html',
|
||||
id:'newsDetail.html',
|
||||
extras:{
|
||||
newsId:newId //扩展参数
|
||||
}
|
||||
});
|
||||
var count = parseInt($("#visitCount_"+newId).text().replace("人",""))+1;
|
||||
$("#visitCount_"+newId).text(count+'人');
|
||||
//mui.openWindow({
|
||||
// url: 'views/news/newsDetail.html',
|
||||
// id:'newsDetail.html',
|
||||
// extras:{
|
||||
// newsId:newId //扩展参数
|
||||
// }
|
||||
// });
|
||||
clicked('views/news/newsDetail.html',true,false,{},{newsId:newId},function(newId){
|
||||
alert(newId);
|
||||
},newId);
|
||||
var count = parseInt($("#visitCount_"+newId).text().replace("人",""))+1;
|
||||
$("#visitCount_"+newId).text(count+'人');
|
||||
}
|
||||
|
||||
window.addEventListener('refresh', function(e){//执行刷新
|
||||
|
||||
Reference in New Issue
Block a user