Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into xh-YOUFANGAPP1.1.2
This commit is contained in:
+18
-1
@@ -38,12 +38,29 @@
|
||||
<div class="content-block">
|
||||
<p>
|
||||
<a onclick="plus.runtime.restart()" class="button button-big button-round theme">重启应用</a>
|
||||
<a onclick="back(),plus.nativeUI.closeWaiting();" class="button button-big button-round theme">返回刷新</a>
|
||||
<a onclick="again()" class="button button-big button-round theme">返回刷新</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript" src="js/common.js" ></script>
|
||||
<script>
|
||||
var flag;
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
function onPlusReady() {
|
||||
var self = plus.webview.currentWebview();
|
||||
flag = self.flag;
|
||||
plus.nativeUI.closeWaiting();
|
||||
}
|
||||
|
||||
function again(){
|
||||
if(flag){
|
||||
back();
|
||||
plus.nativeUI.closeWaiting();
|
||||
}
|
||||
//window.location.reload();
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -22,9 +22,10 @@ axios.interceptors.response.use(function (response) {
|
||||
return response;
|
||||
}, function (error) {
|
||||
try {
|
||||
|
||||
if(error=="Error: Network Error" || error.toString().indexOf('timeout') > -1){
|
||||
if(plus.webview.getWebviewById('error.html')==null){
|
||||
clicked('error.html',true,false,{},{},function(){
|
||||
clicked('error.html',true,false,{},{flag:1},function(){
|
||||
window.location.reload();
|
||||
})
|
||||
}else{
|
||||
|
||||
@@ -141,7 +141,7 @@ $.config = {router: false}
|
||||
|
||||
//loadRegionInfo("上海");
|
||||
function loadRegionRank(city){
|
||||
axios.get("/rest/quotations/regionInfos",{
|
||||
axios.get("/rest/quotations/regionPriceInfos",{
|
||||
params:{
|
||||
city : city
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ $.config = {router: false}
|
||||
|
||||
//loadRegionInfo("上海");
|
||||
function loadRegionInfo(city){
|
||||
axios.get("/rest/quotations/regionInfos",{
|
||||
axios.get("/rest/quotations/regionMarkupInfos",{
|
||||
params:{
|
||||
city : city
|
||||
}
|
||||
|
||||
@@ -175,11 +175,11 @@ var vm = new Vue({
|
||||
})
|
||||
|
||||
|
||||
//function onPlusReady() {
|
||||
// var self = plus.webview.currentWebview();
|
||||
// id = self.newsId;
|
||||
// shareId = id
|
||||
// shareUrl = shareUrl+id
|
||||
function onPlusReady() {
|
||||
var self = plus.webview.currentWebview();
|
||||
id = self.newsId;
|
||||
shareId = id
|
||||
shareUrl = shareUrl+id
|
||||
|
||||
axios.get("/rest/news/detail",{params:{newsId:id}}).then(function(response){
|
||||
if(response.data.code==200){
|
||||
@@ -211,7 +211,7 @@ var vm = new Vue({
|
||||
});
|
||||
getPosition();
|
||||
updateSerivces();
|
||||
//}
|
||||
}
|
||||
|
||||
//数量进行转换
|
||||
function numberConver(thumbsUpCount){
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
<div class="topBg01">
|
||||
<!-- 目前是登录后点击个人头像设置密码 -->
|
||||
<img src="../../images/headPortrait.png" id="user_headImg" onclick="gotoUpdatePass()">
|
||||
<p id="user_mobile"><br><span class="tag"><!--<small>土豪</small>--></span></p>
|
||||
<p><label id="user_mobile"><!--<a href="04_mine05_assetsRanking.html">资产排名:12</a>--></label><!--<span class="tag "><small>土豪</small></span>--></p>
|
||||
</div>
|
||||
<div class="topic" id="toolList" v-bind:style="{display:haveTools}">
|
||||
<div class="topicContent homeBox" style="padding-left:0;padding-right:0;">
|
||||
@@ -434,7 +434,7 @@ function selectUserInfo(){
|
||||
var mobile = result.mobile;
|
||||
//加载个人信息时候为该变量赋值
|
||||
_mobile = result.mobile;
|
||||
$('#user_mobile').html('<br><span class="tag"><small>'+mobile.substring(0,3)+'****'+mobile.substring(7)+'</small></span>');
|
||||
$('#user_mobile').text(mobile.substring(0,3)+'****'+mobile.substring(7));
|
||||
if(result.headImg != null && result.headImg.length > 0){
|
||||
$('#user_headImg').attr('src', result.headImg);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user