diff --git a/common/dic.js b/common/dic.js index a62bbdc..389587f 100644 --- a/common/dic.js +++ b/common/dic.js @@ -372,7 +372,7 @@ const addressColumn = [ }, { value: '185', - label: "绵竹市" + label: "广汉市" }, { value: '143', diff --git a/pages/projectInfo/projectInfo.vue b/pages/projectInfo/projectInfo.vue index bc65067..df4eb3f 100644 --- a/pages/projectInfo/projectInfo.vue +++ b/pages/projectInfo/projectInfo.vue @@ -414,8 +414,7 @@ } }, cityNamed() { - console.log('val', this.info, this.area.dic) - if (this.info && this.info.cityId !== -1 && this.area.dic) { + if (this.info && typeof this.info.cityId !== 'undefined' && this.info.cityId !== -1 && this.area.dic) { return this.area.dic[this.info.cityId].label } else { return '无' diff --git a/uni_modules/uview-ui/components/u-icon/u-icon.vue b/uni_modules/uview-ui/components/u-icon/u-icon.vue index 9340328..d70f584 100644 --- a/uni_modules/uview-ui/components/u-icon/u-icon.vue +++ b/uni_modules/uview-ui/components/u-icon/u-icon.vue @@ -1,234 +1,216 @@ - - - - - + + + + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index a412b25..5771477 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,7 +3,7 @@ module.exports = { port: 1887, proxy: { '/api': { - target: 'http://192.168.1.106:8000', + target: 'http://10.165.0.173:8000', ws: true, pathRewrite: { '^/api': '/'