diff --git a/common/config.js b/common/config.js
index 1e528e7..50f6373 100644
--- a/common/config.js
+++ b/common/config.js
@@ -3,6 +3,4 @@ export default {
// baseUrl: 'https://api.book118.com',
baseUrl:'https://houserent-admin.hhlm1688.com'
// 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/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 12f931c..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,12 +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)
- that.phone = response.result
+ 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 38e1b9c..bf9ed3e 100644
--- a/pages/tourGuide/tourGuide.vue
+++ b/pages/tourGuide/tourGuide.vue
@@ -123,7 +123,7 @@ export default {
return markers;
},
},
- created() {
+ mounted() {
this.getCurrentLocation()
this.onHouseType() // 获取房源类型
this.onHousePageList() // 加载房源列表
diff --git a/pages/user/index.vue b/pages/user/index.vue
index fdc51b7..f247f41 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -15,7 +15,8 @@
font-size: 24rpx;
align-items: center;
border-radius: 20rpx;
- padding: 4rpx 10rpx;">
+ padding: 4rpx 10rpx;
+ margin-left: 10rpx;">
-
-