gjy 3 anni fa
parent
commit
8354ec46f6
3 ha cambiato i file con 6 aggiunte e 3 eliminazioni
  1. 1 0
      common/directive.js
  2. 2 1
      config/index.js
  3. 3 2
      pages/user/user.vue

+ 1 - 0
common/directive.js

@@ -12,6 +12,7 @@ const permission = (el, binding) => {
 	  }
 }
 const getRoles = ()=>{
+	debugger
 	let _roles = uni.getStorageSync('jurisdiction');
 	let list = uni.getStorageSync('rolesList');
 	if(list&&list.length > 0){

+ 2 - 1
config/index.js

@@ -1,7 +1,8 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
-	baseUrlNew: 'http://192.168.1.119:9100/',
+	baseUrlNew: 'http://192.168.1.117:8090/',
+	// baseUrlNew: 'http://192.168.1.119:9100/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 3 - 2
pages/user/user.vue

@@ -305,8 +305,9 @@
 				} else {
 					this.headUrl = this.userInfo.avatarUrl
 				}
-				this.username = this.userInfo.userName
-				this.userphone = this.userInfo.phone
+				
+				this.username = this.userInfo.userName?this.userInfo.userName:uni.getStorageSync("userInfo").data.userName
+				this.userphone = this.userInfo.phone?this.userInfo.phone:uni.getStorageSync("userInfo").data.phone
 				var that = this
 				this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
 					console.log("noticeNumber", res)