diff --git a/api/apiT.js b/api/apiT.js
index 2245e2a..5f21ec4 100644
--- a/api/apiT.js
+++ b/api/apiT.js
@@ -1,7 +1,8 @@
 
  const baseUrl = "http://219.157.255.213:9007/"; //这里放置url域名32044
  // const baseUrl = "http://api.crm.hnxinyouhe.com/"; //这里放置url域名32044
- // const baseUrl = "http://192.168.50.4:8787/"; //这里放置url域名32044
+ // const baseUrl = "http://192.168.50.9:8787/"; //这里放置url域名32044
+ // const baseUrl = "http://219.157.255.213:25329/"; //这里放置url域名32044
  // const baseUrl = "/api/"; //这里放置url域名32044
 export function request(options){//封装的requset
 	let { url,data,method } = options;
diff --git a/common/locales/en.js b/common/locales/en.js
index 9500db0..28ec83f 100644
--- a/common/locales/en.js
+++ b/common/locales/en.js
@@ -10,6 +10,7 @@ export default {
 		addfollowup:'Add follow-up',
 		userList:'Customer Management',
 		persondata:'Personal Data',
+		businesscard:'Business card'
 		
 	},
 	home: {
@@ -55,6 +56,8 @@ export default {
 		Customerphinput:'Please select customer preferences',
 		Cstomerfjinput:'Please select customer rating',
 		Countryinput:'Please select a country',
+		Cstomertag:'Label',
+		Cstomertaginput:'Please select',
 		Company:'Company',
 		Companyinput:'Go locate it',
 		CustomerScreening:'Customer Screening',
@@ -66,7 +69,7 @@ export default {
 		msg:'Message Notification',
 		cpassword:'Change Password',
 		contact:'Contact Service',
-		feedback:'Feedback',
+		feedback:'Work order',
 		about:'About Us',
 		logoff:'Log Off',
 		logout:'Log Out',
@@ -156,4 +159,30 @@ export default {
 	details:'Details',
 	auth:'Lark Authorize',
 	inputnl:'Please select',
+	noresults:'No matching results',
+	keyword:"Please enter search keywords",
+	prompt:'Prompt',
+	restoremsg:'Confirm to restore the current customer data?',
+	onedayn:'Within 1 day',
+	threedayn:'Within 3 day',
+	sevendayn:'Within 7 day',
+	follow:'follow up',
+	timeout:'Timeout',
+	day:'day',
+	hour:'hour',
+	minute:'minute',
+	second:'second',
+	nextgjtime:'Next follow up time',
+	Remindergj:'Follow up reminder',
+	callPhonemsg:'Dial the wrong number！',
+	download:'Download',
+	addtag:'Add labels',
+	CustomerProfile:'Customer Profile',
+	CustomerProfilemag:'No portrait label！',
+	retract:'Retract',
+	expand:'Expand to view more',
+	remarks:'Remarks',
+	channel:'Channel',
+	Nodata:'No data available at the moment!',
+	versionmsg:'It is already the latest version！'
 }
\ No newline at end of file
diff --git a/common/locales/zh.js b/common/locales/zh.js
index d4f7985..a9d1444 100644
--- a/common/locales/zh.js
+++ b/common/locales/zh.js
@@ -10,6 +10,7 @@ export default {
 		addfollowup:'添加跟进',
 		userList:'客户管理',
 		persondata:'个人资料',
+		businesscard:'我的名片'
 	},
 	home: {
 		desc: '首页',
@@ -52,6 +53,8 @@ export default {
 		Customerphinput:'请选择客户偏好',
 		Cstomerfj:'客户分级',
 		Cstomerfjinput:'请选择客户分级',
+		Cstomertag:'客户标签',
+		Cstomertaginput:'请选择',
 		Country:'国家',
 		Countryinput:'请选择国家',
 		Company:'公司',
@@ -65,7 +68,7 @@ export default {
 		msg:'消息通知',
 		cpassword:'修改密码',
 		contact:'联系客服',
-		feedback:'意见反馈',
+		feedback:'提交工单',
 		about:'关于我们',
 		logoff:'注销账户',
 		logout:'退出登录',
@@ -90,7 +93,7 @@ export default {
 		recyclebin:'回收站',
 		restore:'恢复客户',
 		position:'职位',
-		positioninput:'请填写职位'
+		positioninput:'请填写职位',
 	},
 	call:'呼叫',
 	delete:'删除',
@@ -155,4 +158,31 @@ export default {
 	details:'详情',
 	auth:'飞书授权',
 	inputnl:'请选择',
+	noresults:'无匹配结果',
+	keyword:"请输入搜索关键词",
+	prompt:'提示',
+	restoremsg:'确认要恢复当前客户数据?',
+	onedayn:'1天内',
+	threedayn:'3天内',
+	sevendayn:'7天内',
+	follow:'跟进',
+	timeout:'已超时',
+	day:'天',
+	hour:'时',
+	minute:'分',
+	second:'秒',
+	nextgjtime:'下次跟进时间',
+	Remindergj:'跟进提醒',
+	callPhonemsg:'拨打号码错误！',
+	download:'下载',
+	addtag:'添加标签',
+	CustomerProfile:'客户画像',
+	CustomerProfilemag:'暂无画像标签！',
+	retract:'收起',
+	expand:'展开查看更多',
+	remarks:'备注',
+	channel:'渠道',
+	Nodata:'暂无数据!',
+	versionmsg:'已是最新版本！'
+	
 }
\ No newline at end of file
diff --git a/components/Countdown/Countdown.vue b/components/Countdown/Countdown.vue
new file mode 100644
index 0000000..725ea0d
--- /dev/null
+++ b/components/Countdown/Countdown.vue
@@ -0,0 +1,104 @@
+<template>
+  <view class="countdown">
+	  <view class="time green" v-if="!isend">
+		  <image src="/static/image/gtime.png" mode=""></image>
+			<text v-if="showDays && timeObj.days > 0" >{{ timeObj.days }}{{$t('day')}} </text>
+			<text> {{ timeObj.hours | padZero }} : </text>
+			<text> {{ timeObj.minutes | padZero }} : </text>
+			<text> {{ timeObj.seconds | padZero }}</text>
+	  </view>
+	  <view class="time timered" v-else>
+		 <image src="/static/image/redtime.png" mode=""></image>
+	  	 <text>{{$t('timeout')}}</text>
+	  </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    // 倒计时总秒数
+    totalSeconds: {
+      type: Number,
+      required: true
+    },
+    // 是否显示天数
+    showDays: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      timeObj: {
+        days: 0,
+        hours: 0,
+        minutes: 0,
+        seconds: 0
+      },
+	  isend:false,
+      timer: null,
+	  totalSeconds1:this.totalSeconds
+    }
+  },
+  filters: {
+    padZero(value) {
+      return value.toString().padStart(2, '0');
+    }
+  },
+  mounted() {
+	  if(this.totalSeconds>0){
+		  this.runCountdown();
+	  }else{
+		  this.isend=true
+	  }
+  },
+  methods: {
+    runCountdown() {
+      this.updateTime(this.totalSeconds1);
+      this.timer = setInterval(() => {
+        if (this.totalSeconds1 <= 0) {
+          clearInterval(this.timer);
+		  this.isend=true
+          this.$emit('end');
+          return;
+        }
+        this.totalSeconds1--;
+        this.updateTime(this.totalSeconds1);
+      }, 1000);
+    },
+    updateTime(seconds) {
+      this.timeObj.days = Math.floor(seconds / (24 * 3600));
+      const remaining = seconds % (24 * 3600);
+      this.timeObj.hours = Math.floor(remaining / 3600);
+      this.timeObj.minutes = Math.floor((remaining % 3600) / 60);
+      this.timeObj.seconds = remaining % 60;
+    }
+  },
+  beforeDestroy() {
+    clearInterval(this.timer);
+  }
+}
+</script>
+<style lang="scss">
+	.countdown{
+		.time{
+			display: flex;
+			align-items: center;
+			text{
+				margin: 0px 2px;
+			}
+		}
+		image{
+			width: 18px;
+			height: 18px;
+			margin-right: 5px;
+		}
+	}
+	.green{
+		color: #27C89C;
+	}
+	.timered{
+		color: #FF4040;
+	}
+</style>
\ No newline at end of file
diff --git a/components/select/select.vue b/components/select/select.vue
new file mode 100644
index 0000000..78e5bc5
--- /dev/null
+++ b/components/select/select.vue
@@ -0,0 +1,125 @@
+<template>
+	<view>
+		<view class="text">
+			<view class="qx" @click="close('showarea') ">{{$t('cancel')}}</view>
+			<view class="qd" @click="arerfn">{{$t('confirm')}}</view>
+		</view>
+		  <view class="popup-content">
+			<!-- 搜索框 -->
+			<u-input
+			  v-model="searchKeyword"
+			  :placeholder="$t('keyword')"
+			  @input="handleSearch"
+			></u-input>
+	
+			<!-- 选项列表 -->
+			<scroll-view scroll-y class="option-list">
+			  <view
+				v-for="(item, index) in areaList"
+				:key="index"
+				class="option-item"
+				@click="handleSelect(item)"
+				:class="actives==item.id?'actives':''"
+			  >
+				{{ item.name }}
+			  </view>
+			  <view v-if="filteredOptions.length === 0" class="no-data">
+				{{$t('noresults')}}
+			  </view>
+			</scroll-view>
+		  </view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"select",
+		props: {
+			showarea: {
+				type: Boolean,
+				default: true
+			},
+			areaList:[],
+		},
+		data() {
+			return {
+				searchKeyword:'',
+				filteredOptions:'',
+				
+			};
+		},
+		methods:{
+			// 搜索处理函数
+			handleSearch(){
+			  if (this.searchKeyword) {
+				console.log(this.searchKeyword)
+				this.filteredOptions = this.areaList.filter((item) =>
+				  item.name.includes(this.searchKeyword)
+				);
+				console.log(this.filteredOptions)
+			  } else {
+				// 如果搜索框为空，显示全部数据
+				this.filteredOptions = this.areaList;
+			  }
+			},
+			// 选择选项
+			handleSelect(item) {
+			  this.selectedLabel = item.name; // 回显选中的值
+			  // this.searchKeyword = item.name
+			  this.actives = item.id
+			  // this.showPicker = false; // 关闭弹窗
+			  console.log("选中的值:", item.id);
+			  console.log("选中的值:", item.name);
+			},
+			arerfn(){
+				 this.showPicker = false; // 关闭弹窗
+				 this.country_name = this.selectedLabel
+				 this.userinfo.country_id = this.actives
+				 
+			},
+			close(val){
+				this[val] = false
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+.actives{
+		background-color: #dfdfdf;
+	}
+	.text{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		line-height: 30px;
+		padding: 10px 15px 0px;
+		.qd{
+			color: #3471FF;
+		}
+	}
+	.popup-content {
+	  padding: 20px;
+	  background-color: #fff;
+	}
+	
+	.option-list {
+	  max-height: 400rpx;
+	  margin-top: 20rpx;
+	}
+	
+	.option-item {
+	  padding: 20rpx;
+	  border-bottom: 1rpx solid #eee;
+	}
+	
+	.option-item:last-child {
+	  border-bottom: none;
+	}
+	
+	.no-data {
+	  text-align: center;
+	  padding: 20rpx;
+	  color: #999;
+	}
+</style>
\ No newline at end of file
diff --git a/index.html b/index.html
index c1ee912..d2c9bfc 100644
--- a/index.html
+++ b/index.html
@@ -12,6 +12,7 @@
     <title></title>
 	<script src="/static/image-resize-3.0.1.min.js"></script>
 	<script src="/static/quill-1.3.7.min.js"></script>
+	<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBGvV-vX7C72PEbcYrTdmUj3qrubejWzNw&callback=initMap"></script>
     <!--preload-links-->
     <!--app-context-->
   </head>
diff --git a/manifest.json b/manifest.json
index ecf2519..9c3ac43 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
-    "locale" : "zh-Hans", // 设置默认语言，
+    "locale" : "en", // 设置默认语言，
     "app-plus" : {
         "usingComponents" : true,
         "nvueCompiler" : "uni-app",
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index c0dd899..d61baa0 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -266,6 +266,14 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -379,6 +387,14 @@
         "node": ">=4.8"
       }
     },
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -477,6 +493,18 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -691,6 +719,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/underscore": {
       "version": "1.13.7",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
@@ -704,6 +740,14 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "dependencies": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
     "node_modules/vue": {
       "version": "3.5.13",
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
diff --git a/package-lock.json b/package-lock.json
index 713ef37..1035530 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "@googlemaps/js-api-loader": "^1.16.8",
         "cordova-plugin-googlemaps": "^2.7.1",
+        "html2canvas": "^1.4.1",
         "vue-i18n": "^9.1.9"
       }
     },
@@ -276,6 +277,14 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -389,6 +398,14 @@
         "node": ">=4.8"
       }
     },
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -487,6 +504,18 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -701,6 +730,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/underscore": {
       "version": "1.13.7",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
@@ -714,6 +751,14 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "dependencies": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
     "node_modules/vue": {
       "version": "3.5.13",
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
diff --git a/package.json b/package.json
index 76c2e0d..d9fbb2e 100644
--- a/package.json
+++ b/package.json
@@ -120,6 +120,7 @@
   "dependencies": {
     "@googlemaps/js-api-loader": "^1.16.8",
     "cordova-plugin-googlemaps": "^2.7.1",
+    "html2canvas": "^1.4.1",
     "vue-i18n": "^9.1.9"
   }
 }
diff --git a/pages.json b/pages.json
index e4ada26..6c91f48 100644
--- a/pages.json
+++ b/pages.json
@@ -61,7 +61,7 @@
 			}
 		},
 		{
-			"path" : "pages/index/mine",
+			"path" : "pages/index/mine",//我的
 			"style" : 
 			{
 				"navigationBarTitleText" : "",
@@ -70,7 +70,7 @@
 			}
 		},
 		{
-			"path" : "pages/index/customer",
+			"path" : "pages/index/customer",//客户管理
 			"style" : 
 			{
 				"navigationBarTitleText" : "",
@@ -93,7 +93,7 @@
 			"root": "pages/customer",
 			"pages": [
 				{
-					"path": "add",
+					"path": "add",//添加客户
 					"style" :
 					{
 						"navigationBarTitleText" : "",
@@ -102,7 +102,7 @@
 					}
 				},
 				{
-					"path" : "detile",
+					"path" : "detile",//客户详情
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -111,7 +111,7 @@
 					}
 				},
 				{
-					"path" : "editdetile",
+					"path" : "editdetile", //编辑客户
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -120,7 +120,7 @@
 					}
 				},
 				{
-					"path" : "followup",
+					"path" : "followup",//添加跟进
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -147,7 +147,7 @@
 					}
 				},
 				{
-					"path" : "followsuccess",
+					"path" : "followsuccess",//设置下次提醒
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -160,7 +160,7 @@
 			"root": "pages/mine",
 			"pages": [
 				{
-					"path": "changinfo",
+					"path": "changinfo",//修改信息
 					"style" :
 					{
 						"navigationBarTitleText" : "",
@@ -169,7 +169,7 @@
 					}
 				},
 				{
-					"path" : "massege",
+					"path" : "massege",//消息通知
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -178,7 +178,7 @@
 					}
 				},
 				{
-					"path" : "feedback",
+					"path" : "feedback",//意见反馈
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -187,7 +187,7 @@
 					}
 				},
 				{
-					"path" : "about",
+					"path" : "about",//关于我们
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -196,7 +196,7 @@
 					}
 				},
 				{
-					"path" : "logoff",
+					"path" : "logoff",//注销账号
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -205,7 +205,7 @@
 					}
 				},
 				{
-					"path" : "resetPwd",
+					"path" : "resetPwd",//修改密码
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -214,7 +214,7 @@
 					}
 				},
 				{
-					"path" : "recyclebin",
+					"path" : "recyclebin",//回收站
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -223,7 +223,7 @@
 					}
 				},
 				{
-					"path" : "recyclebindetil",
+					"path" : "businesscard",//我的名片
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
diff --git a/pages/customer/add.vue b/pages/customer/add.vue
index 92a2da7..9c45401 100644
--- a/pages/customer/add.vue
+++ b/pages/customer/add.vue
@@ -117,21 +117,38 @@
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="showmagnitude" @cancel="cancel('showmagnitude')"  @close="close('showmagnitude')"  :columns="magnitudeList" keyName="name" @confirm="magnitudeChange"></u-picker>
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="showcartype" @cancel="cancel('showcartype')"  @close="close('showcartype')"   :columns="carTypeList" keyName="name" @confirm="cartypesChange"></u-picker>
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="showgrade" @cancel="cancel('showgrade')" @close="close('showgrade')"  :columns="getGradeList" keyName="name" @confirm="gradeHandler"></u-picker>
-		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="showarea" @cancel="cancel('showarea')"  @close="close('showarea')"   :columns="areaList" keyName="name" @confirm="areaChange"></u-picker>
-		
-		<!-- <u-popup :show="showmap" :round="10" mode="bottom" @close="mapclose" width="90%" height="70%">
-			<view class="mapcont">
-				<view class="header">
-					<view class="cancel" @click="mapclose">取消</view>
-					<view class="title">地图位置</view>
-					<view class="confirm"  @click="mapconfirm">确定</view>
-				</view>
-				<view class="map" id="map">
-				</view>
+		<!-- <u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="showarea" @cancel="cancel('showarea')"  @close="close('showarea')"   :columns="areaList" keyName="name" @confirm="areaChange"></u-picker> -->
+		<!-- 国家选择 -->
+		<u-popup closeOnClickOverlay :show="showarea" mode="bottom"   :round="10"  @close="close('showarea')">
+			<view class="text">
+				<view class="qx" @click="close('showarea') ">{{$t('cancel')}}</view>
+				<view class="qd" @click="arerfn">{{$t('confirm')}}</view>
 			</view>
-		</u-popup> -->
-		
+			  <view class="popup-content">
+				<!-- 搜索框 -->
+				<u-input
+				  v-model="searchKeyword"
+				  :placeholder="$t('keyword')"
+				  @input="handleSearch"
+				></u-input>
 		
+				<!-- 选项列表 -->
+				<scroll-view scroll-y class="option-list">
+				  <view
+					v-for="(item, index) in filteredOptions"
+					:key="index"
+					class="option-item"
+					@click="handleSelect(item)"
+					:class="actives==item.id?'actives':''"
+				  >
+					{{ item.name }}
+				  </view>
+				  <view v-if="filteredOptions.length === 0" class="no-data">
+					{{$t('noresults')}}
+				  </view>
+				</scroll-view>
+			  </view>
+		</u-popup>
 		
 	</view>
 </template>
@@ -140,7 +157,13 @@
 	export default {
 		data() {
 			return {
-				 mapUrl: '',
+				actives:'',
+				activetags:'',
+				searchKeyword: "", // 搜索关键词
+				selectedLabel: "", // 选中的值（显示在输入框中）
+				filteredOptions: [], // 过滤后的数据
+				mapUrl: '',
+				showtag: false,
 				showmap: false,
 				showmagnitude: false,
 				showgrade: false,
@@ -172,7 +195,9 @@
 				  lat:'',
 				  lng:'',
 				},
-				location:{}
+				location:{},
+				activeMap: {}, // 存储每个父级下选中的子项 { 父ID: 子ID }
+				taglist:[]
 			}
 		},
 		onLoad() {
@@ -259,7 +284,8 @@
 					method:'get',
 				}).then(res => {
 					var list = res.data.data
-					this.areaList = [list]
+					this.areaList = list
+					this.filteredOptions = list;
 				})
 			},
 			//商机
