修复 bug

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/CodeController.java

@@ -43,7 +43,7 @@ public class CodeController {
 
         log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
         if (!AccountValidatorUtil.isPhone(phone)){
-            response.addError("请输入正取的手机号!");
+            response.addError("请输入正确的手机号!");
             return response;
         }
 

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

@@ -73,7 +73,7 @@ public class TaUserServiceImpl implements ITaUserService {
         ResponseBean response = new ResponseBean();
         log.info("{} 手机号校验结果: {}",user.getLoginName(),AccountValidatorUtil.isPhone(user.getLoginName()));
         if (!AccountValidatorUtil.isPhone(user.getLoginName())){
-            response.addError("请输入正取的手机号!");
+            response.addError("请输入正确的手机号!");
             return response;
         }
         Map<String,Object> map = Maps.newHashMap();
@@ -112,7 +112,7 @@ public class TaUserServiceImpl implements ITaUserService {
         AppkeyCache.setCache(loginName,"null");
         log.info("{} 手机号校验结果: {}",loginName,AccountValidatorUtil.isPhone(loginName));
         if (!AccountValidatorUtil.isPhone(loginName)){
-            response.addError("请输入正取的手机号!");
+            response.addError("请输入正确的手机号!");
             return response;
         }
         if (StringUtils.isBlank(communityId)) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/CodeController.java

@@ -41,7 +41,7 @@ public class CodeController {
 
         log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
         if (!AccountValidatorUtil.isPhone(phone)){
-            response.addError("请输入正取的手机号!");
+            response.addError("请输入正确的手机号!");
             return response;
         }
 

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

@@ -140,7 +140,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
         if (!AccountValidatorUtil.isPhone(tpBuildingOwnerInfo.getOwnerTel())){
-            responseBean.addError("请输入正取的手机号!");
+            responseBean.addError("请输入正确的手机号!");
             return responseBean;
         }
 
@@ -254,7 +254,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         // 物业端的用户,也就是正在操作的物业人员
         User user = userMapper.selectById(userElement.getId());
         if (!AccountValidatorUtil.isPhone(tpBuildingOwnerInfo.getOwnerTel())){
-            responseBean.addError("请输入正取的手机号!");
+            responseBean.addError("请输入正确的手机号!");
             return responseBean;
         }
 
@@ -270,7 +270,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         // 校验楼栋信息表
         selectBuild = getBuildingInfo(tpBuildingOwnerInfo, userElement.getCommunityId());
         if (null != selectBuild) {
-            responseBean.addError("该楼层的户号,已存在!");
+            responseBean.addError("该楼层的户号已存在!");
             return responseBean;
         }
 

VUECODE/smart-property-manage/src/views/owner/index.vue

@@ -34,14 +34,14 @@
         <template slot-scope="scope">
           <span v-if="scope.row.gender==1">{{ '男' }}</span>
           <span v-if="scope.row.gender==2">{{ '女' }}</span>
-        </template>      
+        </template>
       </el-table-column>
       <el-table-column prop="idCard" label="身份证号" align="center" />
       <!-- <el-table-column prop="name" label="所在户" width="180" /> -->
       <el-table-column label="所在户" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.building!==null&&scope.row.unit!==null&&scope.row.level!==null&&scope.row.roomNo!==null&&scope.row.phase!==null">
-          {{ scope.row.building + scope.row.unit + scope.row.level + scope.row.roomNo+scope.row.phase }}
+          {{ scope.row.phase+scope.row.building + scope.row.unit + scope.row.level + scope.row.roomNo }}
           </span>
           </template>
       </el-table-column>

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

@@ -113,10 +113,8 @@ export default {
       })
     },
     resetForm(formName) {
-      console.log("2")
       // this.$refs[formName].resetFields()
       this.$refs[formName].validate((valid) => {
-        console.log("1")
         if (valid) {
           this.addActivity(2)
         } else {

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

@@ -12,7 +12,7 @@
       <div class="text-progress">
         <span class="people-number">已报名人数 {{ ruleForm.signUpCount }}</span>
         <div class="outer-layer"/>
-        <div class="inner-layer"/>
+        <div ref="innerDiv" :style="{ backgroundColor: 'aquamarine', height: '6px', width: innerW + 'px', position: 'relative', marginTop: '-4px' }"/> <!-- class="inner-layer" -->
       </div>
       <div class="circular"/>
       <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
@@ -26,6 +26,7 @@
 </template>
 
 <script>
+
 export default {
   name: 'Index',
   data() {
@@ -42,7 +43,8 @@ export default {
         registrationEndTime: '', // 报名活动结束时间
         sort: 1, // 权重
         status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
-      }
+      },
+      innerW: 0 // 进度条
     }
   },
   mounted() {
@@ -54,6 +56,12 @@ export default {
         const resData = res.data
         this.ruleForm = resData.info
         this.ruleForm.contentImg = resData.contentImg
+        if (this.ruleForm.signUpMax !== 0) {
+          const tempNum = 450 / this.ruleForm.signUpMax
+          this.innerW = this.ruleForm.signUpCount * tempNum
+          console.log(this.$refs.innerDiv.style.width)
+          console.log(this.innerW)
+        }
       })
     },
     formatDate(val) {
@@ -115,13 +123,12 @@ export default {
   background-color: gainsboro;
   height: 3px;
   width: 450px;
-  margin-top: -10px;
   position: relative;
 }
 .inner-layer {
   background-color: aquamarine;
   height: 6px;
-  width: 100px;
+  width: 20px;
   position: relative;
   margin-top: -4px;
 }
@@ -133,16 +140,16 @@ export default {
   height: 20px;
   position: relative;
   margin-left: 452px;
-  margin-top: 11px;
+  margin-top: 21px;
   float: left;
 }
 .people-limit {
-  margin-top: 13px;
+  margin-top: 23px;
 }
 .bom-button{
   display: flex;
   justify-content: center;
-  margin-top: 20px;
+  margin-top: 30px;
   margin-bottom: 100px;
 }
 </style>

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

@@ -57,7 +57,14 @@
         prop="remark"
         label="报名备注"
         align="center">
-        <template slot-scope="scope"><el-input :value="scope.row.remark" readonly @click="showDialog(scope.row.remark)" /></template>
+        <template slot-scope="scope">
+          <el-popover trigger="hover" placement="top">
+            <p>{{ scope.row.remark }}</p>
+            <div slot="reference" class="text-remark">
+              {{ scope.row.remark }}
+            </div>
+          </el-popover>
+        </template>
       </el-table-column>
       <el-table-column
         prop="phone"
@@ -244,4 +251,10 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+.text-remark{
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap !important;
+  outline: 0 !important
+}
 </style>