高敬炎 2 vuotta sitten
vanhempi
commit
c0928b2470

+ 122 - 83
xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -16,7 +16,7 @@
 				</view>
 				
 				<view class="right">
-					<uni-icons type="closeempty" size="24" @click.native.stop="delVal" color="#9199af" v-if="searchVal"></uni-icons>
+					<image style='width:32rpx;height:32rpx;' v-if="searchVal" @click.native.stop="delSearchVal" src="../../static/imgs/card/searchdel.png" mode="widthFix" ></image>
 					<uni-icons type="mic" size="24" @click.native.stop="micOpen" color="#9199af"></uni-icons>
 				</view>
 			</view>
@@ -37,12 +37,7 @@
 				@down="downCallback">
 				<view v-for='(item,index) in cardHolderList' @longpress="longpress" class="item flex">
 					<!-- <view class="card-list-item" style="background:red"> -->
-					<u-checkbox-group v-if='islongPress' placement="column"
-						@change="checkboxChange($event,index)">
-						<u-checkbox :name='index+1' :checked='item.checked'
-							:customStyle="{marginBottom: '8px'}">
-						</u-checkbox>
-					</u-checkbox-group>
+					
 					<view class="card-list-item"
 						:style="'background:url('+item.currentBackground+');background-size:100% 100%'">
 						<view class="card-content style1" v-if="item.cuttentTemplate==1">
@@ -59,18 +54,26 @@
 									{{item.companyName}}
 								</view>
 								<view class="row3 flex" @click="">
-									<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
-										color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
+									<u--image :showLoading="true" src="/static/imgs/card/address1.png"  width="13px" height="16px"
+										 ></u--image>
+										 <view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 								</view>
 								<view class="row4 flex">
-									<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
-										color="#5e6d82"></uni-icons>{{ item.phone }}
+									<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px" height="13px"
+										></u--image><view class='icon-text'>{{ item.phone }}</view>
 								</view>
-								<view @click='remarkEdit(item)' class="row2"  style="color: #808080">
-									<uni-icons type="redo" size="20" style="margin-right: 20rpx;"></uni-icons>
-									<text>{{item.remark?item.remark:'单击添加备注'}}</text>
+								<view @click='remarkEdit(item)' class="row2 flex"  style="color: #808080">
+									<u--image :showLoading="true" src="/static/imgs/card/remark1.png" width="10px" height="12px"
+										></u--image>
+									<view class='icon-text'>{{item.remark?item.remark:'单击添加备注'}}</view>
 								</view>
 							</view>
+							<u-checkbox-group v-if='islongPress' placement="column"
+								@change="checkboxChange($event,index)">
+								<u-checkbox iconColor='#4977FC' activeColor="#fff" :name='index+1' :checked='item.checked'
+									:customStyle="{marginBottom: '8px'}">
+								</u-checkbox>
+							</u-checkbox-group>
 						</view>
 						<view class="card-content style1 flex-between" v-if="item.cuttentTemplate==2">
 							<view class="right">
@@ -82,16 +85,18 @@
 									{{item.companyName}}
 								</view>
 								<view class="row3 flex">
-									<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
-										color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
+									<u--image :showLoading="true" src="/static/imgs/card/address3.png"  width="13px" height="16px"
+										></u--image>
+										<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 								</view>
 								<view class="row4 flex">
-									<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
-										color="#5e6d82"></uni-icons>{{ item.phone }}
+									<u--image :showLoading="true" src="/static/imgs/card/phone3.png" width="12px" height="13px"
+									></u--image><view class='icon-text'>{{ item.phone }}</view>
 								</view>
-								<view @click='remarkEdit(item)' class="row2"  style="color: #808080">
-									<uni-icons type="redo" size="20" style="margin-right: 20rpx;"></uni-icons>
-									<text>{{item.remark?item.remark:'单击添加备注'}}</text>
+								<view @click='remarkEdit(item)' class="row2 flex"  style="color: #808080">
+									<u--image :showLoading="true" src="/static/imgs/card/remark3.png"  width="10px" height="12px"
+									></u--image>
+									<view class='icon-text'>{{item.remark?item.remark:'单击添加备注'}}</view>
 								</view>
 							</view>
 							<view class="left">
@@ -100,6 +105,12 @@
 								<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px"
 									height="66px" shape="circle" v-else></u--image>
 							</view>
