diff --git a/api/api.js b/api/api.js index 60197b2..ad6e710 100644 --- a/api/api.js +++ b/api/api.js @@ -8,7 +8,7 @@ const config = { // }, getConfig : {url : '/api/getConfig', method : 'GET', limit : 500}, // 登录接口 - loginLogin: { url: '/api/login/login', method: 'GET' , limit : 500 }, + loginLogin: { url: '/school/login/login', method: 'GET' , limit : 500 }, //修改个人信息接口 updateInfo: { url: '/api/info/updateInfo', method: 'POST' , limit : 500 }, //获取用户信息接口 diff --git a/manifest.json b/manifest.json index fd59c4e..55efc84 100644 --- a/manifest.json +++ b/manifest.json @@ -75,7 +75,7 @@ "vueVersion" : "2", "h5" : { "router" : { - "base" : "" + "base" : "/repair" } } } diff --git a/pages.json b/pages.json index 0728828..86d2432 100644 --- a/pages.json +++ b/pages.json @@ -4,12 +4,6 @@ "style": { "navigationBarTitleText": "申请报修" } - }, { - "path": "pages/login/login", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom" - } }, { "path": "pages/repairList/repairList", diff --git a/pages/finish/finish.vue b/pages/finish/finish.vue index 71ebd8b..21b2835 100644 --- a/pages/finish/finish.vue +++ b/pages/finish/finish.vue @@ -124,6 +124,7 @@ //打开处理结果 processingPickerOpen() { + uni.hideKeyboard() this.$refs.processing.open(); }, diff --git a/pages/repair/repair.vue b/pages/repair/repair.vue index 9feed15..0c94cd6 100644 --- a/pages/repair/repair.vue +++ b/pages/repair/repair.vue @@ -3,17 +3,17 @@ - - + + - - + + @@ -54,7 +54,7 @@ - @@ -157,6 +157,18 @@ { id: 1, label: '楼栋2' + }, + { + id: 1, + label: '楼栋3' + }, + { + id: 1, + label: '楼栋4' + }, + { + id: 1, + label: '楼栋5' } ] ], //楼栋列表 @@ -182,19 +194,6 @@ this.$refs.showPrivacy.init(resolve) }) } - - setTimeout(() => { - this.$refs.showPrivacy.init({}) - },2000) - - wx.getPrivacySetting({ - success: res => { - console.log(res) - if (res.needAuthorization) { - - } - } - }) }, onReady() { this.$refs.form.setRules(this.rules);