@@ -302,6 +328,31 @@
 				this.car_type_name = val.value[0].name
 				this.showcartype = false
 			},
+			// 国家搜索处理函数
+			handleSearch() {
+			  if (this.searchKeyword) {
+				console.log(this.searchKeyword)
+				this.filteredOptions = this.areaList.filter((item) =>
+				  item.name.includes(this.searchKeyword)
+				);
+				console.log(this.filteredOptions)
+			  } else {
+				// 如果搜索框为空，显示全部数据
+				this.filteredOptions = this.areaList;
+			  }
+			},
+			// 选择选项
+			handleSelect(item) {
+			  this.selectedLabel = item.name; // 回显选中的值
+			  this.actives = item.id
+			  console.log("选中的值:", item.id);
+			  console.log("选中的值:", item.name);
+			},
+			arerfn(){
+				this.showarea = false; // 关闭弹窗
+				this.country_name = this.selectedLabel
+				this.form.country_id  = this.actives
+			},
 			cancel(val){
 				this[val] = false
 			},
@@ -436,4 +487,47 @@
 			height: 350px;
 		}
 	}
+	
+	
+	
+	
+	//
+	.actives{
+		background-color: #dfdfdf;
+	}
+	.text{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		line-height: 30px;
+		padding: 10px 15px 0px;
+		.qd{
+			color: #3471FF;
+		}
+	}
+	.popup-content {
+	  padding: 20px;
+	  background-color: #fff;
+	}
+	
+	.option-list {
+	  max-height: 400rpx;
+	  margin-top: 20rpx;
+	}
+	
+	.option-item {
+	  padding: 20rpx;
+	  border-bottom: 1rpx solid #eee;
+	}
+	
+	.option-item:last-child {
+	  border-bottom: none;
+	}
+	
+	.no-data {
+	  text-align: center;
+	  padding: 20rpx;
+	  color: #999;
+	}
+	
 </style>
diff --git a/pages/customer/detile.vue b/pages/customer/detile.vue
index d11601a..ce0568a 100644
--- a/pages/customer/detile.vue
+++ b/pages/customer/detile.vue
@@ -14,19 +14,43 @@
 				<view class="cont">
 					<view class="title">
 						<view class=""><text class="name">{{datas.phone}}</text></view>
-						<view class="ststus">渠道：{{datas.channel_name}}</view>
+						<view class="ststus" v-if="datas.channel_name!=''">{{$t('channel')}}：{{datas.channel_name}}</view>
 					</view>
 					<view class="info"><text class="sex">{{datas.sex_txt}}</text> | <text class="addr">{{datas.country_name}}</text><text class="type">{{datas.car_type_name}}</text>
 					</view>
 					<view v-if="datas.email!=''">Email: {{datas.email}}</view>
 					<view v-if="datas.WhatsApp!=''">WhatsAPP: {{datas.WhatsApp}}</view>
-					<view v-if="datas.address!=''">公司: {{datas.address}}</view>
-					<view v-if="datas.describe!=''">备注: {{datas.describe}}</view>
+					<view v-if="datas.address!=''">{{$t('customer.Company')}}: {{datas.address}}</view>
+					<view v-if="datas.describe!=''">{{$t('remarks')}}: {{datas.describe}}</view>
 				</view>
 				<view class="edt">
+					<!-- <view class="btn"  @click="showtag = true"><image src="/static/image/customer/tagadd.png" mode=""></image><text> {{$t('addtag')}}</text></view> -->
 					<view class="btn"  @click="editFn"><image src="/static/image/customer/edit.png" mode=""></image><text> {{$t('edtbtn')}}</text></view>
 				</view>
 			</view>
+			<view class="cells">
+				<view class="top">
+					<view class="item">{{$t('CustomerProfile')}}</view>
+					<view class="right">
+						<view class="btn"@click="showtag = true"><image src="/static/image/customer/tagadd.png" mode=""></image><text> {{$t('addtag')}}</text></view>
+					</view>
+				</view>
+				<view v-if="datas.tags.length>0">
+					<view class="conts" :class="{'expandeds':!expanded}">
+						<view class="tags"  v-for="(item, index) in datas.tags" :key="index">{{item.name}}</view>
+					</view>
+					<view class="toggle"  @click="expanded = !expanded">
+						<text >
+						    {{ expanded ?  $t('retract') : $t('expand') }}
+						</text>
+						 <u-icon v-if="expanded" class="arrowright" name="arrow-up" size="16" color="#999999"></u-icon>
+						 <u-icon v-else class="arrowright" name="arrow-down" size="16" color="#999999"></u-icon>
+					</view>
+				</view>
+				<view v-else class="nones">
+					{{$t('CustomerProfilemag')}}
+				</view>
+			</view>
 			<view class="cell">
 				<view class="item">{{$t('customer.Cstomerfj')}}</view>
 				<view class="right select" @click="showgrade = true">
@@ -47,26 +71,36 @@
 				</view>
 			</view>
 			<u-steps v-if="followList.length>0" :current="followList.length" direction="column" dot>
-				<u-steps-item :title="item.type_txt"  v-for="(item, index) in followList" :key="index">
+				<u-steps-item :title="item.type==1? $t('customer.Online') : $t('customer.Visit') "  v-for="(item, index) in followList" :key="index">
 					<view slot="desc" class="desc">
-						<view class=""  v-if="item.type==0">
+						<view class="flex"  v-if="item.type==0">
 							<view class="">
-								<view class="">
+								<view class="lingh">
 									{{$t('times')}} ：{{item.created_at}}
 								</view>
 								<view class="">{{$t('address')}}：{{item.address}}</view>
-								<view class="">{{$t('customer.Visitcontent')}}：{{item.audio_text}}</view>
+								<view class="lingh">{{$t('customer.Visitcontent')}}：{{item.audio_text}}</view>
 							</view>
 							<view class="">
-								<image :src="item.oss_picture" mode=""></image>
+								<!-- <image :src="item.oss_picture" mode=""></image> -->
+								<u-album
+								    :urls="isurls(item.oss_picture)"
+									:singleSize="80"
+								    keyName="src"
+								></u-album>
 							</view>
 						</view>
 						<view class="" v-else>
-							<view class="">
+							<view class="lingh">
 								{{$t('times')}}：{{item.created_at}}
 							</view>
 							<view class="">
-								<image :src="item.oss_picture" mode=""></image>
+								<u-album
+								    :urls="isurls(item.oss_picture)"
+								    keyName="src"
+									:singleSize="80"
+								></u-album>
+								<!-- <image :src="item.oss_picture" mode=""></image> -->
 							</view>
 						</view>
 					</view>
@@ -75,23 +109,27 @@
 			<empty :list="followList"></empty>
 		</view>
 		<view class="zw"></view>
