Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

This commit is contained in:
zongzhimin
2018-04-08 15:11:47 +08:00
8 changed files with 91 additions and 68 deletions
+11 -3
View File
@@ -75,10 +75,18 @@ $("#login_btn").on("click", function () {
var resData = response.data;
if (resData.status) {
// 用户登录成功的TOKEN
var token = resData.data;
localStorage.setItem("user_token", token);
var data = resData.data;
localStorage.setItem("user_token", data.token);
$.toast(resData.message);
back();
if (data.firstLogin) {
// 显示设置密码页面
clicked('../user/updatePass.html',true,false,{},{},function(){
back();
})
} else {
back();
}
} else {
$.toast(resData.message);
}
+22 -48
View File
@@ -48,74 +48,48 @@ function userinfo(a){
var accessToken = a.authResult.access_token;
var unionid = a.userInfo.unionid;
var headImg = a.userInfo.headimgurl;
wxLogin(openid,unionid,accessToken,nickname,headImg,"weixin")
login(openid, unionid, accessToken, nickname, headImg, "weixin", "/rest/user/wxLogin")
}else if(a.id=='qq'){
var nickname=a.userInfo.nickname;
var nickname= a.userInfo.nickname;
var openid = a.authResult.openid;
var accessToken = a.authResult.access_token;
var headImg = a.userInfo.headimgurl;
qqLogin(openid,accessToken,nickname,headImg,"qq")
var unionid = "";
login(openid, unionid, accessToken, nickname, headImg, "qq", "/rest/user/qqLogin")
}else{
//微博信息获取
var nickname=a.userInfo.name||a.userInfo.screen_name;
var openid = a.authResult.openid;
var nickname = a.userInfo.name||a.userInfo.screen_name;
var openid = a.authResult.uid;
var accessToken = a.authResult.access_token;
var headImg = a.userInfo.profile_image_url;
var uid = a.authResult.uid
weiboLogin(openid,accessToken,nickname,headImg,"sinaweibo")
var headImg = a.userInfo.headimgurl;
var uid = a.authResult.uid;
var unionid = "";
login(openid, unionid, accessToken, nickname, headImg, "sinaweibo", "/rest/user/sinaweiboLogin")
}
},function(e){
$.toast("获取微信用户信息失败:["+e.code+"]:"+e.message);
$.toast("获取用户信息失败:["+e.code+"]:"+e.message);
});
}
function wxLogin(openid, unionid, accessToken, nickname, headImg,loginFrom) {
axios.post("/rest/user/wxLogin", {loginFrom:loginFrom,openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg})
function login(openid, unionid, accessToken, nickname, headImg, loginFrom, uri) {
axios.post(uri, {loginFrom:loginFrom,openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg})
.then(function (response) {
$.hidePreloader();
if(response.data.status){
if("no"==response.data.message){
var resData = response.data;
if(resData.status){
if(resData.data == ""){
//跳转绑定手机号码页面
console.log(response.data.message)
clicked('../user/bindingMobile.html',true,false,{},{loginFrom:loginFrom,openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg},function(){
back();
})
}else{
localStorage.setItem("user_token", resData.data);
back();
}
}else{
//登录失败
$.toast(response.data.data)
}
})
}
function qqLogin(openid, accessToken, nickname, headImg,loginFrom) {
axios.post("/rest/user/qqLogin", {loginFrom:loginFrom,openid:openid, accessToken: accessToken, nickname:nickname,headImg:headImg})
.then(function (response) {
$.hidePreloader();
if(response.data.status){
if("no"==response.data.message){
//跳转绑定手机号码页面
}else{
}
}else{
//登录失败
$.toast(response.data.data)
}
})
}
function weiboLogin(openid, accessToken, nickname, headImg,loginFrom) {
axios.post("/rest/user/sinaweiboLogin", {loginFrom:loginFrom,openid:openid, accessToken: accessToken, nickname:nickname,headImg:headImg})
.then(function (response) {
$.hidePreloader();
if(response.data.status){
if("no"==response.data.message){
//跳转绑定手机号码页面
}else{
}
}else{
//登录失败
$.toast(response.data.data)
$.toast(resData.message)
}
})
}
+4 -3
View File
@@ -222,7 +222,7 @@ function numberConver(thumbsUpCount){
function isCollect(){
axios.post("/rest/news/checkCollect",{newsId : id}).then(function (response) {
var msg = response.data.data
var msg = response.data.data;
if(msg){
$(".collection").addClass("collection02")
$(".collection i").addClass("icon-collection02")
@@ -491,8 +491,9 @@ $(".praise").on("click", function () {
//收藏
$(".collection").on("click", function () {
//doCollect();
collect();
//localStorage.removeItem("user_token");
doCollect();
//collect();
});
function doCollect() {
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
+40 -5
View File
@@ -22,7 +22,7 @@
<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)">
<button class="button button-link button-nav pull-left" onclick="back()">
<span class="icon icon-left"></span>
</button>
<h1 class="title">绑定账号</h1>
@@ -85,6 +85,7 @@ $.config = {router: false}
<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 type="text/javascript" src="../../js/common.js" ></script>
<script>
timer = {
@@ -110,11 +111,18 @@ timer = {
}
}
new Vue({
var vue = new Vue({
el: '#app',
data: {
mobile:'',
smsCode:''
mobile:'', // 手机号码
smsCode:'', // 短信验证码
loginFrom:'', // 登录类型(weixin,qq,sinaweibo)
openid:'', // 微信ID
unionid:'', // 微信unionid,
accessToken: '',// 微信授权token
nickname:'', // 微信昵称
headImg:'', // 微信头像
deviceId:'' // 设备ID
},
methods: {
// 手机号码检查
@@ -169,12 +177,26 @@ new Vue({
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()
mobile:this.mobile,
smsCode:this.smsCode,
province:province,
city:city,
region:region,
pushClientId:getPushInfo(),
loginFrom:this.loginFrom,
openid:this.openid,
unionid:this.unionid,
accessToken:this.accessToken,
nickname:this.nickname,
headImg:this.headImg,
deviceId:this.deviceId
})
.then(function (response) {
var resData = response.data;
if (resData.status) {
$.toast(resData.message);
localStorage.setItem("user_token", resData.data);
back();
} else {
$.toast(resData.message);
}
@@ -187,6 +209,19 @@ new Vue({
}
});
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
vue.$data.loginFrom = self.loginFrom;
vue.$data.openid = self.openid;
vue.$data.unionid = self.unionid;
vue.$data.accessToken = self.accessToken;
vue.$data.nickname = self.nickname;
vue.$data.headImg = self.headImg;
vue.$data.deviceId = plus.device.uuid;
}
</script>
</body>
+4 -2
View File
@@ -60,7 +60,7 @@
</div>
<p class="agreement">
<a class="check"><img class="checkImg" src="../../images/checkImg02.png" id="check"></a>
我已阅读并接受<a href="05_mine05_set03_agreement.html">《服务协议》</a>
我已阅读并接受<a onclick="openView()">《服务协议》</a>
</p>
<div class="content-block loginBox">
<p><a class="button button-big button-fill theme" id="login_btn">登录</a></p>
@@ -114,7 +114,9 @@ $(".check").on("click", function () {
});
function openView() {
clicked(BASE_PATH + '/user/agreement',true)
}
</script>
</body>
+5 -4
View File
@@ -66,9 +66,9 @@
<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>
<a class="icon icon-loginMode01" id="wxLogin" onclick="loginInfo('weixin')"></a>
<a class="icon icon-loginMode02" id="qqLogin" onclick="loginInfo('sinaweibo')"></a>
<a class="icon icon-loginMode03" id="qqLogin" onclick="loginInfo('qq')"></a>
</p>
</div>
</div>
@@ -94,7 +94,7 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/plus.info.js" ></script>
<script type="text/javascript" src="../../js/common.js" ></script>
<script type="text/javascript" src="../../js/login/thirdLogin.js" ></script>
<script>
new Vue({
@@ -132,6 +132,7 @@ new Vue({
var token = resData.data;
localStorage.setItem("user_token", token);
$.toast(resData.message);
back();
} else {
$.toast(resData.message);
}
+4 -2
View File
@@ -21,7 +21,7 @@
<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)">
<button class="button button-link button-nav pull-left" onclick="back()">
<span class="icon icon-left"></span>
</button>
<h1 class="title">设置密码</h1>
@@ -59,7 +59,7 @@
</div>
<div class="content-block loginBox">
<p><a class="button button-big button-fill theme" @click="updatePass">确认</a></p>
<p><a href="05_mine01_index.html">跳过</a></p>
<p><a onclick="back()">跳过</a></p>
</div>
</div>
</div>
@@ -82,6 +82,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/common.js" ></script>
<script>
@@ -119,6 +120,7 @@ new Vue({
var resData = response.data;
if (resData.status) {
$.toast(resData.message);
back();
} else {
$.toast(resData.message);
}
+1 -1
View File
@@ -41,7 +41,7 @@
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="window.location.href='#'">
<button class="button button-link button-nav pull-right" onclick="clicked(BASE_PATH+'/user/setting',true)">
<span class="icon icon-set"></span>
</button>
</header>