+							<u-checkbox-group v-if='islongPress' placement="column"
+								@change="checkboxChange($event,index)">
+								<u-checkbox iconColor='#4977FC' activeColor="#fff" :name='index+1' :checked='item.checked'
+									:customStyle="{marginBottom: '8px'}">
+								</u-checkbox>
+							</u-checkbox-group>
 						</view>
 						<view class="card-content style2" v-if="item.cuttentTemplate==3">
 							<view class="top">
@@ -120,19 +131,26 @@
 								</view>
 								<view class="right">
 									<view class="row1 flex">
-										<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
-											color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
+										<u--image :showLoading="true" src="/static/imgs/card/address1.png"  width="13px" height="16px"
+										></u--image><view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 									</view>
 									<view class="row2 flex">
-										<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
-											color="#5e6d82"></uni-icons>{{ item.phone }}
+										<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px" height="13px"
+											></u--image><view class='icon-text'>{{ item.phone }}</view>
 									</view>
-									<view @click='remarkEdit(item)' class="row2"  style="color: #808080">
-										<uni-icons type="redo" size="20" style="margin-right: 20rpx;"></uni-icons>
-										<text>{{item.remark?item.remark:'单击添加备注'}}</text>
+									<view @click='remarkEdit(item)' class="row2 flex"  style="color: #808080">
+										<u--image :showLoading="true" src="/static/imgs/card/remark1.png" width="10px" height="12px"
+										></u--image>
+										<view class='icon-text'>{{item.remark?item.remark:'单击添加备注'}}</view>
 									</view>
 								</view>
 							</view>
+							<u-checkbox-group v-if='islongPress' placement="column"
+								@change="checkboxChange($event,index)">
+								<u-checkbox iconColor='#4977FC' activeColor="#fff" :name='index+1' :checked='item.checked'
+									:customStyle="{marginBottom: '8px'}">
+								</u-checkbox>
+							</u-checkbox-group>
 						</view>
 						<view class="card-content style2" v-if="item.cuttentTemplate==4">
 							<view class="top">
@@ -154,19 +172,25 @@
 								</view>
 								<view class="right">
 									<view class="row1 flex">
-										<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;"
-											color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
+										<u--image :showLoading="true" src="/static/imgs/card/address2.png" width="13px" height="16px"
+											 ></u--image><view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 									</view>
 									<view class="row2 flex">
-										<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;"
-											color="#5e6d82"></uni-icons>{{ item.phone }}
-									</view>
-									<view @click='remarkEdit(item)' class="row2"  style="color: #808080">
-										<uni-icons type="redo" size="20" style="margin-right: 20rpx;"></uni-icons>
-										<text>{{item.remark?item.remark:'单击添加备注'}}</text>
+										<u--image :showLoading="true" src="/static/imgs/card/phone2.png" width="12px" height="13px"
+											 ></u--image><view  class='icon-text'>{{ item.phone }}</view>
 									</view>
+									<view @click='remarkEdit(item)' class="row2 flex"  style="color: #808080">
+										<u--image :showLoading="true" src="/static/imgs/card/remark2.png" width="10px" height="12px" ></u--image>
+										<view :style='item.remark?"color:#000;":"color:#808080;"' class='icon-text'>{{item.remark?item.remark:'单击添加备注'}}</view>
+									</view>  
 								</view>
 							</view>
+							<u-checkbox-group v-if='islongPress' placement="column"
+								@change="checkboxChange($event,index)">
+								<u-checkbox iconColor='#4977FC' activeColor="#fff" :name='index+1' :checked='item.checked'
+									:customStyle="{marginBottom: '8px'}">
+								</u-checkbox>
+							</u-checkbox-group>
 						</view>
 						<view class="car-bottom flex">
 							<view class="left">
@@ -226,17 +250,23 @@
 		<view class="del-style" v-if="islongPress">
 			<view class="left">
 				<text class="qx" @click="islongPress=false">取消</text>
-				<text class="del" @click="delShow=true">删除</text>
+				<text class="del" @click="del">删除</text>
 			</view>