-		<!-- <view class="foot">
-			<button class="btn"  @click="nextFn">{{$t('submit')}}</button>
-		</view>	 -->
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :defaultIndex="defaultIndexfj" :show="showgrade" @cancel="cancel('showgrade')" @close="close('showgrade')"  :columns="getGradeList" keyName="name" @confirm="gradeHandler"></u-picker>
-		
-		<!-- <u-popup :show="showmap" :round="10" mode="bottom" @close="mapclose">
-			<view class="mapcont">
-				<view class="header">
-					<view class="cancel" @click="mapclose">取消</view>
-					<view class="title">地图位置</view>
-					<view class="confirm"  @click="mapconfirm">确定</view>
-				</view>
-				<view class="map">
+		<!-- 客户标签 -->
+		<u-popup closeOnClickOverlay :show="showtag" mode="bottom"  :round="10"   @close="closetag('showtag')" :closeable="true" >
+			<view class="popup-content">
+				<scroll-view scroll-y class="tag-list">
+				  <view
+					v-for="(item, index) in taglist"
+					:key="index"
+					class="tags"
+				  >
+					<view class="name">{{ item.name }}</view>
+					<view class="row">
+					    <view class="col4 tagitem"  v-for="(item1, index1) in item.tags"  :class="{ 'tagactive': isActive(item1.group_id, item1.id) }"    @click="tagSelect(item1)" :key="index1">
+					       {{ item1.name }}
+					    </view>
+					</view>
 					
-				</view>
+				  </view>
+				</scroll-view>
 			</view>
-		</u-popup> -->
+		</u-popup>
 	</view>
 </template>
 
@@ -101,7 +139,9 @@
 		data() {
 			return {
 				id:'',
+				expanded:false,
 				followList:[],
+				showtag: false,
 				showmap: false,
 				showmagnitude: false,
 				showgrade: false,
@@ -115,7 +155,9 @@
 				form: {
 				  grade:'',
 				},
-				datas:''
+				datas:'',
+				activeMap: {}, // 存储每个父级下选中的子项 { 父ID: 子ID }
+				taglist:[]
 				
 			}
 		},
@@ -125,6 +167,7 @@
 			var that = this
 			this.getGrade()
 			this.customerdetailfn()
+			this.tagGroup()
 			
 		},
 		onShow() {
@@ -141,6 +184,13 @@
 			leftClick(){
 				uni.navigateBack({})
 			},
+			isurls(url){
+				var urls=[]
+				var obj={}
+				obj.src = url
+				urls.push(obj)
+				return urls
+			},
 			gomap(){
 				uni.navigateTo({
 					url: '/pages/customer/map'
@@ -166,6 +216,10 @@
 					}
 				}).then(res => {
 					that.datas = res.data.data
+					
+					that.datas.tags.forEach((item,index) => {
+						that.$set(that.activeMap, item.group_id,item.id);
+					})
 					that.form = res.data.data
 					that.select()
 				})
@@ -238,11 +292,49 @@
 			close(val){
 				this[val] = false
 			},
+			closetag(val){
+				this[val] = false
+				this.customerdetailfn()
+			},
 			editFn(){
 				uni.navigateTo({
 					url: '/pages/customer/editdetile?id='+this.id
 				});
 			},
+			//标签
+			tagGroup(){
+				request({
+					url:'tagGroup/list',
+					method:'get',
+				}).then(res => {
+					this.taglist = res.data.data
+				})
+			},
+			//标签点击
+			tagSelect(item) {
+				 // 如果已选中则取消，否则设置选中
+				this.$set(this.activeMap, item.group_id, this.activeMap[item.group_id] === item.id ? '' : item.id);
+				console.log(this.activeMap)
+				request({
+					url:'tagGroup/updatePivot',
+					method:'post',
+					data:{
+						customer_id: this.id,
+						group_id:item.group_id,
+						tag_id:this.activeMap[item.group_id]
+					}
+				}).then(res => {
+					if(res.data.code!=0){
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none'
+						});
+					}
+				})
+			},
+			isActive(parentId, childId) {
+			  return this.activeMap[parentId] === childId;
+			},
 			nextFn(){
 				request({
 					url:'customer/save',
@@ -267,6 +359,16 @@
 </script>
 
 <style lang="scss">
+	::v-deep  .u-cell__body{
+		padding: 0px !important;
+		
+	}
+	::v-deep .u-collapse-item__content__text{
+		padding: 10px 0px!important;
+	}
+	::v-deep .u-cell__title-text{
+		font-size: 14px;
+	}
 	.u-m-lr-10{
 		margin: 0px 10px;
 	}
@@ -290,11 +392,68 @@
 		position: absolute;
 		top: 2px;
 	}
+	.expandeds{
+		height: 33px;
+		overflow: hidden;
+	}
+	.cells{
+		margin-bottom: 10px;
+		background: #f6f6f6;
+		padding:13px 15px;
+		border-radius: 10px;
+		.top{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			color: #666666;
+		}
+		.btn{
+			color: #3471FF;
+			text-align: right;
+			display: flex;
+			align-items: center;
+		}
+		image{
+			width: 14px;
+			height: 14px;
+			margin-right: 5px;
+		}
+		.conts{
+			padding: 10px 0px;
+		}
+		.tags{
+			display: inline-block;
+			margin: 4px 3px;
+			// width: 31%;
+			background: #ECF2FF;
+			border-radius: 15px;
+			color: #3471FF;
+			text-align: center;
+			padding: 5px 15px;
+		}
+		.toggle{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #999999;
+			font-size: 12px;
+			margin-top: 5px;
+			text{
+				margin-right: 5px;
+			}
+		}
+		.nones{
+			text-align: center;
+			color: #999999;
+			line-height: 30px;
+			font-size: 12px;
+		}
+	}
 	.cell{
 		position: relative;
 		display: flex;
 		justify-content:space-between;
-		padding: 18px 20px;
+		padding: 13px 20px;
 		align-items: center;
 		font-weight: 500;
 		.item{
@@ -315,6 +474,10 @@
 		position: relative;
 		margin-right: 10px;
 	}
+	.tagname{
+		color: #726CFF;
+		font-size: 12px;
+	}
 	.content{
 		padding: 10px 15px;
 		background: #FFFFFF;
@@ -324,8 +487,9 @@
 			margin-bottom: 10px;
 			.edt{
 				display: flex;
-				justify-content: right;
+				justify-content: flex-end;
 				padding-bottom: 10px;
+				text-align: center;
 				image{
 					width: 14px;
 					height: 14px;
@@ -402,10 +566,17 @@
 			height:44px;
 		}
 		.desc{
-			display: flex;
-			justify-content: space-between;
+			
 			align-items: center;
 			color: #999999;
+			.lingh{
+				line-height: 40px;
+			}
+			.flex{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+			}
 		}
 		.title{
 			display: flex;
@@ -427,4 +598,38 @@
 			}
 		}
 	}
+	
+	// 标签弹框
+	.popup-content {
+	  padding: 20px;
+	}
+	.tag-list{
+		max-height: 900rpx;
+		margin-top: 20rpx;
+		.tags{
+			margin-top: 10px;
+		}
+		.name{
+			margin: 10px 0px;
+		}
+		.tagitem{
+			background: #ECF2FF;
+			border-radius: 8px;
+			color: #3471FF;
+			text-align: center;
+			padding: 5px 0px;
+		}
+		.row{
+			width: 100%;
+		}
+		.col4{
+			display: inline-block;
+			margin: 4px 3px;
+			width: 30%;
+		}
+	}
+	.tagactive{
+		background: #3471FF !important;
+		color: #fff !important;
+	}
 </style>
diff --git a/pages/customer/editdetile.vue b/pages/customer/editdetile.vue
index 907e82b..9f46395 100644
--- a/pages/customer/editdetile.vue
+++ b/pages/customer/editdetile.vue
@@ -67,14 +67,6 @@
 					<u-icon class="arrowright" name="arrow-right" size="18" color="#747474"></u-icon>
 				</view>
 			</view>
-			<!-- <u-line></u-line>
-			<view class="cell">
-				<view class="item">{{$t('customer.Cstomerfj')}}</view>
-				<view class="right select" @click="showgrade = true">
-					<view class="" :class="['content2', { placeholder: !grade_name }]">{{grade_name || $t('customer.Cstomerfjinput')}}</view>
-					<u-icon class="arrowright" name="arrow-right" size="18" color="#747474"></u-icon>
-				</view>
-			</view> -->
 			<u-line></u-line>
 			<view class="cell">
 				<view class="item">{{$t('customer.Country')}}</view>
@@ -109,20 +101,37 @@
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :defaultIndex="defaultIndexsj" :show="showmagnitude" @cancel="cancel('showmagnitude')"  @close="close('showmagnitude')" :columns="magnitudeList" keyName="name" @confirm="magnitudeChange"></u-picker>
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')":defaultIndex="defaultIndexph" :show="showcartype" @cancel="cancel('showcartype')"  @close="close('showcartype')"  :columns="carTypeList" keyName="name" @confirm="cartypesChange"></u-picker>
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :defaultIndex="defaultIndexfj" :show="showgrade" @cancel="cancel('showgrade')" @close="close('showgrade')"  :columns="getGradeList" keyName="name" @confirm="gradeHandler"></u-picker>
-		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :defaultIndex="defaultIndexgj" :show="showarea" @cancel="cancel('showarea')" @close="close('showarea')"  :columns="areaList" keyName="name" @confirm="areaChange"></u-picker>
-		
-		<!-- <u-popup :show="showmap" :round="10" mode="bottom" @close="mapclose">
-			<view class="mapcont">
-				<view class="header">
-					<view class="cancel" @click="mapclose">取消</view>
-					<view class="title">地图位置</view>
-					<view class="confirm"  @click="mapconfirm">确定</view>
-				</view>
-				<view class="map">
-					
-				</view>
+		<!-- <u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :defaultIndex="defaultIndexgj" :show="showarea" @cancel="cancel('showarea')" @close="close('showarea')"  :columns="areaList" keyName="name" @confirm="areaChange"></u-picker> -->
+		<u-popup closeOnClickOverlay :show="showarea" mode="bottom"  :round="10"  @close="close('showarea')">
+			<view class="text">
+				<view class="qx" @click="close('showarea') ">{{$t('cancel')}}</view>
+				<view class="qd" @click="arerfn">{{$t('confirm')}}</view>
 			</view>
-		</u-popup> -->
+			  <view class="popup-content">
+				<!-- 搜索框 -->
+				<u-input
+				  v-model="searchKeyword"
+				  :placeholder="$t('keyword')"
+				  @input="handleSearch"
+				></u-input>
+		
+				<!-- 选项列表 -->
+				<scroll-view scroll-y class="option-list">
+				  <view
+					v-for="(item, index) in filteredOptions"
+					:key="index"
+					class="option-item"
+					@click="handleSelect(item)"
+					:class="actives==item.id?'actives':''"
+				  >
+					{{ item.name }}
+				  </view>
+				  <view v-if="filteredOptions.length === 0" class="no-data">
+					{{$t('noresults')}}
+				  </view>
+				</scroll-view>
+			  </view>
+		</u-popup>
 	</view>
 </template>
 
@@ -133,6 +142,10 @@
 			return {
 				id:'',
 				followList:[],
+				actives:'',
+				searchKeyword: "", // 搜索关键词
+				selectedLabel: "", // 选中的值（显示在输入框中）
+				filteredOptions: [], // 过滤后的数据
 				showmap: false,
 				showmagnitude: false,
 				showgrade: false,
@@ -184,7 +197,6 @@
 			var that = this
 			this.getChannel()
 			this.getMagnitude()
-			// this.getGrade()
 			this.carType()
 			this.area()
 			this.customerdetailfn()
@@ -207,7 +219,7 @@
 			gomap(){
 				// #ifdef H5
 					uni.navigateTo({
-						url: '/pages/customer/maph5'
+						url: '/pages/customer/maph5?lat='+this.form.lat+'&lng='+this.form.lng
 					});
 				// #endif
 				// #ifdef APP-PLUS
@@ -224,12 +236,6 @@
 						that.defaultIndexqd=[index]
 					}
 				})
-				// that.getGradeList1.forEach((item,index) => {
-				// 	if(item.id == that.form.grade){
-				// 		that.grade_name = item.name
-				// 		that.defaultIndexfj=[index]
-				// 	}
-				// })
 				that.carTypeList1.forEach((item,index) => {
 					if(item.id == that.form.car_type_id){
 						that.car_type_name = item.name
@@ -242,13 +248,6 @@
 						that.defaultIndexsj=[index]
 					}
 				})
-				that.areaList1.forEach((item,index) => {
-					if(item.id == that.form.country_id){
-						that.country_name = item.name
-						that.defaultIndexgj=[index]
-						console.log(that.country_name)
-					}
-				})
 			},
 			//客户详情 
 			customerdetailfn(){
@@ -262,6 +261,8 @@
 				}).then(res => {
 					that.datas = res.data.data
 					that.form = res.data.data
+					this.actives  = res.data.data.country_id
+					this.country_name  = res.data.data.country_name
 					that.select()
 				})
 			},
@@ -332,7 +333,8 @@
 					var list = res.data.data
 					this.areaList1 = list
 					this.areaList = [list]
-					this.select()
+					this.filteredOptions = list;
+					// this.select()
 				})
 			},
 			//商机
@@ -364,18 +366,46 @@
 				this.grade_name = val.value[0].name
 				this.showgrade = false
 			},
