前端

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -8,12 +8,12 @@
 				</view>
 			</u-navbar>
 			<view class="content1 flex-row-center">
-				<view class="search flex flex-between" @click="search">
-					<view class="left flex">
+				<view class="search flex justify-space-between align-item-center flex-between" @click="search">
+					<view class="left align-item-center flex">
 						<uni-icons type="search" size="24" color="#9199af"></uni-icons>
 						<text class="search-val"> {{searchVal?searchVal:'搜索名片'}}</text>
-						<uni-icons type="closeempty" size="24" @click.native.stop="delSearchVal" v-if="searchVal">
-						</uni-icons>
+						<!-- <uni-icons type="closeempty" size="24" @click.native.stop="delSearchVal" v-if="searchVal">
+						</uni-icons> -->
 					</view>
 
 					<view class="right">
@@ -1307,11 +1307,24 @@
 			color: #9199af;
 			background: #22325f;
 			border-radius: 50rpx;
-			width: 100%;
-			padding: 10rpx 30rpx;
+			width: 93%;
+			padding: 10rpx 0 10rpx 30rpx;
 			box-sizing: border-box;
 			margin-right: 20rpx;
 		}
+		.left{
+			width:82%;
+			text{
+				    height: 46rpx;
+				    white-space: nowrap;
+				    overflow: scroll;
+					position: relative;
+					    top: -3px;
+			}
+		}
+		.right{
+			width:14%;
+		}
 	}
 
 	.content2 {

xiaochengxu/pages/cardHolder/search.vue

@@ -118,7 +118,13 @@
 						}).then(res => {
 							uni.hideLoading()
 							console.log(res)
-							uni.setStorageSync('search_val', res.data);
+							if(res.data.text.length>10){
+								var text = res.data.text.substring(0, 10)
+							}else{
+								var text = res.data.text
+							}
+							
+							uni.setStorageSync('search_val', text);
 							uni.switchTab({
 								url: "/pages/cardHolder/cardHolder"
 
@@ -131,7 +137,13 @@
 			},
 			onClickDelAll() {},
 			onSearchName(e) {
-				uni.setStorageSync('search_val', e);
+				if(e.length>10){
+					var text = e.substring(0, 10)
+				}else{
+					var text = e
+				}
+				
+				uni.setStorageSync('search_val', text);
 				uni.switchTab({
 					url: "/pages/cardHolder/cardHolder"
 

xiaochengxu/pages/circle/changeCard.vue

@@ -136,7 +136,7 @@
 					</view>
 				</view>
 				<view style='margin:0 20rpx;' class="flex flex-between">
-					<span>来至 {{item.circleName}}</span>
+					<span>来自 {{item.circleName}}</span>
 					<span> {{parseTime(item.gmtCreate)}}</span>
 				</view>
 				<!-- <view class="left">

xiaochengxu/pages/circle/search.vue

@@ -114,7 +114,12 @@
 						}).then(res => {
 							uni.hideLoading()
 							console.log(res)
-							uni.setStorageSync('cirlce_search_val', res.data);
+							if(res.data.text.length>10){
+								var text = res.data.text.substring(0, 10)
+							}else{
+								var text = res.data.text
+							}
+							uni.setStorageSync('cirlce_search_val', text);
 							uni.switchTab({
 								url: "/pages/circle/circle"
 			
@@ -126,7 +131,12 @@
 				})
 			},
 			onSearchName(e) {
-				uni.setStorageSync('cirlce_search_val', e);
+				if(e.length>10){
+					var text = e.substring(0, 10)
+				}else{
+					var text = e
+				}
+				uni.setStorageSync('cirlce_search_val', text);
 				uni.switchTab({
 					url:`/pages/circle/circle`
 				})

xiaochengxu/pages/mySet/lookCard.vue

@@ -18,7 +18,7 @@
 				
 			</view>
 			<view style='text-align:center;' class="">
-				<image style='width:96%;height:190px;border-radius:20rpx;'  :src="item.certificateImage" mode="aspectFill"></image>
+				<image @click="click(item)" style='width:96%;height:190px;border-radius:20rpx;'  :src="item.certificateImage" mode="aspectFill"></image>
 			</view>
 			
 		</view>
@@ -48,6 +48,14 @@
 			console.log(this.cardList,11111111)
 		},
 		methods: {
+			click(item){
+				console.log(111111111)
+				uni.previewImage({
+						current: 0,     // 当前显示图片的索引值
+						urls: [item],    // 需要预览的图片列表，photoList要求必须是数组
+						loop:true,          // 是否可循环预览
+					})
+			},
 			clip(status, item) {
 				uni.setClipboardData({
 					data: status == 1 ? item.bankNo : item.personNo, // e是你要保存的内容

xiaochengxu/pages/mySet/myCard.vue

@@ -26,11 +26,12 @@
 				<u-upload @afterRead="afterRead" :fileList="fileList1" @delete="deletePic" name="1" multiple
 					:maxCount="1" height='190' width='360'>
 					<view class="bgc">
-						<view class="circle">
+						<image class='circle' style='width:148rpx;height:148rpx;' src="../../static/imgs/mySet/uploadbg.png" mode=""></image>
+						<!-- <view class="circle">
 							<view class="add">
 								+
 							</view>
-						</view>
+						</view> -->
 					</view>
 					</u-upload>
 			</view>
@@ -766,17 +767,13 @@
 			width: calc(100vw - 40rpx);
 			height: 380rpx;
 			position:relative;
+			
 			.circle{
 				position:absolute;
 				top:50%;
 				left:50%;
 				transform: translateX(-50%) translateY(-50%);			
-				width: 74px;
-				height: 74px;
-				border-radius: 50%;
-				background-color: #F7F7F7;
 				text-align: center;
-				line-height: 74px;
 			}
 		}
 		.submit{

xiaochengxu/pages/mySet/myHome.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<u-navbar placeholder title="我的证件" @leftClick="leftClick">
+		<u-navbar leftIconColor='#fff' bgColor='#112253' titleStyle ='color:#fff'  placeholder title="我的主页" @leftClick="leftClick">
 		</u-navbar>
 		<u-loading-page loading-mode='spinner' image="/static/imgs/logo.png" iconSize='60' :loading='loading'></u-loading-page>
 		<view v-if='!loading'>
@@ -412,7 +412,7 @@
 	}
 	.content1-edit{
 		position: relative;
-		top: -230rpx;
+		top: -172rpx;
 		margin: 20rpx 20rpx 120rpx 20rpx;
 		border-radius: 20rpx;
 		padding:20rpx;