diff --git a/admin/.env.development b/admin/.env.development index 6a9f5e7..49cebfc 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -5,6 +5,7 @@ ENV = 'development' VUE_APP_BASE_API = 'http://127.0.0.1:18091' # VUE_APP_BASE_API = 'http://124.71.134.146:18091' # VUE_APP_BASE_API = 'https://crmeb.test.jiutianda.cn' +# VUE_APP_BASE_API = 'http://wangyi.test.jiutianda.cn' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/app/components/Authorize.vue b/app/components/Authorize.vue index 8ddc8cb..590507f 100644 --- a/app/components/Authorize.vue +++ b/app/components/Authorize.vue @@ -44,7 +44,7 @@ }, data(){ return { - logoUrl:'' + logoUrl:'/static/images/logo.png' } }, computed:mapGetters(['isLogin','userInfo']), @@ -106,15 +106,15 @@ }) }, getLogoUrl(){ - let that = this; - if (Cache.has(LOGO_URL)) { - this.logoUrl = Cache.get(LOGO_URL); - return; - } - getLogo().then(res=>{ - that.logoUrl = res.data.logoUrl - Cache.set(LOGO_URL,that.logoUrl); - }) + // let that = this; + // if (Cache.has(LOGO_URL)) { + // this.logoUrl = Cache.get(LOGO_URL); + // return; + // } + // getLogo().then(res=>{ + // that.logoUrl = res.data.logoUrl + // Cache.set(LOGO_URL,that.logoUrl); + // }) }, close(){ let pages = getCurrentPages(), currPage = pages[pages.length - 1]; diff --git a/app/config/app.js b/app/config/app.js index fc5356a..4d303cc 100644 --- a/app/config/app.js +++ b/app/config/app.js @@ -8,8 +8,7 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- //移动端商城API -// let domain = 'http://124.71.134.146:18093' -let domain = 'https://crmebxcx.test.jiutianda.cn' +let domain = 'http://wangyi2.test.jiutianda.cn' module.exports = { // 请求域名 格式: https://您的域名 @@ -18,7 +17,7 @@ module.exports = { // #ifdef MP HTTP_REQUEST_URL: domain, // #endif - HTTP_ADMIN_URL:'http://124.71.134.146:18091', //PC后台的API请求地址,上传图片用,影响h5上传头像 + HTTP_ADMIN_URL:'http://wangyi2.test.jiutianda.cn', //PC后台的API请求地址,上传图片用,影响h5上传头像 // #ifdef H5 //H5接口是浏览器地址 // HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host, diff --git a/app/pages/retrieve_password/index.vue b/app/pages/retrieve_password/index.vue index 21d89f7..85e31d3 100644 --- a/app/pages/retrieve_password/index.vue +++ b/app/pages/retrieve_password/index.vue @@ -2,7 +2,7 @@ - + diff --git a/app/pages/users/app_login/index.vue b/app/pages/users/app_login/index.vue index bacee33..7f60fe0 100644 --- a/app/pages/users/app_login/index.vue +++ b/app/pages/users/app_login/index.vue @@ -2,7 +2,7 @@
- +
diff --git a/app/pages/users/login/index.vue b/app/pages/users/login/index.vue index e484d99..eb4d0d2 100644 --- a/app/pages/users/login/index.vue +++ b/app/pages/users/login/index.vue @@ -3,7 +3,7 @@
- +
@@ -96,7 +96,7 @@ captcha: "", formItem: 1, type: "login", - logoUrl: "", + logoUrl: "/static/images/logo.png", keyCode: "", codeUrl: "", codeVal: "", @@ -271,10 +271,10 @@ let that = this }, async getLogoImage() { - let that = this; - getLogo().then(res => { - that.logoUrl = res.data.logoUrl?res.data.logoUrl:'/static/images/logo2.png'; - }); + // let that = this; + // getLogo().then(res => { + // that.logoUrl = res.data.logoUrl?res.data.logoUrl:'/static/images/logo.png'; + // }); }, async loginMobile() { let that = this; diff --git a/app/pages/users/retrievePassword/index.vue b/app/pages/users/retrievePassword/index.vue index e9937e6..6ef8497 100644 --- a/app/pages/users/retrievePassword/index.vue +++ b/app/pages/users/retrievePassword/index.vue @@ -2,7 +2,7 @@
- +
diff --git a/app/pages/users/wechat_login/index.vue b/app/pages/users/wechat_login/index.vue index 1e68531..ad56bab 100644 --- a/app/pages/users/wechat_login/index.vue +++ b/app/pages/users/wechat_login/index.vue @@ -67,7 +67,7 @@ statusBarHeight: statusBarHeight, isHome: false, isPhoneBox: false, - logoUrl: '', + logoUrl: '/static/images/logo.png', code: '', authKey: '', options: '', @@ -80,9 +80,9 @@ routinePhone }, onLoad(options) { - getLogo().then(res => { - this.logoUrl = res.data.logoUrl - }) + // getLogo().then(res => { + // this.logoUrl = res.data.logoUrl + // }) let that = this // #ifdef H5 document.body.addEventListener("focusout", () => { diff --git a/app/static/images/logo.png b/app/static/images/logo.png index 4464251..86b9ab8 100644 Binary files a/app/static/images/logo.png and b/app/static/images/logo.png differ diff --git a/app/static/images/logo2.png b/app/static/images/logo2.png deleted file mode 100644 index 36046f7..0000000 Binary files a/app/static/images/logo2.png and /dev/null differ