-			<view class="right">
-				全选
+			<view style='width:128rpx;' class="right flex">
+				<view>全选</view>
+				<u-checkbox-group class='' placement="column"
+					@change="checkboxChange($event,'')">
+					<u-checkbox iconColor='#4977FC' activeColor="#fff" name='全选'  :checked='checked'
+						:customStyle="{marginBottom: '8px',position: 'relative',top: '-19px',right:'-8px'}">
+					</u-checkbox>
+				</u-checkbox-group>
 			</view>
 			
 		</view>
-		<u-picker :show="isShowType" :columns="typeColumns" keyName="circleName" title="选择分类" @close="isShowType=false"
+		<u-picker :show="isShowType" :columns="typeColumns" keyName="circleName" :title="type == 2?'修改分类':'选择分类'" @close="isShowType=false"
 			@cancel="isShowType=false" closeOnClickOverlay @confirm="typeConfirm"></u-picker>
 		<u-toast ref="uToast"></u-toast>
-		<u-modal :show="delShow" title="提示" showCancelButton='true' @cancel="delShow=false" @confirm="delConfirm"
+		<u-modal :show="delShow" title="提示" confirmText='确定' showCancelButton='true' @cancel="delShow=false" @confirm="delConfirm"
 			:content='"已选中"+this.checkedList.length+"张名片,确定删除?"'></u-modal>
 		<u-modal :show="modalShow" @confirm='remarkConfirm' :confirmColor="remark?'#2979ff':'#ccc'"
 			showCancelButton='true' title="备注">
@@ -244,15 +274,9 @@
 				<u--textarea v-model="remark" placeholder="输入备注,不超过150个字"></u--textarea>
 			</view>
 		</u-modal>
-		<view v-if='qrcodeShow' class="shade">
-			<view class='qrCode'>
-				<view style='text-align:right;'>
-					<uni-icons @click='qrcodeShow=false' type="close" size="20"></uni-icons>
-				</view>
-				<image :src="currectData.qrCode" mode=""></image>
-			</view>
-
-		</view>
+		<u-popup :show="qrcodeShow" @close="qrcodeShow=false" mode="center" :round='10'>
+			<image style='margin:10px;' :src="currectData.qrCode" mode="widthFix"></image>
+		</u-popup>
 		<u-popup :show="popupshow" :closeOnClickOverlay='true' :overlayOpacity='0.4' @close='handleHiddenShare' :round="10" mode="bottom">
 			<view>
 				<!-- <view class="share-to">
@@ -682,7 +706,15 @@
 				}
 			},
 			del() {
-				this.delShow = true
+				
+				if(this.checkedList.length>0){
+					this.delShow = true
+				}else{
+					this.$refs.uToast.show({
+						type: 'error',
+						message: '请勾选后再进行删除!',
+					})
+				}
 			},
 
 			longpress() {
@@ -1056,7 +1088,6 @@
 				}
 
 				.row2 {
-					margin-top: 10rpx;
 					font-size: 24rpx;
 					font-weight: bold;
 					color: #323333;
@@ -1069,6 +1100,9 @@
 					color: #323333;
 
 				}
+				.row2,.row4 {
+					margin-top: 10rpx;
+				}
 			}
 		}
 
@@ -1127,6 +1161,7 @@
 						font-weight: bold;
 						color: #323333;
 					}
+					
 				}
 
 				.right {
@@ -1138,7 +1173,7 @@
 						color: #323333;
 					}
 
-					.row2 {
+					.row2,.row4 {
 						margin-top: 10rpx;
 					}
 				}
@@ -1158,7 +1193,11 @@
 				position: absolute;
 				bottom: 63rpx;
 				left: 20rpx;
-
+				bottom:24rpx;
+				width:94.9%;
+				background: url("../../static/imgs/card/bg5.png") no-repeat center;
+				background-size: 100% 100%;
+				height: 80rpx;
 				// width: calc(100% - 40rpx);
 				.left {
 					// top: -40rpx;
@@ -1170,17 +1209,11 @@
 					display: flex;
 					align-items: center;
 					justify-content: space-evenly;
-					background: url("../../static/imgs/card/bgc1.png") no-repeat center;
-					background-size: 100% 100%;
-				}
-
-				.right {
-					position: absolute;
-					left: 65vw;
-					height: 80rpx;
-					width: 30vw;
-					background: url("../../static/imgs/card/right-bgc.png") no-repeat center;
-					background-size: 100% 100%;
+					z-index:100;
+					left: 0px;
+					
+					// background-size: 100% 100%;
+					overflow-y: hidden;
 				}
 			}
 
