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

# Conflicts:
#	unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardManagementInfoServiceImpl.java

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;

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;

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(
@@ -43,11 +42,14 @@ public interface ICardManagementInfoService{
 		throws ServiceException;
 
 	@HttpMethod(description = "删除",  permissionName = "名片管理管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id,
+						@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;

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;

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;

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;

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;

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;

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;

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;
 	}
 

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

@@ -2,9 +2,15 @@ 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;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -28,13 +34,16 @@ import org.springframework.transaction.annotation.Transactional;
 public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 	@Autowired
 	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;
 	}
 
@@ -61,6 +70,19 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService{
 				}
 							wrapper.eq("delete_flag", 0);
 		List<CardHolderInfo> list = cardHolderInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+		if (!CollectionUtils.isEmpty(list)){
+			for (CardHolderInfo cardHolderInfo:list){
+				CardManagementInfo cardManagementInfo=cardManagementInfoMapper.selectById(cardHolderInfo.getCardId());
+				if (cardManagementInfo!=null){
+					cardHolderInfo.setCardManagementInfo(cardManagementInfo);
+				}
+				//查看是否允许分享
+				CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardHolderInfo.getCommonId());
+				if (commonUserInfo!=null){
+					cardHolderInfo.setShareCard(commonUserInfo.getShareCard());
+				}
+			}
+		}
 		Integer count = cardHolderInfoMapper.selectCount(wrapper);
 		return new Page<CardHolderInfo>(list, page, limit, count);
 	}
@@ -80,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;
 	}
 

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

@@ -2,11 +2,16 @@ package com.iotechn.unimall.admin.api.card.impl;
 
 import java.util.List;
 
-import com.iotechn.unimall.core.util.GeneratorUtil;
 import com.iotechn.unimall.data.util.QRCodeUtil;
+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;
@@ -14,12 +19,10 @@ 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;
 import org.springframework.transaction.annotation.Transactional;