-			//国家切换事件
-			areaChange(val){
-				this.form.country_id = val.value[0].id
-				this.country_name = val.value[0].name
-				this.showarea = false
-			},
+			// //国家切换事件
+			// areaChange(val){
+			// 	this.form.country_id = val.value[0].id
+			// 	this.country_name = val.value[0].name
+			// 	this.showarea = false
+			// },
 			//偏好切换事件
 			cartypesChange(val){
 				this.form.car_type_id = val.value[0].id
 				this.car_type_name = val.value[0].name
 				this.showcartype = false
 			},
+			// 搜索处理函数
+			handleSearch() {
+			  if (this.searchKeyword) {
+				console.log(this.searchKeyword)
+				this.filteredOptions = this.areaList1.filter((item) =>
+				  item.name.includes(this.searchKeyword)
+				);
+				console.log(this.filteredOptions)
+			  } else {
+				// 如果搜索框为空，显示全部数据
+				this.filteredOptions = this.areaList1;
+			  }
+			},
+			// 选择选项
+			handleSelect(item) {
+			  this.selectedLabel = item.name; // 回显选中的值
+			  // this.searchKeyword = item.name
+			  this.actives = item.id
+			  // this.showPicker = false; // 关闭弹窗
+			  console.log("选中的值:", item.id);
+			  console.log("选中的值:", item.name);
+			},
+			arerfn(){
+				 this.showarea = false; // 关闭弹窗
+				 this.country_name = this.selectedLabel
+				 this.form.country_id = this.actives
+				 
+			},
 			cancel(val){
 				this[val] = false
 			},
@@ -481,4 +511,49 @@
 		margin-bottom: 40px;
 		margin: 15px 4%;
 	}
+	
+	
+	
+	
+	.actives{
+		background-color: #dfdfdf;
+	}
+	.text{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		line-height: 30px;
+		padding: 10px 15px 0px;
+		.qd{
+			color: #3471FF;
+		}
+	}
+	.popup-content {
+	  padding: 20px;
+	  background-color: #fff;
+	}
+	
+	.option-list {
+	  max-height: 400rpx;
+	  margin-top: 20rpx;
+	}
+	
+	.option-item {
+	  padding: 20rpx;
+	  border-bottom: 1rpx solid #eee;
+	}
+	
+	.option-item:last-child {
+	  border-bottom: none;
+	}
+	
+	.no-data {
+	  text-align: center;
+	  padding: 20rpx;
+	  color: #999;
+	}
+	
+	
+	
+	
 </style>
diff --git a/pages/customer/followup.vue b/pages/customer/followup.vue
index f6bb6b3..2c7877a 100644
--- a/pages/customer/followup.vue
+++ b/pages/customer/followup.vue
@@ -13,14 +13,14 @@
 			<view class="cont">
 				<view class="title">
 					<view class=""><text class="name">{{userdatas.phone}}</text></view>
-					<view class="ststus">渠道：{{userdatas.channel_name}}</view>
+					<view class="ststus">{{$t('channel')}}：{{userdatas.channel_name}}</view>
 				</view>
 				<view class="info"><text class="sex">{{userdatas.sex_txt}}</text> | <text class="addr">{{userdatas.country_name}}</text><text class="type">{{userdatas.car_type_name}}</text>
 				</view>
 				<view v-if="userdatas.email!=''">Email: {{userdatas.email}}</view>
 				<view v-if="userdatas.WhatsApp!=''">WhatsAPP: {{userdatas.WhatsApp}}</view>
-				<view v-if="userdatas.address!=''">公司: {{userdatas.address}}</view>
-				<view v-if="userdatas.describe!=''">备注: {{userdatas.describe}}</view>
+				<view v-if="userdatas.address!=''">{{$t('customer.Company')}}: {{userdatas.address}}</view>
+				<view v-if="userdatas.describe!=''">{{$t('remarks')}}: {{userdatas.describe}}</view>
 			</view>
 		</view>
 		<view class="cell2">
@@ -97,26 +97,36 @@
 				{{$t('customer.followrecord')}} <text class="status" :style="{color:(datas.follow == 0 ?'#3471FF' : datas.follow == 1 ?'#27C89C': '#FF4040')}">{{datas.follow_txt}}</text>
 			</view>
 			<u-steps v-if="followList.length>0" :current="followList.length" direction="column" dot>
-				<u-steps-item :title="item.type_txt"  v-for="(item, index) in followList" :key="index">
+				<u-steps-item :title="item.type==1? $t('customer.Online') : $t('customer.Visit') "  v-for="(item, index) in followList" :key="index">
 					<view slot="desc" class="desc">
-						<view class=""  v-if="item.type==0">
+						<view class="flex"  v-if="item.type==0">
 							<view class="">
-								<view class="">
+								<view class="lingh">
 									{{$t('times')}} ：{{item.created_at}}
 								</view>
 								<view class="">{{$t('address')}}：{{item.address}}</view>
-								<view class="">{{$t('customer.Visitcontent')}}：{{item.audio_text}}</view>
+								<view class="lingh">{{$t('customer.Visitcontent')}}：{{item.audio_text}}</view>
 							</view>
 							<view class="">
-								<image :src="item.oss_picture" mode=""></image>
+								<!-- <image :src="item.oss_picture" mode=""></image> -->
+								<u-album
+								    :urls="isurls(item.oss_picture)"
+									:singleSize="80"
+								    keyName="src"
+								></u-album>
 							</view>
 						</view>
 						<view class="" v-else>
-							<view class="">
+							<view class="lingh">
 								{{$t('times')}}：{{item.created_at}}
 							</view>
 							<view class="">
-								<image :src="item.oss_picture" mode=""></image>
+								<!-- <image :src="item.oss_picture" mode=""></image> -->
+								<u-album
+								    :urls="isurls(item.oss_picture)"
+									:singleSize="80"
+								    keyName="src"
+								></u-album>
 							</view>
 						</view>
 					</view>
@@ -187,11 +197,12 @@
 		},
 		onLoad(options) {
 			console.log(options);
+			this.getlocahost()
 			this.id = options.id;
 			this.form.customer_id = options.id;
 			var that = this
 			this.getGrade()
-			this.getlocahost()
+			
 			this.customerdetailfn()
 			this.followlistfn()
 		},
@@ -199,6 +210,13 @@
 			leftClick(){
 				uni.navigateBack({})
 			},
+			isurls(url){
+				var urls=[]
+				var obj={}
+				obj.src = url
+				urls.push(obj)
+				return urls
+			},
 			close(val){
 				this[val]=false
 			},
@@ -281,33 +299,7 @@
 					},
 				});
 			},
-			getlocahost(){
-				// 检查定位权限
-				uni.getSetting({
-					success: (res) => {
-					  if (!res.authSetting['scope.userLocation']) {
-						// 未授权，请求权限
-						uni.authorize({
-						  scope: 'scope.userLocation',
-						  success: () => {
-							this.getlocahost();
-						  },
-						  fail: () => {
-							uni.showToast({
-							  title: '定位权限未授权',
-							  icon: 'none',
-							});
-						  },
-						});
-					  } else {
-						// 已授权，直接获取定位
-						this.getlocahost();
-					  }
-					},
-				});
-			},
-			getlocahost(){
-				
+			unigetLocation(){
 				var that = this
 				uni.getLocation({
 				  type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02
@@ -325,18 +317,53 @@
 				    console.log('获取位置完成');
 				  }
 				});
-				
-				// uni.chooseLocation({
-				//   success: function (res) {
-				//     console.log('位置名称：' + res.name);
-				//     console.log('详细地址：' + res.address);
-				//     console.log('经度：' + res.longitude);
-				//     console.log('纬度：' + res.latitude);
-				//   },
-				//   fail: function (err) {
-				//     console.log('选择位置失败：', err);
-				//   }
-				// });
+			},
+			getlocahost() {
+				if (navigator.geolocation) {
+					navigator.geolocation.getCurrentPosition(
+						(position) => {
+							console.log('当前位置的经度：' + position.coords.longitude);
+							console.log('当前位置的纬度：' + position.coords.latitude);
+							this.getarrd(position.coords.longitude,position.coords.latitude)
+							this.error = '';
+							console.log("获取位置成功：", position);
+						},
+						(error) => {
+							this.unigetLocation()
+							// this.error = this.getErrorMessage(error);
+							// uni.showToast({
+							// 	title: this.error,
+							// 	icon: 'none'
+							// });
+							console.error("获取位置失败：", error);
+						},
+						{
+							enableHighAccuracy: true,
+							timeout: 10000,
+							maximumAge: 0
+						}
+					);
+				} else {
+					this.unigetLocation()
+					// this.error = "浏览器不支持 Geolocation API";
+					// uni.showToast({
+					// 	title: this.error,
+					// 	icon: 'none'
+					// });
+					console.error("浏览器不支持 Geolocation API");
+				}
+			},
+			getErrorMessage(error) {
+				switch (error.code) {
+					case error.PERMISSION_DENIED:
+						return "用户拒绝了地理位置权限";
+					case error.POSITION_UNAVAILABLE:
+						return "无法获取当前位置";
+					case error.TIMEOUT:
+						return "获取位置超时";
+					default:
+						return "未知错误";
+				}
 			},
 			// 跟进记录
 			followlistfn(){
@@ -438,14 +465,14 @@
 					header:{'Authorization': 'Bearer ' +  uni.getStorageSync('token')},
 					success: (uploadFileRes) => {
 						const path=JSON.parse(uploadFileRes.data)
-						if(path.code==-1){
+						if(path.code==0){
+							that.form[name] = path.data.path
+							console.log(that.form)
+						}else{
 							uni.showToast({
 								title: path.message,
 								icon: 'none'
 							});
-						}else{
-							that.form[name] = path.data.path
-							console.log(that.form)
 						}
 					}
 				});
@@ -733,6 +760,14 @@
 			justify-content: space-between;
 			align-items: center;
 			color: #999999;
