init

components/my.vue

@@ -29,7 +29,11 @@
 						<navigator url="/pages2/wd/level" hover-class="none" style="position: relative;margin-top: 20rpx;">
 							<view class="progress_text">
 								{{ userInfo.integral === null ? 0 : userInfo.integral }}/{{
-									userInfo.userLevel === null || userInfo.userLevel === undefined ? '0' : userLevelList[userInfo.userLevel - 1] === undefined ? '0': userLevelList[userInfo.userLevel - 1]
+									userInfo.userLevel === null || userInfo.userLevel === undefined
+										? '0'
+										: userLevelList[userInfo.userLevel - 1] === undefined
+										? '0'
+										: userLevelList[userInfo.userLevel - 1]
 								}}
 							</view>
 							<u-line-progress
@@ -179,13 +183,13 @@ export default {
 		pulling() {
 			this.triggered = true;
 		},
-		refresher(){
-			let that = this
-			this.init()
+		refresher() {
+			let that = this;
+			this.init();
 			this.$api.refreshUserInfo();
-			setTimeout(function(){
-				that.triggered = false
-			},500)
+			setTimeout(function() {
+				that.triggered = false;
+			}, 500);
 		},
 		restore() {
 			this.triggered = false;
@@ -224,12 +228,7 @@ export default {
 			this.$store.state.allowLoading = false;
 			const firstFunc = await this.getInfoAttached();
 			const seciedFunc = await this.getLevel();
-<<<<<<< HEAD
-			//		this.$api.refreshUserInfo();
 			this.$store.state.allowLoading = true;
-=======
-			this.$store.state.allowLoading = true
->>>>>>> ae3c0e80d7af9b78c30f703a3d0538b4dd4c18f2
 		},
 		jumpPopup() {
 			uni.showModal({

pages2/resume/addResume.vue

@@ -465,14 +465,13 @@ export default {
 			array_Arrivaltime: ['随时', '1周内', '1个月内', '3个月内', '待定'],
 			array_eduType: ['小学', '初中', '中专/高中', '专科', '本科', '硕士研究生', '博士研究生'],
 			array_cfType: ['建筑资历证书', '非建筑资历证书'],
-			userInfo: {},
 			userSchool: {},
 			id: null,
 			showJDT: false,
 		};
 	},
 	onLoad(options) {
-		this.getUserInfo();
+		// this.getUserInfo();
 		this.getUserSchool();
 		if (options.id !== undefined) {
 			this.id = options.id;
@@ -483,7 +482,7 @@ export default {
 	onReady() {
 		this.$refs.uForm.setRules(this.rules);
 	},
-	computed: { ...mapGetters(['dictObj']) },
+	computed: { ...mapGetters(['dictObj','userInfo']) },
 	mounted() {
 		this.getCateList();
 	},
@@ -515,11 +514,11 @@ export default {
 				}
 			});
 		},
-		getUserInfo() {
-			this.$api.getInfo().then(res => {
-				this.userInfo = res.data.data;
-			});
-		},
+		// getUserInfo() {
+		// 	this.$api.getInfo().then(res => {
+		// 		this.userInfo = res.data.data;
+		// 	});
+		// },
 		getUserSchool() {
 			this.$api.getSchoolInfo().then(res => {
 				this.userSchool = res.data.data;