-
 /**
  * 名片管理Service业务层处理
  * 
@@ -30,22 +33,27 @@ import org.springframework.transaction.annotation.Transactional;
 public class CardManagementInfoServiceImpl implements ICardManagementInfoService{
 	@Autowired
 	private CardManagementInfoMapper cardManagementInfoMapper;
-
 	@Autowired
 	private QRCodeUtil qrCodeUtil;
+	@Autowired
+	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;
 	}
 
 	@Override
 	public Page<CardManagementInfo> list(Long commonId,String cardBusiness,String name,String post,String companyName,String location,String detailedAddress,String phone,String headSculpture,String qrCode,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
-		String str = qrCodeUtil.getQRCodeImage("id=xxx二维码字符串", false, "名字", GeneratorUtil.genUUId());
-		System.out.println(str);
+//		String str = qrCodeUtil.getQRCodeImage("id=xxx二维码字符串", false, "名字", GeneratorUtil.genUUId());
+//		System.out.println(str);
 		Wrapper<CardManagementInfo> wrapper = new EntityWrapper<CardManagementInfo>();
 														if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);
@@ -86,20 +94,44 @@ 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);
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
+	public Boolean delete(String id,String deleteCondition) {
 		String[] ids = String.valueOf(id).split(",");
 		for (String tt:ids) {
 			CardManagementInfo tmp =  cardManagementInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
-				tmp.setDeleteFlag(1l);
+				//退出关联的圈子
+				List<CircleCardInfo> list=circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>().eq("card_id",tmp.getId()));
+				for(CircleCardInfo aa:list){
+					aa.setDeleteFlag(1l);
+					circleCardInfoMapper.updateById(aa);
+				}
+				//从所有拥有此名片用户列表删除
+				if ("1".equals(deleteCondition)){
+					List<CardHolderInfo> cardHolderInfoList=cardHolderInfoMapper.selectList(new EntityWrapper<CardHolderInfo>().eq("card_id",tmp.getId()));
+					for(CardHolderInfo aa:cardHolderInfoList){
+						aa.setDeleteFlag(1l);
+						cardHolderInfoMapper.updateById(aa);
+					}
+				}
+				tmp.setCommonId(null);
 				cardManagementInfoMapper.updateById(tmp);
 			}
 		}
@@ -107,13 +139,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);

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;
 	}
 

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;
 	}
 

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

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;
 	}
 

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;
 	}
 

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;
 	}
 

unimall-admin/config/dev.env.js

@@ -1,6 +1,6 @@
 module.exports = {
     NODE_ENV: '"development"',
     ENV_CONFIG: '"dev"',
-    HOST: '"http://localhost:8182"',
-    BASE_API: '"http://localhost:8182/m.api"'
+    HOST: '"http://192.168.110.138:8182"',
+    BASE_API: '"http://192.168.110.138:8182/m.api"'
 }

unimall-admin/config/index.js

@@ -25,7 +25,7 @@ module.exports = {
         // Use Eslint Loader?
         // If true, your code will be linted during bundling and
         // linting errors and warnings will be shown in the console.
-        useEslint: true,
+        useEslint: false,
         // If true, eslint errors and warnings will also be shown in the error overlay
         // in the browser.
         showEslintErrorsInOverlay: false,

unimall-admin/src/views/cardClassifyInfo/index.vue

@@ -186,7 +186,7 @@
 </template>
 
 <script>
-import { listCardClassifyInfo, getCardClassifyInfo, delCardClassifyInfo, addCardClassifyInfo, updateCardClassifyInfo, exportCardClassifyInfo } from "@/api/unimall/cardClassifyInfo";
+import { listCardClassifyInfo, getCardClassifyInfo, delCardClassifyInfo, addCardClassifyInfo, updateCardClassifyInfo, exportCardClassifyInfo } from "@/api/card/cardClassifyInfo";
 
 export default {
   data() {

unimall-admin/src/views/cardHolderInfo/index.vue

@@ -190,7 +190,7 @@
 </template>
 
 <script>
-import { listCardHolderInfo, getCardHolderInfo, delCardHolderInfo, addCardHolderInfo, updateCardHolderInfo, exportCardHolderInfo } from "@/api/unimall/cardHolderInfo";
+import { listCardHolderInfo, getCardHolderInfo, delCardHolderInfo, addCardHolderInfo, updateCardHolderInfo, exportCardHolderInfo } from "@/api/card/cardHolderInfo";
 
 export default {
   data() {

unimall-admin/src/views/cardManagementInfo/index.vue

@@ -277,7 +277,7 @@
 </template>
 
 <script>
-import { listCardManagementInfo, getCardManagementInfo, delCardManagementInfo, addCardManagementInfo, updateCardManagementInfo, exportCardManagementInfo } from "@/api/unimall/cardManagementInfo";
+import { listCardManagementInfo, getCardManagementInfo, delCardManagementInfo, addCardManagementInfo, updateCardManagementInfo, exportCardManagementInfo } from "@/api/card/cardManagementInfo";
 
 export default {
   data() {

unimall-admin/src/views/certificateManagementInfo/index.vue

@@ -186,7 +186,7 @@
 </template>
 
 <script>
-import { listCertificateManagementInfo, getCertificateManagementInfo, delCertificateManagementInfo, addCertificateManagementInfo, updateCertificateManagementInfo, exportCertificateManagementInfo } from "@/api/unimall/certificateManagementInfo";
+import { listCertificateManagementInfo, getCertificateManagementInfo, delCertificateManagementInfo, addCertificateManagementInfo, updateCertificateManagementInfo, exportCertificateManagementInfo } from "@/api/card/certificateManagementInfo";
 
 export default {
   data() {

unimall-admin/src/views/circleCardInfo/index.vue

@@ -185,7 +185,7 @@
 </template>
 
 <script>
-import { listCircleCardInfo, getCircleCardInfo, delCircleCardInfo, addCircleCardInfo, updateCircleCardInfo, exportCircleCardInfo } from "@/api/unimall/circleCardInfo";
+import { listCircleCardInfo, getCircleCardInfo, delCircleCardInfo, addCircleCardInfo, updateCircleCardInfo, exportCircleCardInfo } from "@/api/card/circleCardInfo";
 
 export default {
   data() {

unimall-admin/src/views/circleManagementInfo/index.vue

@@ -188,7 +188,7 @@
 </template>
 
 <script>
-import { listCircleManagementInfo, getCircleManagementInfo, delCircleManagementInfo, addCircleManagementInfo, updateCircleManagementInfo, exportCircleManagementInfo } from "@/api/unimall/circleManagementInfo";
+import { listCircleManagementInfo, getCircleManagementInfo, delCircleManagementInfo, addCircleManagementInfo, updateCircleManagementInfo, exportCircleManagementInfo } from "@/api/card/circleManagementInfo";
 
 export default {
   data() {

unimall-admin/src/views/commonUserInfo/index.vue

@@ -249,7 +249,7 @@
 </template>
 
 <script>
-import { listCommonUserInfo, getCommonUserInfo, delCommonUserInfo, addCommonUserInfo, updateCommonUserInfo, exportCommonUserInfo } from "@/api/unimall/commonUserInfo";
+import { listCommonUserInfo, getCommonUserInfo, delCommonUserInfo, addCommonUserInfo, updateCommonUserInfo, exportCommonUserInfo } from "@/api/card/commonUserInfo";
 
 export default {
   data() {

unimall-admin/src/views/personalHomepageInfo/index.vue

@@ -237,7 +237,7 @@
 </template>
 
 <script>
-import { listPersonalHomepageInfo, getPersonalHomepageInfo, delPersonalHomepageInfo, addPersonalHomepageInfo, updatePersonalHomepageInfo, exportPersonalHomepageInfo } from "@/api/unimall/personalHomepageInfo";
+import { listPersonalHomepageInfo, getPersonalHomepageInfo, delPersonalHomepageInfo, addPersonalHomepageInfo, updatePersonalHomepageInfo, exportPersonalHomepageInfo } from "@/api/card/personalHomepageInfo";
 
 export default {
   data() {

unimall-admin/src/views/searchRecordsInfo/index.vue

@@ -184,7 +184,7 @@
 </template>
 
 <script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/unimall/info";
+import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/card/info";
 
 export default {
   data() {

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/commonUser/CommonUserServiceImpl.java

@@ -86,6 +86,8 @@ public class CommonUserServiceImpl implements CommonUserService {
                 newUserDO.setGmtUpdate(now);
                 newUserDO.setGmtCreate(now);
                 commonUserInfoMapper.insert(newUserDO);
+                //更新数据库默认值
+                newUserDO = commonUserInfoMapper.selectById(newUserDO.getId());
             } else {
                 newUserDO = list.get(0);
             }

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

@@ -62,8 +62,11 @@ public class CardHolderInfo extends SuperDO {
     @Excel(name = "删除标识")
     @TableField("delete_flag")
     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)

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

@@ -57,6 +57,18 @@ public class CardManagementInfo extends SuperDO {
     @Excel(name = "定位")
     @TableField("location")
     private String location;
+    /** 省 */
+    @Excel(name = "省")
+    @TableField("province")
+    private String province;
+    /** 市 */
+    @Excel(name = "市")
+    @TableField("city")
+    private String city;
+    /** 区 */
+    @Excel(name = "区")
+    @TableField("area")
+    private String area;
 
     /** 详细地址 */
     @Excel(name = "详细地址")