@@ -1217,23 +1250,6 @@
 		width: 100%;
 	}
 
-	.shade {
-		background: rgba(0, 0, 0, 0.2);
-		width: 100%;
-		height: 100vh;
-		position: fixed;
-		top: 0;
-		left: 0;
-	}
-
-	.qrCode {
-		position: absolute;
-		top: 50%;
-		left: 0;
-		right: 0;
-		transform: translateY(-50%);
-		text-align: center;
-	}
 	/deep/.u-checkbox-group{
 		position: absolute;
 		    right: 20px;
@@ -1246,8 +1262,22 @@
 		width:calc(100vw - 40rpx);
 		position: fixed;
 		display: flex;
+		z-index:100;
 		justify-content: space-between;
-		bottom:0
+		bottom:0;
+		font-size:28rpx;
+		.right{
+			color:#344577;
+		}
+	}
+	.del,.qx{
+		padding:10rpx;
+	}
+	.del{
+		color:#FF4040;
+	}
+	.qx{
+		color:#666;
 	}
 	.share-content{
 		display:flex;
@@ -1262,4 +1292,13 @@
 		}
 		font-size:24rpx;
 	}
+	.icon-text{
+		margin-left: 10px;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #323333;
+	}
+	/deep/.u-checkbox__icon-wrap.u-checkbox__icon-wrap--square{
+		border-color:#D7DEEB !important;
+	}
 </style>

+ 23 - 7
xiaochengxu/pages/cardHolder/notice.vue

@@ -2,12 +2,16 @@
 	<view>
 		<!-- <mescroll-body  :up="upOption" ref="mescrollRef" @init="mescrollInit" @up="upCallback" @down="downCallback"> -->
 			
-			<view v-for='item in noticeList'>
-				<view class="">
-					<view>{{item.newsTitle}}</view>
-					<view>{{parseTime(item.gmtCreate)}}</view>
+			<view class='notice-wrap' v-for='item in noticeList'>
+				<view class="flex justify-space-between">
+					<view style='width:100px;margin:10rpx 0;' class='flex justify-space-between'>
+						<u--image :showLoading="true" src="/static/imgs/card/news.png" width="52rpx" height="52rpx"></u--image>
+						<view>{{item.newsTitle}}</view>
+					</view>
+					
+					<view class='date'>{{parseTime(item.gmtCreate)}}</view>
 				</view>
-				<view>{{item.newsContent}}</view>
+				<view class='content'>{{item.newsContent}}</view>
 			</view>
 		<!-- </mescroll-body> -->
 		<u-toast ref="uToast"></u-toast>
@@ -76,6 +80,18 @@
 	}
 </script>
 
-<style lang="scss">
-
+<style lang="scss" scoped>
+.notice-wrap{
+	background:#fff;
+	padding:20rpx;
+	margin:10rpx;
+	border-radius:20rpx;
+}
+.date{
+	color:#CCCCCC;
+}
+.content{
+	font-size:26rpx;
+	color:#666;
+}
 </style>

+ 444 - 25
xiaochengxu/pages/circle/changeCard.vue

@@ -1,11 +1,184 @@
 <template>
 	<view class="content">
-		<view class="content1">
-			<span>邀请</span>
-			<span>黑名单</span>
+		<view class="content1 flex">
+			<span class='default active'>邀请</span>
+			<span class='default'>黑名单</span>
 		</view>
 		<view class="content2 ">
