|
@@ -2,7 +2,6 @@ const util = require("../../utils/util.js"); |
|
|
const Http = require("../../utils/HttpBasics"); |
|
|
const Http = require("../../utils/HttpBasics"); |
|
|
const config = require("../../config/config"); |
|
|
const config = require("../../config/config"); |
|
|
Page({ |
|
|
Page({ |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 页面的初始数据 |
|
|
* 页面的初始数据 |
|
|
*/ |
|
|
*/ |
|
@@ -51,6 +50,7 @@ Page({ |
|
|
success: function (res) { |
|
|
success: function (res) { |
|
|
that.setData({ |
|
|
that.setData({ |
|
|
address: res.name + '(' + res.address + ')', |
|
|
address: res.name + '(' + res.address + ')', |
|
|
|
|
|
addressStr: JSON.stringify(res) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
fail: function (error) { |
|
|
fail: function (error) { |
|
@@ -73,8 +73,8 @@ Page({ |
|
|
} else { |
|
|
} else { |
|
|
var sex = that.data.sex; |
|
|
var sex = that.data.sex; |
|
|
} |
|
|
} |
|
|
if (that.data.address) { |
|
|
|
|
|
var address = that.data.address; |
|
|
|
|
|
|
|
|
if (that.data.addressStr) { |
|
|
|
|
|
var address = that.data.addressStr; |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
var address = null; |
|
|
var address = null; |
|
@@ -146,10 +146,17 @@ Page({ |
|
|
url: config.api.getScore, |
|
|
url: config.api.getScore, |
|
|
data: {} |
|
|
data: {} |
|
|
}).then(res => { |
|
|
}).then(res => { |
|
|
console.log(res); |
|
|
|
|
|
if (res.data.address) { |
|
|
|
|
|
|
|
|
console.log(res.data.address); |
|
|
|
|
|
var reg = RegExp(/address/); |
|
|
|
|
|
if (res.data.address.match(reg)) { |
|
|
|
|
|
that.setData({ |
|
|
|
|
|
address: JSON.parse(res.data.address).address + JSON.parse(res.data.address).name, |
|
|
|
|
|
addressStr: JSON.parse(res.data.address).address + JSON.parse(res.data.address).name |
|
|
|
|
|
}) |
|
|
|
|
|
}else{ |
|
|
that.setData({ |
|
|
that.setData({ |
|
|
address: res.data.address, |
|
|
address: res.data.address, |
|
|
|
|
|
addressStr: res.data.address |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
if (res.data.name) { |
|
|
if (res.data.name) { |
|
|