@@ -78,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")
@@ -92,7 +109,19 @@ public class CardManagementInfo extends SuperDO {
     @Excel(name = "删除标识")
     @TableField("delete_flag")
     private Long deleteFlag;
-
+    /**
+     * 删除条件 1所有拥有此名片用户列表删除
+     */
+    @TableField(exist = false)
+    private String deleteCondition;
+    /**
+     * 主页id
+     */
+    @TableField(exist = false)
+    private Long personalHomeId;
+    /** 允许圈子成员查看主页(1允许) */
+    @TableField(exist = false)
+    private Long lookPage;
 
     @Override
     public String toString() {

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() {

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CommonUserInfo.java

@@ -56,18 +56,6 @@ public class CommonUserInfo extends SuperDO {
     @Excel(name = "头像")
     @TableField("head")
     private String head;
-    /** 省 */
-    @Excel(name = "省")
-    @TableField("province")
-    private String province;
-    /** 市 */
-    @Excel(name = "市")
-    @TableField("city")
-    private String city;
-    /** 区 */
-    @Excel(name = "区")
-    @TableField("area")
-    private String area;
 
     /** 允许他人分享名片(1允许) */
     @Excel(name = "允许他人分享名片(1允许)")

xiaochengxu/common/helper.js

@@ -25,10 +25,63 @@ const logout = () => {
 		key: 'userInfo'
 	})
 }
+const formatLocation = (str) => {
+	let area = {}
+	let index11 = 0
+	let index1 = str.indexOf("省")
+	if (index1 == -1) {
+		index11 = str.indexOf("自治区")
+		if (index11 != -1) {
+			area.Province = str.substring(0, index11 + 3)
+		} else {
+			area.Province = str.substring(0, 0)
+		}
+	} else {
+		area.Province = str.substring(0, index1 + 1)
+	}
+
+	let index2 = str.indexOf("市")
+	if (index11 == -1) {
+		area.City = str.substring(index11 + 1, index2 + 1)
+	} else {
+		if (index11 == 0) {
+			area.City = str.substring(index1 + 1, index2 + 1)
+		} else {
+			area.City = str.substring(index11 + 3, index2 + 1)
+		}
+	}
+
+	let index3 = str.indexOf("区")
+	if (index3 == -1) {
+		index3 = str.indexOf("县")
+		if (index3 == -1) {
+			index3 = str.lastIndexOf("市")
+			if (index3 == -1) {
+				index3 = str.indexOf("镇")
+				if (index3 == -1) {
+
+				} else {
+					area.Country = str.substring(index2 + 1, index3 + 1)
+
+				}
+			} else {
+				area.Country = str.substring(index2 + 1, index3 + 1)
+			}
+		} else {
+			area.Country = str.substring(index2 + 1, index3 + 1)
+		}
+
+	} else {
+		area.Country = str.substring(index2 + 1, index3 + 1)
+	}
+	area.Village = str.substring(index3 + 1, str.length)
+	return area;
+}
 
 
 
 export default {
 logout,
-contactCustomerService
+contactCustomerService,
+formatLocation
 }

xiaochengxu/main.js

@@ -5,10 +5,12 @@ import App from './App'
 
 Vue.config.productionTip = false
 import request from '@/util/request.js'
+import helper from '@/common/helper.js'
 import WXBizDataCrypt from '@/util/WXBizDataCrypt.js'
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
 Vue.prototype.$request = request
+Vue.prototype.$helper = helper
 import store from './store'
 Vue.prototype.$store = store
 

xiaochengxu/manifest.json

@@ -48,20 +48,20 @@
     /* SDK配置 */
     "quickapp" : {},
     /* 快应用特有相关 */
-  "mp-weixin": {
-  	"appid": "wxa03b5fb231b72b08",
-  	"setting": {
-  		"urlCheck": false,
-  		"minified": true,
-  		"postcss": true
-  	},
-  	"usingComponents": true,
-  	"permission": {
-  		"scope.userLocation": {
-  			"desc": "为用户提供给接送服务，需要定位信息"
-  		}
-  	},
-  	"requiredPrivateInfos": ["chooseLocation"]
-  },
+    "mp-weixin" : {
+        "appid" : "wx4505a6ea6f703e17",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : true
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "为用户提供给接送服务，需要定位信息"
+            }
+        },
+        "requiredPrivateInfos" : [ "chooseLocation" ]
+    },
     "vueVersion" : "2"
 }

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -92,12 +92,63 @@
 			};
 		},
 		onShow() {
+			if (uni.getStorageSync("userInfo")) {
+				this.userInfo = uni.getStorageSync("userInfo")
+				this.init()
+			} else {
+				this.login()
+			}
 			this.searchVal = uni.getStorageSync("search_val") ? uni.getStorageSync("search_val") : ''
 		},
 		methods: {
-			toNotice(){
+			init(){
+				
+			},
+			login() {
+				let that = this
+				uni.login({
+					"provider": "weixin",
+					success: function(wxres) {
+						that.$request.baseRequest('commonUserApp', 'commonUserLogin', {
+							loginType: 1,
+							raw: JSON.stringify(wxres)
+						}, failres => {
+							this.$refs.uToast.show({
+								type: 'error',
+								message: failres.errmsg,
+							})
+							uni.hideLoading()
+						}).then(res => {
+							uni.getUserInfo({
+								provider: 'weixin',
+								success: function(info) {
+									console.log(info)
+									res.data.nickname = info.userInfo.nickName
+									res.data.head = info.userInfo.avatarUrl
+									that.$request.baseRequest('commonUserApp', 'edit', {
+										commonUserInfo: JSON.stringify(res.data)
+									}, failres => {
+										this.$refs.uToast.show({
+											type: 'error',
+											message: failres.errmsg,
+										})
+										uni.hideLoading()
+									}).then(res1 => {
+										uni.setStorageSync("userInfo",res1.data)
+									})
+								}
+							})
+						})
+					},
+					fail: function(err) {
+						// 登录授权失败  
+						// err.code是错误码
+					}
+				})
+			},
+			toNotice() {
 				uni.navigateTo({
-					url:"/pages/cardHolder/notice"
+					url: "/pages/cardHolder/notice"
 				})
 			},
 			micOpen: function() {

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(){
-				11
-				// 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
-				// })
+				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()
+						
+						// }
+					})
+				}
+				
 			},
 			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,

