upodate

mobile-code/src/admin/interest/my-invite.vue

@@ -6,7 +6,7 @@
 					<div class="user-wrap-left">
 						<app-avatar-module :width="100" />
 						<div class="user-det">
-							<div class="user-name">{{ userInfo.merchantName }}</div>
+							<!-- <div class="user-name">{{ userInfo.merchantName }}</div> -->
 							<div class="app-color-3">三级代理</div>
 						</div>
 					</div>

mobile-code/src/admin/setting/password.vue

@@ -33,6 +33,7 @@ import { mapGetters } from 'vuex'
 import TuiListCell from '@/components/plugin/list-cell'
 const form = require('@/utils/formValidation.js')
 // api
+import { getSelfInfo } from '@/utils/auth'
 import { updatePassword, updateConfirmPassword } from '@/api/login'
 export default {
 	name: 'password-setting',
@@ -69,15 +70,15 @@ export default {
 	computed: {
 		...mapGetters({ selfInfo: 'getSelfInfo' }),
 		isOldPass() {
-			let status = this.tabIndex == 1 ? this.selfInfo.password : this.selfInfo.confirmPassword
+			let status = this.selfInfo ? this.tabIndex == 1 ? this.selfInfo.password : this.selfInfo.confirmPassword : false
 			return !!status
 		}
 	},
 	onLoad() {
-		// getSelfInfo().then(res => {
+		getSelfInfo().then(res => {
 		// 	console.log(res)
 		// 	// if (res.) {}
-		// })
+		})
 	},
 	methods: {
 		changeTab(index) {

mobile-code/src/mixins/globalMixins.js

@@ -15,9 +15,9 @@ export default {
 			pageTo: pageTo
 		}
 	},
-	computed: {
-		...mapGetters({ userInfo: 'getUser' })
-	},
+	// computed: {
+	// 	...mapGetters({ userInfo: 'getUser' })
+	// },
 	// 页面生命周期才触发
 	onLoad: function(option) {
 		this.option = option || null
@@ -38,6 +38,7 @@ export default {
 			if (isLogin()) {
 				// #ifdef H5
 				if (this.init) {
+					getUser()
 					this.init()
 					// console.log('init', this.init)
 				}
@@ -45,6 +46,7 @@ export default {
 				// #ifdef MP-WEIXIN
 				wxLoginFn().then(res => {
 					if (this.init) {
+						getUser()
 						this.init()
 					}
 				})
@@ -62,6 +64,7 @@ export default {
 				// #ifdef MP-WEIXIN
 				wxLoginFn().then(res => {
 					if (this.init) {
+						getUser()
 						this.init()
 					}
 				})

mobile-code/src/utils/auth.js

@@ -35,7 +35,7 @@ export async function getShopUser(update) {
 }
 
 /**
- * 获取后台用户信息
+ * 获取后台商户用户信息
  * @parmas update为true时会重新触发请求，重置vuex的数据
  */
 export async function getUser(update) {