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

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

@@ -124,7 +124,7 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
         if (circleManagementInfo.getStatus()==3){
             CardNewsInfo cardNewsInfo=new CardNewsInfo();
             cardNewsInfo.setNewsTitle("系统消息");
-            cardNewsInfo.setNewsContent("您创建的圈子"+circleManagementInfo.getCircleName()+"未通过审核，驳回原因："+circleManagementInfo.getReason());
+            cardNewsInfo.setNewsContent("您创建的圈子”"+circleManagementInfo.getCircleName()+"”未通过审核，驳回原因："+circleManagementInfo.getReason()+"。");
             cardNewsInfo.setReceiveId(circleManagementInfo.getCommonId());
             cardNewsInfo.setGmtCreate(now);
             cardNewsInfo.setGmtUpdate(now);
@@ -144,7 +144,7 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
             }
             CardNewsInfo cardNewsInfo=new CardNewsInfo();
             cardNewsInfo.setNewsTitle("系统消息");
-            cardNewsInfo.setNewsContent("您创建的圈子"+circleManagementInfo.getCircleName()+"已通过审核，快去邀请好友一起加入吧");
+            cardNewsInfo.setNewsContent("您创建的圈子”"+circleManagementInfo.getCircleName()+"“已通过审核，快去邀请好友一起加入吧。");
             cardNewsInfo.setReceiveId(circleManagementInfo.getCommonId());
             cardNewsInfo.setGmtCreate(now);
             cardNewsInfo.setGmtUpdate(now);

xiaochengxu/pages/circle/circle.vue

@@ -39,7 +39,7 @@
 						<image :src="item.circleHead?item.circleHead:'../../static/imgs/mySet/ewm.png'" mode="aspectFill" class="img"></image>
 					</view>
 					<view class="right">
-						<view class="top">{{item.circleName}}（{{item.cardNum}}）</view>
+						<view class="top">{{item.circleName}}（{{item.cardNum}}人）</view>
 						<view style='flex-wrap: wrap;' class="bottom flex">
 							<view v-for="item1 in item.circleLabelArray" class="text">
 								{{item1}}

xiaochengxu/pages/circle/createCirclce.vue

@@ -100,6 +100,7 @@
 				this.cardList = [res.data.items]
 				this.list = res.data.items
 				this.formData.cardBusiness  = res.data.items[0].cardBusiness
+				this.formData.cardId=res.data.items[0].id
 			})
 		},
 		methods: {

xiaochengxu/pages/mySet/help.vue

@@ -34,8 +34,8 @@
 	text-align:center;
 }
 .img{
-	width:92vw;
-	height:276rpx;
+	width:680rpx;
+	height:246rpx;
 	margin:20rpx auto;
 }
 </style>

xiaochengxu/pages/mySet/lookCard.vue

@@ -1,16 +1,24 @@
 <template>
 	<view>
 		<view v-for='(item,index) in cardList' class="">
-			<view class='flex justify-space-between'>
+			<view style='margin:10px;' class='flex justify-space-between'>
 				<view>{{item.certificateName}}</view>
-				<view v-if='item.personNo'>({{item.personNo1}})</view>
-				<u-icon v-if='item.personNo' @click='clip(0,item)' name="file-text-fill" color="#2979ff" size="28"></u-icon>
-				<text v-if='item.bankNo'>({{item.bankNo1}})</text>
-				<u-icon v-if='item.bankNo' @click='clip(1,item)' name="file-text-fill" color="#2979ff" size="28"></u-icon>
-				<view v-if='!item.personNo&&!item.bankNo' :class='countdownTime==0?"finished":"unfinished"' @click='imageOCR(item,index)'>{{text}}</view>
+				<view class="flex">
+					<view v-if='item.personNo'>({{item.personNo1}})</view>
+					<view style='margin:0 10rpx;' class='finished' v-if='item.personNo' @click='clip(0,item)'>
+						复制号码
+					</view>
+					<text v-if='item.bankNo'>({{item.bankNo1}})</text>
+					<view class='finished' v-if='item.bankNo' @click='clip(1,item)' >
+						复制号码
+					</view>
+					<view :class='countdownTime==0?"finished":"unfinished"' @click='imageOCR(item,index)'>{{text}}</view>
+				</view>
+				
+				
 			</view>
 			<view style='text-align:center;' class="">
-				<image style='width:360px;height:190px;border-radius:20rpx;'  :src="item.certificateImage" mode=""></image>
+				<image style='width:96%;height:190px;border-radius:20rpx;'  :src="item.certificateImage" mode="aspectFill"></image>
 			</view>
 			
 		</view>

xiaochengxu/pages/mySet/myHome.vue

@@ -130,7 +130,9 @@
 		data() {
 			return {
 				companyData:{
-					commonId:''
+					commonId:'',
+					companyIntroduction:'',
+					scopeOfBusiness:''
 				},
 				userInfo:{},
 				fileList:[],
@@ -389,14 +391,14 @@
 		border-radius: 20rpx 20rpx 0 0;
 		padding:10rpx 20rpx;
 		box-sizing: border-box;
-		.row{
-			padding-bottom: 24rpx;
+		.row:last-child{
+			padding-bottom: 20rpx;
 		}
 		.line{
 			border-bottom: 1px solid #E6E6E6;
 		}
 		.top-m{
-			margin-top: 24rpx;
+			margin-top: 20rpx;
 		}
 		.qyfc{
 			margin: 24rpx 0;
@@ -411,10 +413,11 @@
 	}
 	.footer{
 		position: fixed;
-		bottom: 80rpx;
+		bottom: 0rpx;
 		width: calc(100% - 40rpx);
-		padding: 0 20rpx;
+		padding: 40rpx 20rpx;
 		z-index: 999;
+		background:#fff;
 	}
 	.button{
 		color: #fff;
@@ -439,6 +442,7 @@
 		font-size:32rpx;
 		font-weight: bold;
 		color: #1A1A1A;
+		margin:20rpx 0;
 	}
 	.content{
 		font-size: 28rpx;