xiaochengxu/pages/mySet/myInfo.vue

@@ -3,44 +3,42 @@
 		<view class="card-list">
 			<view class="row" v-for="(item,index) in cardList" :key="index">
 				<view class="title-name">
-					名称
+					{{item.cardBusiness}}
 				</view>
 				<view class="flex card-list-item">
 					<view class="left">
 						<view class="top flex-row-center">
-							<image src="../../static/uni.png" mode="widthFix" class="img"></image>
+							<image :src="item.headSculpture" mode="widthFix" class="img"></image>
 						</view>
 						<view class="bottom flex flex-evenly">
+							<uni-icons type="home" size="20" @click="toHome(item)"></uni-icons>
 							<uni-icons type="home" size="20"></uni-icons>
-							<text>默</text>
 							<uni-icons type="redo" size="20"></uni-icons>
 						</view>
 					</view>
 					<view class="right">
 						<view class="row1 flex">
-							<text>张三</text>
+							<text>{{item.name}}</text>
 							<text class="line"></text>
-							<text>总经理</text>
+							<text>{{item.post}}</text>
 						</view>
 						<view class="row2">
-							北京xxx有限公司
+							{{item.companyName}}
 						</view>
 						<view class="row3" @click="toMap">
 							<uni-icons type="redo" size="20"></uni-icons>
