Browse Source

添加 手机号返回值

魏熙美 6 years ago
parent
commit
7222d7c5ea

+ 13
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUserVerify.java View File

68
      */
68
      */
69
     private String verifyUrl;
69
     private String verifyUrl;
70
 
70
 
71
+    /**
72
+     * 用户手机号
73
+     */
74
+    private String loginName;
75
+
71
     public Integer getId() {
76
     public Integer getId() {
72
         return id;
77
         return id;
73
     }
78
     }
251
     public void setVerifyUrl(String verifyUrl) {
256
     public void setVerifyUrl(String verifyUrl) {
252
         this.verifyUrl = verifyUrl;
257
         this.verifyUrl = verifyUrl;
253
     }
258
     }
259
+
260
+    public String getLoginName() {
261
+        return loginName;
262
+    }
263
+
264
+    public void setLoginName(String loginName) {
265
+        this.loginName = loginName;
266
+    }
254
 }
267
 }

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

272
         taUserVO.setUserVerifyList(taUserVerifies);
272
         taUserVO.setUserVerifyList(taUserVerifies);
273
         // 无关联房产
273
         // 无关联房产
274
         if (null == taUserVerifies || taUserVerifies.size() == 0) {
274
         if (null == taUserVerifies || taUserVerifies.size() == 0) {
275
-            response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + token);
275
+            response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + token + "&phone=" + currentUser.getLoginName());
276
             return response;
276
             return response;
277
         }
277
         }
278
 
278
 

+ 2
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServicelmpl.java View File

95
         taUserVerify.setRoleName(taSysRole.getRoleName());
95
         taUserVerify.setRoleName(taSysRole.getRoleName());
96
         ToCommunities toCommunities = toCommunitiesMapper.selectByPrimaryKey(taUserVerify.getCommunityId());
96
         ToCommunities toCommunities = toCommunitiesMapper.selectByPrimaryKey(taUserVerify.getCommunityId());
97
         taUserVerify.setCommunityName(toCommunities.getCommunityName());
97
         taUserVerify.setCommunityName(toCommunities.getCommunityName());
98
+        TaUser currentUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
99
+        taUserVerify.setLoginName(currentUser.getLoginName());
98
         if ("2".equals(taUserVerify.getVerifyStatus()) || "1".equals(taUserVerify.getVerifyStatus())) {
100
         if ("2".equals(taUserVerify.getVerifyStatus()) || "1".equals(taUserVerify.getVerifyStatus())) {
99
 
101
 
100
             // 开始查询 业主
102
             // 开始查询 业主

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

259
 		TaUserVO userVO = new TaUserVO();
259
 		TaUserVO userVO = new TaUserVO();
260
 		BeanTools.copyProperties(user, userVO);
260
 		BeanTools.copyProperties(user, userVO);
261
 		// 刚注册的用户,跳转到绑定房产页面
261
 		// 刚注册的用户,跳转到绑定房产页面
262
-		response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), userVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + request.getSession().getId());
262
+		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());
263
 
263
 
