소스 검색

Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

# Conflicts:
#	xiaochengxu/pages/mySet/newCard.vue
achao 2 년 전
부모
커밋
08110b80fe
22개의 변경된 파일332개의 추가작업 그리고 143개의 파일을 삭제
  1. 6 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardClassifyInfoService.java
  2. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardHolderInfoService.java
  3. 5 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardManagementInfoService.java
  4. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICertificateManagementInfoService.java
  5. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleCardInfoService.java
  6. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleManagementInfoService.java
  7. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICommonUserInfoService.java
  8. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/IPersonalHomepageInfoService.java
  9. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ISearchRecordsInfoService.java
  10. 19 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardClassifyInfoServiceImpl.java
  11. 12 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardHolderInfoServiceImpl.java
  12. 34 8
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardManagementInfoServiceImpl.java
  13. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CertificateManagementInfoServiceImpl.java
  14. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleCardInfoServiceImpl.java
  15. 33 5
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleManagementInfoServiceImpl.java
  16. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CommonUserInfoServiceImpl.java
  17. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/PersonalHomepageInfoServiceImpl.java
  18. 2 4
      unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/SearchRecordsInfoServiceImpl.java
  19. 3 1
      unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardHolderInfo.java
  20. 13 0
      unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardManagementInfo.java
  21. 4 0
      unimall-data/src/main/java/com/iotechn/unimall/data/domain/CircleManagementInfo.java
  22. 179 65
      xiaochengxu/pages/mySet/myHome.vue

+ 6 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardClassifyInfoService.java

@@ -8,6 +8,7 @@ import com.iotechn.unimall.core.annotation.HttpParam;
 import com.iotechn.unimall.core.annotation.HttpParamType;
 import com.iotechn.unimall.core.annotation.param.NotNull;
 import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
 