-							<text>北京市朝阳区幸福大街8号</text>
+							<text>{{item.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</text>
 						</view>
 						<view class="row3">
 							<uni-icons type="redo" size="20"></uni-icons>
-							<text>13333333333</text>
-						</view>
-						<view class="row3">
-							<uni-icons type="redo" size="20"></uni-icons>
-							<text>我是备注</text>
+							<text>{{item.phone}}</text>
 						</view>
 					</view>
 				</view>
 				<view class="car-bottom flex">
-					<button>置顶</button>
+					<u-button text="置顶" @click="topMarking(item)" throttle-time='1000'></u-button>
+					<!-- <button @click="$u.debounce(topMarking, 500)">置顶</button> -->
+					<!-- <button @click="$u.debounce(topMarking(item), 500)">置顶</button> -->
 					<button>删除</button>
 					<button>编辑</button>
 				</view>
@@ -51,35 +49,61 @@
 				<text class=''>添加新名片</text>
 			</view>
 		</view>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
 <script>
-	import uploadImage from '@/components/ossutil/uploadFile.js';
+	var that;
 	export default {
 		data() {
 			return {
-				cardList: [{},
-					{}
-				]
+				cardList: []
 			};
 		},
-		methods:{
-			addCard(){
-				
+		onLoad() {
+			that = this
+			this.userInfo = uni.getStorageSync("userInfo")
+		},
+		onShow() {
+			this.init()
+		},
+		methods: {
+			init() {
+				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'list', {
+					commonId: this.userInfo.id
+				}, failres => {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: failres.errmsg,
+					})
+					uni.hideLoading()
+				}).then(res => {
+					this.cardList = res.data.items
+				})
+			},
+			addCard() {
+				uni.navigateTo({
+					url: "/pages/mySet/newCard"
+				})
+			},
+			topMarking(val) {
+				that.$request.baseRequest('admin.unimall.cardManagementInfo', 'top', {
+					cardManagementInfo: JSON.stringify({id:val.id})
+				}, failres => {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: failres.errmsg,
+					})
+					uni.hideLoading()
+				}).then(res => {
+					this.$refs.uToast.show({
+						type: 'success',
+						message: '置顶成功！',
+					})
+						this.init()
+				})
 			}
-			// chooseImage(){
-			// 	uni.chooseImage({
-			// 		success: (res) => {
-			// 			uploadImage(res.tempFilePaths[0], 'cardImages/',
-			// 				result => {
-			// 					// this.trainImg = result
-			// 					uni.hideLoading();
-			// 				}
-			// 			)
-			// 		}
-			// 	});
-			// }
 		}
 	}
 </script>

