From 72e41fd868725a9b0e6cdeaee59a49bcfa66db9e Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Tue, 11 Dec 2018 13:29:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=20=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9merge=E5=88=B0d?= =?UTF-8?q?ev]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/edit/edit.js | 17 ++++++++++++----- pages/grade/grade.js | 1 - 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pages/edit/edit.js b/pages/edit/edit.js index 97601ec..64b4089 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -2,7 +2,6 @@ const util = require("../../utils/util.js"); const Http = require("../../utils/HttpBasics"); const config = require("../../config/config"); Page({ - /** * 页面的初始数据 */ @@ -51,6 +50,7 @@ Page({ success: function (res) { that.setData({ address: res.name + '(' + res.address + ')', + addressStr: JSON.stringify(res) }) }, fail: function (error) { @@ -73,8 +73,8 @@ Page({ } else { var sex = that.data.sex; } - if (that.data.address) { - var address = that.data.address; + if (that.data.addressStr) { + var address = that.data.addressStr; } else { var address = null; @@ -146,10 +146,17 @@ Page({ url: config.api.getScore, data: {} }).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({ address: res.data.address, + addressStr: res.data.address }) } if (res.data.name) { diff --git a/pages/grade/grade.js b/pages/grade/grade.js index d440b00..cee3682 100644 --- a/pages/grade/grade.js +++ b/pages/grade/grade.js @@ -36,7 +36,6 @@ Page({ } }) .then(res=>{ - console.log(JSON.parse(res.data.score.rules).concat(JSON.parse(res.data.score.rules)[1].childs)); that.setData({ flags: 'have', rules: JSON.parse(res.data.score.rules).concat(JSON.parse(res.data.score.rules)[1].childs),