添加 手机号返回值

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUserVerify.java

@@ -68,6 +68,11 @@ public class TaUserVerify {
      */
     private String verifyUrl;
 
+    /**
+     * 用户手机号
+     */
+    private String loginName;
+
     public Integer getId() {
         return id;
     }
@@ -251,4 +256,12 @@ public class TaUserVerify {
     public void setVerifyUrl(String verifyUrl) {
         this.verifyUrl = verifyUrl;
     }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -272,7 +272,7 @@ public class TaUserServiceImpl implements ITaUserService {
         taUserVO.setUserVerifyList(taUserVerifies);
         // 无关联房产
         if (null == taUserVerifies || taUserVerifies.size() == 0) {
-            response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + token);
+            response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + token + "&phone=" + currentUser.getLoginName());
             return response;
         }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServicelmpl.java

@@ -95,6 +95,8 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         taUserVerify.setRoleName(taSysRole.getRoleName());
         ToCommunities toCommunities = toCommunitiesMapper.selectByPrimaryKey(taUserVerify.getCommunityId());
         taUserVerify.setCommunityName(toCommunities.getCommunityName());
+        TaUser currentUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
+        taUserVerify.setLoginName(currentUser.getLoginName());
         if ("2".equals(taUserVerify.getVerifyStatus()) || "1".equals(taUserVerify.getVerifyStatus())) {
 
             // 开始查询 业主

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxLoginServiceImpl.java

@@ -259,7 +259,7 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		TaUserVO userVO = new TaUserVO();
 		BeanTools.copyProperties(user, userVO);
 		// 刚注册的用户，跳转到绑定房产页面
-		response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), userVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + request.getSession().getId());
+		response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), userVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + request.getSession().getId() + "&phone=" + user.getLoginName());
 
 		/**
 		 * 这里是因为 手机号注册 和 社交登录的手机号注册，公用的一个接口，所以有 openid 的时候，表示是微信那边的社交登录

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -33,7 +33,7 @@
               v-model="loginForm.password"
               name="password"
               type="text"
-              auto-complete="on"
+              auto-complete="off"
               placeholder="请输入验证码"
               @keyup.enter.native="handleLogin"
             />

VUECODE/smart-property-manage/src/views/building/audit/index.vue

@@ -2,11 +2,11 @@
   <div id="root">
     <el-form :inline="true" :model="formInline" class="demo-form-inline">
       <el-dialog
-        title="提示"
         :visible.sync="dialogVisible"
+        title="提示"
         width="30%">
         <span><el-radio v-model="formInline.remark" label="不认识的人的手机号">不认识的人的手机号</el-radio>
-              <el-radio v-model="formInline.remark" label="其他原因需要沟通">其他原因需要沟通</el-radio>
+          <el-radio v-model="formInline.remark" label="其他原因需要沟通">其他原因需要沟通</el-radio>
         </span>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
@@ -116,7 +116,8 @@ export default {
       },
       total: 0, // 总数
       tableData: [], // 数据体
-      dialogVisible: false
+      dialogVisible: false,
+      fullscreen: true // 是否开启菊花转
     }
   },
   mounted() {
@@ -160,20 +161,22 @@ export default {
       })
     },
     // 展示弹框
-    passTheAudit(verifyId, vstatus){
+    passTheAudit(verifyId, vstatus) {
       this.formInline.userVerifyId = verifyId
       this.formInline.verifyStatus = vstatus
       this.dialogVisible = true
     },
     // 提交
-    submitAudit(){    
+    submitAudit() {
       this.userVerifyAudit()
     },
 
-    userVerifyAudit(verifyId, vstatus,isA) {
-      if(isA=='1'){
-      this.formInline.userVerifyId = verifyId
-      this.formInline.verifyStatus = vstatus
+    userVerifyAudit(verifyId, vstatus, isA) {
+      this.fullscreen = true
+      const loading = this.$loading({ fullscreen: this.fullscreen, background: 'rgba(0, 0, 0, 0.8)' })
+      if (isA === '1') {
+        this.formInline.userVerifyId = verifyId
+        this.formInline.verifyStatus = vstatus
       }
       this.$store.dispatch('UserVerifyAudit', this.formInline).then((res) => {
         const resCode = res.code
@@ -183,11 +186,14 @@ export default {
             type: 'success'
           })
           this.dialogVisible = false
+          loading.close()
           this.getData()
           return
         }
+        loading.close()
         this.$message.error(res.message)
       }).catch(() => {
+        loading.close()
         console.log('UserVerifyAudit error')
       })
     },

VUECODE/smart-property-manage/src/views/building/info/index.vue

@@ -133,7 +133,8 @@ export default {
         remark: ''
       },
       total: 0, // 数据总数
-      dialogVisible: false
+      dialogVisible: false,
+      fullscreen: true
       
     }
   },
@@ -190,6 +191,8 @@ export default {
     },
     // 审核结果提交
     submit(){
+      this.fullscreen = true
+      const loading = this.$loading({ fullscreen: this.fullscreen, background: 'rgba(0, 0, 0, 0.8)' })
       this.$store.dispatch('VerifyinfoAdd', this.listQuery).then((res) => {
         const resCode = res.code
         if (resCode === '0') {
@@ -197,12 +200,15 @@ export default {
             message: res.message,
             type: 'success'
           })
+          loading.close()
           this.$router.push({ name: 'building-index' })
         }
         if (resCode === '1') {
+          loading.close()
           this.$message.error(res.message)
         }
       }).catch(() => {
+        loading.close()
         console.log('UserVerifyAudit error')
       })
     }