@@ -20,8 +21,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.cardClassifyInfo", description = "名片分类")
 public interface ICardClassifyInfoService{
 	@HttpMethod(description = "新增",  permissionName = "名片分类管理")
-	public Boolean add(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表", permissionName = "名片分类管理")
 	public Page<CardClassifyInfo> list(
@@ -38,9 +38,11 @@ public interface ICardClassifyInfoService{
 	@HttpMethod(description = "删除",  permissionName = "名片分类管理")
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
+	@HttpMethod(description = "置顶",  permissionName = "名片分类管理")
+	public Boolean top(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
+
 	@HttpMethod(description = "修改",  permissionName = "名片分类管理")
-	public Boolean update(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "cardClassifyInfo", type = HttpParamType.COMMON, description = "名片分类") CardClassifyInfo cardClassifyInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "名片分类管理")
 	public CardClassifyInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardHolderInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.cardHolderInfo", description = "名片夹")
 public interface ICardHolderInfoService{
 	@HttpMethod(description = "新增",  permissionName = "名片夹管理")
-	public Boolean add(@NotNull @HttpParam(name = "cardHolderInfo", type = HttpParamType.COMMON, description = "名片夹") CardHolderInfo cardHolderInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "cardHolderInfo", type = HttpParamType.COMMON, description = "名片夹") CardHolderInfo cardHolderInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "名片夹管理")
 	public Page<CardHolderInfo> list(
@@ -39,8 +38,7 @@ public interface ICardHolderInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "名片夹管理")
-	public Boolean update(@NotNull @HttpParam(name = "cardHolderInfo", type = HttpParamType.COMMON, description = "名片夹") CardHolderInfo cardHolderInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "cardHolderInfo", type = HttpParamType.COMMON, description = "名片夹") CardHolderInfo cardHolderInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询", permissionName = "名片夹管理")
 	public CardHolderInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

+ 5 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardManagementInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.cardManagementInfo", description = "名片管理")
 public interface ICardManagementInfoService{
 	@HttpMethod(description = "新增",  permissionName = "名片管理管理")
-	public Boolean add(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "名片管理管理")
 	public Page<CardManagementInfo> list(
@@ -47,8 +46,10 @@ public interface ICardManagementInfoService{
 						@HttpParam(name = "deleteCondition", type = HttpParamType.COMMON, description = "删除条件") String deleteCondition)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "名片管理管理")
-	public Boolean update(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo)throws ServiceException;
+
+	@HttpMethod(description = "置顶",  permissionName = "名片管理管理")
+	public Boolean top(@NotNull @HttpParam(name = "cardManagementInfo", type = HttpParamType.COMMON, description = "名片管理") CardManagementInfo cardManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询", permissionName = "名片管理管理")
 	public CardManagementInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICertificateManagementInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.certificateManagementInfo", description = "证件管理")
 public interface ICertificateManagementInfoService{
 	@HttpMethod(description = "新增", permissionName = "证件管理管理")
-	public Boolean add(@NotNull @HttpParam(name = "certificateManagementInfo", type = HttpParamType.COMMON, description = "证件管理") CertificateManagementInfo certificateManagementInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "certificateManagementInfo", type = HttpParamType.COMMON, description = "证件管理") CertificateManagementInfo certificateManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "证件管理管理")
 	public Page<CertificateManagementInfo> list(
@@ -39,8 +38,7 @@ public interface ICertificateManagementInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "证件管理管理")
-	public Boolean update(@NotNull @HttpParam(name = "certificateManagementInfo", type = HttpParamType.COMMON, description = "证件管理") CertificateManagementInfo certificateManagementInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "certificateManagementInfo", type = HttpParamType.COMMON, description = "证件管理") CertificateManagementInfo certificateManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "证件管理管理")
 	public CertificateManagementInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleCardInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.circleCardInfo", description = "圈子个人关系")
 public interface ICircleCardInfoService{
 	@HttpMethod(description = "新增",  permissionName = "圈子个人关系管理")
-	public Boolean add(@NotNull @HttpParam(name = "circleCardInfo", type = HttpParamType.COMMON, description = "圈子个人关系") CircleCardInfo circleCardInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "circleCardInfo", type = HttpParamType.COMMON, description = "圈子个人关系") CircleCardInfo circleCardInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表", permissionName = "圈子个人关系管理")
 	public Page<CircleCardInfo> list(
@@ -39,8 +38,7 @@ public interface ICircleCardInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id")String circleId)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "圈子个人关系管理")
-	public Boolean update(@NotNull @HttpParam(name = "circleCardInfo", type = HttpParamType.COMMON, description = "圈子个人关系") CircleCardInfo circleCardInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "circleCardInfo", type = HttpParamType.COMMON, description = "圈子个人关系") CircleCardInfo circleCardInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "圈子个人关系管理")
 	public CircleCardInfo get(@NotNull @HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id")String circleId)throws ServiceException;

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleManagementInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.circleManagementInfo", description = "圈子管理")
 public interface ICircleManagementInfoService{
 	@HttpMethod(description = "新增",  permissionName = "圈子管理管理")
-	public Boolean add(@NotNull @HttpParam(name = "circleManagementInfo", type = HttpParamType.COMMON, description = "圈子管理") CircleManagementInfo circleManagementInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "circleManagementInfo", type = HttpParamType.COMMON, description = "圈子管理") CircleManagementInfo circleManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "圈子管理管理")
 	public Page<CircleManagementInfo> list(
@@ -40,8 +39,7 @@ public interface ICircleManagementInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "圈子管理管理")
-	public Boolean update(@NotNull @HttpParam(name = "circleManagementInfo", type = HttpParamType.COMMON, description = "圈子管理") CircleManagementInfo circleManagementInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "circleManagementInfo", type = HttpParamType.COMMON, description = "圈子管理") CircleManagementInfo circleManagementInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "圈子管理管理")
 	public CircleManagementInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICommonUserInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.commonUserInfo", description = "用户管理")
 public interface ICommonUserInfoService{
 	@HttpMethod(description = "新增",  permissionName = "用户管理管理")
-	public Boolean add(@NotNull @HttpParam(name = "commonUserInfo", type = HttpParamType.COMMON, description = "用户管理") CommonUserInfo commonUserInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "commonUserInfo", type = HttpParamType.COMMON, description = "用户管理") CommonUserInfo commonUserInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "用户管理管理")
 	public Page<CommonUserInfo> list(
@@ -44,8 +43,7 @@ public interface ICommonUserInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "用户管理管理")
-	public Boolean update(@NotNull @HttpParam(name = "commonUserInfo", type = HttpParamType.COMMON, description = "用户管理") CommonUserInfo commonUserInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "commonUserInfo", type = HttpParamType.COMMON, description = "用户管理") CommonUserInfo commonUserInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询", permissionName = "用户管理管理")
 	public CommonUserInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/IPersonalHomepageInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.personalHomepageInfo", description = "个人主页")
 public interface IPersonalHomepageInfoService{
 	@HttpMethod(description = "新增",  permissionName = "个人主页管理")
-	public Boolean add(@NotNull @HttpParam(name = "personalHomepageInfo", type = HttpParamType.COMMON, description = "个人主页") PersonalHomepageInfo personalHomepageInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "personalHomepageInfo", type = HttpParamType.COMMON, description = "个人主页") PersonalHomepageInfo personalHomepageInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表",  permissionName = "个人主页管理")
 	public Page<PersonalHomepageInfo> list(
@@ -45,8 +44,7 @@ public interface IPersonalHomepageInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改", permissionName = "个人主页管理")
-	public Boolean update(@NotNull @HttpParam(name = "personalHomepageInfo", type = HttpParamType.COMMON, description = "个人主页") PersonalHomepageInfo personalHomepageInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "personalHomepageInfo", type = HttpParamType.COMMON, description = "个人主页") PersonalHomepageInfo personalHomepageInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "个人主页管理")
 	public PersonalHomepageInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ISearchRecordsInfoService.java

@@ -20,8 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.searchRecordsInfo", description = "搜索记录")
 public interface ISearchRecordsInfoService{
 	@HttpMethod(description = "新增", permissionName = "搜索记录管理")
-	public Boolean add(@NotNull @HttpParam(name = "searchRecordsInfo", type = HttpParamType.COMMON, description = "搜索记录") SearchRecordsInfo searchRecordsInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean add(@NotNull @HttpParam(name = "searchRecordsInfo", type = HttpParamType.COMMON, description = "搜索记录") SearchRecordsInfo searchRecordsInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表", permissionName = "搜索记录管理")
 	public Page<SearchRecordsInfo> list(
@@ -39,8 +38,7 @@ public interface ISearchRecordsInfoService{
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "搜索记录管理")
-	public Boolean update(@NotNull @HttpParam(name = "searchRecordsInfo", type = HttpParamType.COMMON, description = "搜索记录") SearchRecordsInfo searchRecordsInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+	public Boolean update(@NotNull @HttpParam(name = "searchRecordsInfo", type = HttpParamType.COMMON, description = "搜索记录") SearchRecordsInfo searchRecordsInfo)throws ServiceException;
 
 	@HttpMethod(description = "查询", permissionName = "搜索记录管理")
 	public SearchRecordsInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;

+ 19 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardClassifyInfoServiceImpl.java

@@ -2,9 +2,11 @@ package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
+import com.iotechn.unimall.data.domain.CardManagementInfo;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -30,11 +32,10 @@ public class CardClassifyInfoServiceImpl implements ICardClassifyInfoService{
 	private CardClassifyInfoMapper cardClassifyInfoMapper;
 	
 	@Override
-	public Boolean add(CardClassifyInfo cardClassifyInfo,Long adminId) throws ServiceException {
+	public Boolean add(CardClassifyInfo cardClassifyInfo) throws ServiceException {
 		Date now = new Date();
 		cardClassifyInfo.setGmtCreate(now);
 		cardClassifyInfo.setGmtUpdate(now);
-		cardClassifyInfo.setCommonId(adminId);
 		return cardClassifyInfoMapper.insert(cardClassifyInfo)>0;
 	}
 
@@ -80,10 +81,24 @@ public class CardClassifyInfoServiceImpl implements ICardClassifyInfoService{
 	}
 
 	@Override
-	public Boolean update(CardClassifyInfo cardClassifyInfo,Long adminId) throws ServiceException {
+	public Boolean top(CardClassifyInfo cardClassifyInfo) throws ServiceException {
+		CardClassifyInfo cardClassifyInfo1=cardClassifyInfoMapper.selectById(cardClassifyInfo.getId());
+		List<CardClassifyInfo> cardClassifyInfoList=cardClassifyInfoMapper.selectList(new EntityWrapper<CardClassifyInfo>()
+				.eq("common_id",cardClassifyInfo1.getCommonId()));
+		if (!CollectionUtils.isEmpty(cardClassifyInfoList)) {
+			for (CardClassifyInfo aa : cardClassifyInfoList) {
+				aa.setTopMarking(0l);
+				cardClassifyInfoMapper.updateById(aa);
+			}
+		}
+		cardClassifyInfo1.setTopMarking(1l);
+		return cardClassifyInfoMapper.updateById(cardClassifyInfo1)>0;
+	}
+
+	@Override
+	public Boolean update(CardClassifyInfo cardClassifyInfo) throws ServiceException {
 		Date now = new Date();
 		cardClassifyInfo.setGmtUpdate(now);
-		cardClassifyInfo.setCommonId(adminId);
 		return cardClassifyInfoMapper.updateById(cardClassifyInfo)>0;
 	}
 

+ 12 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardHolderInfoServiceImpl.java

@@ -3,7 +3,10 @@ package com.iotechn.unimall.admin.api.card.impl;
 import java.util.List;
 
 import com.iotechn.unimall.data.domain.CardManagementInfo;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
+import com.iotechn.unimall.data.domain.PersonalHomepageInfo;
 import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
+import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,13 +36,14 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 	private CardHolderInfoMapper cardHolderInfoMapper;
 	@Autowired
 	private CardManagementInfoMapper cardManagementInfoMapper;
+	@Autowired
+	private CommonUserInfoMapper commonUserInfoMapper;
 	
 	@Override
-	public Boolean add(CardHolderInfo cardHolderInfo,Long adminId) throws ServiceException {
+	public Boolean add(CardHolderInfo cardHolderInfo) throws ServiceException {
 		Date now = new Date();
 		cardHolderInfo.setGmtCreate(now);
 		cardHolderInfo.setGmtUpdate(now);
-		cardHolderInfo.setCommonId(adminId);
 		return cardHolderInfoMapper.insert(cardHolderInfo)>0;
 	}
 
@@ -72,6 +76,11 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 				if (cardManagementInfo!=null){
 					cardHolderInfo.setCardManagementInfo(cardManagementInfo);
 				}
+				//查看是否允许分享
+				CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardHolderInfo.getCommonId());
+				if (commonUserInfo!=null){
+					cardHolderInfo.setShareCard(commonUserInfo.getShareCard());
+				}
 			}
 		}
 		Integer count = cardHolderInfoMapper.selectCount(wrapper);
@@ -93,10 +102,9 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 	}
 
 	@Override
-	public Boolean update(CardHolderInfo cardHolderInfo,Long adminId) throws ServiceException {
+	public Boolean update(CardHolderInfo cardHolderInfo) throws ServiceException {
 		Date now = new Date();
 		cardHolderInfo.setGmtUpdate(now);
-		cardHolderInfo.setCommonId(adminId);
 		return cardHolderInfoMapper.updateById(cardHolderInfo)>0;
 	}
 

+ 34 - 8
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardManagementInfoServiceImpl.java

@@ -2,13 +2,15 @@ package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
-import com.iotechn.unimall.data.domain.CardHolderInfo;
-import com.iotechn.unimall.data.domain.CircleCardInfo;
+import com.iotechn.unimall.data.domain.*;
+import com.iotechn.unimall.data.domain.tools.gen.GenTableColumn;
 import com.iotechn.unimall.data.mapper.CardHolderInfoMapper;
 import com.iotechn.unimall.data.mapper.CircleCardInfoMapper;
+import com.iotechn.unimall.data.mapper.PersonalHomepageInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -16,7 +18,6 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
 import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
-import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.iotechn.unimall.admin.api.card.ICardManagementInfoService;
 import com.iotechn.unimall.data.model.Page;
 import java.util.Date;
@@ -35,13 +36,14 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 	private CircleCardInfoMapper circleCardInfoMapper;
 	@Autowired
 	private CardHolderInfoMapper cardHolderInfoMapper;
+	@Autowired
+	private PersonalHomepageInfoMapper personalHomepageInfoMapper;
 	
 	@Override
-	public Boolean add(CardManagementInfo cardManagementInfo,Long adminId) throws ServiceException {
+	public Boolean add(CardManagementInfo cardManagementInfo) throws ServiceException {
 		Date now = new Date();
 		cardManagementInfo.setGmtCreate(now);
 		cardManagementInfo.setGmtUpdate(now);
-		cardManagementInfo.setCommonId(adminId);
 		return cardManagementInfoMapper.insert(cardManagementInfo)>0;
 	}
 
@@ -87,8 +89,18 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("top_marking",false);
 		List<CardManagementInfo> list = cardManagementInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+		if (!CollectionUtils.isEmpty(list)){
+			for (CardManagementInfo cardManagementInfo:list){
+				PersonalHomepageInfo personalHomepageInfo=new PersonalHomepageInfo();
+				personalHomepageInfo.setCommonId(cardManagementInfo.getCommonId());
+				PersonalHomepageInfo personalHomepageInfo1=personalHomepageInfoMapper.selectOne(personalHomepageInfo);
+				if (personalHomepageInfo1!=null){
+					cardManagementInfo.setPersonalHomeId(personalHomepageInfo1.getId());
+				}
+			}
+		}
 		Integer count = cardManagementInfoMapper.selectCount(wrapper);
 		return new Page<CardManagementInfo>(list, page, limit, count);
 	}
@@ -122,13 +134,27 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
 	}
 
 	@Override
-	public Boolean update(CardManagementInfo cardManagementInfo,Long adminId) throws ServiceException {
+	public Boolean update(CardManagementInfo cardManagementInfo) throws ServiceException {
 		Date now = new Date();
 		cardManagementInfo.setGmtUpdate(now);
-		cardManagementInfo.setCommonId(adminId);
 		return cardManagementInfoMapper.updateById(cardManagementInfo)>0;
 	}
 
+	@Override
+	public Boolean top(CardManagementInfo cardManagementInfo) throws ServiceException {
+		CardManagementInfo cardManagementInfo1=cardManagementInfoMapper.selectById(cardManagementInfo.getId());
+		List<CardManagementInfo> cardManagementInfoList=cardManagementInfoMapper.selectList(new EntityWrapper<CardManagementInfo>()
+				.eq("common_id",cardManagementInfo1.getCommonId()));
+		if (!CollectionUtils.isEmpty(cardManagementInfoList)) {
+			for (CardManagementInfo aa : cardManagementInfoList) {
+				aa.setTopMarking(0l);
+				cardManagementInfoMapper.updateById(aa);
+			}
+		}
+		cardManagementInfo1.setTopMarking(1l);
+		return cardManagementInfoMapper.updateById(cardManagementInfo1)>0;
+	}
+
 	@Override
 	public CardManagementInfo get(Long id) throws ServiceException {
 		return cardManagementInfoMapper.selectById(id);

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CertificateManagementInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class CertificateManagementInfoServiceImpl implements ICertificateManagem
 	private CertificateManagementInfoMapper certificateManagementInfoMapper;
 	
 	@Override
-	public Boolean add(CertificateManagementInfo certificateManagementInfo,Long adminId) throws ServiceException {
+	public Boolean add(CertificateManagementInfo certificateManagementInfo) throws ServiceException {
 		Date now = new Date();
 		certificateManagementInfo.setGmtCreate(now);
 		certificateManagementInfo.setGmtUpdate(now);
-		certificateManagementInfo.setCommonId(adminId);
 		return certificateManagementInfoMapper.insert(certificateManagementInfo)>0;
 	}
 
@@ -80,10 +79,9 @@ public class CertificateManagementInfoServiceImpl implements ICertificateManagem
 	}
 
 	@Override
-	public Boolean update(CertificateManagementInfo certificateManagementInfo,Long adminId) throws ServiceException {
+	public Boolean update(CertificateManagementInfo certificateManagementInfo) throws ServiceException {
 		Date now = new Date();
 		certificateManagementInfo.setGmtUpdate(now);
-		certificateManagementInfo.setCommonId(adminId);
 		return certificateManagementInfoMapper.updateById(certificateManagementInfo)>0;
 	}
 

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleCardInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 	private CircleCardInfoMapper circleCardInfoMapper;
 	
 	@Override
-	public Boolean add(CircleCardInfo circleCardInfo,Long adminId) throws ServiceException {
+	public Boolean add(CircleCardInfo circleCardInfo) throws ServiceException {
 		Date now = new Date();
 		circleCardInfo.setGmtCreate(now);
 		circleCardInfo.setGmtUpdate(now);
-		circleCardInfo.setCommonId(adminId);
 		return circleCardInfoMapper.insert(circleCardInfo)>0;
 	}
 
@@ -80,10 +79,9 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 	}
 
 	@Override
-	public Boolean update(CircleCardInfo circleCardInfo,Long adminId) throws ServiceException {
+	public Boolean update(CircleCardInfo circleCardInfo) throws ServiceException {
 		Date now = new Date();
 		circleCardInfo.setGmtUpdate(now);
-		circleCardInfo.setCommonId(adminId);
 		return circleCardInfoMapper.updateById(circleCardInfo)>0;
 	}
 

+ 33 - 5
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleManagementInfoServiceImpl.java

@@ -1,7 +1,14 @@
 package com.iotechn.unimall.admin.api.card.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.iotechn.unimall.data.domain.CardManagementInfo;
+import com.iotechn.unimall.data.domain.CircleCardInfo;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
+import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
+import com.iotechn.unimall.data.mapper.CircleCardInfoMapper;
+import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,13 +35,18 @@ import org.springframework.transaction.annotation.Transactional;
 public class CircleManagementInfoServiceImpl implements ICircleManagementInfoService{
 	@Autowired
 	private CircleManagementInfoMapper circleManagementInfoMapper;
+	@Autowired
+	private CircleCardInfoMapper circleCardInfoMapper;
+	@Autowired
+	private CardManagementInfoMapper cardManagementInfoMapper;
+	@Autowired
+	private CommonUserInfoMapper commonUserInfoMapper;
 	
 	@Override
-	public Boolean add(CircleManagementInfo circleManagementInfo,Long adminId) throws ServiceException {
+	public Boolean add(CircleManagementInfo circleManagementInfo) throws ServiceException {
 		Date now = new Date();
 		circleManagementInfo.setGmtCreate(now);
 		circleManagementInfo.setGmtUpdate(now);
-		circleManagementInfo.setCommonId(adminId);
 		return circleManagementInfoMapper.insert(circleManagementInfo)>0;
 	}
 
@@ -83,16 +95,32 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
 	}
 
 	@Override
-	public Boolean update(CircleManagementInfo circleManagementInfo,Long adminId) throws ServiceException {
+	public Boolean update(CircleManagementInfo circleManagementInfo) throws ServiceException {
 		Date now = new Date();
 		circleManagementInfo.setGmtUpdate(now);
-		circleManagementInfo.setCommonId(adminId);
 		return circleManagementInfoMapper.updateById(circleManagementInfo)>0;
 	}
 
 	@Override
 	public CircleManagementInfo get(Long id) throws ServiceException {
-		return circleManagementInfoMapper.selectById(id);
+		CircleManagementInfo circleManagementInfo=circleManagementInfoMapper.selectById(id);
+		//查询圈子名片关系表
+		List<CircleCardInfo> circleCardInfoList=circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>().eq("circle_id",id));
+		List<CardManagementInfo> cardManagementInfoList=new ArrayList<>();
+		for(CircleCardInfo circleCardInfo:circleCardInfoList){
+			//查询名片信息
+			CardManagementInfo cardManagementInfo=cardManagementInfoMapper.selectById(circleCardInfo.getCardId());
+			if (cardManagementInfo!=null){
+				//查看是否允许圈子成员查看主页
+				CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardManagementInfo.getCommonId());
+				if (commonUserInfo!=null){
+					cardManagementInfo.setLookPage(commonUserInfo.getLookPage());
+				}
+				cardManagementInfoList.add(cardManagementInfo);
+			}
+		}
+		circleManagementInfo.setCardManagementInfoList(cardManagementInfoList);
+		return circleManagementInfo;
 	}
 	
 	@Override

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CommonUserInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class CommonUserInfoServiceImpl implements ICommonUserInfoService{
 	private CommonUserInfoMapper commonUserInfoMapper;
 	
 	@Override
-	public Boolean add(CommonUserInfo commonUserInfo,Long adminId) throws ServiceException {
+	public Boolean add(CommonUserInfo commonUserInfo) throws ServiceException {
 		Date now = new Date();
 		commonUserInfo.setGmtCreate(now);
 		commonUserInfo.setGmtUpdate(now);
-		commonUserInfo.setId(adminId);
 		return commonUserInfoMapper.insert(commonUserInfo)>0;
 	}
 
@@ -95,10 +94,9 @@ public class CommonUserInfoServiceImpl implements ICommonUserInfoService{
 	}
 
 	@Override
-	public Boolean update(CommonUserInfo commonUserInfo,Long adminId) throws ServiceException {
+	public Boolean update(CommonUserInfo commonUserInfo) throws ServiceException {
 		Date now = new Date();
 		commonUserInfo.setGmtUpdate(now);
-		commonUserInfo.setId(adminId);
 		return commonUserInfoMapper.updateById(commonUserInfo)>0;
 	}
 

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/PersonalHomepageInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class PersonalHomepageInfoServiceImpl implements IPersonalHomepageInfoSer
 	private PersonalHomepageInfoMapper personalHomepageInfoMapper;
 	
 	@Override
-	public Boolean add(PersonalHomepageInfo personalHomepageInfo,Long adminId) throws ServiceException {
+	public Boolean add(PersonalHomepageInfo personalHomepageInfo) throws ServiceException {
 		Date now = new Date();
 		personalHomepageInfo.setGmtCreate(now);
 		personalHomepageInfo.setGmtUpdate(now);
-		personalHomepageInfo.setCommonId(adminId);
 		return personalHomepageInfoMapper.insert(personalHomepageInfo)>0;
 	}
 
@@ -98,10 +97,9 @@ public class PersonalHomepageInfoServiceImpl implements IPersonalHomepageInfoSer
 	}
 
 	@Override
-	public Boolean update(PersonalHomepageInfo personalHomepageInfo,Long adminId) throws ServiceException {
+	public Boolean update(PersonalHomepageInfo personalHomepageInfo) throws ServiceException {
 		Date now = new Date();
 		personalHomepageInfo.setGmtUpdate(now);
-		personalHomepageInfo.setCommonId(adminId);
 		return personalHomepageInfoMapper.updateById(personalHomepageInfo)>0;
 	}
 

+ 2 - 4
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/SearchRecordsInfoServiceImpl.java

@@ -30,11 +30,10 @@ public class SearchRecordsInfoServiceImpl implements ISearchRecordsInfoService{
 	private SearchRecordsInfoMapper searchRecordsInfoMapper;
 	
 	@Override
-	public Boolean add(SearchRecordsInfo searchRecordsInfo,Long adminId) throws ServiceException {
+	public Boolean add(SearchRecordsInfo searchRecordsInfo) throws ServiceException {
 		Date now = new Date();
 		searchRecordsInfo.setGmtCreate(now);
 		searchRecordsInfo.setGmtUpdate(now);
-		searchRecordsInfo.setCommonId(adminId);
 		return searchRecordsInfoMapper.insert(searchRecordsInfo)>0;
 	}
 
@@ -80,10 +79,9 @@ public class SearchRecordsInfoServiceImpl implements ISearchRecordsInfoService{
 	}
 
 	@Override
-	public Boolean update(SearchRecordsInfo searchRecordsInfo,Long adminId) throws ServiceException {
+	public Boolean update(SearchRecordsInfo searchRecordsInfo) throws ServiceException {
 		Date now = new Date();
 		searchRecordsInfo.setGmtUpdate(now);
-		searchRecordsInfo.setCommonId(adminId);
 		return searchRecordsInfoMapper.updateById(searchRecordsInfo)>0;
 	}
 

+ 3 - 1
unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardHolderInfo.java

@@ -64,7 +64,9 @@ public class CardHolderInfo extends SuperDO {
     private Long deleteFlag;
     @TableField(exist = false)
     private CardManagementInfo cardManagementInfo;
-
+    /** 允许他人分享名片(1允许) */
+    @TableField(exist = false)
+    private Long shareCard;
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 13 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardManagementInfo.java

@@ -90,6 +90,11 @@ public class CardManagementInfo extends SuperDO {
     @TableField("qr_code")
     private String qrCode;
 
+    /** 置顶标识 */
+    @Excel(name = "置顶标识")
+    @TableField("top_marking")
+    private Long topMarking;
+
     /**  */
     @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
     @TableField("gmt_create")
@@ -109,6 +114,14 @@ public class CardManagementInfo extends SuperDO {
      */
     @TableField(exist = false)
     private String deleteCondition;
+    /**
+     * 主页id
+     */
+    @TableField(exist = false)
+    private Long personalHomeId;
+    /** 允许圈子成员查看主页(1允许) */
+    @TableField(exist = false)
+    private Long lookPage;
 
     @Override
     public String toString() {

+ 4 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/domain/CircleManagementInfo.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.enums.FieldFill;
 import com.iotechn.unimall.core.util.StringUtils;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 圈子管理对象 circle_management_info
@@ -63,6 +64,9 @@ public class CircleManagementInfo extends SuperDO {
     @TableField("delete_flag")
     private Long deleteFlag;
 
+    @TableField(exist = false)
+    private List<CardManagementInfo> cardManagementInfoList;
+
 
     @Override
     public String toString() {

+ 179 - 65
xiaochengxu/pages/mySet/myHome.vue

@@ -1,15 +1,19 @@
 <template>
 	<view>
-		<view class="swiper-wrap">
-			<u-swiper :list="list1" indicator indicatorMode="dot"
+		<view v-if='!editstatus&&fileList.length>0' class="swiper-wrap">
+			<u-swiper :list="fileList" indicator indicatorMode="dot"
 			autoplay
+			imgMode='aspectFit'
+			height='300'
 		    @change="change" @click="click">
 			</u-swiper>	
 		</view>
-		<view>
+		<view v-if='editstatus'>
+			<view>企业风采</view>
+			<!-- <image v-for='item in fileList' :src="item.url" mode=""></image> -->
 			<u-upload
-					:fileList="fileList1"
 					@afterRead="afterRead"
+					:fileList="fileList1"
 					@delete="deletePic"
 					name="1"
 					multiple
@@ -22,81 +26,184 @@
 				loading
 		></u-skeleton> -->
 		<view class="company-title">
-		 	<u--input v-model="companyData.companyName" placeholder="请选择性别" border="none" ></u--input>
+			<view>公司名称</view>
+		 	<u--input v-if='editstatus' v-model="companyData.companyName"  placeholder="请输入公司名称" border="none" ></u--input>
+			<view v-else>{{companyData.companyName}}</view>
 		</view>
 		<view class="intro">
-			<u--input v-model="companyData.companyIntroduction" placeholder="请选择性别" border="none" ></u--input>
+			<view>公司简介</view>
+			<u--input v-if='editstatus' v-model="companyData.companyIntroduction" placeholder="请输入公司简介" border="none" ></u--input>
+			<view v-else>{{companyData.companyIntroduction}}</view>
 		</view>
 		<view class="scope">
-			<u--input v-model="companyData.scopeOfBusiness" placeholder="请选择性别" border="none" ></u--input>
+			<view>业务范围</view>
+			<u--input v-if='editstatus' v-model="companyData.scopeOfBusiness" placeholder="请输入业务范围" border="none" ></u--input>
+			<view v-else>{{companyData.scopeOfBusiness}}</view>
 		</view>
 		<u-list>
 			<u-list-item>
-				<u--input v-model="companyData.companyAddress" placeholder="请选择性别" border="none" ></u--input>
+				<view>公司地址</view>
+				<u--input v-if='editstatus' v-model="companyData.companyAddress" placeholder="请输入公司地址" border="none" ></u--input>
+				<view v-else>{{companyData.companyAddress}}</view>
 			</u-list-item>
 			<u-list-item>
-				<u--input v-model="companyData.phone" placeholder="请选择性别" border="none" ></u--input>
+				<view>公司电话</view>
+				<u--input v-if='editstatus' v-model="companyData.phone" placeholder="请输入公司电话" border="none" ></u--input>
+				<view v-else>{{companyData.phone}}</view>
 			</u-list-item>
 			<u-list-item>
-				<u--input v-model="companyData.portraiture" placeholder="请选择性别" border="none" ></u--input>
+				<view>公司传真</view>
+				<u--input v-if='editstatus' v-model="companyData.portraiture" placeholder="请输入公司传真" border="none" ></u--input>
+				<view v-else>{{companyData.portraiture}}</view>
 			</u-list-item>
 			<u-list-item>
-				<u--input v-model="companyData.postbox" placeholder="请选择性别" border="none" ></u--input>
+				<view>公司邮箱</view>
+				<u--input v-if='editstatus' v-model="companyData.postbox" placeholder="请输入公司邮箱" border="none" ></u--input>
+				<view v-else>{{companyData.postbox}}</view>
 			</u-list-item>
 		</u-list>
 		<view class="footer">
-			<view @click='edit' class='button'>编辑</view>
+			<view v-if='!editstatus' @click='edit' class='button'>编辑</view>
+			<view v-else @click='$u.debounce(buttonsubmit, 500)' class='button'>提交</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import uploadImage from '@/components/ossutil/uploadFile.js'; 
 	export default {
 		data() {
 			return {
-				list1: [],
-				companyData:{},
+				companyData:{
+					commonId:''
+				},
+				userInfo:{},
+				fileList:[],
+				fileList1:[],
+				editstatus:false,
 			}
 		},
+		onLoad() {
+			uni.showLoading({
+					title: '数据加载中'
+				})
+				this.getList()
+		},
+		onShow() {
+				this.userInfo = uni.getStorageSync("userInfo")
+				this.companyData.commonId=uni.getStorageSync("userInfo").id
+				console.log(1111111111)
+				
+			
+			// this.getList()
+			
+		},
 		methods: {
+			getList(){
+				this.$request.baseRequest('admin.unimall.personalHomepageInfo', 'list',{
+					page:1,
+					limit:10,
+					commonId:uni.getStorageSync("userInfo").id
+				}, failres => {
+					console.log('res+++++', failres.errmsg)
+					this.$refs.uToast.show({
+						type: 'error',
+						message: failres.errmsg,
+					})
+					uni.hideLoading()
+				}).then(res => {
+					console.log(res)
+					if(res.data.items.length>0){
+						this.companyData=res.data.items[0]
+						if(res.data.items[0].addressUrl){
+							var arr=res.data.items[0].addressUrl.split(',')
+							this.fileList1=[]
+							for(var i=0;i<arr.length;i++){
+								if(arr[i]){
+									this.fileList1.push({url:arr[i]})
+								}
+							}
+							this.fileList=arr
+						}
+						console.log(this.fileList1)
+						this.editstatus=false
+					}else{
+						this.editstatus=true
+					}
+					// if (res.errno == 200) {
+					uni.hideLoading()
+					
+					// }
+				})
+			},
 			edit(){
+				this.editstatus=true
+			},
+			change(){
+				
+			},
+			click(index){
+				console.log(index)
+				uni.previewImage({
+						current: index,     // 当前显示图片的索引值
+						urls: this.fileList,    // 需要预览的图片列表,photoList要求必须是数组
+						loop:true,          // 是否可循环预览
+					})
+			},
+			buttonsubmit(){
+				uni.showLoading({
+					title: '数据加载中',
+					mask:true
+				})
+				if(this.companyData.id){
+					this.$request.baseRequest('admin.unimall.personalHomepageInfo', 'update',{
+						personalHomepageInfo:JSON.stringify(this.companyData)
+					}, failres => {
+						console.log('res+++++', failres.errmsg)
+						this.$refs.uToast.show({
+							type: 'error',
+							message: failres.errmsg,
+						})
+						uni.hideLoading()
+					}).then(res => {
+						// if (res.errno == 200) {
+						uni.hideLoading()
+						uni.showToast({
+						    title: '编辑成功',
+						    icon: 'none',
+						    duration: 2000
+						})
+						this.getList()
+						// }
+					})
+				}else{
+					this.$request.baseRequest('admin.unimall.personalHomepageInfo', 'add',{
+						personalHomepageInfo:JSON.stringify(this.companyData)
+					}, failres => {
+						console.log('res+++++', failres.errmsg)
+						this.$refs.uToast.show({
+							type: 'error',
+							message: failres.errmsg,
+						})
+						uni.hideLoading()
+					}).then(res => {
+						// if (res.errno == 200) {
+						uni.hideLoading()
+						uni.showToast({
+						    title: '提交成功',
+						    icon: 'none',
+						    duration: 2000
+						})
+						this.getList()
+						
+						// }
+					})
+				}
 				
-				// uni.showLoading({
-				// 	title: '数据加载中'
-				// })
-				// this.$request.baseRequest('personalHomepageInfo', 'list', {
-				// 	remark2: this.route,
-				// 	carpoolingType: this.type,
-				// 	companyId: 1,
-				// 	pageNum: page.num,
-				// 	pageSize: page.size,
-				// }, failres => {
-				// 	console.log('res+++++', failres.errmsg)
-				// 	this.$refs.uToast.show({
-				// 		type: 'error',
-				// 		message: failres.errmsg,
-				// 	})
-				// 	uni.hideLoading()
-				// }).then(res => {
-				// 	// if (res.errno == 200) {
-				// 	uni.hideLoading()
-				// 	console.log(11)
-				// 	let curPageData = res.data.items;
-				// 	let totalPage = res.data.total;
-				// 	let curPageLen = curPageData.length;
-				// 	this.mescroll.endByPage(curPageLen, totalPage);
-				// 	console.log(res.data)
-				// 	// this.makeData(res.data)
-				// 	if (page.num == 1) this.infoList = []; //如果是第一页需手动置空列表
-				// 	this.infoList = this.infoList.concat(curPageData); //追加新数据
-				// 	// }
-				// })
-				// uni.navigateTo({
-				// 	url:_url
-				// })
 			},
 			deletePic(event) {
 				this[`fileList${event.name}`].splice(event.index, 1)
+				this.companyData.addressUrl =this[`fileList${event.name}`].toString()
 			},
 			// 新增图片
 			async afterRead(event) {
@@ -104,31 +211,38 @@
 				let lists = [].concat(event.file)
 				let fileListLen = this[`fileList${event.name}`].length
 				lists.map((item) => {
-					this[`fileList${event.name}`].push({
-						...item,
-						status: 'uploading',
-						message: '上传中'
-					})
-				})
+				     this[`fileList${event.name}`].push({
+				      ...item,
+				      status: 'uploading',
+				      message: '上传中'
+				     })
+				    })
+				// console.log(event,111111,fileListLen)
 				for (let i = 0; i < lists.length; i++) {
 					const result = await this.uploadFilePromise(lists[i].url)
+					this.companyData.addressUrl = this.companyData.addressUrl?this.companyData.addressUrl+','+result:result
+					this[`fileList${event.name}`][fileListLen]={}
 					let item = this[`fileList${event.name}`][fileListLen]
-					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
-						status: 'success',
-						message: '',
-						url: result
-					}))
-					fileListLen++
+					console.log(item)
+					 this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+					  status: 'success',
+					  message: '',
+					  url: result
+					 }))
+					 fileListLen++
 				}
+				console.log(this[`fileList${event.name}`])
 			},
 			uploadFilePromise(url) {
+				console.log(url)
 				return new Promise((resolve, reject) => {
-					// uploadImage(res.tempFilePaths[0], 'cardImages/',
-					// 				result => {
-					// 					// this.trainImg = result
-					// 					uni.hideLoading();
-					// 				}
-					// 			)
+					uploadImage(url, 'cardImages/',
+						result => {
+							console.log(result,22222)
+							
+							resolve(result)
+						}
+					)
 					// let a = uni.uploadFile({
 					// 	url: 'http://192.168.2.21:7001/upload', // 仅为示例,非真实的接口地址
 					// 	filePath: url,