264
 		/**
264
 		/**
265
 		 * 这里是因为 手机号注册 和 社交登录的手机号注册,公用的一个接口,所以有 openid 的时候,表示是微信那边的社交登录
265
 		 * 这里是因为 手机号注册 和 社交登录的手机号注册,公用的一个接口,所以有 openid 的时候,表示是微信那边的社交登录

+ 1
- 1
VUECODE/smart-operate-manage/src/views/login/index.vue View File

33
               v-model="loginForm.password"
33
               v-model="loginForm.password"
34
               name="password"
34
               name="password"
35
               type="text"
35
               type="text"
36
-              auto-complete="on"
36
+              auto-complete="off"
37
               placeholder="请输入验证码"
37
               placeholder="请输入验证码"
38
               @keyup.enter.native="handleLogin"
38
               @keyup.enter.native="handleLogin"
39
             />
39
             />

+ 15
- 9
VUECODE/smart-property-manage/src/views/building/audit/index.vue View File

2
   <div id="root">
2
   <div id="root">
3
     <el-form :inline="true" :model="formInline" class="demo-form-inline">
3
     <el-form :inline="true" :model="formInline" class="demo-form-inline">
4
       <el-dialog
4
       <el-dialog
5
-        title="提示"
6
         :visible.sync="dialogVisible"
5
         :visible.sync="dialogVisible"
6
+        title="提示"
7
         width="30%">
7
         width="30%">
8
         <span><el-radio v-model="formInline.remark" label="不认识的人的手机号">不认识的人的手机号</el-radio>
8
         <span><el-radio v-model="formInline.remark" label="不认识的人的手机号">不认识的人的手机号</el-radio>
9
-              <el-radio v-model="formInline.remark" label="其他原因需要沟通">其他原因需要沟通</el-radio>
9
+          <el-radio v-model="formInline.remark" label="其他原因需要沟通">其他原因需要沟通</el-radio>
10
         </span>
10
         </span>
11
         <span slot="footer" class="dialog-footer">
11
         <span slot="footer" class="dialog-footer">
12
           <el-button @click="dialogVisible = false">取 消</el-button>
12
           <el-button @click="dialogVisible = false">取 消</el-button>
116
       },
116
       },
117
       total: 0, // 总数
117
       total: 0, // 总数
118
       tableData: [], // 数据体
118
       tableData: [], // 数据体
119
-      dialogVisible: false
119
+      dialogVisible: false,
120
+      fullscreen: true // 是否开启菊花转
120
     }
121
     }
121
   },
122
   },
122
   mounted() {
123
   mounted() {
160
       })
161
       })
161
     },
162
     },
162
     // 展示弹框
163
     // 展示弹框
163
-    passTheAudit(verifyId, vstatus){
164
+    passTheAudit(verifyId, vstatus) {
164
       this.formInline.userVerifyId = verifyId
165
       this.formInline.userVerifyId = verifyId
165
       this.formInline.verifyStatus = vstatus
166
       this.formInline.verifyStatus = vstatus
166
       this.dialogVisible = true
167
       this.dialogVisible = true
167
     },
168
     },
168
     // 提交
169
     // 提交
169
-    submitAudit(){    
170
+    submitAudit() {
170
       this.userVerifyAudit()
171
       this.userVerifyAudit()
171
     },
172
     },
172
 
173
 
173
-    userVerifyAudit(verifyId, vstatus,isA) {
174
-      if(isA=='1'){
175
-      this.formInline.userVerifyId = verifyId
176
-      this.formInline.verifyStatus = vstatus
174
+    userVerifyAudit(verifyId, vstatus, isA) {
175
+      this.fullscreen = true
176
+      const loading = this.$loading({ fullscreen: this.fullscreen, background: 'rgba(0, 0, 0, 0.8)' })
177
+      if (isA === '1') {
178
+        this.formInline.userVerifyId = verifyId
179
+        this.formInline.verifyStatus = vstatus
177
       }
180
       }
178
       this.$store.dispatch('UserVerifyAudit', this.formInline).then((res) => {
181
       this.$store.dispatch('UserVerifyAudit', this.formInline).then((res) => {
179
         const resCode = res.code
182
         const resCode = res.code
183
             type: 'success'
186
             type: 'success'
184
           })
187
           })
185
           this.dialogVisible = false
188
           this.dialogVisible = false
189
+          loading.close()
186
           this.getData()
190
           this.getData()
187
           return
191
           return
188
         }
192
         }
193
+        loading.close()
189
         this.$message.error(res.message)
194
         this.$message.error(res.message)
190
       }).catch(() => {
195
       }).catch(() => {
196
+        loading.close()
191
         console.log('UserVerifyAudit error')
197
         console.log('UserVerifyAudit error')
192
       })
198
       })
193
     },
199
     },

+ 7
- 1
VUECODE/smart-property-manage/src/views/building/info/index.vue View File

133
         remark: ''
133
         remark: ''
134
       },
134
       },
135
       total: 0, // 数据总数
135
       total: 0, // 数据总数
136
-      dialogVisible: false
136
+      dialogVisible: false,
137
+      fullscreen: true
137
       
138
       
138
     }
139
     }
139
   },
140
   },
190
     },
191
     },
191
     // 审核结果提交
192
     // 审核结果提交
192
     submit(){
193
     submit(){
194
+      this.fullscreen = true
195
+      const loading = this.$loading({ fullscreen: this.fullscreen, background: 'rgba(0, 0, 0, 0.8)' })
193
       this.$store.dispatch('VerifyinfoAdd', this.listQuery).then((res) => {
196
       this.$store.dispatch('VerifyinfoAdd', this.listQuery).then((res) => {
194
         const resCode = res.code
197
         const resCode = res.code
195
         if (resCode === '0') {
198
         if (resCode === '0') {
197
             message: res.message,
200
             message: res.message,
198
             type: 'success'
201
             type: 'success'
199
           })
202
           })
203
+          loading.close()
200
           this.$router.push({ name: 'building-index' })
204
           this.$router.push({ name: 'building-index' })
201
         }
205
         }
202
         if (resCode === '1') {
206
         if (resCode === '1') {
207
+          loading.close()
203
           this.$message.error(res.message)
208
           this.$message.error(res.message)
204
         }
209
         }
205
       }).catch(() => {
210
       }).catch(() => {
211
+        loading.close()
206
         console.log('UserVerifyAudit error')
212
         console.log('UserVerifyAudit error')
207
       })
213
       })
208
     }
214
     }