diff --git a/common/config.js b/common/config.js index ddf9c19..c016d14 100644 --- a/common/config.js +++ b/common/config.js @@ -4,6 +4,4 @@ export default { baseUrl:'https://houserent-admin.hhlm1688.com', // baseUrl:'http://augcl.natapp1.cc', // baseUrl:'http://h5.xzaiyp.top' - // baseUrl:'https://houserent-admin.hhlm1688.com' - // baseUrl:'http://h5.xzaiyp.top' } \ No newline at end of file diff --git a/config.js b/config.js index 009d516..8933336 100644 --- a/config.js +++ b/config.js @@ -1,9 +1,11 @@ import Vue from 'vue' import utils from './utils/utils.js' -// 移除重复的 uvUI 导入和初始化,已在 main.js 中处理 +import uvUI from '@/uni_modules/uv-ui-tools' + +Vue.use(uvUI); // 当前环境 -const type = 'dev' +const type = 'prod' // 环境配置 @@ -15,8 +17,7 @@ const config = { baseUrl : 'http://augcl.natapp1.cc/employ-api', }, prod : { - baseUrl : 'https://houserent-admin.hhlm1688.com/employ-api', - // baseUrl : 'https://employadmin.augcl.com/employ-api', + baseUrl : 'https://employadmin.augcl.com/employ-api', } } @@ -24,18 +25,18 @@ const config = { // 默认配置 const defaultConfig = { mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU', - aliOss: { - url: 'https://image.hhlm1688.com/', - config: { + aliOss : { + url : 'https://image.hhlm1688.com', + config : { //桶的地址 - region: 'oss-cn-guangzhou', + region: 'oss-cn-shenzhen', //id - accessKeyId: 'LTAI5tQSs47izVy8DLVdwUU9', + accessKeyId:'LTAI5tQSs47izVy8DLVdwUU9', //密钥 - accessKeySecret: 'qHI7C3PaXYZySr84HTToviC71AYlFq', + accessKeySecret:'qHI7C3PaXYZySr84HTToviC71AYlFq', //桶的名字 bucket: 'hanhaiimage', - endpoint: 'oss-cn-shenzhen.aliyuncs.com', + endpoint:'oss-cn-shenzhen.aliyuncs.com', } }, } diff --git a/pages/auth/index.vue b/pages/auth/index.vue index e25f409..51a8e5f 100644 --- a/pages/auth/index.vue +++ b/pages/auth/index.vue @@ -12,11 +12,11 @@ 微信登录 - + @@ -75,6 +75,11 @@ this.userYsObj = this.$utils.getkeyContent('user_ys') }, methods: { + onJump(){ + uni.switchTab({ + url:"/pages/home/index" + }) + }, open(){ this.$refs.popup.open(); }, @@ -128,7 +133,7 @@ let userInfo =response.result.userInfo if(!userInfo.nickName - || !userInfo.phone){ + || !userInfo.phone || !userInfo.headImage){ uni.navigateTo({ url:"/pages/login/index" }) diff --git a/pages/login/index.vue b/pages/login/index.vue index 2f0fe96..abc5ce6 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -53,10 +53,10 @@ } }, onLoad(options) { + this.imagUrl = uni.getStorageSync('userInfo').headImage + this.nameUser = uni.getStorageSync('userInfo').nickName + this.phone = uni.getStorageSync('userInfo').phone if(options.back==1){ - this.imagUrl = uni.getStorageSync('userInfo').headImage - this.nameUser = uni.getStorageSync('userInfo').nickName - this.phone = uni.getStorageSync('userInfo').phone this.back = options.back } }, @@ -78,13 +78,11 @@ code : detail.code, encryptedData: detail.encryptedData, iv:detail.iv, - sessionKey: uni.getStorageSync('sessionKey'), - openid:uni.getStorageSync('userInfo').appletOpenid } bindPhone(params).then((response) => { console.info(response) - console.info(JSON.parse(response.result).phone_info.phoneNumber) - that.phone = JSON.parse(response.result).phone_info.phoneNumber + let data = JSON.parse(response.result) + that.phone = data.phone_info.phoneNumber }).catch(error=>{ }) diff --git a/pages/tourGuide/tourGuide.vue b/pages/tourGuide/tourGuide.vue index bd44df5..f762bbc 100644 --- a/pages/tourGuide/tourGuide.vue +++ b/pages/tourGuide/tourGuide.vue @@ -237,7 +237,7 @@ export default { this.$refs.dropDown.init(); } }, - created() { + mounted() { this.getCurrentLocation() this.onHouseType() // 获取房源类型 //this.getUserInfo() // 获取用户信息 diff --git a/pages_subpack/detail/index.vue b/pages_subpack/detail/index.vue index 3b2c723..68b44d2 100644 --- a/pages_subpack/detail/index.vue +++ b/pages_subpack/detail/index.vue @@ -13,8 +13,6 @@ - -