-			<view class="row" v-for="(item,index) in cardList" :key="index">
+			<view v-for='(item,index) in cardList' class="item">
+				<!-- <view class="card-list-item" style="background:red"> -->
+				
+				<view class="card-list-item"
+					:style="item.cardManagementInfo.currentBackground?'background:url('+item.cardManagementInfo.currentBackground+');background-size:100% 100%':''">
+				<view class="card-content style1" v-if="item.cardManagementInfo.cuttentTemplate==1">
+							<view class="left">
+							<u--image :showLoading="true" :src="item.cardManagementInfo.headSculpture" width="66px" height="66px"
+								shape="circle"></u--image>
+						</view>
+						 <view class="right">
+							<view class="row1">
+								<text class="name">{{item.cardManagementInfo.name}}</text>
+								<text class="post">{{item.cardManagementInfo.post}}</text>
+							</view>
+							<view class="row2">
+								{{item.cardManagementInfo.companyName}}
+							</view>
+							<view class="row3 flex" @click="">
+								<u--image :showLoading="true" src="/static/imgs/card/address1.png"  width="13px" height="16px"
+									 ></u--image>
+									 <view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+							</view>
+							<view class="row4 flex">
+								<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px" height="13px"
+									></u--image><view class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
+							</view>
+						</view>
+					</view> 
+					
+					<view class="card-content style1 flex-between" v-if="item.cardManagementInfo.cuttentTemplate==2">
+						<view class="right">
+							<view class="row1">
+								<text class="name">{{item.cardManagementInfo.name}}</text>
+								<text class="post">{{item.cardManagementInfo.post}}</text>
+							</view>
+							<view class="row2">
+								{{item.cardManagementInfo.companyName}}
+							</view>
+							<view class="row3 flex">
+								<u--image :showLoading="true" src="/static/imgs/card/address3.png"  width="13px" height="16px"
+									></u--image>
+									<view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+							</view>
+							<view class="row4 flex">
+								<u--image :showLoading="true" src="/static/imgs/card/phone3.png" width="12px" height="13px"
+								></u--image><view class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
+							</view>
+						</view>
+						<view class="left">
+							<u--image :showLoading="true" :src="item.cardManagementInfo.headSculpture" width="66px" height="66px"
+								shape="circle" v-if="item.cardManagementInfo.headSculpture"></u--image>
+							<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px"
+								height="66px" shape="circle" v-else></u--image>
+						</view>
+
+					</view>
+					<view class="card-content style2" v-if="item.cardManagementInfo.cuttentTemplate==3">
+						<view class="top">
+							<u--image :showLoading="true" :src="item.cardManagementInfo.headSculpture" width="66px" height="66px"
+								shape="circle" v-if="item.cardManagementInfo.headSculpture"></u--image>
+							<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px"
+								height="66px" shape="circle" v-else></u--image>
+						</view>
+						<view class="bottom flex">
+							<view class="left">
+								<view class="row1">
+									<text class="name">{{item.cardManagementInfo.name}}</text>
+									<text class="post">{{item.cardManagementInfo.post}}</text>
+								</view>
+								<view class="row2">
+									{{item.cardManagementInfo.companyName}}
+								</view>
+							</view>
+							<view class="right">
+								<view class="row1 flex">
+									<u--image :showLoading="true" src="/static/imgs/card/address1.png"  width="13px" height="16px"
+									></u--image><view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+								</view>
+								<view class="row2 flex">
+									<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px" height="13px"
+										></u--image><view class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="card-content style2" v-if="item.cardManagementInfo.cuttentTemplate==4">
+						<view class="top">
+							<view class="row1">
+								<text class="name">{{item.cardManagementInfo.name}}</text>
+								<text class="post">{{item.cardManagementInfo.post}}</text>
+							</view>
+							<view class="row2">
+								{{item.cardManagementInfo.companyName}}
+							</view>
+			
+						</view>
+						<view class="bottom flex">
+							<view class="left">
+								<u--image :showLoading="true" :src="item.cardManagementInfo.headSculpture" width="66px" height="66px"
+									shape="circle" v-if="item.cardManagementInfo.headSculpture"></u--image>
+								<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png"
+									width="66px" height="66px" shape="circle" v-else></u--image>
+							</view>
+							<view class="right">
+								<view class="row1 flex">
+									<u--image :showLoading="true" src="/static/imgs/card/address2.png" width="13px" height="16px"
+										 ></u--image><view class='icon-text'>{{ item.cardManagementInfo.province }}{{ item.cardManagementInfo.city }}{{ item.cardManagementInfo.area }}</view>
+								</view>
+								<view class="row2 flex">
+									<u--image :showLoading="true" src="/static/imgs/card/phone2.png" width="12px" height="13px"
+										 ></u--image><view  class='icon-text'>{{ item.cardManagementInfo.phone }}</view>
+								</view>
+
+							</view>
+						</view>
+					</view>
+					<view class="status-btns" v-if="item.status==0">
+						<span class='status-btn' @click='cardExchangeInfoEdit(1,item)'> 拉黑</span>
+						<span class='status-btn error' @click='cardExchangeInfoEdit(2,item)'>拒绝</span>
+						<span class='status-btn success' @click='cardExchangeInfoEdit(3,item)'>接受</span>
+						<span class='status-btn' @click='cardExchangeInfoEdit(4,item)'>移除</span>
+					</view>
+					<view class="status-btns" v-else>
+						<span class='status' v-if="item.status==1">已接受</span>
+						<span class='status' v-if="item.status==3">已拒绝</span>
+						<span class='status' v-if="item.status==5">已过期</span>
+						<span class='status' v-if="item.status==7">已拉黑</span>
+					</view>
+				</view>
+				<view style='margin:0 20rpx;' class="flex flex-between">
+					<span>来至 {{item.circleName}}</span>
+					<span> {{parseTime(item.gmtCreate)}}</span>
+				</view>
+				<!-- <view class="left">
+					<view class="top flex-row-center">
+						<image :src="item.headSculpture" mode="widthFix" class="img"></image>
+					</view>
+					<view class="bottom flex flex-evenly">
+						<uni-icons @click="toHome(item)" type="home" size="20"></uni-icons>
+						<text @click='switchType(item)'>{{item.classify?item.classifyName:'默'}}</text>
+						<uni-icons @click='share(item)' type="redo" size="20" color=''></uni-icons>
+					</view>
+				</view>
+				<view class="right">
+					<view class="row1 flex">
+						<text>{{item.name}}</text>
+						<text class="line"></text>
+						<text>{{item.post}}</text>
+						<u-checkbox-group v-if='islongPress' placement="column"
+							@change="checkboxChange($event,index)">
+							<u-checkbox :name='index+1' :checked='item.checked'
+								:customStyle="{marginBottom: '8px'}">
+							</u-checkbox>
+						</u-checkbox-group>
+					</view>
+					<view class="row2">
+						{{item.companyName}}
+					</view>
+					<view class="row3" @click="toMap(item)">
+						<uni-icons type="redo" size="20"></uni-icons>
+						<text>{{item.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</text>
+					</view>
+					<view class="row3">
+						<uni-icons type="redo" size="20"></uni-icons>
+						<text>{{item.phone}}</text>
+					</view>
+					<view @click='remarkEdit(item)' class="row3">
+						<uni-icons type="redo" size="20"></uni-icons>
+						<text>{{item.remark?item.remark:'单击添加备注'}}</text>
+					</view>
+				</view> -->
+			</view>
+			<!--< view class="row" v-for="(item,index) in cardList" :key="index">
 				<view class="flex">
 					<view class="left">
 						<view class="top flex-row-center">
@@ -47,7 +220,7 @@
 					<span>来至 {{item.circleName}}</span>
 					<span> {{parseTime(item.gmtCreate)}}</span>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<u-toast ref="uToast"></u-toast>
 	</view>
@@ -59,7 +232,7 @@
 			return {
 				userInfo:{},
 				status:1,
-				cardList:[],
+				cardList:[{cardManagementInfo:{}}],
 			};
 		},
 		onLoad() {
@@ -113,36 +286,282 @@
 </script>
 
 <style lang="scss" scoped>
-	.content2 {
-		border: 1px solid #ccc;
-		border-radius: 30rpx;
-		padding: 40rpx;
+	.content1 {
+		background: #112253;
+		padding: 0rpx 20rpx 160rpx 20rpx;
 		box-sizing: border-box;
+		border-radius: 0px 0px 20rpx 20rpx;
+	}
+	// .content2 {
+	// 	margin-top:-112rpx;
+	// 	border: 1px solid #ccc;
+	// 	border-radius: 30rpx;
+	// 	padding: 40rpx;
+	// 	box-sizing: border-box;
 
-		.left {
-			width: 30%;
+	// 	.left {
+	// 		width: 30%;
 
-			.top {
+	// 		.top {
 				
-				margin-bottom: 20rpx;
+	// 			margin-bottom: 20rpx;
+	// 		}
+	// 		.img {
+	// 			width: 80%;
+	// 		}
+
+	// 		.bottom {
+	// 		}
+	// 	}
+
+	// 	.right {
+	// 		.row1 {
+	// 			.line {
+	// 				width: 1px;
+	// 				height: 20px;
+	// 				margin: 0 20rpx;
+	// 				background: black;
+	// 			}
+	// 		}
+	// 	}
+	// }
+	.default{
+		color:rgba(255, 255, 255, 0.5);
+		font-size:26rpx;
+		padding:20rpx;
+		position:relative;
+	}
+	.active{
+		color:#fff;
+		font-size:32rpx;
+	}
+	.active:after{
+		content:'';
+		display:block;
+		width:10px;
+		height:2px;
+		background:#fff;
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0;
+	}
+	.content2 {
+		// padding:0 20rpx;
+		position: relative;
+		top: -144rpx;
+	
+		.style1 {
+			display: flex;
+			padding: 20rpx 30rpx;
+			width: 85%;
+			margin-bottom: 90rpx;
+	
+			.left {
+				width: 132rpx;
+				height: 132rpx;
+				border-radius: 50%;
 			}
-			.img {
-				width: 80%;
+	
+			.right {
+				margin-left: 40rpx;
+	
+				.row1 {
+					.name {
+						font-size: 38rpx;
+						font-weight: bold;
+						color: #040000;
+						margin-right: 20rpx;
+					}
+	
+					.post {
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #666666;
+					}
+				}
+	
+				.row2 {
+					font-size: 24rpx;
+					font-weight: bold;
+					color: #323333;
+				}
+	
+				.row3 {
+					margin-top: 30rpx;
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #323333;
+	
+				}
+				.row2,.row4 {
+					margin-top: 10rpx;
+				}
 			}
-
+		}
+	
+		.style2 {
+			padding: 30rpx;
+			margin-bottom: 100rpx;
+	
+			.top {
+				.row1 {
+					.name {
+						font-size: 38rpx;
+						font-weight: bold;
+						color: #040000;
+						margin-right: 20rpx;
+					}
+	
+					.post {
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #666666;
+					}
+				}
+	
+				.row2 {
+					margin-top: 10rpx;
+					font-size: 24rpx;
+					font-weight: bold;
+					color: #323333;
+				}
+			}
+	
 			.bottom {
+				margin-top: 48rpx;
+	
+				.left {
+					margin-right: 40rpx;
+	
+					.row1 {
+						.name {
+							font-size: 38rpx;
+							font-weight: bold;
+							color: #040000;
+							margin-right: 20rpx;
+						}
+	
+						.post {
+							font-size: 26rpx;
+							font-weight: 500;
+							color: #666666;
+						}
+					}
+	
+					.row2 {
+						margin-top: 10rpx;
+						font-size: 24rpx;
+						font-weight: bold;
+						color: #323333;
+					}
+					
+				}
+	
+				.right {
+	
+					.row1,
+					.row2 {
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #323333;
+					}
+	
+					.row2,.row4 {
+						margin-top: 10rpx;
+					}
+				}
 			}
+	
 		}
-
-		.right {
-			.row1 {
-				.line {
-					width: 1px;
-					height: 20px;
-					margin: 0 20rpx;
-					background: black;
+	
+		.card-list-item {
+			width: calc(100%);
+			// left:-20rpx;
+			position: relative;
+			border-radius: 30rpx;
+			padding: 40rpx;
+			box-sizing: border-box;
+	
+			.car-bottom {
+				position: absolute;
+				bottom: 63rpx;
+				left: 20rpx;
+				bottom:24rpx;
+				width:94.9%;
+				background: url("../../static/imgs/card/bg5.png") no-repeat center;
+				background-size: 100% 100%;
+				height: 80rpx;
+				// width: calc(100% - 40rpx);
+				.left {
+					// top: -40rpx;
+					position: absolute;
+					padding: 20rpx 0;
+					width: 70vw;
+					height: 80rpx;
+					box-sizing: border-box;
+					display: flex;
+					align-items: center;
+					justify-content: space-evenly;
+					z-index:100;
+					left: 0px;
+					
+					// background-size: 100% 100%;
+					overflow-y: hidden;
+				}
+			}
+	
+			.left {
+				width: 30%;
+	
+				.top {
+	
+					margin-bottom: 20rpx;
+				}
+	
+				.img {
+					width: 80%;
+				}
+	
+				.bottom {}
+			}
+	
+			.right {
+				.row1 {
+					.line {
+						width: 1px;
+						height: 20px;
+						margin: 0 20rpx;
+						background: black;
+					}
 				}
 			}
 		}
+	
+	}
+	.icon-text{
+		margin-left: 10px;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #323333;
+	}
+	.status-btns{
+		margin:10rpx 0 25rpx;
+		text-align:right;
+	}
+	.status-btns span{
+		background:#fff;
+		border:1px solid rgba(0, 0, 0, 0.20);
+		padding:10rpx 30rpx;
+		font-size:26rpx;
+	}
+	.status{
+		color:#666;
+	}
+	.error{
+		color:#FF4E4E;
+	}
+	.success{
+		color:#279D2A;
 	}
 </style>

+ 2 - 2
xiaochengxu/pages/circle/circle.vue

@@ -5,8 +5,7 @@
 				<view class="left flex" @click="search">
 					<image src="../../static/imgs/cirlce/search.png" mode="widthFix" class="search-img"></image>
 					<text class="search-val"> {{searchVal?searchVal:'搜索圈子'}}</text>
-					<uni-icons type="closeempty" size="24" @click.native.stop="delSearchVal"
-						v-if="searchVal"></uni-icons>
+					<image style='width:32rpx;height:32rpx;' v-if="searchVal" @click.native.stop="delSearchVal" src="../../static/imgs/card/searchdel.png" mode="widthFix" ></image>
 				</view>
 			</view>
 			<view class="right relative">
@@ -89,6 +88,7 @@
 		methods: {
 			delSearchVal() {
 				this.searchVal = ""
+				uni.removeStorageSync('cirlce_search_val')
 				this.mescroll.resetUpScroll()
 			},
 			toChangeCard() {

+ 5 - 5
xiaochengxu/pages/mySet/myInfo.vue

@@ -6,7 +6,7 @@
 					{{item.cardBusiness}}
 				</view>
 				<view class="card-list-item" :style="item.currentBackground?'background:url('+item.currentBackground+');background-size:100% 100%':''">
-					<view class="card-content style1" v-if="item.cuttentTemplate==0">
+					<view class="card-content style1" v-if="item.cuttentTemplate==1">
 						<view class="left">
 							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px" shape="circle"></u--image>
 						</view>
@@ -29,7 +29,7 @@
 							</view> -->
 						</view>
 					</view>
-					<view class="card-content style1 flex-between" v-if="item.cuttentTemplate==1">
+					<view class="card-content style1 flex-between" v-if="item.cuttentTemplate==2">
 						<view class="right">
 							<view class="row1">
 								<text class="name">{{item.name}}</text>
@@ -53,7 +53,7 @@
 							<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
 						</view>
 					</view>
-					<view class="card-content style2" v-if="item.cuttentTemplate==2">
+					<view class="card-content style2" v-if="item.cuttentTemplate==3">
 							<view class="top">
 								<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px" shape="circle" v-if="item.headSculpture"></u--image>
 								<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
@@ -78,7 +78,7 @@
 								</view>
 							</view>
 					</view>
-					<view class="card-content style2" v-if="item.cuttentTemplate==3">
+					<view class="card-content style2" v-if="item.cuttentTemplate==4">
 							<view class="top">
 								<view class="row1">
 									<text class="name">{{item.name}}</text>
@@ -151,7 +151,7 @@
 			</view>
 		</u-popup>
 		<u-popup :show="isShowCode" @close="isShowCode=false" mode="center" :round='10'>
-		                <image :src="selectCode" mode="widthFix"></image>
+		                <image style='margin:10px;' :src="selectCode" mode="widthFix"></image>
 				</u-popup>
 	</view>
 </template>

+ 1 - 1
xiaochengxu/pages/mySet/mySet.vue

@@ -30,7 +30,7 @@
 			</view>
 		</view>
 		<u-popup :show="isShowCode" @close="isShowCode=false" mode="center" :round='10'>
-			<image :src="selectCode" mode="widthFix"></image>
+			<image style='margin:10px;' :src="selectCode" mode="widthFix"></image>
 		</u-popup>
 		<u-picker keyName="cardBusiness" :confirmType='"share"' :confirmText='"分享"' title="选择名片" @cancel="show=false"
 			closeOnClickOverlay @change="cardChange" :show="show" :columns="cardList"></u-picker>

BIN
xiaochengxu/static/imgs/card/bg5.png


BIN
xiaochengxu/static/imgs/card/news.png


BIN
xiaochengxu/static/imgs/card/right-bgc.png


BIN
xiaochengxu/static/imgs/card/searchdel.png