版本01

components/my.vue

@@ -224,12 +224,9 @@ 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/wd/info.vue

@@ -15,7 +15,7 @@
 		</view>
 		<view class="form">
 			<u-form :model="form" ref="uForm">
-				<u-form-item label="姓名" prop="realname"><u-input placeholder="请实名认证" :disabled="true" v-model="form.realname" /></u-form-item>
+				<u-form-item label="姓名" prop="realname"><u-input placeholder="请实名认证"  v-model="form.realname" /></u-form-item>
 				<u-form-item label="手机号码" prop="telphone" :label-width="auto"><u-input :disabled="true" v-model="form.telphone" /></u-form-item>
 				<u-form-item label="身份证号" prop="idCard" :label-width="auto"><u-input placeholder="请实名认证" :disabled="true" v-model="form.idCard" /></u-form-item>
 				<u-form-item label="性别" prop="sex">