合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivitySignUpServiceImpl.java

@@ -123,6 +123,11 @@ public class TpActivitySignUpServiceImpl extends ServiceImpl<TpActivitySignUpMap
         }
 
         tpActivitySignUpMapper.deleteById(tpActivitySignUp);
+        TpActivity tpActivity = tpActivityMapper.selectById(tpActivitySignUp.getId());
+        if (tpActivity.getSignUpCount().intValue() > 0) {
+            tpActivity.setSignUpCount(tpActivity.getSignUpCount() - 1);
+            tpActivityMapper.updateById(tpActivity);
+        }
 
         // 发送短信
         // TODO 删除成功后, 发送短信通知用户

CODE/smart-community/zuul/src/main/java/com/community/huiju/filter/DomainZuulPostFilter.java

@@ -66,7 +66,7 @@ public class DomainZuulPostFilter extends ZuulFilter {
         }else {
             log.info("获取的token: {}", token);
 
-            if (matcher.match(RequestURI.APP_API.getUrl(), requestURI)) {
+            if (requestURI.indexOf(RequestURI.APP_API.getUrl()) != -1) {
                 UserElement appElement = (UserElement) request.getSession().getAttribute(Constant.APP_USER_SESSION);
                 if (null == appElement) {
                     responseBean.addError(Status.RESPONSE_STATUS_803.getValue(),Status.RESPONSE_STATUS_803.getComment());
@@ -74,7 +74,7 @@ public class DomainZuulPostFilter extends ZuulFilter {
                     ctx.setResponseBody(JSONObject.toJSONString(responseBean));
                 }
 
-            } else if (matcher.match(RequestURI.OPERATE_API.getUrl(), requestURI) || matcher.match(RequestURI.PROPERTY_API.getUrl(), requestURI)) {
+            } else if (requestURI.indexOf(RequestURI.OPERATE_API.getUrl()) != -1 || requestURI.indexOf(RequestURI.PROPERTY_API.getUrl()) != -1) {
                 UserElement webOperateElement = (UserElement) request.getSession().getAttribute(Constant.WEB_USER_SESSION);
                 if (null == webOperateElement) {
                     responseBean.addError(Status.RESPONSE_STATUS_803.getValue(),Status.RESPONSE_STATUS_803.getComment());

VUECODE/smart-operate-manage/src/utils/request.js

@@ -39,7 +39,7 @@ service.interceptors.response.use(
         duration: 5 * 1000
       })
 
-      // 802:Token 身份凭证不存在; 50012:其他客户端登录了;  803:Token 过期了;
+      // 802:Token 身份凭证不存在; 50012:其他客户端登录了;  803:您长时间未登录，需要重新登录。
       if (res.code === 802 || res.code === 50012 || res.code === 803) {
         MessageBox.confirm(
           '你已被登出，可以取消继续留在该页面，或者重新登录',

VUECODE/smart-property-manage/src/views/social/signUp/index.vue

@@ -59,7 +59,7 @@
         align="center">
         <template slot-scope="scope">
           <el-popover trigger="hover" placement="top">
-            <p>{{ scope.row.remark }}</p>
+            <div style="width: 300px; word-wrap: break-word;">{{ scope.row.remark }}</div>
             <div slot="reference" class="text-remark">
               {{ scope.row.remark }}
             </div>
@@ -222,7 +222,7 @@ export default {
             message: res.message,
             type: 'success'
           })
-          // 获取密码
+          // 获取列表
           this.signUpList()
           this.deleteData.deleteId = ''
           return
@@ -232,6 +232,9 @@ export default {
       }).catch(() => {
         console.log('error DeleteSignUp')
       })
+
+      // 关闭弹窗
+      this.dialogTableVisible = false
     }
   }
 }