前端

xiaochengxu/App.vue

@@ -20,6 +20,7 @@
 	@import "@/uni_modules/uview-ui/index.scss";
 	@import '@/uni_modules/uni-scss/index.scss';
 	@import '@/static/styles/index.scss';
+	@import '@/static/icons/iconfont.css';
 	// 设置整个项目的背景色
 	page {
 		background-color: #f5f5f5;

xiaochengxu/pages.json

@@ -59,7 +59,6 @@
 				"navigationBarTitleText": "名片",
 				"enablePullDownRefresh": false
 			}
-
 		}, {
 			"path": "pages/circle/detail",
 			"style": {
@@ -99,7 +98,7 @@
 		}, {
 			"path": "pages/mySet/myHome",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "主页信息",
 				"enablePullDownRefresh": false
 			}
 

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -202,6 +202,7 @@
 			},
 			delSearchVal() {
 				this.searchVal = ""
+				uni.removeStorageSync("search_val")
 				this.mescroll.resetUpScroll()
 			},
 			toUrl(){

xiaochengxu/pages/cardHolder/search.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<d-search-log :color_border="color_border" :color_text="color_border" :search_list_old_man_num='15' :search_list_hot="search_list_hot"
+		<d-search-log :placeholder="'搜索名片'" :color_border="color_border" :color_text="color_border" :search_list_old_man_num='15' :search_list_hot="search_list_hot"
 			:store_key="store_key" @onClickDelAllApi="onClickDelAll" @onSearchNameApi="onSearchName"></d-search-log>
 
 	</view>

xiaochengxu/pages/circle/search.vue

@@ -26,7 +26,7 @@
 			onSearchName(e) {
 				uni.setStorageSync('cirlce_search_val', e);
 				uni.switchTab({
-					url:`/pages/circle/circle?val=${e}`
+					url:`/pages/circle/circle`
 				})
 				// uni.switchTab({
 				// 	url:"/pages/circle/circle?val="+e

xiaochengxu/pages/mySet/myCard.vue

@@ -1,5 +1,7 @@
 <template>
 	<view>
+		<u-navbar placeholder title="我的证件" @leftClick="leftClick">
+		</u-navbar>
 		<view class="flex content1 flex-between">
 			<view @click='addclick' class="button">
 				<image src="../../static/imgs/mySet/add.png" mode="widthFix" class="btn-img"></image>
@@ -14,14 +16,14 @@
 				识别号码
 			</view>
 		</view>
-		<view v-if='addstatus' class="content2" style="background-color: #fff;">
+		<view v-if='addstatus' class="content2" >
 			<view class="flex flex-between">
-				<u--input v-model="cardData.certificateName" placeholder="输入证件名称"></u--input>
+				<u--input border="bottom" v-model="cardData.certificateName" placeholder="输入证件名称"></u--input>
 				<view @click='add' class="submit">提交</view>
 			</view>
-			<view>
+			<view class='add-image' >
 				<u-upload @afterRead="afterRead" :fileList="fileList1" @delete="deletePic" name="1" multiple
-					:maxCount="1">
+					:maxCount="1" height='190' width='306'>
 					<view class="bgc">
 						<view class="circle">
 							<view class="add">
@@ -48,32 +50,34 @@
 							<u-icon v-if='item.bankNo' @click='clip(1,item)' name="file-text-fill" color="#2979ff"
 								size="28"></u-icon>
 						</view>
-						<u--input v-else v-model="item.certificateName" placeholder="输入证件名称"></u--input>
+						<u--input @input='certificateNameInput($event,item)' border="bottom" v-else v-model="item.certificateName" placeholder="输入证件名称"></u--input>
 						<view class="flex" v-if="item.editstatus">
 							<view @click='qxEdit(item)' :class="!item.editstatus?'edit':'finished'" style="margin:0 20rpx;">取消</view>
-							<view @click='edit(item)' :class="!item.editstatus?'edit':'finished'">完成</view>
+							<view @click="del(item)" :class="!item.editstatus?'edit':'finished'" style="margin:0 20rpx 0 0;">删除</view>
+							<view @click='edit(item)' :class="!item.status?'edit':'finished'">完成</view>
 						</view>
-						<view @click='edit(item)' :class="!item.editstatus?'edit':'finished'" v-else>编辑</view>
+						<view @click='edit(item)' class="finished" v-else>编辑</view>
 					</view>
 					<view class="row2" v-if='!item.editstatus'>
 						<image  :src="item.certificateImage" mode="aspectFill" class="img"></image>
 						<view class="right">
 							<u-checkbox-group v-model="item.checked" placement="column" @change="checkboxChange($event,index,item)">
-								<u-checkbox :name='index+1' :customStyle="{marginBottom: '8px'}">
+								<u-checkbox iconColor='#4977FC' activeColor="#fff" :name='index+1' :customStyle="{marginBottom: '8px'}">
 								</u-checkbox>
 							</u-checkbox-group>
 							<!-- <image src="../../static/imgs/mySet/del1.png" mode="widthFix" @click="del(item)" style="width: 28rpx;"></image> -->
-							<u-icon @click="del(item)" name="trash-fill" color="#fff" size="24"></u-icon>
 						</view>
 					</view>
-					<u-upload v-else @afterRead="afterRead" :fileList="fileList2" @delete="deletePic" name="2" multiple
-						:maxCount="1">
-						<view class="">
-							123
+					<view v-else style='padding-left:20rpx;' >
+						<u-upload  @afterRead="afterRead" :fileList="fileList2" @delete="deletePic" name="2" multiple
+						:maxCount="1" height='190' width='306'>
+							<view class="">
+								123
+							</view>
+							<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png" 
+								mode="widthFix" style="width: 250px;height: 150px;"></image> -->
+							</u-upload>
 						</view>
-						<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png" 
-							mode="widthFix" style="width: 250px;height: 150px;"></image> -->
-						</u-upload>
 				</view>
 			</mescroll-body>
 		</view>
@@ -168,6 +172,15 @@
 			});
 		},
 		methods: {
+			certificateNameInput(e,item){
+				console.log(item)
+				if(item.certificateName1!=item.certificateName){
+					item.status=true
+				}else{
+					item.status=false
+				}
+				
+			},
 			qxEdit(){
 				this.mescroll.resetUpScroll()
 			},
@@ -191,27 +204,30 @@
 			},
 			edit(item) {
 				if (item.editstatus) {
-					this.$request.baseRequest('admin.unimall.certificateManagementInfo', 'update', {
-						certificateManagementInfo: JSON.stringify(item)
-					}, failres => {
-						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
-						})
-						uni.hideLoading()
-					}).then(res => {
-						this.$refs.uToast.show({
-							type: 'success',
-							message: '编辑成功',
-						})
-						this.modalshow = false
-						this.checkedList = []
-						uni.hideLoading()
-						this.mescroll.resetUpScroll()
-					})
+					if(item.status){
+						this.$request.baseRequest('admin.unimall.certificateManagementInfo', 'update', {
+							certificateManagementInfo: JSON.stringify(item)
+						}, failres => {
+							console.log('res+++++', failres.errmsg)
+							this.$refs.uToast.show({
+								type: 'error',
+								message: failres.errmsg,
+							})
+							uni.hideLoading()
+						}).then(res => {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: '编辑成功',
+							})
+							this.modalshow = false
+							this.checkedList = []
+							uni.hideLoading()
+							this.mescroll.resetUpScroll()
+						})	
+					}
 				} else {
 					item.editstatus = true
+					item.certificateName1=item.certificateName
 					this.fileList2 = [{
 						url: item.certificateImage
 					}]
@@ -499,6 +515,7 @@
 					if (res.data.items.length > 0) {
 						for (var i = 0; i < res.data.items.length; i++) {
 							res.data.items[i].editstatus = false
+							res.data.items[i].status = false
 							if (res.data.items[i].personNo) res.data.items[i].personNo1 = '*' + (res.data.items[i]
 								.personNo.substring(res.data.items[i].personNo.length - 4))
 							if (res.data.items[i].bankNo) res.data.items[i].bankNo1 = '*' + (res.data.items[i]
@@ -649,6 +666,7 @@
 			border-radius: 20rpx;
 			padding: 24rpx;
 			width: calc(33% - 60rpx);
+			font-size:32rpx;
 		}
 
 		.btn-img {
@@ -661,13 +679,18 @@
 		.bgc{
 			background: #fff;
 			width: calc(100vw - 40rpx);
-			height: 190rpx;
+			height: 380rpx;
 			.circle{
+				position:absolute;
+				top:50%;
+				left:50%;
+				transform: translateX(-50%) translateY(-100%);			
 				width: 74px;
 				height: 74px;
 				border-radius: 50%;
 				background-color: #F7F7F7;
-				
+				text-align: center;
+				line-height: 74px;
 			}
 		}
 		.submit{
@@ -694,7 +717,7 @@
 		.edit{
 			padding: 10rpx 14rpx;
 			text-align: center;
-			background: #112253;
+			background: rgba(17, 34, 83, 0.1);
 			border-radius: 10rpx;
 			font-size: 28rpx;
 			font-weight: bold;
@@ -722,8 +745,7 @@
 					    right: 0;
 					    height: 100%;
 					    right: 10px;
-					    background: #11225359;
-					    border-radius: 10px;
+
 					    display: flex;
 					    flex-direction: column;
 					    justify-content: space-between;
@@ -736,4 +758,9 @@
 				}
 		}
 	}
+	.add-image{
+		background-color: #fff;
+		margin-top:10rpx;
+		border-radius:20rpx;
+	}
 </style>

xiaochengxu/pages/mySet/myHome.vue

@@ -19,8 +19,13 @@
 		<view class="content1" :class="editstatus?'content1-edit':''">
 			<view class="company-title row flex flex-between line" >
 				<view v-if='editstatus'>公司/机构名称</view>
+				<view class='title' v-else>{{companyData.companyName}}</view>
 			 	<u--input v-if='editstatus' v-model="companyData.companyName"  placeholder="请输入公司名称" border="none" inputAlign='right'></u--input>
-				<view v-else>{{companyData.companyName}}</view>
+				<view v-if='!editstatus' style='width:30px;' class='button flex align-item-center' @click='edit'>
+					<image src="../../static/imgs/mySet/edit.png" style='width:26rpx;height:26rpx;' mode=""></image>
+					<view >编辑</view>
+				</view>
+				<view v-else @click='$u.debounce(buttonsubmit, 500)' class='button'>提交</view>
 			</view>
 			<view class="intro top-m">
 				<view v-if='editstatus'class="row">公司/机构简介</view>
@@ -327,5 +332,7 @@
 		color: #fff;
 		background-color: #112253;
 		border-radius: 20rpx;
+		padding:20rpx;
+		font-size:28rpx;
 	}
 </style>

xiaochengxu/static/icons/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4001868 */
-  src: url('iconfont.woff2?t=1681436897668') format('woff2'),
-       url('iconfont.woff?t=1681436897668') format('woff'),
-       url('iconfont.ttf?t=1681436897668') format('truetype');
+  src: url('@/static/icons/iconfont.woff2?t=1681436897668') format('woff2'),
+       url('@/static/icons/iconfont.woff?t=1681436897668') format('woff'),
+       url('@/static/icons/iconfont.ttf?t=1681436897668') format('truetype');
 }
 
 .iconfont {

xiaochengxu/uni_modules/d-search-log/components/d-search-log/d-search-log.vue

@@ -3,25 +3,25 @@
 		
 		<view class="dSLComVueTop">
 			<view class="dSLComVueTopLeft">
-				<u-icon name="search" size="30"></u-icon>
-				<!-- <image src="/static/icon_img/search.png" class="dSLComVueTopLeftImg" style="width: 30rpx;height: 30rpx;flex: none;"></image> -->
+				<image class="dSLComVueTopLeftImg" style="width: 30rpx;height: 30rpx;flex: none;" src="@/static/imgs/card/search.png"></image>
 				<input  class="dSLComVueTopLeftInput" v-model="search_input" type="text" :placeholder="placeholder" @blur="onClickInput" />
 				<view class="dSLComVueTopLeftDel" v-if="search_input" @click="onClickDel">
-					<u-icon name="close" size="20"></u-icon>
+					<!-- <u-icon name="close" size="20"></u-icon> -->
 					<!-- <image src="/static/icon_img/del.png" class="dSLComVueTopLeftDelImg" style="width: 35rpx;height: 35rpx;flex: none;" ></image> -->
 				</view>
+				<image src="@/static/imgs/card/voice.png" class="dSLComVueTopLeftDelImg" style="width: 30rpx;height: 39rpx;flex: none;" ></image>
 			</view>
 			<view class="dSLComVueTopRight">
-				<view class="dSLComVueTopRightBtn" @click="onClickInput" :style="'border: 1rpx solid '+color_border+';color: '+color_text+';'">{{search_name?search_name:'搜索'}}</view>
+				<view class="dSLComVueTopRightBtn" @click="onClickInput" >{{search_name?search_name:'搜索'}}</view>
 			</view>
 		</view>
 		
 		<view v-if="is_show_more" class="dSLComVue">
 			<view class="dSLComVueTitle" >
-				<text>搜索历史</text>
+				<text>历史搜索</text>
 				<view style="width: 100rpx;height: 60rpx;display: flex;align-items: center;" @click="onClickDelAll">
-					<u-icon name="trash-fill" size="30"></u-icon>
-					<!-- <image src="./static/icon_img/del2.png" style="width: 40rpx;height: 40rpx;margin-right: 35rpx;"></image> -->
+					<!-- <u-icon name="trash-fill" size="30"></u-icon> -->
+					<image src="@/static/imgs/card/del.png" style="width: 27rpx;height: 32rpx;margin-right: 35rpx;"></image>
 				</view>
 			</view>
 			
@@ -75,6 +75,10 @@
 				value: Boolean,
 				default: true
 			},
+			search_icon:{
+				value: String,
+				default: ''
+			},
 			search_list_old_man_num: {
 				value: Number,
 				default: 10
@@ -148,10 +152,7 @@
 					key: store_key,
 					success: (res) => {
 						var old_data = JSON.parse(res.data);
-						
 						that.search_list_old = old_data; //更新历史搜索
-						
-						
 						// console.log('____________________dev')
 						// console.log(that.search_list_old)
 						// console.log('____________________dev')
@@ -263,15 +264,15 @@
 			border-radius: 40rpx;
 			.dSLComVueTopLeft {
 				flex: 1;
-				height: 60rpx;
-				background-color: #e8e8e8;
-				border-radius: 30rpx;
+				height: 80rpx;
+				background-color: #F0F0F0;
+				border-radius: 50rpx;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
 				padding: 0 3%;
 				// background-color: #ccc;
-				border: 1rpx solid #f2f2f2;
+				border: 1rpx solid #F0F0F0;
 				
 				.dSLComVueTopLeftImg {
 					flex: 1;
@@ -279,7 +280,7 @@
 				}
 				.dSLComVueTopLeftInput {
 					flex: 1;
-					height: 60rpx;
+					height: 80rpx;
 					padding: 0 20rpx;
 					
 				}
@@ -294,7 +295,7 @@
 			}
 			.dSLComVueTopRight {
 				width: 100rpx;
-				margin-left: 30rpx;
+				margin-left: 10rpx;
 				height: 60rpx;
 				display: flex;
 				align-items: center;
@@ -326,7 +327,20 @@
 			justify-content: space-between;
 			padding-left: 5%;
 		}
-		
+		.dSLComVueTitle text{
+			position:relative;
+			font-size:32rpx;
+		}
+		.dSLComVueTitle text::before{
+			content:'';
+			display:block;
+			position:absolute;
+			width: 3px;
+			height: 16px;
+			left: -6px;
+			top: 4px;
+			background:#4977FC;
+		}
 		.dSLComVueLog {
 			width: 90%;
 			display: flex;
@@ -336,7 +350,7 @@
 				line-height: 55rpx;
 				background-color: #e8e8e8;
 				padding: 0rpx 30rpx;
-				border-radius: 30rpx;
+				border-radius: 10rpx;
 				flex: none;
 				margin: 10rpx 25rpx 15rpx 0;
 				// border: 1rpx solid #ccc