+			.lingh{
+				line-height: 40px;
+			}
+			.flex{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+			}
 		}
 		.title{
 			color: #666666;
diff --git a/pages/customer/maph5.vue b/pages/customer/maph5.vue
index 147c1a6..3dd6d29 100644
--- a/pages/customer/maph5.vue
+++ b/pages/customer/maph5.vue
@@ -31,6 +31,7 @@ export default {
 		value: '',
 		// 模糊匹配数据
 		list: [],
+		center: { lat:'', lng:''},
 		cityInfo:{
 			lat: '',
 			lng: '',
@@ -44,7 +45,12 @@ export default {
 		}
 	}
   },
-  onLoad() {
+  onLoad(e) {
+	  if(e.lat&&e.lat!=''&&e.lat!=0){
+		  this.center.lat = e.lat
+		  this.center.lng = e.lng
+	  }
+	  console.log(e)
 		this.initMap()
   },
   methods:{
@@ -92,63 +98,123 @@ export default {
 			});
 			that.list =[]
 		},
+		getErrorMessage(error) {
+			switch (error.code) {
+				case error.PERMISSION_DENIED:
+					return "用户拒绝了地理位置权限";
+				case error.POSITION_UNAVAILABLE:
+					return "无法获取当前位置";
+				case error.TIMEOUT:
+					return "获取位置超时";
+				default:
+					return "未知错误";
+			}
+		},
+		addmapmarkfn(lat,lng){
+			var that = this
+			that.map = new google.maps.Map(document.getElementById("map"),
+			  {
+			    center: { lat:lat, lng: lng},
+			    zoom: 12,// 地图缩放参数
+			  	maxZoom: 18,// 最大缩放参数
+			  	minZoom: 4,// 最小缩放参数		
+			    disableDefaultUI: true// 禁用默认UI
+			  }
+			)
+			var marker = new google.maps.Marker({
+				position: { lat:lat, lng: lng},
+				map: that.map,
+				draggable: true, // 允许拖动标记
+				icon: {
+					url: 'https://now.guua.com/attachs/default/location_shop.png',
+					scaledSize: new google.maps.Size(30, 30),
+					origin: new google.maps.Point(0, 0),
+					anchor: new google.maps.Point(0, 0)
+				}
+			});
+			// 监听标记拖动事件
+			marker.addListener('dragend', () => {
+			    const position = marker.getPosition();
+			    that.map.setCenter(position);
+			    // 根据标记位置获取地址信息
+			    const geocoder = new google.maps.Geocoder();
+			    geocoder.geocode({ location: position }, (results, status) => {
+			      if (status === 'OK' && results[0]) {
+					  console.log(results)
+					  console.log(position)
+					  that.cityInfo.address = results[0].formatted_address;
+					  that.cityInfo.lat = position.lat();
+					  that.cityInfo.lng = position.lng();
+					  that.value =  results[0].formatted_address;
+					console.log(that.cityInfo)
+			      } else {
+			        alert('无法获取地址信息');
+			      }
+			    });
+			});
+		},
+		unigetLocation(){
+			var that = this
+			uni.getLocation({
+			  type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02
+			  success: function (res) {
+			    console.log('当前位置的经度：' + res.longitude);
+			    console.log('当前位置的纬度：' + res.latitude);
+				that.addmapmarkfn(res.latitude,res.longitude)
+			    // 如果需要将经纬度转换为具体地址，可以使用逆地理编码
+			    // 这里调用 uni.chooseLocation 或第三方地图服务（如高德、腾讯地图）
+			  },
+			  fail: function (err) {
+			    console.log('获取位置失败：', err);
+			  },
+			  complete: function () {
+			    console.log('获取位置完成');
+			  }
+			});
+		},
 	    initMap() {
 			var that = this
 		  loader
 		    .load()
 		    .then((google) => {
-				uni.getLocation({
-				  type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02
-				  success: function (res) {
-						  console.log(res)
-						that.map = new google.maps.Map(document.getElementById("map"),
-						  {
-						    center: { lat:res.latitude, lng: res.longitude},
-						    zoom: 12,// 地图缩放参数
-						  	maxZoom: 18,// 最大缩放参数
-						  	minZoom: 4,// 最小缩放参数		
-						    disableDefaultUI: true// 禁用默认UI
-						  }
-						)
-						var marker = new google.maps.Marker({
-							position: { lat:res.latitude, lng: res.longitude},
-							map: that.map,
-							draggable: true, // 允许拖动标记
-							icon: {
-								url: 'https://now.guua.com/attachs/default/location_shop.png',
-								scaledSize: new google.maps.Size(30, 30),
-								origin: new google.maps.Point(0, 0),
-								anchor: new google.maps.Point(0, 0)
+				if(this.center.lat!=''){
+					that.addmapmarkfn(parseFloat(this.center.lat),parseFloat(this.center.lng))
+				}else{
+					if (navigator.geolocation) {
+						navigator.geolocation.getCurrentPosition(
+							(position) => {
+								console.log('当前位置的经度：' + position.coords.longitude);
+								console.log('当前位置的纬度：' + position.coords.latitude);
+								that.addmapmarkfn(position.coords.latitude,position.coords.longitude)
+								this.error = '';
+								console.log("获取位置成功：", position);
+							},
+							(error) => {
+								that.unigetLocation()
+								// this.error = this.getErrorMessage(error);
+								// uni.showToast({
+								// 	title: this.error,
+								// 	icon: 'none'
+								// });
+								console.error("获取位置失败：", error);
+							},
+							{
+								enableHighAccuracy: true,
+								timeout: 10000,
+								maximumAge: 0
 							}
-						});
-						// 监听标记拖动事件
-						marker.addListener('dragend', () => {
-						    const position = marker.getPosition();
-						    that.map.setCenter(position);
-						    // 根据标记位置获取地址信息
-						    const geocoder = new google.maps.Geocoder();
-						    geocoder.geocode({ location: position }, (results, status) => {
-						      if (status === 'OK' && results[0]) {
-								  console.log(results)
-								  console.log(position)
-								  that.cityInfo.address = results[0].formatted_address;
-								  that.cityInfo.lat = position.lat();
-								  that.cityInfo.lng = position.lng();
-								  that.value =  results[0].formatted_address;
-								console.log(that.cityInfo)
-						      } else {
-						        alert('无法获取地址信息');
-						      }
-						    });
-						});
-				  },
-				  fail: function (err) {
-				    console.log('获取位置失败：', err);
-				  },
-				  complete: function () {
-				    console.log('获取位置完成');
-				  }
-				})
+						);
+					} else {
+						that.unigetLocation()
+						// this.error = "浏览器不支持 Geolocation API";
+						// uni.showToast({
+						// 	title: this.error,
+						// 	icon: 'none'
+						// });
+						console.error("浏览器不支持 Geolocation API");
+					}
+				}
+				
 		      
 		    })
 		    .catch((e) => {
diff --git a/pages/index/customer.vue b/pages/index/customer.vue
index 8220466..a167df2 100644
--- a/pages/index/customer.vue
+++ b/pages/index/customer.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="conts">
-		<z-paging  ref="paging" v-model="datalist" @query="queryList"  empty-view-text='暂无数据!'>	
+		<z-paging  ref="paging" v-model="datalist" @query="queryList"  :empty-view-text="$t('Nodata')">	
 			<template #top>
 				<view class="top">
 					<!-- <view class="navbar">{{$t('customer.title')}}</view> -->
@@ -19,7 +19,7 @@
 					</view>
 				</view>
 				<view class="tabsbg">
-					<u-tabs :list="list1" lineColor="#fff" :scrollable="false" @click="tabclick" :inactiveStyle="{color: '#fff'}" :activeStyle="{color: '#fff',fontWeight: 'bold',transform: 'scale(1.05)'}"></u-tabs>
+					<u-tabs :list="list1" :current="current" lineColor="#fff" :scrollable="false" @click="tabclick" :inactiveStyle="{color: '#fff'}" :activeStyle="{color: '#fff',fontWeight: '500',transform: 'scale(1.05)'}"></u-tabs>
 				</view>
 			</template>
 			<view class="list">
@@ -31,7 +31,7 @@
 									<view class="">{{item.created_at}}</view>
 									<view class="right">
 										<text class="medal" :style="{color:(item.magnitude == 0 ?'#F5AB00' : item.magnitude == 1 ?'#8495B8': '#9B7200')}">{{item.magnitude_txt}}</text>
-										<text class="tag" :style="{background:(item.follow == 0 ?'#3471FF' : item.follow == 1 ?'#27C89C': '#FF4040')}">{{item.follow_txt}}</text>
+										<text class="tag" :style="{background:(item.follow == 0 ?'#3471FF' : item.follow == 1 ?'#27C89C': '#FF4040')}">{{item.follow==0?$t('followup'):item.follow==1?$t('deal'):$t('lost')}}</text>
 									</view>
 								</view>
 								<u-line margin="20rpx 0px"></u-line>
@@ -82,6 +82,7 @@
 	export default {
 		data() {
 			return {
+				current:0,
 				options1: [],
 				x: 300,		//x坐标
 				y: 550,		//y坐标
@@ -96,7 +97,14 @@
 				datalist:[],
 			}
 		},
-		onLoad() {
+		onLoad(e) {
+			console.log(e)
+			if(e.tab){
+				this.follow=e.tab - 1
+				this.current = e.tab
+				this.datalist=[]
+				// this.queryList(1, 10)
+			}
 			const { windowWidth, windowHeight } = uni.getSystemInfoSync();
 			this.x = windowWidth-70
 			this.y = windowHeight-55
@@ -138,6 +146,18 @@
 					id: 2
 				}]
 			]
+			uni.setTabBarItem({
+				index: 0,
+				text: this.$t('tabbar.home')
+			})
+			uni.setTabBarItem({
+				index: 1,
+				text: this.$t('tabbar.customer')
+			})
+			uni.setTabBarItem({
+				index: 2,
+				text: this.$t('tabbar.mine')
+			})
 		},
 		methods: {
 			searchCli(){
@@ -163,6 +183,7 @@
 				}else{
 					this.follow=e.index - 1
 				}
+				this.datalist=[]
 				this.queryList(1, 10)
 			},
 			//客户列表数据
@@ -201,7 +222,7 @@
 				var phoneNumber= item.phone
 			    if (!phoneNumber) {
 			        uni.showToast({
-			          title: '请输入电话号码',
+			          title:  this.$t('callPhonemsg'),
 			          icon: 'none',
 			        });
 			        return;
@@ -386,7 +407,7 @@
 			padding: 0px 15px 10px;
 			color: #3471FF;
 			display: flex;
-			justify-content: right;
+			justify-content: flex-end;
 			view{
 				margin-left:15px;
 			}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5cbe756..1392d8e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,68 +1,102 @@
 <template>
 	<view class="content">
-		<view class="contop">
-			<view class="changeyy" @click="showlang = true">
-				<image src="/static/image/change.png" mode=""></image>{{$t('home.langbtn')}}
-			</view>
-			<view class="title">
-				{{$t('home.title')}} CRM
-			</view>
-			<view class="num">
-				{{statisticsdata.day}}<text>{{$t('home.day')}}</text>
-			</view>
-		</view>
-		<view class="data-briefing">
-			<view class="top">
-				<text>{{$t('home.databf')}}</text>
-				<view class="time" @click="show = true">
-					<image src="/static/image/time.png" mode=""></image>
-					<u--input v-model="time" border="none" disabled disabledColor="#ffffff"
-						style="width: 65px;margin-left: 5px;"></u--input>
-					<u-icon name="arrow-down" color="#666666" size="16"></u-icon>
+		<z-paging  ref="paging" v-model="datalist" @query="queryList"  :empty-view-text="$t('Nodata')">	
+			<template #top>
+				<view class="contop">
+					<view class="changeyy" @click="showlang = true">
+						<image src="/static/image/change.png" mode=""></image>{{$t('home.langbtn')}}
+					</view>
+					<view class="title">
+						{{$t('home.title')}} CRM
+					</view>
+					<view class="num">
+						{{statisticsdata.day}}<text>{{$t('home.day')}}</text>
+					</view>
+					<view class="data-briefing">
+						<view class="top">
+							<text>{{$t('home.databf')}}</text>
+							<view class="time" @click="show = true">
+								<image src="/static/image/time.png" mode=""></image>
+								<view class="" style="margin:0px 5px;">{{time}}</view>
+								<u-icon name="arrow-down" color="#666666" size="16"></u-icon>
+							</view>
+						</view>
+						<view class="cont">
+							<u-grid :border="false">
+								<u-grid-item>
+									<text class="grid-num">{{statisticsdata.customer}}</text>
+									<text class="grid-text">{{$t('home.addkh')}}</text>
+								</u-grid-item>
+								<u-grid-item>
+									<text class="grid-num">{{statisticsdata.visit}}</text>
+									<text class="grid-text">{{$t('home.addbf')}}</text>
+								</u-grid-item>
+								<u-grid-item>
+									<text class="grid-num">{{statisticsdata.follow}}</text>
+									<text class="grid-text">{{$t('home.addgj')}}</text>
+								</u-grid-item>
+								<u-grid-item @click="custormerfn(1)">
+									<text class="grid-num">{{statisticsdata.customer_init}}</text>
+									<text class="grid-text">{{$t('followup')}}</text>
+								</u-grid-item>
+								<u-grid-item @click="custormerfn(2)">
+									<text class="grid-num">{{statisticsdata.customero_fllow}}</text>
+									<text class="grid-text">{{$t('deal')}}</text>
+								</u-grid-item>
+								<u-grid-item @click="custormerfn(3)">
+									<text class="grid-num">{{statisticsdata.customer_deal}}</text>
+									<text class="grid-text">{{$t('lost')}}</text>
+								</u-grid-item>
+							</u-grid>
+						</view>
+					</view>
 				</view>
+				<view ></view>
+				<view class="gjtimetop">
+					<view class="title">{{$t('Remindergj')}}</view>
+					<view class="selecttime" @click="showgjtime = true">
+						<view class="">{{secelttime}}</view>
+						<u-icon name="arrow-down" color="#666666" size="16"></u-icon>
+					</view>
+				</view>
+			</template>
+			<view class="gjtime">
+				<view class="contents"  v-for="(item, index) in datalist" :key="index">
+					<view class="" >
+						<view class="cont">
+							<view class="title">
+								<view class=""><text class="name">{{item.contacts}}</text></view>
+								<countdown :total-seconds="item.follow_remaining" :show-days="true"  @end="onCountdownEnd" />
+							</view>
+							<view class=""><text class="phone">{{item.phone}}</text></view>
+							<view class="">{{$t('nextgjtime')}}：<text>{{item.follow_next}}</text></view>
+						</view>
+					</view>
+					<view class="desc1">
+						<view class=""  @click="callPhone(item)"><image src="/static/image/customer/phone.png" mode=""></image> {{$t('call')}}</view>
+						<view class=""  @click="editClick(item)"><image src="/static/image/customer/edit.png" mode=""></image> {{$t('follow')}}</view>
+					</view>
+				</view>
+				
 			</view>
-			<view class="cont">
-				<u-grid :border="false">
-					<u-grid-item>
-						<text class="grid-num">{{statisticsdata.customer}}</text>
-						<text class="grid-text">{{$t('home.addkh')}}</text>
-					</u-grid-item>
-					<u-grid-item>
-						<text class="grid-num">{{statisticsdata.visit}}</text>
-						<text class="grid-text">{{$t('home.addbf')}}</text>
-					</u-grid-item>
-					<u-grid-item>
-						<text class="grid-num">{{statisticsdata.follow}}</text>
-						<text class="grid-text">{{$t('home.addgj')}}</text>
-					</u-grid-item>
-					<u-grid-item>
-						<text class="grid-num">{{statisticsdata.customer_init}}</text>
-						<text class="grid-text">{{$t('followup')}}</text>
-					</u-grid-item>
-					<u-grid-item>
-						<text class="grid-num">{{statisticsdata.customero_fllow}}</text>
-						<text class="grid-text">{{$t('deal')}}</text>
-					</u-grid-item>
-					<u-grid-item>
-						<text class="grid-num">{{statisticsdata.customer_deal}}</text>
-						<text class="grid-text">{{$t('lost')}}</text>
-					</u-grid-item>
-				</u-grid>
-			</view>
-		</view>
+		</z-paging>
 		<u-datetime-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="show" @close="close('show')"  v-model="value1"
 			@confirm="confirm" @cancel="cancel" mode="year-month"></u-datetime-picker>
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" @close="close('showlang')" :show="showlang" :columns="columns"
 			@cancel="cancellang" @confirm="confirmlang" :title="$t('home.langbtn')" keyName="label"></u-picker>
+		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" @close="close('showgjtime')" :show="showgjtime" :columns="columnstime"
+			@cancel="close('showgjtime')" @confirm="confirmgj"  keyName="label"></u-picker>
 	</view>
 </template>
 
 <script>
+	import Countdown from '@/components/Countdown/Countdown.vue';
 	import {
 		request,
 		showToast
 	} from '@/api/apiT.js'
 	export default {
+		components: { Countdown },
 		data() {
 			return {
 				statisticsdata:{},
@@ -71,11 +105,14 @@
 				value0: 0,
 				show: false,
 				showlang: false,
+				showgjtime: false,
+				secelttime:this.$t('all'),
 				value1: Number(new Date()),
 				timevalue: this.result(Number(new Date())),
 				time: this.result(Number(new Date())),
 				datalist: [],
 				follow:'',
+				filter:'',//跟进日期筛选
 				columns: [
 					[{
 						label: this.$t('zh'),
@@ -85,12 +122,29 @@
 						id: 'en'
 					}]
 				],
-				
+				columnstime:[
+					[{
+						label: this.$t('all'),
+						id: ''
+					},{
+						label: this.$t('onedayn'),
+						id: '0'
+					}, {
+						label: this.$t('threedayn'),
+						id: '1'
+					}, {
+						label: this.$t('sevendayn'),
+						id: '2'
+					}]
+				]
 			}
 		},
 		onLoad() {
 			uni.removeStorageSync('location')
 			// this.getcustomerlist()
+			// this.queryList(1,10)
+		},
+		onShow() {
 			uni.setTabBarItem({
 				index: 0,
 				text: this.$t('tabbar.home')
@@ -118,15 +172,21 @@
 						created:this.timevalue
 					}
 				}).then(res => {
-					console.log(res.data.data)
 					this.statisticsdata = res.data.data
 				})
 			},
 			cancellang() {
 				this.showlang = false
 			},
+			//数据简报点击事件
+			custormerfn(item){
+				uni.reLaunch({
+					url: '/pages/index/customer?tab='+item,// 替换为你要跳转的页面路径
+				});
+			},
 			//语言切换事件
 			confirmlang(e) {
+				var that = this
 				uni.setLocale(e.value[0].id)
 				this.$i18n.locale = e.value[0].id
 				// uni.setStorageSync('i18locale', e.value[0].id);
@@ -140,6 +200,26 @@
 						id: 'en'
 					}]
 				];
+				this.columnstime =[
+					[{
+						label: this.$t('all'),
+						id: ''
+					},{
+						label: this.$t('onedayn'),
+						id: '0'
+					}, {
+						label: this.$t('threedayn'),
+						id: '1'
+					}, {
+						label: this.$t('sevendayn'),
+						id: '2'
+					}]
+				];
+				this.columnstime[0].forEach((item,index) => {
+					if(item.id == that.filter){
+						that.secelttime  = item.label
+					}
+				})
 				uni.setTabBarItem({
 					index: 0,
 					text: this.$t('tabbar.home')
@@ -188,6 +268,63 @@
 				this.time = timeFormat(time, 'yyyy-mm')
 				return timeFormat(time, 'yyyy-mm')
 			},
+			//跟进日期选择
+			confirmgj(e){
+				this.showgjtime = false
+				this.secelttime=e.value[0].label
+				this.filter = e.value[0].id 
+				this.datalist=[]
+				this.queryList(1, 10)
+			},
+			onCountdownEnd(){},
+			//客户列表数据
+			queryList(pageNo, pageSize) {
+				var that = this;
+				request({
+					url:'customer/waitFollow',
+					method:'get',
+					data: {
+						page:pageNo,
+						per_page:10,
+						filter:this.filter
+					}
+				}).then(res => {
+					if(res.data.code ==0){
+						var datas = res.data.data.list;
+						this.$refs.paging.complete(datas);
+					}else{
+						// this.$refs.paging.complete(null);
+						// that.listlength=0
+					} 
+					uni.stopPullDownRefresh();
+				})
+			},
+			// 拨打电话
+			callPhone(item) {
+				var phoneNumber= item.phone
+			    if (!phoneNumber) {
+			        uni.showToast({
+			          title: this.$t('callPhonemsg'),
+			          icon: 'none',
+			        });
+			        return;
+			    }
+			
+			    uni.makePhoneCall({
+			        phoneNumber: phoneNumber,
+			        success: () => {
+			          console.log('拨打电话成功');
+			        },
+			        fail: (err) => {
+			          console.log('拨打电话失败', err);
+			        },
+			    });
+			},
+			editClick(item){
+				uni.navigateTo({
+					url: '/pages/customer/followup?id='+item.id
+				});
+			},
 		}
 	}
 </script>
@@ -206,7 +343,7 @@
 	}
 
 	.changeyy {
-		padding: 10px 15px;
+		padding: 20rpx 30rpx;
 		border-radius: 50px;
 		background-color: rgba(255, 255, 255, 0.2);
 		margin-bottom: 50rpx;
@@ -229,7 +366,10 @@
 			background-image: url("/static/image/topbg.png");
 			background-size: 100%;
 			background-repeat: no-repeat;
-			padding: 88rpx 30rpx 240rpx;
+			/* #ifdef APP-PLUS */
+				padding: 80rpx 30rpx 0px;
+			/* #endif */
+			padding: 20rpx 30rpx 0px;
 			color: #FFFFFF;
 
 			.title {
@@ -253,10 +393,10 @@
 
 		.data-briefing {
 			background-color: #FFFFFF;
-			margin: 15px;
+			// margin: 15px;
 			padding: 15px;
 			border-radius: 10px;
-			margin-top: -21%;
+			margin-top:80rpx;
 
 			.top {
 				display: flex;
@@ -299,15 +439,75 @@
 
 
 		}
-
-		.userlist {
-			background: linear-gradient(to bottom, #E6EDFF, #ffffff);
-			background-size: 100%;
-			background-repeat: no-repeat;
-
-			.list {
-				padding: 15px;
+	}
+	.gjtimetop{
+		margin:20px 15px 0px;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.title{
+			color: #222222;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+		.selecttime{
+			display: flex;
+			align-items: center;
+			view{
+				margin-right: 5px;
+			}
+			// color: #666666;
+		}
+	}
+	.gjtime{
+		padding:5px 15px 15px;
+		
+	}
+	.contents{
+		background-color: #FFFFFF;
+		border-radius: 10px;
+		margin: 15px 0px;
+		.cont{
+			padding:15px;
+			font-size: 24rpx;
+			.title{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				color: #222222;
+				image{
+					width: 18px;
+					height: 18px;
+					// vertical-align: sub;
+					margin-right: 5px;
+				}
+			}
+			.name{
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-right: 10px;
+			}
+			.phone{
+				font-size: 28rpx;
+			}
+			.ststus{
+				color: #666666;
 			}
 		}
 	}
+	.desc1{
+		padding: 0px 15px 10px;
+		color: #3471FF;
+		display: flex;
+		justify-content: flex-end;
+		view{
+			margin-left:15px;
+		}
+		image{
+			width: 14px;
+			height: 14px;
+			// vertical-align: sub;
+			margin-right: 5px;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index b077ca0..9171886 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -18,8 +18,7 @@
 					</view>
 					<view class="minemp">
 						<view  class="mineid">ID：{{userinfo.sn}}</view>
-						<!-- <view class="mp" @click="gomymp">{{$t('auth')}}</view> -->
-						<!-- <view v-if="!isopenid" class="mp" @click="gomyauth">{{$t('auth')}}</view> -->
+						<!-- <view class="mp" @click="gomymp">{{$t('navbar.businesscard')}}</view> -->
 					</view>
 				</view>
 			</view>
@@ -50,7 +49,7 @@
 					<uni-icons type="right"  class="icon" size="18"></uni-icons>
 				</view> -->
 				<view class="sonContent" v-if="!isopenid" @click="gomyauth">
-					<image class="son-img-bg" style="width: 30px; height: 30px;" src="/static/image/login/fenshu.png"></image>
+					<image class="son-img-bg"  src="/static/image/mine/icon9.png"></image>
 					<span>{{$t('auth')}}</span>
 					<uni-icons type="right"  class="icon" size="18"></uni-icons>
 				</view>
@@ -64,18 +63,17 @@
 					<span>{{$t('mine.logoff')}}</span>
 					<uni-icons type="right"  class="icon" size="18"></uni-icons>
 				</view> -->
-				<!-- <view class="sonContent" @click="navTo('/pages/mine/recyclebin')">
+				<view class="sonContent" @click="navTo('/pages/mine/recyclebin')">
 					<image class="son-img-bg" src="/static/image/mine/icon8.png"></image>
 					<span>{{$t('mine.recyclebin')}}</span>
 					<uni-icons type="right"  class="icon" size="18"></uni-icons>
-				</view> -->
+				</view>
 				
 				<view class="sonContent" @click="logout">
 					<image class="son-img-bg" src="/static/image/mine/icon7.png"></image>
 					<span>{{$t('mine.logout')}}</span>
 					<uni-icons type="right" class="icon" size="18"></uni-icons>
 				</view>
-				
 			</view>
 			
 		</view>
@@ -109,7 +107,20 @@
 			
 		},
 		onShow() {
+			uni.setTabBarItem({
+				index: 0,
+				text: this.$t('tabbar.home')
+			})
+			uni.setTabBarItem({
+				index: 1,
+				text: this.$t('tabbar.customer')
+			})
+			uni.setTabBarItem({
+				index: 2,
+				text: this.$t('tabbar.mine')
+			})
 			this.getuserinfo()
+			
 		},
 		methods: {
 			getuserinfo(){
@@ -127,7 +138,7 @@
 			},
 			gomymp(){
 				uni.navigateTo({
-					url: '/pages/mine/webview'
+					url: '/pages/mine/businesscard'
 				})
 			},
 			gomyauth(){
@@ -215,14 +226,14 @@
 		/* #ifdef APP-PLUS */
 		height:44px;
 		/* #endif */
-		height:30px;
+		height:34px;
 	}
 	.content{
 		padding:10px 15px 15px;
 		.contop{
 			display: flex;
 			align-items: center;
-			margin: 0px 0px 30px;
+			// margin: 0px 0px 30px;
 			font-size: 34rpx;
 			color: white;
 			.right{
@@ -244,7 +255,7 @@
 						font-size: 28rpx;
 						background: #fff;
 						color: #3471FF;
-						padding: 1px 15px;
+						padding: 0px 12px;
 						border-radius: 5px 15px 15px 15px;
 					}
 				}
@@ -283,7 +294,7 @@
 		display: flex;
 		box-sizing: border-box;
 		flex-direction: column;
-	
+		margin-top: 13%;
 		.sonTitle {
 			height: 80rpx;
 			line-height: 80rpx;
@@ -316,7 +327,7 @@
 				width: 20px;
 				height: 20px;
 				position: absolute;
-				top: 45%;
+				top: 50%;
 				margin-top: -20rpx;
 				left: 12px;
 			}
diff --git a/pages/mine/about.vue b/pages/mine/about.vue
index 8b96147..d7f4def 100644
--- a/pages/mine/about.vue
+++ b/pages/mine/about.vue
@@ -10,7 +10,7 @@
 				<u-cell
 				    size="large"
 				    :title="$t('mine.Versionup')"
-				    value="v0.0101"
+				    value="v1.1.0"
 					isLink
 					@click="handleVersionUpdate"
 				></u-cell>
@@ -38,7 +38,7 @@
 			},
 			handleVersionUpdate() {
 				uni.showToast({
-					title: '检查版本更新',
+					title: this.$t('versionmsg'),
 					icon: 'none'
 				});
 			},
diff --git a/pages/mine/businesscard.vue b/pages/mine/businesscard.vue
new file mode 100644
index 0000000..6bde537
--- /dev/null
+++ b/pages/mine/businesscard.vue
@@ -0,0 +1,245 @@
+<template>
+	<view>
+		<uni-nav-bar leftText=" " :fixed="true" :border="false" leftIcon="back" @clickLeft="leftClick" color="#000000"
+			backgroundColor="#fff" :statusBar="true"  :title="$t('navbar.businesscard')"></uni-nav-bar>
+		<view class="card">
+			<view class="img_top" ref="poster" id="poster">
+				<view class="name">
+					<view class="left">
+						<view class="title">
+							<view class="leftbg"></view> 
+							<view>{{userinfo.name}}</view>
+						</view>
+						<view class="ftitle">{{userinfo.position}}</view>
+					</view>
+				    <view>
+						<image :src="userinfo.avatar" mode=""></image>
+					</view>
+				</view>
+				<view class="conts">
+					<view class="coles">
+						<image src="/static/image/mine/phone.png" mode=""></image>
+						<view class="">{{userinfo.mobile}}</view>
+					</view>
+					<view class="coles">
+						<image src="/static/image/mine/email.png" style="height:13px;" mode=""></image>
+						<view class="">{{userinfo.email}}</view>
+					</view>
+					<view class="coles">
+						<image src="/static/image/mine/addr.png" style="height:18px;width: 14px;" mode=""></image>
+						<view class="">{{userinfo.country_name}}</view>
+					</view>
+				</view>
+				<view class="code">
+					<image src="/static/image/mine/ewm.png" mode=""></image>
+					<text>微信</text>
+				</view>
+			    <!-- <view class="code" :class=" activeImg === share_one ? 'code_one' : activeImg === share_two ? 'code_two' : activeImg === share_three ? 'code_three' : 'code_one'">
+			        <qrcode-vue :value="codeUrl" :size="70"></qrcode-vue>
+			    </view> -->
+			</view>
+			
+		</view>
+		<view class="foot">
+			<button class="btn"  @click="goDown">{{$t('download')}}</button>
+		</view>	
+	</view>
+</template>
+
+<script>
+	import { request,showToast } from '@/api/apiT.js'
+	import html2canvas from 'html2canvas';
+	export default {
+		data() {
+			return {
+				userinfo:{}
+			}
+		},
+		onLoad() {
+			this.getinfo()
+		},
+		methods: {
+			leftClick(){
+				uni.navigateBack({})
+			},
+			getinfo(){
+				var that= this;
+				request({
+					url:'user/getInfo',
+					method:'get',
+				}).then(res => {
+					that.userinfo = res.data.data;
+				})
+			},
+			saveImgFile(baseImg){
+				const bitmap = new plus.nativeObj.Bitmap('test')
+				bitmap.loadBase64Data(
+				    baseImg,
+				    function () {
+				        const url = '_doc/' + new Date().getTime() + '.png' // url为时间戳命名方式
+				        bitmap.save(
+				            url,
+				            {
+				                overwrite: true // 是否覆盖
+				            },
+				            i => {
+				                plus.gallery.save(
+				                    i.target,
+				                    function () {
+										uni.showToast({
+											title: '图片保存至相册成功',
+											icon: 'none'
+										});
+				                        bitmap.clear()
+				                    },
+				                    function (e) {
+										uni.showToast({
+											title: '图片保存至相册失败',
+											icon: 'none'
+										});
+				                        // console.log('图片保存至相册失败:' + JSON.stringify(e))
+				                        bitmap.clear()
+				                    }
+				                )
+				            },
+				            e => {
+								uni.showToast({
+									title: '图片保存失败1',
+									icon: 'none'
+								});
+				                bitmap.clear()
+				            }
+				        )
+				    },
+				    e => {
+				        uni.showToast({
+				        	title: '图片保存失败2',
+				        	icon: 'none'
+				        });
+				        bitmap.clear()
+				    }
+				)
+			},
+			downloadImage(url, filename) {
+				// 创建一个隐藏的 <a> 标签
+				const link = document.createElement('a');
+				link.href = url;
+				link.download = filename;
+				// 触发点击事件
+				link.click();
+			},
+			goDown(){
+				const element = document.getElementById('poster');
+				var that= this
+				html2canvas(element, {
+				    backgroundColor: '#f5f5f5', //海报的背景颜色
+				    useCORS: true // 允许跨域
+				}).then(canvas => {
+				    // canvas 其实就是我们所讲的res 的意思 返回报文的意思
+				    let baseImg = canvas.toDataURL('image/png')
+					uni.showModal ({
+						title: '下载名片',
+						content: '确定下载当前名片图吗？',
+						success: function (res) {
+							if (res.confirm) {
+								that.downloadImage(baseImg, 'screenshot.png');
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.card{
+		padding: 15px;
+	}
+	.img_top{
+		background-image: url('/static/image/mine/cardbg.png');
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		text-align: center;
+		position: relative;
+		width:690rpx;
+		height:1060rpx;
+		padding-top: 60rpx;
+		.leftbg{
+			width: 10px;
+			height: 34px;
+			background: linear-gradient(to bottom, #3471FF, #BD67FF);
+			margin-right: 15px;
+		}
+		.name{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex: 1;
+			margin: 0px 25px 0px 0px;
+			.title{
+				color: #3C4169;
+				font-size: 28px;
+				font-weight: bold;
+				display: flex;
+				align-items: center;
+			}
+			.ftitle{
+				color: #222222;
+				font-size: 16px;
+				font-weight: bold;
+				margin-top: 20px;
+			}
+			image{
+				width: 100px;
+				height: 100px;
+				border-radius: 50%;
+			}
+		}
+		.conts{
+			padding: 15px 25px;
+			line-height: 32px;
+			margin-bottom: 20px;
+			.coles{
+				display: flex;
+				align-items: center;
+				font-size: 16px;
+				image{
+					width: 16px;
+					height: 16px;
+					margin-right: 5px;
+				}
+			}
+		}
+		.code{
+			background-color: rgba(255,255,255,50%);
+			border-radius: 10px;
+			text-align: center;
+			width: 340rpx;
+			margin: auto;
+			padding: 15px;
+			image{
+				width: 160px;
+				height: 160px;
+			}
+		}
+	}
+	.foot{
+		position: fixed;
+		bottom: 0px;
+		width: 100%;
+		height: 90px;
+		background: #FFFFFF;
+		z-index: 1;
+	}
+	.btn{
+		background: linear-gradient(to right, #3471FF, #6776FF);
+		color: white;
+		border-radius: 50px;
+		width: 92%;
+		margin-bottom: 40px;
+		margin: 15px 4%;
+	}
+</style>
diff --git a/pages/mine/changinfo.vue b/pages/mine/changinfo.vue
index 666ce10..089c172 100644
--- a/pages/mine/changinfo.vue
+++ b/pages/mine/changinfo.vue
@@ -57,7 +57,7 @@
 			<u-divider text=""></u-divider>
 			<view class="cell1">
 				<view class="item">{{$t('customer.Country')}}</view>
-				<view class="right select" @click="showarea = true">
+				<view class="right select" @click="showPicker = true">
 					<view class="" :class="['content2', { placeholder: !country_name }]">{{country_name || $t('customer.Countryinput')}}</view>
 					<u-icon class="arrowright" name="arrow-right" size="18" color="#747474"></u-icon>
 				</view>
@@ -66,16 +66,52 @@
 		<view class="foot">
 			<button class="btn"  @click="bcFn">{{$t('save')}}</button>
 		</view>	
-		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :defaultIndex="defaultIndexgj" :show="showarea" @cancel="cancel('showarea')" @close="close('showarea')"  :columns="areaList" keyName="name" @confirm="areaChange"></u-picker>
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :defaultIndex="defaultIndexgs" :show="showcomp" @cancel="cancel('showcomp')" @close="close('showcomp')"  :columns="company" keyName="name" @confirm="companyChange"></u-picker>
 		
+		<u-popup closeOnClickOverlay :show="showPicker" mode="bottom"  :round="10"  @close="close('showPicker')">
+			<view class="text">
+				<view class="qx" @click="close('showPicker') ">{{$t('cancel')}}</view>
+				<view class="qd" @click="arerfn">{{$t('confirm')}}</view>
+			</view>
+			  <view class="popup-content">
+				<!-- 搜索框 -->
+				<u-input
+				  v-model="searchKeyword"
+				  :placeholder="$t('keyword')"
+				  @input="handleSearch"
+				></u-input>
+		
+				<!-- 选项列表 -->
+				<scroll-view scroll-y class="option-list">
+				  <view
+					v-for="(item, index) in filteredOptions"
+					:key="index"
+					class="option-item"
+					@click="handleSelect(item)"
+					:class="actives==item.id?'actives':''"
+				  >
+					{{ item.name  }}
+				  </view>
+				  <view v-if="filteredOptions.length === 0" class="no-data">
+					{{$t('noresults')}}
+				  </view>
+				</scroll-view>
+			  </view>
+		</u-popup>
 	</view>
 </template>
 <script>
+	import { nextTick } from "vue"
 	import { request,showToast } from '@/api/apiT.js'
 	export default {
 		data() {
 			return {
+				loca:uni.getLocale(),
+				actives:'',
+				showPicker: false, // 控制选择器显示
+				searchKeyword: "", // 搜索关键词
+				selectedLabel: "", // 选中的值（显示在输入框中）
+				filteredOptions: [], // 过滤后的数据
 				showarea: false,
 				showcomp: false,
 				country_name:'',
@@ -83,8 +119,6 @@
 				areaList:[],
 				defaultIndexgj:[0],
 				company_name:'',
-				company:[],
-				company1:[],
 				defaultIndexgs:[0],
 				imageStyles: {
 					border: true,
@@ -99,6 +133,34 @@
 			this.getinfo()
 		},
 		methods: {
+			// 搜索处理函数
+			handleSearch() {
+				var that = this
+			  if (this.searchKeyword) {
+				console.log(this.searchKeyword)
+				this.filteredOptions = this.areaList1.filter((item) => item.name.includes(this.searchKeyword));
+				
+				console.log(this.filteredOptions)
+			  } else {
+				// 如果搜索框为空，显示全部数据
+				this.filteredOptions = this.areaList1;
+			  }
+			},
+			// 选择选项
+			handleSelect(item) {
+				this.selectedLabel = item.name; // 回显选中的值
+			  // this.searchKeyword = item.name
+			  this.actives = item.id
+			  // this.showPicker = false; // 关闭弹窗
+			  console.log("选中的值:", item.id);
+			  console.log("选中的值:", item.name);
+			},
+			arerfn(){
+				 this.showPicker = false; // 关闭弹窗
+				 this.country_name = this.selectedLabel
+				 this.userinfo.country_id = this.actives
+				 
+			},
 			getinfo(){
 				var that= this;
 				request({
@@ -109,19 +171,13 @@
 						res.data.data.position=''
 					}
 					that.userinfo = res.data.data;
-					
+					this.actives  = res.data.data.country_id
+					this.country_name  = res.data.data.country_name
 					that.select1()
 				})
 			},
 			select1(){
 				var that=this;
-				that.areaList1.forEach((item,index) => {
-					if(item.id == that.userinfo.country_id){
-						that.country_name = item.name
-						that.defaultIndexgj=[index]
-						console.log(that.country_name)
-					}
-				})
 				that.company1.forEach((item,index) => {
 					if(item.id == that.userinfo.sign){
 						that.company_name = item.name
@@ -129,12 +185,6 @@
 					}
 				})
 			},
-			//国家切换事件
-			areaChange(val){
-				this.userinfo.country_id = val.value[0].id
-				this.country_name = val.value[0].name
-				this.showarea = false
-			},
 			//国家
 			area(){
 				request({
@@ -143,7 +193,7 @@
 				}).then(res => {
 					var list = res.data.data
 					this.areaList1 = list
-					this.areaList = [list]
+					this.filteredOptions = list;
 					this.select1()
 				})
 			},
@@ -311,4 +361,44 @@
 		height: 35px;
 		border-radius: 50%;
 	}
+	
+	
+	//
+	.actives{
+		background-color: #dfdfdf;
+	}
+	.text{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		line-height: 30px;
+		padding: 10px 15px 0px;
+		.qd{
+			color: #3471FF;
+		}
+	}
+	.popup-content {
+	  padding: 20px;
+	  background-color: #fff;
+	}
+	
+	.option-list {
+	  max-height: 400rpx;
+	  margin-top: 20rpx;
+	}
+	
+	.option-item {
+	  padding: 20rpx;
+	  border-bottom: 1rpx solid #eee;
+	}
+	
+	.option-item:last-child {
+	  border-bottom: none;
+	}
+	
+	.no-data {
+	  text-align: center;
+	  padding: 20rpx;
+	  color: #999;
+	}
 </style>
diff --git a/pages/mine/recyclebin.vue b/pages/mine/recyclebin.vue
index 2cd4fae..6f62715 100644
--- a/pages/mine/recyclebin.vue
+++ b/pages/mine/recyclebin.vue
@@ -1,31 +1,15 @@
 <template>
 	<view>
-		<z-paging  ref="paging" v-model="datalist" @query="queryList"  empty-view-text='暂无数据!'>
+		<z-paging  ref="paging" v-model="datalist" @query="queryList"  :empty-view-text="$t('Nodata')">
 			<template #top>
 				<uni-nav-bar leftText=" " :fixed="true" :border="false" leftIcon="back" @clickLeft="leftClick" color="#000000"
 					backgroundColor="#fff" :statusBar="true" :title="$t('mine.recyclebin')"></uni-nav-bar>
 			</template>
 			<view class="contents" >
 				<view class="colls" v-for="(item, index) in datalist" :key="index" >
-					<view class=""  @click="detileClick(item)">
-						<view class="top">
-							<view class="name">{{item.contacts}}</view>
-							<view class="right">
-								<text class="medal" :style="{color:(item.magnitude == 0 ?'#F5AB00' : item.magnitude == 1 ?'#8495B8': '#9B7200')}">{{item.magnitude_txt}}</text>
-							</view>
-						</view>
-						<u-line margin="20rpx 0px" color="#fff" :hairline="false"></u-line>
-						<view class="cont">
-							<view class="title">
-								<view class=""><text class="name">{{item.phone}}</text></view>
-								<view class="ststus">{{item.grade_txt}}</view>
-							</view>
-							<view class="info"><text class="sex">{{item.sex_txt}}</text> | <text class="addr">{{item.country_name}}</text><text class="type">{{item.car_type_name}}</text>
-							</view>
-						</view>
-					</view>
-					<view class="edt">
-						<view class="btn"  @click="editFn"><text> {{$t('mine.restore')}}</text></view>
+					<view class="cont">
+						<view class=""><text class="name">{{item.contacts}}</text><text>{{item.phone}}</text></view>
+						<view class="btn"  @click="restoreFn(item)"><text> {{$t('mine.restore')}}</text></view>
 					</view>
 				</view>
 			</view>
@@ -42,6 +26,9 @@
 			}
 		},
 		methods: {
+			leftClick(){
+				uni.navigateBack({})
+			},
 			//客户列表数据
 			queryList(pageNo, pageSize) {
 				var that = this;
@@ -51,6 +38,7 @@
 					data: {
 						page:pageNo,
 						per_page:10,
+						recycle:'recycle'
 					}
 				}).then(res => {
 					console.log(res.data)
@@ -58,15 +46,38 @@
 						var datas = res.data.data.list;
 						this.$refs.paging.complete(datas);
 					}else{
-						// this.$refs.paging.complete(null);
-						// that.listlength=0
 					} 
 					uni.stopPullDownRefresh();
 				})
 			},
-			detileClick(item){
-				uni.navigateTo({
-					url: '/pages/mine/recyclebindetil?id='+item.id
+			restoreFn(item){
+				var that=this
+				uni.showModal({
+					title: this.$t('prompt'),
+					content: this.$t('restoremsg'),
+					success: function (res) {
+						if (res.confirm) {
+							request({
+								url:'customer/restore',
+								method:'post',
+								data: {
+									id:item.id,
+								}
+							}).then(res => {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none'
+								});
+								if(res.data.code ==0){
+									setTimeout(() => {
+										that.queryList(1, 10)
+									}, 1000);
+									
+								}
+							})
+						} else if (res.cancel) {
+						}
+					}
 				});
 			}
 		}
@@ -95,39 +106,12 @@
 			margin-right: 10px;
 		}
 		.cont{
-			padding: 0px 15px 10px;
-			font-size: 24rpx;
-			.title{
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				color: #222222;
-			}
-			.ststus{
-				color: #666666;
-			}
-			.info,.desc{
-				color: #78758E;
-				line-height: 26px;
-			}
-			.sex{
-				margin-right: 5px;
-			}
-			.addr{
-				margin-left: 5px;
-			}
-			.type{
-				margin-left: 5px;
-				color: #3471FF;
-			}
-		}
-		.edt{
+			padding: 15px 12px;
+			font-size: 28rpx;
 			display: flex;
-			justify-content: right;
-			padding-bottom: 10px;
-			padding-right: 15px;
+			align-items: center;
+			justify-content: space-between;
 		}
-		
 		.btn{
 			background: linear-gradient(to right, #3471FF, #6776FF);
 			color: white;
diff --git a/pages/mine/recyclebindetil.vue b/pages/mine/recyclebindetil.vue
deleted file mode 100644
index 507e842..0000000
--- a/pages/mine/recyclebindetil.vue
+++ /dev/null
@@ -1,333 +0,0 @@
-<template>
-	<view>
-		<uni-nav-bar leftText=" " :fixed="true" :border="false" leftIcon="back" @clickLeft="leftClick" color="#000000" backgroundColor="#fff" :statusBar="true" :title="$t('details')"></uni-nav-bar>
-		<view class="content">
-			<view class="contents" >
-				<view class="top">
-					<view class="name">{{datas.contacts}}</view>
-					<view class="right">
-						<text class="medal" :style="{color:(datas.magnitude == 0 ?'#F5AB00' : datas.magnitude == 1 ?'#8495B8': '#9B7200')}">{{datas.magnitude_txt}}</text>
-					</view>
-				</view>
-				<u-line margin="20rpx 0px" color="#fff" :hairline="false"></u-line>
-				<view class="cont">
-					<view class="title">
-						<view class=""><text class="name">{{datas.phone}}</text></view>
-						<view class="ststus">渠道：{{datas.channel_name}}</view>
-					</view>
-					<view class="info"><text class="sex">{{datas.sex_txt}}</text> | <text class="addr">{{datas.country_name}}</text><text class="type">{{datas.car_type_name}}</text>
-					</view>
-					<view v-if="datas.email!=''">Email: {{datas.email}}</view>
-					<view v-if="datas.WhatsApp!=''">WhatsAPP: {{datas.WhatsApp}}</view>
-					<view v-if="datas.address!=''">公司: {{datas.address}}</view>
-					<view v-if="datas.describe!=''">备注: {{datas.describe}}</view>
-				</view>
-			</view>
-			<view class="cell">
-				<view class="item">{{$t('customer.Cstomerfj')}}</view>
-				<view class="right select">
-					<view class="" :class="['content2', { placeholder: !datas.grade_txt }]">{{datas.grade_txt || $t('customer.Cstomerfjinput')}}</view>
-				</view>
-			</view>
-		</view>
-		<u-gap height="10" bgColor="#F6F6F6"></u-gap>
-		<view class="steps">
-			<view class="title">
-				<view class="">
-					{{$t('customer.followrecord')}} <text class="status" :style="{color:(datas.follow == 0 ?'#3471FF' : datas.follow == 1 ?'#27C89C': '#FF4040')}">{{datas.follow_txt}}</text>
-				</view>
-			</view>
-			<u-steps v-if="followList.length>0" :current="followList.length" direction="column" dot>
-				<u-steps-item :title="item.type_txt"  v-for="(item, index) in followList" :key="index">
-					<view slot="desc" class="desc">
-						<view class=""  v-if="item.type==0">
-							<view class="">
-								<view class="">
-									{{$t('times')}} ：{{item.created_at}}
-								</view>
-								<view class="">{{$t('address')}}：{{item.address}}</view>
-								<view class="">{{$t('customer.Visitcontent')}}：{{item.audio_text}}</view>
-							</view>
-							<view class="">
-								<image :src="item.oss_picture" mode=""></image>
-							</view>
-						</view>
-						<view class="" v-else>
-							<view class="">
-								{{$t('times')}}：{{item.created_at}}
-							</view>
-							<view class="">
-								<image :src="item.oss_picture" mode=""></image>
-							</view>
-						</view>
-					</view>
-				</u-steps-item>
-			</u-steps>
-			<empty :list="followList"></empty>
-		</view>
-		<view class="zw"></view>
-		<view class="foot">
-			<button class="btn"  @click="nextFn">{{$t('mine.restore')}}</button>
-		</view>	
-	</view>
-</template>
-
-<script>
-	import { request,showToast } from '@/api/apiT.js'
-	export default {
-		data() {
-			return {
-				id:'',
-				followList:[],
-				grade_name:'',
-				form: {
-				  grade:'',
-				},
-				datas:''
-				
-			}
-		},
-		onLoad(options) {
-			console.log(options);
-			this.id = options.id;
-			var that = this
-			this.customerdetailfn()
-			
-		},
-		onShow() {
-			this.followlistfn()
-		},
-		methods: {
-			leftClick(){
-				uni.navigateBack({})
-			},
-			gomap(){
-				uni.navigateTo({
-					url: '/pages/customer/map'
-				});
-			},
-			//客户详情 
-			customerdetailfn(){
-				var that=this;
-				request({
-					url:'customer/detail',
-					method:'get',
-					data: {
-						id:this.id,
-					}
-				}).then(res => {
-					that.datas = res.data.data
-					that.form = res.data.data
-				})
-			},
-			// 跟进记录
-			followlistfn(){
-				request({
-					url:'follow/list',
-					method:'get',
-					data: {
-						customer_id:this.id,
-					}
-				}).then(res => {
-					this.followList = res.data.data
-					console.log(res.data.data)
-				})
-			},
-			nextFn(){
-				// request({
-				// 	url:'customer/save',
-				// 	method:'post',
-				// 	data:this.form
-				// }).then(res => {
-				// 	uni.showToast({
-				// 		title: res.data.message,
-				// 		icon: 'none'
-				// 	});
-				// 	if(res.data.code ==0){
-				// 		setTimeout(() => {
-				// 			uni.reLaunch({
-				// 				url: '/pages/index/customer',// 替换为你要跳转的页面路径
-				// 			});
-				// 		}, 1000);
-				// 	}
-				// })
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.u-m-lr-10{
-		margin: 0px 10px;
-	}
-	.placeholder {
-	  color: #999; /* 占位符颜色 */
-	}
-	textarea {
-	  min-height: 200rpx;// 设置默认高度 ，解决设置自适应高度之后高度无效问题
-	  margin-top: 15px;
-	  background-color: #F6F6F6;
-	  padding: 15px;
-	  border-radius: 10px;
-	}
-	.red{
-		color: red;
-	}
-	.zw{
-		height: 120px;
-	}
-	.uniui-right{
-		position: absolute;
-		top: 2px;
-	}
-	.cell{
-		position: relative;
-		display: flex;
-		justify-content:space-between;
-		padding: 18px 20px;
-		align-items: center;
-		font-weight: 500;
-		.item{
-			width: 90px;
-			color: #666666;
-		}
-		background: #f6f6f6;
-		border-radius: 10px;
-	}
-	.arrowright{
-		margin-right: -15px;
-	}
-	.right{
-		text-align: right;
-	}
-	.select{
-		display: flex;
-		position: relative;
-		margin-right: 10px;
-	}
-	.content{
-		padding: 10px 15px;
-		background: #FFFFFF;
-		.contents{
-			background-color:#F6F6F6;
-			border-radius: 10px;
-			margin-bottom: 10px;
-			.edt{
-				display: flex;
-				justify-content: right;
-				padding-bottom: 10px;
-				image{
-					width: 14px;
-					height: 14px;
-					margin-right: 5px;
-					vertical-align: middle;
-				}
-			}
-			
-			.btn{
-				color: #3471FF;
-				text-align: right;
-				padding: 0px 15px 0px;
-			}
-			.top{
-				padding: 10px 15px 0px;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				.tag{
-					color: white;
-					border-radius: 20px 0px 0px 20px;
-					padding: 3px 10px;
-					margin-right: -15px;
-				}
-				.right{
-					display: flex;
-					align-items: center;
-				}
-			}
-			.name{
-				font-size: 32rpx;
-				font-weight: bold;
-				margin-right: 10px;
-			}
-			.cont{
-				padding: 0px 15px 10px;
-				font-size: 24rpx;
-				
-				.title{
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					color: #222222;
-				}
-				.ststus{
-					color: #666666;
-				}
-				.info,.desc{
-					color: #78758E;
-					line-height: 26px;
-				}
-				.sex{
-					margin-right: 5px;
-				}
-				.addr{
-					margin-left: 5px;
-				}
-				.type{
-					margin-left: 5px;
-					color: #3471FF;
-				}
-			}
-		}
-	}
-	
-	.steps{
-		padding: 15px;
-		background: #fff;
-		image{
-			width: 44px;
-			height:44px;
-		}
-		.desc{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			color: #999999;
-		}
-		.title{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			color: #666666;
-			font-size: 32rpx;
-			margin-bottom: 15px;
-			.status{
-				font-size: 28rpx;
-				margin-left: 10px;
-			}
-			.btnjl{
-				background: linear-gradient(to right, #3471FF, #6776FF);
-				color: white;
-				padding: 4px 10px;
-				border-radius: 20px;
-				font-size: 28rpx;
-			}
-		}
-	}
-	.foot{
-		position: fixed;
-		bottom: 0px;
-		width: 100%;
-		height: 160rpx;
-		background: #FFFFFF;
-		z-index: 1;
-	}
-	.btn{
-		background: linear-gradient(to right, #3471FF, #6776FF);
-		color: white;
-		border-radius: 50px;
-		width: 92%;
-		margin-bottom: 40px;
-		margin: 15px 4%;
-	}
-</style>
diff --git a/static/image/customer/tagadd.png b/static/image/customer/tagadd.png
new file mode 100644
index 0000000..1c4a0f5
Binary files /dev/null and b/static/image/customer/tagadd.png differ
diff --git a/static/image/gtime.png b/static/image/gtime.png
new file mode 100644
index 0000000..ea7e967
Binary files /dev/null and b/static/image/gtime.png differ
diff --git a/static/image/mine/addr.png b/static/image/mine/addr.png
new file mode 100644
index 0000000..a94dd46
Binary files /dev/null and b/static/image/mine/addr.png differ
diff --git a/static/image/mine/cardbg.png b/static/image/mine/cardbg.png
new file mode 100644
index 0000000..deaf031
Binary files /dev/null and b/static/image/mine/cardbg.png differ
diff --git a/static/image/mine/email.png b/static/image/mine/email.png
new file mode 100644
index 0000000..0c060b2
Binary files /dev/null and b/static/image/mine/email.png differ
diff --git a/static/image/mine/ewm.png b/static/image/mine/ewm.png
new file mode 100644
index 0000000..df52c84
Binary files /dev/null and b/static/image/mine/ewm.png differ
diff --git a/static/image/mine/icon9.png b/static/image/mine/icon9.png
new file mode 100644
index 0000000..2edb7b1
Binary files /dev/null and b/static/image/mine/icon9.png differ
diff --git a/static/image/mine/phone.png b/static/image/mine/phone.png
new file mode 100644
index 0000000..0dad3c1
Binary files /dev/null and b/static/image/mine/phone.png differ
diff --git a/static/image/redtime.png b/static/image/redtime.png
new file mode 100644
index 0000000..9c267bc
Binary files /dev/null and b/static/image/redtime.png differ
diff --git a/static/image/topbg.png b/static/image/topbg.png
index aaec6d1..bbac171 100644
Binary files a/static/image/topbg.png and b/static/image/topbg.png differ