合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/HttpSessionConfig.java

@@ -11,7 +11,7 @@ import org.springframework.session.web.http.HttpSessionIdResolver;
  * @author weiximei
  */
 @Configuration
-@EnableJdbcHttpSession(maxInactiveIntervalInSeconds = MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS*4)
+@EnableJdbcHttpSession(maxInactiveIntervalInSeconds = MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS*48*7)
 public class HttpSessionConfig {
 
     @Bean

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

@@ -18,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author weichaochao
@@ -304,6 +305,23 @@ public class SocialController extends BaseController {
         ResponseBean response = socialServiceI.addAllTransaction(userId, paramets);
         return response;
     }
+    
+    @ApiOperation(value = "举报二手交易帖子", notes = "举报二手交易帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="transactionId:二手交易帖子id, reportReasonId:举报原因id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/transaction/report/{communityId}", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBean reportTransaction(@PathVariable("communityId") Integer communityId,@RequestBody String paramets, HttpSession session)throws IOException{
+        
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        ResponseBean response = socialServiceI.reportTransaction(userId, communityId,paramets);
+        return response;
+    }
 
     @ApiOperation(value = "获取我发布所有二手租赁帖子", notes = "获取我发布所有二手租赁帖子")
     @ApiImplicitParams({
@@ -374,4 +392,13 @@ public class SocialController extends BaseController {
         socialServiceI.accessTicket(communityId, tpTicket, ticketId, userId);
         return responseBean;
     }
+    
+    @ApiOperation(value = "获取举报原因列表", notes = "获取举报原因列表")
+    @RequestMapping(value = "/reports", method = RequestMethod.GET)
+    public ResponseBean getReportReasons() {
+        ResponseBean responseBean = new ResponseBean();
+        List<Map<String,Object>> reportList = socialServiceI.getReportReasons();
+        responseBean.addSuccess(reportList);
+        return responseBean;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface TpTransactionMapper {
@@ -27,4 +28,8 @@ public interface TpTransactionMapper {
     void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId);
 
     TpTransaction getById(@Param("id")Integer id);
+	
+	List<Map<String, Object>> getReportReasons();
+    
+    int saveReportReason(@Param("userId") Integer userId,@Param("communityId") Integer communityId,@Param("transactionId") Integer transactionId,@Param("reportReasonId") String reportReasonId);
 }

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

@@ -29,6 +29,11 @@ public class TpTransaction {
     private Date updateDate;
 
     private List<String> imgList;
+    
+    /**
+     * 是否被举报 1是被举报 0或null是没被举报
+     */
+    private String isReported;
 
     private  Integer roleId;
 
@@ -150,4 +155,12 @@ public class TpTransaction {
     public void setImgList(List<String> imgList) {
         this.imgList = imgList;
     }
+    
+    public String getIsReported() {
+        return isReported;
+    }
+    
+    public void setIsReported(String isReported) {
+        this.isReported = isReported;
+    }
 }

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

@@ -5,6 +5,7 @@ import com.community.huiju.model.*;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author weichaochao
@@ -151,4 +152,19 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	ResponseBean deleteransaction(Integer id,Integer userid);
+	
+	/**
+	 * 获取举报原因列表
+	 * @return
+	 */
+	List<Map<String, Object>> getReportReasons();
+	
+	/**
+	 * 举报二手交易帖子
+	 * @param userId
+	 * @param communityId
+	 * @param paramets
+	 * @return
+	 */
+	ResponseBean reportTransaction(Integer userId,Integer communityId, String paramets);
 }

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

@@ -11,6 +11,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import com.sun.org.apache.bcel.internal.generic.NEW;
+import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +27,7 @@ import java.util.stream.Collectors;
  * @date 2018/10/23
  */
 @Service("SocialService")
+@Transactional
 public class SocialServiceImpl implements SocialServiceI {
 
     @Autowired
@@ -445,8 +447,52 @@ public class SocialServiceImpl implements SocialServiceI {
         }
         return responseBean;
         }
-
-
+    
+    /**
+     * 获取举报原因列表
+     *
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getReportReasons() {
+        return tpTransactionMapper.getReportReasons();
+    }
+    
+    /**
+     * 举报二手交易帖子
+     *
+     * @param userId
+     * @param paramets
+     * @return
+     */
+    @Override
+    public ResponseBean reportTransaction(Integer userId, Integer communityId, String paramets) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(paramets);
+        Integer transactionId = jsonObject.getInteger("transactionId");
+        String reportReasonId = jsonObject.getString("reportReasonId");
+        //校验举报的帖子存不存在
+        TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(transactionId,communityId);
+        if (null == tpTransaction){
+            responseBean.addError("举报的交易不存在");
+            return responseBean;
+        }
+        //插入举报表
+        tpTransactionMapper.saveReportReason(userId,communityId,transactionId,reportReasonId);
+        //更新交易表的举报状态为被举报
+        TpTransaction record = new TpTransaction();
+        record.setId(transactionId);
+        record.setIsReported("1");
+        Integer size = tpTransactionMapper.updateByPrimaryKeySelective(record);
+        if (size > 0){
+            responseBean.addSuccess(size);
+            return responseBean;
+        }
+        responseBean.addError("举报出错");
+        return responseBean;
+    }
+    
+    
     @Override
     public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId) {
         //修改工单内容和评分

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

@@ -129,48 +129,27 @@ public class TaUserServiceImpl implements ITaUserService {
         Map<String,Object> map = Maps.newHashMap();
         map.put("loginName",loginName);
         TaUser currentUser = taUserMapper.selectByLoginName(map);
+        TaUserVO taUserVO = new TaUserVO();
         if (null != currentUser){
             if (!communityId.equals(currentUser.getCommunityId()+"")) {
                 response.addError("用户不在此小区!");
                 return response;
             }
-            TaUserVO taUserVO = new TaUserVO();
-            BeanUtils.copyProperties(currentUser,taUserVO);
-            // 角色
-            TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(currentUser.getId());
-            taUserVO.setRole(taSysRole.getRoleName());
-            // 人脸是否已录入
-            // taUserVO.setFace("register");
-            if ("1".equals(currentUser.getFaceStatus())) {
-                taUserVO.setFace("register");
-            } else {
-                taUserVO.setFace("unregister");
-            }
 
-            ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(currentUser.getCommunityId());
-            taUserVO.setCommunityName(communities.getCommunityName());
-            //查询当前人信息
-            if (null!=currentUser.getParentId() && !"".equals(currentUser.getParentId())) {
-                //查询当前人业主或租客的信息
-                TaUser proprietorUser = taUserMapper.selectByPrimaryKey(currentUser.getParentId());
-                taUserVO.setProprietorID(proprietorUser.getId());
-                taUserVO.setProprietorPhone(proprietorUser.getLoginName());
-                taUserVO.setProprietorName(proprietorUser.getUserName());
-            }
             response.addSuccess(taUserVO);
-            return response;
         }else {
-            TaUser user = new TaUser();
-            user.setLoginName(loginName);
-            user.setCommunityId(Integer.valueOf(communityId));
-            ResponseBean result = register(user);
+            currentUser = new TaUser();
+            currentUser.setLoginName(loginName);
+            currentUser.setCommunityId(Integer.valueOf(communityId));
+            ResponseBean result = register(currentUser);
+            taUserVO = (TaUserVO) result.getData();
+            response.addSuccess(taUserVO);
+        }
 
-            ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(user.getCommunityId());
-            TaUserVO taUserVO = (TaUserVO) result.getData();
-            taUserVO.setCommunityName(communities.getCommunityName());
+        // 获取住址位置
+        // 根据用户id, 获取 用户的住址, 人脸是否认证, 角色
+        userSetUp(currentUser, taUserVO);
 
-            response.addSuccess(result.getData());
-        }
 
         return response;
     }
@@ -831,11 +810,38 @@ public class TaUserServiceImpl implements ITaUserService {
         }
 
 
+        TaUserVO userVO = new TaUserVO();
+
+        // 根据用户id, 获取 用户的住址, 人脸是否认证, 角色
+        userSetUp(user, userVO);
+
+        response.addSuccess(userVO);
+
+        return response;
+    }
+
+    /**
+     * 根据用户id, 获取 用户的住址, 人脸是否认证, 角色
+     * @param user
+     * @param userVO
+     */
+    private TaUserVO userSetUp(TaUser user, TaUserVO userVO){
 
+        BeanTools.copyProperties(user,userVO);
         // 获取业主信息
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(user.getBuildingOwnerInfoId());
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = null;
+        if ( null != user.getBuildingOwnerInfoId() && !"".equals(user.getBuildingOwnerInfoId())) {
+            // 获取业主信息
+            tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(user.getBuildingOwnerInfoId());
+            userVO.setAddressBuilding(tpBuildingOwnerInfo.getPhase() + tpBuildingOwnerInfo.getBuilding()
+                    +tpBuildingOwnerInfo.getUnit()
+                    +tpBuildingOwnerInfo.getLevel()
+                    +tpBuildingOwnerInfo.getRoomNo());
+        }
+
+
         // 获取小区
-        ToCommunities toCommunities = toCommunitiesMapper.selectByPrimaryKey(tpBuildingOwnerInfo.getCommunityId());
+        ToCommunities toCommunities = toCommunitiesMapper.selectByPrimaryKey(user.getCommunityId());
 
         // 省
         SysNation province = sysNationMapper.selectByPrimaryKey(toCommunities.getProvinceId());
@@ -844,13 +850,7 @@ public class TaUserServiceImpl implements ITaUserService {
         // 区
         SysNation district = sysNationMapper.selectByPrimaryKey(toCommunities.getDistrictId());
 
-        TaUserVO userVO = new TaUserVO();
-        BeanUtils.copyProperties(user,userVO);
         userVO.setAddressProvince(province.getProvince()+""+city.getCity()+""+district.getDistrict());
-        userVO.setAddressBuilding(tpBuildingOwnerInfo.getPhase() + tpBuildingOwnerInfo.getBuilding()
-                +tpBuildingOwnerInfo.getUnit()
-                +tpBuildingOwnerInfo.getLevel()
-                +tpBuildingOwnerInfo.getRoomNo());
         userVO.setCommunityName(toCommunities.getCommunityName());
 
         // 角色
@@ -871,9 +871,8 @@ public class TaUserServiceImpl implements ITaUserService {
             userVO.setProprietorPhone(proprietorUser.getLoginName());
             userVO.setProprietorName(proprietorUser.getUserName());
         }
-        response.addSuccess(userVO);
 
-        return response;
+        return userVO;
     }
 
     @Override

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -156,6 +156,9 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
       <if test="viewCount != null" >
         view_count = #{viewCount,jdbcType=INTEGER},
       </if>
+      <if test="isReported != null and isReported !=''" >
+        is_reported = #{isReported,jdbcType=CHAR},
+      </if>
       <if test="status != null" >
         status = #{status,jdbcType=CHAR},
       </if>
@@ -238,4 +241,15 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     from tp_transaction
     where id = #{id,jdbcType=INTEGER} and status = 1
   </select>
+
+  <select id="getReportReasons" resultType="java.util.Map">
+    SELECT id,reason FROM sys_report_reason ORDER BY sort
+  </select>
+
+  <insert id="saveReportReason">
+    insert into tp_transaction_report (community_id, transaction_id,
+      report_reason_id, reporter_id)
+    values (#{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},
+      #{reportReasonId,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER})
+  </insert>
 </mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpActivitySignUpMapper.java

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.huiju.model.TpActivitySignUp;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -21,7 +19,7 @@ import java.util.List;
 @Mapper
 public interface TpActivitySignUpMapper extends BaseMapper<TpActivitySignUp> {
 
-    @Select("SELECT tas.* FROM tp_activity_sign_up tas LEFT JOIN ta_user tau on tas.ta_user_id = tau.id where tau.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%') and tau.login_name LIKE concat('%',#{phone,jdbcType=VARCHAR},'%')")
+//    @Select("SELECT tas.* FROM tp_activity_sign_up tas LEFT JOIN ta_user tau on tas.ta_user_id = tau.id where tau.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%') and tau.login_name LIKE concat('%',#{phone,jdbcType=VARCHAR},'%')")
     IPage<TpActivitySignUp> listQuery(Page page, @Param("userName") String userName, @Param("phone") String phone);
 
 }

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

@@ -111,6 +111,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map,false);
         queryWrapper.like(tpBuildingOwnerInfo.getOwnerName() != null,"owner_name", tpBuildingOwnerInfo.getOwnerName());
+        queryWrapper.orderByDesc("create_date");
 
         // 分页查询
         IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, queryWrapper);

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

@@ -56,7 +56,7 @@ public class TpActivitySignUpServiceImpl extends ServiceImpl<TpActivitySignUpMap
         Integer pageNum = jsonObject.getInteger("pageNum");
         Integer pageSize = jsonObject.getInteger("pageSize");
         String userName = jsonObject.getString("userName");
-        String phone = jsonObject.getString("userName");
+        String phone = jsonObject.getString("phone");
 
         TpActivity tpActivity = tpActivityMapper.selectById(activityId);
         if (null == tpActivity) {

CODE/smart-community/property-api/src/main/resources/mapper/TpActivitySignUpMapper.xml

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.community.huiju.dao.TpActivitySignUpMapper">
 
+    <select id="listQuery" resultType="com.community.huiju.model.TpActivitySignUp">
+        SELECT
+        tas.*
+        FROM tp_activity_sign_up tas
+        LEFT JOIN ta_user tau on tas.ta_user_id = tau.id
+        where tau.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')
+        and tau.login_name LIKE concat('%',#{phone,jdbcType=VARCHAR},'%')
+    </select>
+
 </mapper>

VUECODE/smart-property-manage/src/api/activity.js

@@ -77,7 +77,7 @@ export function getSignUp(data) {
       id: data.id,
       userName: data.userName,
       phone: data.phone,
-      pageNum: data.userName,
+      pageNum: data.pageNum,
       pageSize: data.pageSize
     }
   })

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

@@ -1,7 +1,7 @@
 <template>
   <div class="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
-      <el-form-item label="期" prop="phase">
+      <el-form-item label="期/区" prop="phase">
         <el-input v-model="ruleForm.phase"/>
       </el-form-item>
       <el-form-item label="栋" prop="building">
@@ -45,7 +45,7 @@ export default {
       },
       rules: {
         phase: [
-          { required: true, message: '请输入期', trigger: 'blur' }
+          { required: true, message: '请输入期/区', trigger: 'blur' }
         ],
         building: [
           { required: true, message: '请输入楼栋', trigger: 'blur' }

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -4,7 +4,7 @@
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
         <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
-          <el-button style="margin-left: 10px;" size="large" type="primary"><a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771">下载模板</a></el-button>
+          <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771"><el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button></a>
           <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="dialogBuildingIndex">取消</el-button>

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

@@ -4,6 +4,9 @@
       <el-form-item v-show="false" label="编号" >
         <el-input v-model="ruleForm.id" disabled/>
       </el-form-item>
+      <el-form-item label="期/区" prop="phase">
+        <el-input v-model="ruleForm.phase"/>
+      </el-form-item>
       <el-form-item label="栋" prop="building">
         <el-input v-model="ruleForm.building"/>
       </el-form-item>
@@ -48,7 +51,7 @@ export default {
       listQuery: [], // 查询的参数
       rules: {
         phase: [
-          { required: true, message: '请输入楼栋', trigger: 'blur' }
+          { required: true, message: '请输入期/区', trigger: 'blur' }
         ],
         building: [
           { required: true, message: '请输入楼栋', trigger: 'blur' }
@@ -74,7 +77,8 @@ export default {
   },
   mounted() {
     this.listQuery = this.$route.params.listQuery
-    this.getById(this.$route.params.id)
+    this.ruleForm.id = this.$route.params.id
+    this.getById()
   },
   methods: {
     submitForm(formName) { // 提交
@@ -115,8 +119,8 @@ export default {
         console.log('error AddBuilding')
       })
     },
-    getById(buildingId) { // 根据楼栋信息 id 查询楼栋信息
-      this.$store.dispatch('GetByIdBuildingId', buildingId).then((res) => {
+    getById() { // 根据楼栋信息 id 查询楼栋信息
+      this.$store.dispatch('GetByIdBuildingId', this.ruleForm.id).then((res) => {
         const data = res.data
         this.ruleForm.id = data.id
         this.ruleForm.phase = data.phase

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

@@ -3,7 +3,7 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item label="楼盘库">
-        <el-select v-model="listQuery.phase" placeholder="期" @change="buildSelectChange(0)">
+        <el-select v-model="listQuery.phase" placeholder="期/区" @change="buildSelectChange(0)">
           <!--<el-option label="选择楼栋" value="-1" />-->
           <el-option
             v-for="item in phaseList"

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

@@ -105,7 +105,8 @@ export default {
     }
   },
   mounted() {
-    this.getById(this.$route.params.id)
+    this.ruleForm.id = this.$route.params.id
+    this.getById()
   },
   methods: {
     submitForm(formName) {
@@ -182,8 +183,8 @@ export default {
       this.ruleForm.sort = value
       console.log(value)
     },
-    getById(id) { // 根据ID获取活动信息
-      this.$store.dispatch('ActivityById', id).then((res) => {
+    getById() { // 根据ID获取活动信息
+      this.$store.dispatch('ActivityById', this.ruleForm.id).then((res) => {
         const resData = res.data
         this.imageUrl = resData.info.activityCarouselImg
         this.ruleForm = resData.info

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

@@ -57,7 +57,7 @@
         prop="remark"
         label="报名备注"
         align="center">
-        <template slot-scope="scope">{{ scope.row.remark }}</template>
+        <template slot-scope="scope"><el-input :value="scope.row.remark" readonly @click="showDialog(scope.row.remark)" /></template>
       </el-table-column>
       <el-table-column
         prop="phone"
@@ -80,6 +80,9 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
+    <el-dialog :visible.sync="dialogTableVisible" title="收货地址">
+      <div>{{ dialogContent }}</div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -95,7 +98,9 @@ export default {
       },
       total: 0, // 数据总数
       list: [],
-      listLoading: true // 表格加载框
+      listLoading: true, // 表格加载框
+      dialogTableVisible: false, // 是否显示弹框
+      dialogContent: '提示信息' // 弹框内容
     }
   },
   mounted() {
@@ -108,10 +113,10 @@ export default {
       this.signUpList()
     },
     clearListQuery() {
+      this.listQuery.userName = ''
+      this.listQuery.phone = ''
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 10
-      this.listQuery.id = ''
-      this.listQuery.activityTitle = ''
       this.signUpList()
     },
     handleSelectionChange(data) { // 表格选择
@@ -173,6 +178,10 @@ export default {
           role = '未认证'
       }
       return role
+    },
+    showDialog(remark) { // 备注 弹框
+      this.dialogContent = remark
+      this.dialogTableVisible = true
     }
   }
 }