diff --git a/manifest.json b/manifest.json index d5bb9cb..a68c6a2 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "物联网可视化", "appid" : "__UNI__604B8F1", "description" : "", - "versionName" : "1.0.23", - "versionCode" : 1023, + "versionName" : "1.0.25", + "versionCode" : 1025, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/network/api/index.js b/network/api/index.js index dc94364..a11a67c 100644 --- a/network/api/index.js +++ b/network/api/index.js @@ -10,6 +10,35 @@ export default { // 消息模块 newApi:require("./new.js").default, + // 获取配置(获取应用名称) + getAppConfig(data){ + return new Promise((resolve, reject) => { + request.customRequest({ + url: '/admin/admin/site/config', + method: 'GET', + },data) + .then((res) =>{ + resolve(res); + }).catch(err =>{ + reject(err); + }) + }) + }, + // 获取登录配置(是否开启密码登录的图片验证码) + getLoginConfig(data){ + return new Promise((resolve, reject) => { + request.customRequest({ + url: '/user/admin/site/loginConfig', + method: 'GET', + },data) + .then((res) =>{ + resolve(res); + }).catch(err =>{ + reject(err); + }) + }) + }, + // 获取图片验证码 getImgCode(data){ return new Promise((resolve, reject) => { diff --git a/pages/tabbar/login.vue b/pages/tabbar/login.vue index 91e7268..162ae0b 100644 --- a/pages/tabbar/login.vue +++ b/pages/tabbar/login.vue @@ -1,15 +1,10 @@