xiaochengxu/pages/mySet/mySet.vue

@@ -2,9 +2,9 @@
 	<view class="content">
 		<view class="content1 flex-all-center relative">
 			<view class="user">
-				<image src="../../static/logo.png" mode="widthFix" class="img"></image>
+				<image :src="userInfo.head" mode="widthFix" class="img"></image>
 				<view class="name">
-					我是昵称
+					{{userInfo.nickname}}
 				</view>
 			</view>
 			<view class="position">
@@ -25,6 +25,7 @@
 	export default {
 		data() {
 			return {
+				userInfo:{},
 				menuList:[
 					{
 					name:"我的名片",
@@ -61,6 +62,10 @@
 				]
 			};
 		},
+		onShow() {
+			this.userInfo = uni.getStorageSync("userInfo")
+			console.log(this.userInfo)
+		},
 		methods:{
 			menuClick(typeName){
 				let _url = '/pages/mySet/'+typeName

xiaochengxu/pages/mySet/newCard.vue

@@ -6,10 +6,10 @@
 			</view>
 			<view class="right">
 				<view class="row1">
-					姓名|职务
+					{{cardInfo.name}}|{{cardInfo.post}}
 				</view>
 				<view class="">
-					公司名称
+					{{cardInfo.companyName}}
 				</view>
 				<view class="">
 					地址
@@ -31,7 +31,7 @@
 			</view>
 			<u--form labelPosition="left" :model="cardInfo" ref="uForm">
 				<u-form-item label="名片标识" prop="userInfo.cardBusiness" borderBottom>
-					<text>名片-{{cardInfo.cardBusiness}}</text>
+					<u--input v-model="cardInfo.cardBusiness" border="none" placeholder="输入名片标识"></u--input>
 				</u-form-item>
 				<u-form-item label="姓名" prop="userInfo.name" borderBottom>
 					<u--input v-model="cardInfo.name" border="none" placeholder="输入姓名"></u--input>
@@ -42,14 +42,19 @@
 				<u-form-item label="公司/机构名称" prop="userInfo.companyName" borderBottom>
 					<u--input v-model="cardInfo.companyName" border="none" placholder="输入公司/机构名称"></u--input>
 				</u-form-item>
-				<u-form-item label="定位" prop="userInfo.name" borderBottom  @click="placeSelect();hideKeyboard()">
-					<text>选择定位> </text>
+				</u-form-item>
+				<!-- 		<u-form-item label="地址" prop="userInfo.name" borderBottom>
+					<view @click="showPicker">选择地址</view>
+					<view>{{ province }}{{ city }}{{ area }}</view>
+				</u-form-item> -->
+				<u-form-item label="定位" prop="userInfo.name" borderBottom @click="placeSelect();hideKeyboard()">
+					<text>选择地址> </text>
 				</u-form-item>
 				<u-form-item label="详细地址" prop="userInfo.name" borderBottom>
-					<u--input v-model="cardInfo.name" border="none" placeholder="输入地址,不超过15个字"></u--input>
+					<u--input v-model="cardInfo.detailedAddress" border="none" placeholder="输入地址,不超过15个字"></u--input>
 				</u-form-item>
 				<u-form-item label="联系电话" prop="userInfo.name" borderBottom>
-					<u--input v-model="cardInfo.name" border="none" placeholder="输入联系电话"></u--input>
+					<u--input v-model="cardInfo.phone" border="none" placeholder="输入联系电话"></u--input>
 				</u-form-item>
 			</u--form>
 		</view>
@@ -63,30 +68,41 @@
 			</view>
 		</view>
 		<view class="bottom">
-			<button>提交</button>
+			<button @click="submit">提交</button>
 		</view>
+		<city-picker ref="picker" mode="multiSelector" :list="areaData" :level="3" @confirm="finishSelectAddress">
+		</city-picker>
+		<u-modal :show="isSubmit" :content='content' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton
+			@cancel="isSubmit=false" @close="isSubmit=false" closeOnClickOverlay></u-modal>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
 <script>
+	var that;
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
+		onLoad() {
+			that = this
+			this.userInfo = uni.getStorageSync("userInfo")
+			this.cardInfo.commonId = this.userInfo.id
+		},
 		data() {
 			return {
+				isSubmit: false,
+				content: '确定提交名片信息？',
+				userInfo: {},
 				fileList1: [],
 				cardInfo: {
-					commonId:'',
-					cardBusiness:'',
-					name:'',
-					post:'',
-					companyName:'',
-					location:'',
-					detailedAddress:'',
-					phone:'',
-					headSculpture:''
-					
-					
-					
+					commonId: '',
+					cardBusiness: '名片标识-1',
+					name: '',
+					post: '',
+					companyName: '',
+					location: '',
+					detailedAddress: '',
+					phone: '',
+					headSculpture: ''
 				}
 			};
 		},
@@ -95,22 +111,12 @@
 				uni.chooseLocation({
 					success: function(res) {
 						console.log(res);
-						11111
-						// console.log('位置名称：' + res.name);
-						// console.log('详细地址：' + res.address);
-						// console.log('纬度：' + res.latitude);
-						// console.log('经度：' + res.longitude);
-						this.cardInfo.location = res.latitude+','+res.longitude
-						this.
-						console.log('----------------------------')
-						// that.addressInfo.latitude = res.latitude
-						// that.addressInfo.longitude = res.longitude
-						// that.addressInfo.detailedAddress = _address.Village
-						// that.addressInfo.province = _address.Province
-						// that.addressInfo.city = _address.City
-						// that.addressInfo.area = _address.Country
-						// that.addressInfo.commonId = that.userInfo.id
-						// that.$forceUpdate()
+						that.cardInfo.location = res.latitude + ',' + res.longitude
+						let _address = that.$helper.formatLocation(res.address)
+						that.cardInfo.province = _address.Province
+						that.cardInfo.city = _address.City
+						that.cardInfo.area = _address.Country
+						that.cardInfo.detailedAddress = _address.Village
 					}
 				});
 			},
@@ -144,29 +150,37 @@
 					fileListLen++
 				}
 			},
-			uploadFilePromise(url) {
+			uploadFilePromise(res) {
 				return new Promise((resolve, reject) => {
-					// uploadImage(res.tempFilePaths[0], 'cardImages/',
-					// 				result => {
-					// 					// this.trainImg = result
-					// 					uni.hideLoading();
-					// 				}
-					// 			)
-					// let a = uni.uploadFile({
-					// 	url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
-					// 	filePath: url,
-					// 	name: 'file',
-					// 	formData: {
-					// 		user: 'test'
-					// 	},
-					// 	success: (res) => {
-					// 		setTimeout(() => {
-					// 			resolve(res.data.data)
-					// 		}, 1000)
-					// 	}
-					// });
+					uploadImage(res, 'cardImages/',
+						result => {
+							that.cardInfo.headSculpture = result
+							resolve(res)
+						}
+					)
 				})
 			},
+			confirmSubmit() {
+				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'add', {
+					cardManagementInfo: JSON.stringify(this.cardInfo)
+				}, failres => {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: failres.errmsg,
+					})
+					uni.hideLoading()
+				}).then(res => {
+					this.isSubmit = false
+					this.$refs.uToast.show({
+						type: 'success',
+						message: '提交成功！',
+					})
+				})
+			},
+			submit() {
+				this.isSubmit = true
+
+			}
 		}
 	}
 </script>