diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js
index a126994..f20f0c4 100644
--- a/fangija-zsyf/config.js
+++ b/fangija-zsyf/config.js
@@ -1,8 +1,8 @@
/**服务端地址**/
//var BASE_PATH = "http://192.168.10.128:8084";
//var BASE_PATH = "http://192.168.10.47:8086";
-var BASE_PATH = "http://192.168.10.161:8084";
+//var BASE_PATH = "http://192.168.10.161:8084";
//var BASE_PATH = "http://192.168.10.53:8084";
-//var BASE_PATH = "http://192.168.10.170:8084";
+var BASE_PATH = "http://192.168.10.171:8084";
/**是否显示过启动页面**/
var lauchFlag = false;
\ No newline at end of file
diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css
index 32b9f3f..0666237 100644
--- a/fangija-zsyf/css/main.css
+++ b/fangija-zsyf/css/main.css
@@ -298,8 +298,9 @@ em.down{color:#88D053;}
.popup-about02 .list-block.historyList{margin-top:-1px;}
.popup-about02 .list-block.historyList .searchHistory{padding-top:0;}
.newCss ul{padding:0.75rem;padding-top:0;padding-left:0.25rem;overflow:hidden;}
-.newCss ul li{background:#F4F4F4;border-radius:0.16rem;display:inline-block;margin-left:0.5rem;margin-bottom:0.5rem;padding:0 0.5rem;line-height:1.5rem;}
+.newCss ul li{background:#F4F4F4;border-radius:0.16rem;display:inline-block;margin-left:0.5rem;margin-bottom:0.5rem;padding:0 0.5rem;line-height:1.5rem;font-size:0.65rem;color:#333;}
.newCss ul li span{font-size:0.65rem;color:#333;}
+.newCss ul li a{font-size:0.65rem;color:#333;}
.newCss ul:before,.popup-about02 .list-block.newCss ul:after{height:0;}
.content-padded + .newCss ul{padding-bottom:0;}
@@ -538,7 +539,7 @@ input::-webkit-input-placeholder{
.list-block.commentList .item-text{height:auto;min-height:1.5rem;}
.commentBox{height:66px;background:#fff;position:absolute;right:0;left:0;bottom:0;z-index:10;}
-.commentBox .searchbar{padding:0.75rem 0.5rem;padding-left:0;margin:0;height:66px;background:#fff;border-top:solid 1px #DCDCDC;position:absolute;right:0;left:0;bottom:0;z-index:10;}
+.commentBox .searchbar{padding:0.75rem 0.5rem;padding-left:0;margin:0;height:66px;background:#fff;border-top:solid 1px #e7e7e7;position:absolute;right:0;left:0;bottom:0;z-index:10;}
.commentBox .searchbar .search-input{line-height:36px;}
.commentBox .searchbar .search-input input{height:36px;background:#EFEFEF;}
.commentBox .searchbar.commentInputBox .search-input input{padding-left:1.8rem;}
@@ -1211,6 +1212,8 @@ input[type=range]::-webkit-slider-thumb {
.icon-around03:before { content: "\e610"; }
+.icon-star:before { content: ""; }
+
/* 自适应 */
@media(max-width:414px){
.list-block .item-title span.c3a{max-width:220px;}
diff --git a/fangija-zsyf/js/common.js b/fangija-zsyf/js/common.js
index 1bf58bb..caac7b6 100644
--- a/fangija-zsyf/js/common.js
+++ b/fangija-zsyf/js/common.js
@@ -7,22 +7,40 @@ document.addEventListener('touchstart',shield,false);//取消浏览器的所有
document.oncontextmenu=shield;//屏蔽选择函数
// H5 plus事件处理
var ws=null,as='pop-in';
+(function() {
+ var first = null;
+ mui.back = function() { //首次按键,提示‘再按一次退出应用’
+ if (!first) {
+ first = new Date().getTime();
+ mui.toast('再按一次退出应用');
+ setTimeout(function() {
+ first = null;
+ }, 1000);
+ } else {
+ if (new Date().getTime() - first > 1000) {
+ plus.runtime.quit();
+ }
+ }
+ };
+})
function plusReady(){
- ws=plus.webview.currentWebview();
+ /*ws=plus.webview.currentWebview();
// Android处理返回键
plus.key.addEventListener('backbutton',function(){
- /*if (ws.id == 'yfindex.html') {
+ if (ws.id == 'yfindex.html') {
+ alert("aa")
plus.nativeUI.confirm("确认退出",function(e) {
+ alert(e.index);
if(e.index == 0) {
plus.runtime.quit();
}
});
} else {
back();
- }*/
+ }
back();
},false);
- compatibleAdjust();
+ compatibleAdjust();*/
}
if(w.plus){
plusReady();
diff --git a/fangija-zsyf/js/login/thirdLogin.js b/fangija-zsyf/js/login/thirdLogin.js
new file mode 100644
index 0000000..9f94671
--- /dev/null
+++ b/fangija-zsyf/js/login/thirdLogin.js
@@ -0,0 +1,121 @@
+var auths = {}
+function plusReady() {
+ plus.oauth.getServices(function(services) {
+ for(var i in services){
+ var service=services[i];
+ auths[service.id]=service;
+ }
+ }, function(e) {
+ alert("获取登录服务列表失败:" + e.message + " - " + e.code);
+ });
+}
+document.addEventListener('plusready',plusReady,false);
+// 登录认证
+function loginInfo(dest){
+ var auth=auths[dest];
+ console.log(JSON.stringify(auth))
+ if(auth){
+ var w=null;
+ if(plus.os.name=="Android"){
+ w=plus.nativeUI.showWaiting();
+ }
+ document.addEventListener("pause",function(){
+ setTimeout(function(){
+ w&&w.close();w=null;
+ },2000);
+ }, false );
+ auth.login(function(){
+ w&&w.close();w=null;
+ userinfo(auth);
+ },function(e){
+ w&&w.close();w=null;
+ $.toast("登录认证失败:["+e.code+"]:"+e.message);
+ });
+ }else{
+ $.toast("无效的登录认证通道!");
+ $.toast("无效的登录认证通道!",null,"登录");
+ }
+}
+
+//wx获取用户信息
+function userinfo(a){
+ a.getUserInfo(function(){
+ console.log(JSON.stringify(a))
+ $.showPreloader();
+ if(a.id=='weixin'){
+ var nickname=a.userInfo.nickname||a.userInfo.name||a.userInfo.miliaoNick;
+ var openid = a.authResult.openid;
+ var accessToken = a.authResult.access_token;
+ var unionid = a.userInfo.unionid;
+ var headImg = a.userInfo.headimgurl;
+ wxLogin(openid,unionid,accessToken,nickname,headImg,"weixin")
+ }else if(a.id=='qq'){
+ 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")
+ }else{
+ //微博信息获取
+ var nickname=a.userInfo.name||a.userInfo.screen_name;
+ var openid = a.authResult.openid;
+ var accessToken = a.authResult.access_token;
+ var headImg = a.userInfo.profile_image_url;
+ var uid = a.authResult.uid
+ weiboLogin(openid,accessToken,nickname,headImg,"sinaweibo")
+ }
+
+ },function(e){
+ $.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})
+ .then(function (response) {
+ $.hidePreloader();
+ if(response.data.status){
+ if("no"==response.data.message){
+ //跳转绑定手机号码页面
+ console.log(response.data.message)
+ }else{
+
+ }
+ }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)
+ }
+ })
+}
diff --git a/fangija-zsyf/js/login/wxLogin.js b/fangija-zsyf/js/login/wxLogin.js
deleted file mode 100644
index 1b144a1..0000000
--- a/fangija-zsyf/js/login/wxLogin.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var auths = {}
-function plusReady() {
- plus.oauth.getServices(function(services) {
- alert("111111111111111111111111")
- auths = services;
- }, function(e) {
- alert("获取登录服务列表失败:" + e.message + " - " + e.code);
- });
-}
-document.addEventListener('plusready',plusReady,false);
-// 登录认证
-function webChatLogin(){
- var auth=auths['weixin'];
- if(auth){
- var w=null;
- if(plus.os.name=="Android"){
- w=plus.nativeUI.showWaiting();
- }
- document.addEventListener("pause",function(){
- setTimeout(function(){
- w&&w.close();w=null;
- },2000);
- }, false );
- auth.login(function(){
- w&&w.close();w=null;
- userinfo(auth);
- },function(e){
- w&&w.close();w=null;
- $.toast("登录认证失败:["+e.code+"]:"+e.message);
- });
- }else{
- $.toast("无效的登录认证通道!");
- $.toast("无效的登录认证通道!",null,"登录");
- }
-}
-
-function authLogin(type) {
- console.log("hhhhhhhhhhhhhhhhhhh")
-}
diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json
index 98399d1..ebe1f31 100644
--- a/fangija-zsyf/manifest.json
+++ b/fangija-zsyf/manifest.json
@@ -14,7 +14,7 @@
"icons": {
"144": "icon.png"
},
- "launch_path": "main.html",/*应用的入口页面,默认为根目录下的index.html;支持网络地址,必须以http://或https://开头*/
+ "launch_path": "/views/user/bindingMobile.html",/*应用的入口页面,默认为根目录下的index.html;支持网络地址,必须以http://或https://开头*/
"developer": {
"name": "",/*开发者名称*/
"email": "",/*开发者邮箱地址*/
@@ -101,9 +101,7 @@
"Maps": {
"description": "地图"
},
- "OAuth": {
- "description": "登录授权"
- },
+ "OAuth": {},
"Push": {
"description": "消息推送"
@@ -312,12 +310,6 @@
"description": "可选,微信分享",
"appid": "wx734a9e3085abcd90",
"appsecret": "47ce59f3c52984c4e193880fb09b12af"
- },
- "sina": {
- "appkey": "3194052034",
- "appsecret": "e863ae4e4f14d41af3142e5ae06867dd",
- "redirect_uri": "http://sh.fangjia.com/",
- "description": "可选,新浪微博分享"
}
},
"payment": {},
@@ -325,7 +317,7 @@
"weixin": {
"appid": "wx734a9e3085abcd90",
"appsecret": "47ce59f3c52984c4e193880fb09b12af"
- }
+ },"qq":{"appid":"1106734669"},"sina":{"appkey":"3194052034","appsecret":"e863ae4e4f14d41af3142e5ae06867dd","redirect_uri":"http://fangjia.com"}
}
},
"debug": true
@@ -1519,6 +1511,20 @@
],
"refer": [],
"priority": 0
+ },
+ "/views/user/bindingMobile.html": {
+ "resources": [],
+ "refer": [
+ "error.html"
+ ],
+ "priority": 0
+ },
+ "views/user/codeSms.html": {
+ "resources": [
+ "/views/user/bindingMobile.html"
+ ],
+ "refer": [],
+ "priority": 0
}
},
"idle": {
diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html
index 8307d46..5b4492c 100644
--- a/fangija-zsyf/views/evaluate/evaluateReport.html
+++ b/fangija-zsyf/views/evaluate/evaluateReport.html
@@ -104,19 +104,19 @@
-
+