diff --git a/common/config.js b/common/config.js
index 909021e..40e9a67 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,5 +1,5 @@
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.json b/pages.json
index 88b6283..48ffa37 100644
--- a/pages.json
+++ b/pages.json
@@ -176,8 +176,7 @@
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "租房",
- "navigationBarBackgroundColor": "#1EC77A",
- "backgroundColor": "#1EC77A"
+ "navigationBarBackgroundColor": "#1EC77A"
},
"tabBar": {
"color": "#666666",
diff --git a/pages/home/index.vue b/pages/home/index.vue
index aa792b3..34dc4c3 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,6 +1,6 @@
-
+
{{city?city:'未知'}}
@@ -11,10 +11,13 @@
-
-
+
+
+
+
-
+
+
-
+
+ -->
@@ -49,7 +48,16 @@
return {
nameUser:"",
imagUrl:"",
- phone:""
+ phone:"",
+ back:0
+ }
+ },
+ onLoad(options) {
+ 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
}
},
methods: {
@@ -88,20 +96,27 @@
nickName:that.nameUser,
// phone:that.phone
}
- // if(that.imagUrl&&that.nameUser&&that.phone){
+ // &&that.phone
+ if(that.imagUrl&&that.nameUser){
UpdateInfo(params).then((response) => {
- uni.switchTab({
- url:"/pages/home/index"
- })
+ if(this.back==1){
+ uni.navigateBack({
+ delta:1
+ })
+ }else{
+ uni.switchTab({
+ url:"/pages/home/index"
+ })
+ }
}).catch((error) =>{
})
- // }else{
- // return uni.showToast({
- // icon:"none",
- // title:"头像和昵称不能为空!"
- // })
- // }
+ }else{
+ return uni.showToast({
+ icon:"none",
+ title:"头像和昵称不能为空!"
+ })
+ }
}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 5bf2e60..7e5842d 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -2,7 +2,7 @@
-
+
{{user.nickName?user.nickName:'暂无昵称'}}
@@ -91,6 +91,14 @@
+
+
+ 退出登录
+
+
+
+
+
@@ -110,6 +118,11 @@
this.onInfo()
},
methods: {
+ onHead(){
+ uni.navigateTo({
+ url:"/pages/login/index?back="+1
+ })
+ },
onInfo(){
let that = this
that.user = uni.getStorageSync('userInfo')
@@ -140,6 +153,26 @@
url:"/pages_subpack/broker-account/index"
})
},
+ onLogOut(){
+ uni.showModal({
+ title:"温馨提示",
+ content:"确定退出当前登录",
+ cancelText:"取消",
+ confirmText:"确定",
+ success:(res)=> {
+ console.info(res)
+ if(res.confirm==true){
+ uni.removeStorageSync("userInfo")
+ uni.removeStorageSync("token")
+ uni.removeStorageSync("sessionKey")
+ uni.navigateTo({
+ url:"/pages/auth/index"
+ })
+ }
+ }
+ })
+
+ },
onCustomerService(){
let that = this
let obj = that.$utils.getkeyContent('phone')
diff --git a/pages_subpack/detail/index.vue b/pages_subpack/detail/index.vue
index 440c465..9eeebe5 100644
--- a/pages_subpack/detail/index.vue
+++ b/pages_subpack/detail/index.vue
@@ -13,9 +13,12 @@
-
-
-
+
+
+
@@ -55,20 +58,24 @@
{{detail.address}}
-
-
-
+
- -->
+
+
+
房屋周边
@@ -194,8 +201,7 @@
-
-
+
@@ -266,13 +272,14 @@