添加版权信息

commit aa54e053ee
Author: 浅念 <email@sample.com>
Date:   Thu Apr 3 13:17:00 2025 +0800

    下拉组件加俄语包

commit 97a896dbe8
Author: 浅念 <email@sample.com>
Date:   Thu Apr 3 13:13:51 2025 +0800

    修改语言

commit 07e477972e
Author: 浅念 <email@sample.com>
Date:   Thu Apr 3 11:21:13 2025 +0800

    我的名片 下载调整

commit fde5830450
Author: 浅念 <email@sample.com>
Date:   Wed Apr 2 15:51:39 2025 +0800

    名片页面

commit b60cbff6d5
Author: 浅念 <email@sample.com>
Date:   Tue Apr 1 17:19:32 2025 +0800

    调整样式

commit 7fd2e63c9d
Author: 浅念 <email@sample.com>
Date:   Tue Apr 1 17:18:22 2025 +0800

    添加标签检索，添加公海页面

App.vue

@@ -102,10 +102,21 @@
 	page {
 		background-color:#F9F9F9;
 		height: 100%;
-		font-size: 28rpx;
+		font-size: 24rpx;
 		/* line-height: 1.8; */
 	}
-
+	uni-input{
+		font-size: 24rpx;
+	}
+	textarea {
+	  font-size: 24rpx;
+	}
+	.select{
+		font-size: 24rpx;
+	}
+	.u-radio-group--row{
+		 font-size: 24rpx;
+	}
 	.fix-pc-padding {
 		padding: 0 50px;
 	}

api/apiT.js

@@ -1,13 +1,14 @@
 
  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;
 	data = data || {},
 	uni.showLoading({
-		title: '加载中'
+		title: ''
 	});
 	
 	return new Promise((resolve,rejext)=>{
@@ -22,6 +23,7 @@ export function request(options){//封装的requset
 						title: res.data.message,
 						icon: 'none'
 					});
+					uni.clearStorageSync();
 					setTimeout(() => {
 						uni.reLaunch({
 							url: '/pages/login/index',// 替换为你要跳转的页面路径

common/locales/en.js

@@ -2,6 +2,7 @@ export default {
 	// 可以以页面为单位来写，比如首页的内容，写在index字段，个人中心写在center，共同部分写在common部分
 	tabbar: {
 		home: 'home',
+		highseas: 'HighSeas',
 		customer: 'customer',
 		mine: 'mine'
 	},
@@ -9,7 +10,10 @@ export default {
 		customerinfo:'Customer Information',
 		addfollowup:'Add follow-up',
 		userList:'Customer Management',
+		tagselect:'Tag filtering',
+		highseas:'Customer High Seas',
 		persondata:'Personal Data',
+		businesscard:'Business card'
 		
 	},
 	home: {
@@ -55,6 +59,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 +72,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',
@@ -80,7 +86,7 @@ export default {
 		Versionup:'Version Update',
 		Privacy:'Privacy Policy',
 		UserAgreement:'User Agreement',
-		copyright:'© Henan Xinyouhe Technology Co., Ltd. All rights reserved',
+		copyright:'© 2024 powered by Henan Jinhai Technology Environmental Protection Co., Ltd',
 		logoff:'Account cancellation',
 		logoffmsg:'The following information will be cleared and cannot be retrieved',
 		logoffts1:'Ldentity and account information',
@@ -91,7 +97,10 @@ export default {
 		recyclebin:'Recycle bin',
 		restore:'Restore',
 		position:'Position',
-		positioninput:'Please fill in the position'
+		positioninput:'Please fill in the position',
+		QRcode:'QR code',
+		WeChat:'WeChat',
+		UploadQRcode:'Upload QR code'
 	},
 	call:'Call',
 	delete:'Delete',
@@ -106,6 +115,7 @@ export default {
 	confirm:'confirm',
 	prompt:'prompt',
 	deletemsg:'Are you sure you want to delete this customer?',
+	receivemsg:'Are you sure you want to claim this customer？',
 	submit:'Submit',
 	gender:'Gender',
 	gender0:'unknown',
@@ -156,4 +166,34 @@ 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！',
+	receiveOrder:'Collect Order',
+	loading:'loading',
+	downmp:'Download business card',
+	downmpmsg:'Are you sure to download the current business card image?',
 }

common/locales/ru.js

@@ -2,16 +2,196 @@ export default {
 	// 可以以页面为单位来写，比如首页的内容，写在index字段，个人中心写在center，共同部分写在common部分
 	tabbar: {
 		home: 'начало',
+		highseas: 'открытое море',
 		customer: 'клиент',
 		mine: 'мой'
 	},
+	navbar: {
+		customerinfo: "Информация о клиенте",
+		addfollowup: "Добавить последующие	",
+		highseas: "Открытое море клиентов",
+		userList: "Управление клиентами",
+		tagselect: "Фильтр по меткам",
+		persondata: "Личные данные",
+		businesscard: "Моя визитка"
+	},
 	home: {
-		desc: 'начало'
+		desc: "начало",
+		langbtn: "Сменить язык",
+		title: "Вы сопровождаете линке",
+		day: "день",
+		databf: "Данные Брифинги",
+		addxs: "Новые Подсказка",
+		addkh: "Новые клиенты",
+		addbf: "Новые посещения",
+		addgj: "Новые последующие	"
 	},
 	customer: {
-		desc: 'клиент'
+		desc: "клиент",
+		title: "Управление клиентами",
+		inputhd: "Введите имя клиента или номер телефона",
+		followtype: "Способ последующие	",
+		Online: "Линия",
+		Visit: "Посещение",
+		addfollow: "Добавить последующие",
+		followtime: "Время последующие	",
+		updataimg: "Загрузить скриншот последнего чата",
+		followrecord: "Запись последующие	",
+		followlocation: "Текущее местоположение",
+		locationimg: "Сфотографировать текущее местоположение",
+		Visitcontent: "Содержание посещения",
+		Visiinputhd: "Введите содержание посещения~",
+		Remarks: "Примечание (необязательно)",
+		Remarksinputhd: "Введите примечание~",
+		NextReminder: "Следующее напоминание о последующие	",
+		CustomerChannel: "Канал клиента",
+		CustomerChannelinput: "Выберите канал клиента",
+		Medal: "Коммерческая возможность",
+		Medalinput: "Выберите коммерческую возможность",
+		CustomerName: "Имя клиента",
+		CustomerNameinput: "Введите имя клиента",
+		WhatsAppinput: "Введите WhatsApp",
+		Emailinput: "Введите Email",
+		Customerph: "Предпочтения клиента",
+		Customerphinput: "Выберите предпочтения клиента",
+		Cstomerfj: "Классификация клиентов",
+		Cstomerfjinput: "Выберите классификацию",
+		Cstomertag: "Метка клиента",
+		Cstomertaginput: "Выберите",
+		Country: "Страна",
+		Countryinput: "Выберите страну",
+		Company: "Компания",
+		Companyinput: "Определить местоположение",
+		CustomerScreening: "Фильтрация клиентов"
 	},
 	mine: {
-		desc: 'мой'
+		desc: "мой",
-	}
+		title: "мой",
+		msg: "Уведомления",
+		cpassword: "Изменить пароль",
+		contact: "Связаться с поддержкой",
+		feedback: "Отправить заявку",
+		about: "О нас",
+		logoff: "Удалить аккаунт",
+		logout: "Выйти",
+		kfphone: "Телефон поддержки",
+		lxcall: "Контакт",
+		lxcallinputhd: "Введите ваш номер",
+		feedbackinputhd: "Введите ваши ценные предложения~",
+		nickname: "Никнейм",
+		nicknameinputhd: "Введите никнейм",
+		idinputhd: "Введите ID",
+		Versionup: "Обновление версии",
+		Privacy: "Политика конфиденциальности",
+		UserAgreement: "Пользовательское соглашение",
+		copyright:'© 2024 powered by Henan Jinhai Technology Environmental Protection Co., Ltd',
+		logoff:'Списание счетов',
+		logoffmsg: "Следующая информация будет удалена без возможности восстановления",
+		logoffts1: "Идентификационные и учетные данные",
+		logoffts2: "Вся информация о клиентах",
+		logoffts3: "Личная информация",
+		logoffbtn: "Подтвердить удаление",
+		changeavatar: "Нажмите, чтобы сменить аватар",
+		recyclebin: "Корзина",
+		restore: "Восстановить клиента",
+		position: "Должность",
+		positioninput: "Введите должность",
+		QRcode: "QR-код",
+		WeChat: "Микросхема",
+		UploadQRcode: "Загрузить QR-код"
+	},
+	call: "Позвонить",
+	delete: "Удалить",
+	all: "Все",
+	tday: "Сегодня",
+	threeday: "Последние 3 дня",
+	sevenday: "Последние 7 дней",
+	followup: "Последующие",
+	deal: "Завершено",
+	lost: "Потеряно",
+	cancel: "Отмена",
+	confirm: "Подтвердить",
+	prompt: "Подсказка",
+	deletemsg: "Вы уверены, что хотите удалить этого клиента?",
+	receivemsg: "Вы уверены, что хотите принять этого клиента?",
+	submit: "Отправить",
+	gender: "Пол",
+	gender0: "Неизвестно",
+	gender1: "Мужской",
+	gender2: "Женский",
+	Region: "Страна/регион",
+	Regioninputhd: "Выбрать",
+	login: "Войти",
+	threelogin: "Вход через Третья сторона",
+	account: "Аккаунт",
+	password: "Пароль",
+	fgpassword: "Забыли пароль",
+	Facebook: "Feishu",
+	email: "Email",
+	emailinput: "Введите email",
+	phone: "Телефон",
+	agreeMsg: "Я прочитал и согласен с",
+	Privacy:'《Политика конфиденциальности》',
+	UserAgreement:'《Пользовательское соглашение》',
+	and: "и",
+	empty: "Нет записей~",
+	times: "Время",
+	address: "Адрес",
+	emailerr: "Email не может быть пустым",
+	emailerr1: "Неверный формат email",
+	passworerr: "Пароль не может быть пустым",
+	passworerr1: "Пароли не совпадают",
+	agreementarr: "Пожалуйста, сначала согласитесь с пользовательским соглашением и политикой конфиденциальности",
+	reg: "Регистрация",
+	codeerr: "Код подтверждения не может быть пустым",
+	getcode: "Получить код",
+	code: "Код подтверждения",
+	save: "Сохранить",
+	resetpassword: "Сбросить пароль",
+	newpassword: "Новый пароль",
+	Confirmpassword: "Подтвердите пароль",
+	Confirmbtn: "Подтвердить изменение",
+	edtbtn: "Редактировать данные",
+	zh: "Китайский",
+	en: "Английский",
+	ru: "Русский",
+	subsuccess: "Успешно отправлено",
+	onedaygj: "Через 1 день",
+	threedaygj: "Через 3 дня",
+	sevendaygj: "Через 7 дней",
+	autodaygj: "Настроить",
+	nexttime: "Настройка напоминания о следующем последующие	",
+	details: "Детали",
+	auth: "Авторизация Feishu",
+	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: "Уже последняя версия!",
+	receiveOrder: "Принять заказ",
+	loading: "Загрузка",
+	downmp:'Скачать визитку',
+	downmpmsg:'Вы уверены в загрузке текущей карты?',
 }

common/locales/zh.js

@@ -2,14 +2,18 @@ export default {
 	// 可以以页面为单位来写，比如首页的内容，写在index字段，个人中心写在center，共同部分写在common部分
 	tabbar: {
 		home: '首页',
+		highseas: '公海',
 		customer: '客户',
 		mine: '我的'
 	},
 	navbar:{
 		customerinfo:'客户资料',
 		addfollowup:'添加跟进',
+		highseas:'客户公海',
 		userList:'客户管理',
+		tagselect:'标签筛选',
 		persondata:'个人资料',
+		businesscard:'我的名片'
 	},
 	home: {
 		desc: '首页',
@@ -52,12 +56,13 @@ export default {
 		Customerphinput:'请选择客户偏好',
 		Cstomerfj:'客户分级',
 		Cstomerfjinput:'请选择客户分级',
+		Cstomertag:'客户标签',
+		Cstomertaginput:'请选择',
 		Country:'国家',
 		Countryinput:'请选择国家',
 		Company:'公司',
 		Companyinput:'去定位',
 		CustomerScreening:'客户筛选'	
-		
 	},
 	mine: {
 		desc: '我的',
@@ -65,7 +70,7 @@ export default {
 		msg:'消息通知',
 		cpassword:'修改密码',
 		contact:'联系客服',
-		feedback:'意见反馈',
+		feedback:'提交工单',
 		about:'关于我们',
 		logoff:'注销账户',
 		logout:'退出登录',
@@ -79,7 +84,7 @@ export default {
 		Versionup:'版本更新',
 		Privacy:'隐私政策',
 		UserAgreement:'用户协议',
-		copyright:'©河南新友合科技有限公司 版权所有',
+		copyright:'© 2024 powered by 河南晋海科技环保有限公司',
 		logoff:'账户注销',
 		logoffmsg:'以下信息将被清空无法找回',
 		logoffts1:'身份、账号信息',
@@ -90,7 +95,10 @@ export default {
 		recyclebin:'回收站',
 		restore:'恢复客户',
 		position:'职位',
-		positioninput:'请填写职位'
+		positioninput:'请填写职位',
+		QRcode:'二维码',
+		WeChat:'微信',
+		UploadQRcode:'上传二维码'
 	},
 	call:'呼叫',
 	delete:'删除',
@@ -105,6 +113,7 @@ export default {
 	confirm:'确定',
 	prompt:'提示',
 	deletemsg:'确定要删除此客户吗？',
+	receivemsg:'确定要领取此客户吗？',
 	submit:'提交',
 	gender:'性别',
 	gender0:'未知',
@@ -155,4 +164,34 @@ 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:'已是最新版本！',
+	receiveOrder:'领单',
+	loading:'加载中',
+	downmp:'下载名片',
+	downmpmsg:'确定下载当前名片图吗?',
 }

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>

components/Countdown/time-counter.vue

@@ -0,0 +1,114 @@
+<template>
+	<view class="countdown">
+		<view class="time green">
+			<image src="/static/image/gtime.png" mode=""></image>
+			<text>{{ timeObj.days }}{{$t('day')}} </text>
+			<text> {{ timeObj.hours | padZero }} : </text>
+			<text> {{ timeObj.minutes | padZero }} : </text>
+			<text> {{ timeObj.seconds | padZero }}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			// 起始时间
+			totalSeconds: {
+				type: '',
+				required: true
+			},
+			// 是否显示天数
+			showDays: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				startTime: this.totalSeconds, // 开始时间(Date对象)
+				elapsedTime: 0, // 已过时间(毫秒)
+				timer: null, // 计时器对象
+				isRunning: false, // 是否运行中
+				startTimeStr: '' ,// 显示用的开始时间字符串
+				timeObj: {
+				  days: 0,
+				  hours: 0,
+				  minutes: 0,
+				  seconds: 0
+				},
+			}
+		},
+		mounted() {
+			this.runCountdown();
+		},
+		filters: {
+		  padZero(value) {
+		    return value.toString().padStart(2, '0');
+		  }
+		},
+		methods: {
+			// 计算已过时间
+			calculateElapsed() {
+				if (this.startTime) {
+					// 计算差值（毫秒）
+					let diff = this.startTime
+					const dateStr = diff;
+					const timestamp = new Date(dateStr).getTime();
+					
+					// 处理iOS兼容性问题（推荐写法）
+					const iosFriendlyTimestamp = new Date(dateStr.replace(/-/g, '/')).getTime();
+					// 当前时间戳（毫秒）
+					const now = Date.now()
+					 // 计算差值（毫秒）
+					let diff1 = Math.abs(now - iosFriendlyTimestamp)
+					  
+					// 计算各个单位
+					const seconds = Math.floor(diff1 / 1000)
+					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;
+				}
+			},
+			runCountdown() {
+				if (!this.isRunning && this.startTime) {
+					this.isRunning = true
+					this.timer = setInterval(() => {
+						this.calculateElapsed()
+					}, 1000)
+				}
+			},
+		},
+		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>

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>

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>

main.js

@@ -23,8 +23,9 @@ import Eyu from '@/common/locales/ru.js';
 // 引入并使用vue-i18n
 import VueI18n from 'vue-i18n'
 Vue.use(VueI18n)
+console.log(uni.getLocale())
 let i18nConfig = {
-  locale: uni.getLocale(),// 获取已设置的语言
+  locale: uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale(),// 获取已设置的语言
 	messages: {
 		// 这里的属性名是任意的，您也可以把zh设置为cn等，只是后续切换语言时
 		// 要标识这里的语言属性，如：this.$i18n.locale = zh|en|cn|xxx
@@ -36,7 +37,7 @@ let i18nConfig = {
 // 构造i18n对象
 const i18n = new VueI18n({
 	// 默认语言，这里的local属性，对应message中的cn、en属性
-	locale:uni.getLocale(),
+	locale:uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale(),
 	// 引入语言文件
 	messages: {
 		// 这里的属性名是任意的，您也可以把zh设置为cn等，只是后续切换语言时

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",

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",

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",

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"
   }
 }

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" : "",
@@ -86,6 +86,15 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle":"custom"// 去掉微信小程序顶部导航 
 			}
+		},
+		{
+			"path" : "pages/index/highseas",//客户公海
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh": false,
+				"navigationStyle":"custom"// 去掉微信小程序顶部导航 
+			}
 		}
 	],
 	"subPackages":[
@@ -93,7 +102,7 @@
 			"root": "pages/customer",
 			"pages": [
 				{
-					"path": "add",
+					"path": "add",//添加客户
 					"style" :
 					{
 						"navigationBarTitleText" : "",
@@ -102,7 +111,7 @@
 					}
 				},
 				{
-					"path" : "detile",
+					"path" : "detile",//客户详情
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -111,7 +120,7 @@
 					}
 				},
 				{
-					"path" : "editdetile",
+					"path" : "editdetile", //编辑客户
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -120,7 +129,7 @@
 					}
 				},
 				{
-					"path" : "followup",
+					"path" : "followup",//添加跟进
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -147,7 +156,16 @@
 					}
 				},
 				{
-					"path" : "followsuccess",
+					"path" : "followsuccess",//设置下次提醒
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"enablePullDownRefresh": false,
+						"navigationStyle":"custom"// 去掉微信小程序顶部导航 
+					}
+				},
+				{
+					"path" : "tagcustomer",//标签筛选
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -160,7 +178,7 @@
 			"root": "pages/mine",
 			"pages": [
 				{
-					"path": "changinfo",
+					"path": "changinfo",//修改信息
 					"style" :
 					{
 						"navigationBarTitleText" : "",
@@ -169,7 +187,7 @@
 					}
 				},
 				{
-					"path" : "massege",
+					"path" : "massege",//消息通知
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -178,7 +196,7 @@
 					}
 				},
 				{
-					"path" : "feedback",
+					"path" : "feedback",//意见反馈
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -187,7 +205,7 @@
 					}
 				},
 				{
-					"path" : "about",
+					"path" : "about",//关于我们
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -196,7 +214,7 @@
 					}
 				},
 				{
-					"path" : "logoff",
+					"path" : "logoff",//注销账号
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -205,7 +223,7 @@
 					}
 				},
 				{
-					"path" : "resetPwd",
+					"path" : "resetPwd",//修改密码
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -214,7 +232,7 @@
 					}
 				},
 				{
-					"path" : "recyclebin",
+					"path" : "recyclebin",//回收站
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -223,7 +241,7 @@
 					}
 				},
 				{
-					"path" : "recyclebindetil",
+					"path" : "businesscard",//我的名片
 					"style" : 
 					{
 						"navigationBarTitleText" : "",
@@ -262,6 +280,12 @@
 				"selectedIconPath": "/static/image/home-s.png",
 				"text": "首页"
 			},
+			{
+				"pagePath": "pages/index/highseas",
+				"iconPath": "/static/image/highseas.png",
+				"selectedIconPath": "/static/image/highseas-s.png",
+				"text": "公海"
+			},
 			{
 				"pagePath": "pages/index/customer",
 				"iconPath": "/static/image/user.png",

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-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%">
+		<u-popup closeOnClickOverlay :show="showarea" mode="bottom"   :round="10"  @close="close('showarea')">
-			<view class="mapcont">
+			<view class="text">
-				<view class="header">
+				<view class="qx" @click="close('showarea') ">{{$t('cancel')}}</view>
-					<view class="cancel" @click="mapclose">取消</view>
+				<view class="qd" @click="arerfn">{{$t('confirm')}}</view>
-					<view class="title">地图位置</view>
-					<view class="confirm"  @click="mapconfirm">确定</view>
-				</view>
-				<view class="map" id="map">
-				</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
 			},
@@ -370,9 +421,8 @@
 		justify-content:space-between;
 		padding: 18px 20px;
 		align-items: center;
-		font-size: 32rpx;
 		font-weight: 500;
-		font-size: 32rpx;
+		font-size: 24rpx;
 		color: #666666;
 		.item{
 			width: 90px;
@@ -382,14 +432,11 @@
 		margin-right: -15px;
 	}
 	.cell1{
-		font-size: 32rpx;
+		font-size: 24rpx;
 		padding: 18px 20px;
 		align-items: center;
 		font-weight: 500;
 		color: #666666;
-		.item{
-			width: 100px;
-		}
 	}
 	.right{
 		text-align: right;
@@ -415,6 +462,7 @@
 		width: 92%;
 		margin-bottom: 40px;
 		margin: 15px 4%;
+		font-size: 28rpx;
 	}
 	.mapcont{
 		.header{
@@ -436,4 +484,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>

pages/customer/detile.vue

@@ -7,26 +7,50 @@
 					<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>
-						<text class="tag" :style="{background:(datas.follow == 0 ?'#3471FF' : datas.follow == 1 ?'#27C89C': '#FF4040')}">{{datas.follow_txt}}</text>
+						<text class="tag" :style="{background:(datas.follow == 0 ?'#3471FF' : datas.follow == 1 ?'#27C89C': '#FF4040')}">{{datas.follow==0?$t('followup'):datas.follow==1?$t('deal'):$t('lost')}}</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 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.address!=''">{{$t('customer.Company')}}: {{datas.address}}</view>
-					<view v-if="datas.describe!=''">备注: {{datas.describe}}</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" @click="tagselects(item)"  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">
@@ -40,33 +64,43 @@
 		<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>
+					{{$t('customer.followrecord')}} <text class="status" :style="{color:(datas.follow == 0 ?'#3471FF' : datas.follow == 1 ?'#27C89C': '#FF4040')}">{{datas.follow==0?$t('followup'):datas.follow==1?$t('deal'):$t('lost')}}</text>
 				</view>
 				<view class="btnjl" @click="followupFn">
 					{{$t('navbar.addfollowup')}}
 				</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 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>
 					
-		<!-- <u-popup :show="showmap" :round="10" mode="bottom" @close="mapclose">
+				  </view>
-			<view class="mapcont">
+				</scroll-view>
-				<view class="header">
-					<view class="cancel" @click="mapclose">取消</view>
-					<view class="title">地图位置</view>
-					<view class="confirm"  @click="mapconfirm">确定</view>
-				</view>
-				<view class="map">
-					
-				</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,54 @@
 			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'
+						});
+					}
+				})
+			},
+			tagselects(item){ //标签筛选
+				uni.navigateTo({
+					url: '/pages/customer/tagcustomer?tag_id='+item.id+'&name='+item.name
+				});
+			},
+			isActive(parentId, childId) {
+			  return this.activeMap[parentId] === childId;
+			},
 			nextFn(){
 				request({
 					url:'customer/save',
@@ -267,6 +364,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 +397,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 +479,10 @@
 		position: relative;
 		margin-right: 10px;
 	}
+	.tagname{
+		color: #726CFF;
+		font-size: 12px;
+	}
 	.content{
 		padding: 10px 15px;
 		background: #FFFFFF;
@@ -324,8 +492,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;
@@ -359,7 +528,7 @@
 				}
 			}
 			.name{
-				font-size: 32rpx;
+				font-size: 30rpx;
 				font-weight: bold;
 				margin-right: 10px;
 			}
@@ -402,10 +571,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;
@@ -423,8 +599,42 @@
 				color: white;
 				padding: 4px 10px;
 				border-radius: 20px;
-				font-size: 28rpx;
+				font-size: 24rpx;
 			}
 		}
 	}
+	
+	// 标签弹框
+	.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 13px;
+		}
+		.row{
+			width: 100%;
+		}
+		.col4{
+			display: inline-block;
+			margin: 4px 3px;
+			// width: 30%;
+		}
+	}
+	.tagactive{
+		background: #3471FF !important;
+		color: #fff !important;
+	}
 </style>

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-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')">
-		<!-- <u-popup :show="showmap" :round="10" mode="bottom" @close="mapclose">
+			<view class="text">
-			<view class="mapcont">
+				<view class="qx" @click="close('showarea') ">{{$t('cancel')}}</view>
-				<view class="header">
+				<view class="qd" @click="arerfn">{{$t('confirm')}}</view>
-					<view class="cancel" @click="mapclose">取消</view>
-					<view class="title">地图位置</view>
-					<view class="confirm"  @click="mapconfirm">确定</view>
-				</view>
-				<view class="map">
-					
-				</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){
+			// areaChange(val){
-				this.form.country_id = val.value[0].id
+			// 	this.form.country_id = val.value[0].id
-				this.country_name = val.value[0].name
+			// 	this.country_name = val.value[0].name
-				this.showarea = false
+			// 	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
 			},
@@ -448,13 +478,10 @@
 		margin-right: -15px;
 	}
 	.cell1{
-		font-size: 32rpx;
+		font-size: 24rpx;
 		padding: 18px 20px;
 		align-items: center;
 		font-weight: 500;
-		.item{
-			width: 100px;
-		}
 	}
 	.right{
 		text-align: right;
@@ -480,5 +507,51 @@
 		width: 92%;
 		margin-bottom: 40px;
 		margin: 15px 4%;
+		font-size: 32rpx;
 	}
+	
+	
+	
+	
+	.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>

pages/customer/followsuccess.vue

@@ -42,6 +42,8 @@
 			closeOnClickOverlay
 			v-model="nexttime"
 			mode="datetime"
+			:cancel-text="$t('cancel')"
+			:confirm-text="$t('confirm')" 
 			@confirm="confirmnext"
 			@cancel="cancelnext"
 			@close="close('shownexttime')"

pages/customer/followup.vue

@@ -6,21 +6,21 @@
 				<view class="name">{{userdatas.contacts}}</view>
 				<view class="right">
 					<text class="medal" :style="{color:(userdatas.magnitude == 0 ?'#F5AB00' : userdatas.magnitude == 1 ?'#8495B8': '#9B7200')}">{{userdatas.magnitude_txt}}</text>
-					<text class="tag" :style="{background:(userdatas.follow == 0 ?'#3471FF' : userdatas.follow == 1 ?'#27C89C': '#FF4040')}">{{userdatas.follow_txt}}</text>
+					<text class="tag" :style="{background:(userdatas.follow == 0 ?'#3471FF' : userdatas.follow == 1 ?'#27C89C': '#FF4040')}">{{userdatas.follow==0?$t('followup'):userdatas.follow==1?$t('deal'):$t('lost')}}</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">{{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.address!=''">{{$t('customer.Company')}}: {{userdatas.address}}</view>
-				<view v-if="userdatas.describe!=''">备注: {{userdatas.describe}}</view>
+				<view v-if="userdatas.describe!=''">{{$t('remarks')}}: {{userdatas.describe}}</view>
 			</view>
 		</view>
 		<view class="cell2">
@@ -94,29 +94,39 @@
 		<u-gap height="10" bgColor="#F6F6F6"></u-gap>
 		<view class="steps">
 			<view class="title">
-				{{$t('customer.followrecord')}} <text class="status" :style="{color:(datas.follow == 0 ?'#3471FF' : datas.follow == 1 ?'#27C89C': '#FF4040')}">{{datas.follow_txt}}</text>
+				{{$t('customer.followrecord')}} <text class="status" :style="{color:(userdatas.follow == 0 ?'#3471FF' : userdatas.follow == 1 ?'#27C89C': '#FF4040')}">{{userdatas.follow==0?$t('followup'):userdatas.follow==1?$t('deal'):$t('lost')}}</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>
@@ -126,7 +136,6 @@
 		</view>
 		<u-gap height="100" bgColor="#fff"></u-gap>
 		<view class="foot"> 
-			<!-- <button class="btn1" @click="shownexttime=true">{{$t('customer.NextReminder')}}</button> -->
 			<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>
@@ -136,6 +145,8 @@
 			closeOnClickOverlay
 			v-model="firstFollow"
 			mode="datetime"
+			:cancel-text="$t('cancel')" 
+			:confirm-text="$t('confirm')" 
 			@confirm="confirm"
 			@change="change"
 			@cancel="cancel('show')"
@@ -146,6 +157,8 @@
 			closeOnClickOverlay
 			v-model="nexttime"
 			mode="datetime"
+			:cancel-text="$t('cancel')"
+			:confirm-text="$t('confirm')" 
 			@confirm="confirmnext"
 			@cancel="cancelnext"
 			@close="close('shownexttime')"
@@ -187,11 +200,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 +213,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 +302,7 @@
 					},
 				});
 			},
-			getlocahost(){
+			unigetLocation(){
-				// 检查定位权限
-				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(){
-				
 				var that = this
 				uni.getLocation({
 				  type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02
@@ -325,18 +320,53 @@
 				    console.log('获取位置完成');
 				  }
 				});
-				
+			},
-				// uni.chooseLocation({
+			getlocahost() {
-				//   success: function (res) {
+				if (navigator.geolocation) {
-				//     console.log('位置名称：' + res.name);
+					navigator.geolocation.getCurrentPosition(
-				//     console.log('详细地址：' + res.address);
+						(position) => {
-				//     console.log('经度：' + res.longitude);
+							console.log('当前位置的经度：' + position.coords.longitude);
-				//     console.log('纬度：' + res.latitude);
+							console.log('当前位置的纬度：' + position.coords.latitude);
-				//   },
+							this.getarrd(position.coords.longitude,position.coords.latitude)
-				//   fail: function (err) {
+							this.error = '';
-				//     console.log('选择位置失败：', err);
+							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 +468,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)
 						}
 					}
 				});
@@ -586,7 +616,7 @@
 			}
 		}
 		.name{
-			font-size: 32rpx;
+			font-size: 30rpx;
 			font-weight: bold;
 			margin-right: 10px;
 		}
@@ -654,9 +684,8 @@
 		justify-content:space-between;
 		padding: 18px 20px;
 		align-items: center;
-		font-size: 32rpx;
 		font-weight: 500;
-		font-size: 32rpx;
+		font-size: 24rpx;
 		color: #666666;
 		.item{
 			width: 90px;
@@ -666,7 +695,7 @@
 		margin-right: -15px;
 	}
 	.cell1{
-		font-size: 32rpx;
+		font-size: 24rpx;
 		padding: 18px 20px;
 		align-items: center;
 		font-weight: 500;
@@ -692,19 +721,8 @@
 		color: white;
 		border-radius: 50px;
 		width: 93%;
-		height: 96rpx;
+		height:88rpx;
-		line-height: 96rpx;
+		line-height: 88rpx;
-		margin-top: 20px;
-	}
-	.btn1{
-		font-size: 28rpx;
-		border: 1px solid #3471FF;
-		background: #fff;
-		color: #3471FF;
-		border-radius: 50px;
-		width: 45%;
-		height: 96rpx;
-		line-height: 96rpx;
 		margin-top: 20px;
 	}
 	.addimg{
@@ -733,6 +751,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;

pages/customer/maph5.vue

@@ -3,8 +3,8 @@
     <view id="map" style="height: 100vh;"></view>
 	<!-- 输入框事件 -->
 	<view style="display: flex; padding: 30rpx; position: fixed;width: 93%; background: white;  top: 0px;">
-		<input v-model="value" type="text" id="search-box" placeholder="请输入" class="search" @input="getPlacesList" />
+		<input v-model="value" type="text" id="search-box" :placeholder="$t('keyword')" class="search" @input="getPlacesList" />
-		<view class="btn" @click="nextfn">确定</view>
+		<view class="btn" @click="nextfn">{{$t('confirm')}}</view>
 	</view>
 	<view class="card" v-if="list.length > 0">
 		<view class="item" v-for="(item, index) in list" :key="index">
@@ -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({
+				if(this.center.lat!=''){
-				  type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02
+					that.addmapmarkfn(parseFloat(this.center.lat),parseFloat(this.center.lng))
-				  success: function (res) {
+				}else{
-						  console.log(res)
+					if (navigator.geolocation) {
-						that.map = new google.maps.Map(document.getElementById("map"),
+						navigator.geolocation.getCurrentPosition(
-						  {
+							(position) => {
-						    center: { lat:res.latitude, lng: res.longitude},
+								console.log('当前位置的经度：' + position.coords.longitude);
-						    zoom: 12,// 地图缩放参数
+								console.log('当前位置的纬度：' + position.coords.latitude);
-						  	maxZoom: 18,// 最大缩放参数
+								that.addmapmarkfn(position.coords.latitude,position.coords.longitude)
-						  	minZoom: 4,// 最小缩放参数		
+								this.error = '';
-						    disableDefaultUI: true// 禁用默认UI
+								console.log("获取位置成功：", position);
-						  }
+							},
-						)
+							(error) => {
-						var marker = new google.maps.Marker({
+								that.unigetLocation()
-							position: { lat:res.latitude, lng: res.longitude},
+								// this.error = this.getErrorMessage(error);
-							map: that.map,
+								// uni.showToast({
-							draggable: true, // 允许拖动标记
+								// 	title: this.error,
-							icon: {
+								// 	icon: 'none'
-								url: 'https://now.guua.com/attachs/default/location_shop.png',
+								// });
-								scaledSize: new google.maps.Size(30, 30),
+								console.error("获取位置失败：", error);
-								origin: new google.maps.Point(0, 0),
+							},
-								anchor: new google.maps.Point(0, 0)
+							{
+								enableHighAccuracy: true,
+								timeout: 10000,
+								maximumAge: 0
 							}
-						});
+						);
-						// 监听标记拖动事件
+					} else {
-						marker.addListener('dragend', () => {
+						that.unigetLocation()
-						    const position = marker.getPosition();
+						// this.error = "浏览器不支持 Geolocation API";
-						    that.map.setCenter(position);
+						// uni.showToast({
-						    // 根据标记位置获取地址信息
+						// 	title: this.error,
-						    const geocoder = new google.maps.Geocoder();
+						// 	icon: 'none'
-						    geocoder.geocode({ location: position }, (results, status) => {
+						// });
-						      if (status === 'OK' && results[0]) {
+						console.error("浏览器不支持 Geolocation API");
-								  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('获取位置完成');
-				  }
-				})
 		      
 		    })
 		    .catch((e) => {

pages/customer/tagcustomer.vue

@@ -0,0 +1,202 @@
+<template>
+	<view>
+		<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('navbar.tagselect')"></uni-nav-bar>
+			</template>
+			<view class="list">
+				<view class="contents" v-for="(item, index) in datalist" :key="index" >
+					<view class=""  @click="godetile(item)">
+						<view class="top">
+							<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==0?$t('followup'):item.follow==1?$t('deal'):$t('lost')}}</text>
+							</view>
+						</view>
+						<u-line margin="20rpx 0px"></u-line>
+						<view class="cont">
+							<view class="title">
+								<view class=""><text class="name">{{item.contacts}}</text><text class="phone">{{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 class="tags">
+							   <text>#</text> {{tag_name}}
+							</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('customer.addfollow')}}</view>
+						<!-- <view class=""  @click="delClick(item)"><image src="/static/image/customer/trash.png" mode=""></image> {{$t('delete')}}</view> -->
+					</view>
+				</view>
+			</view>
+		</z-paging>
+	</view>
+</template>
+
+<script>
+	import { request,showToast } from '@/api/apiT.js'
+	export default {
+		data() {
+			return {
+				datalist:[],
+				tag_id:'',
+				tag_name:''
+			}
+		},
+		onLoad(e) {
+			console.log(e)
+			this.tag_id = e.tag_id
+			this.tag_name = e.name
+		},
+		methods: {
+			leftClick(){
+				uni.navigateBack({})
+			},
+			//客户列表数据
+			queryList(pageNo, pageSize) {
+				var that = this;
+				request({
+					url:'customer/list',
+					method:'get',
+					data: {
+						tag_id:this.tag_id,
+						page:pageNo,
+						per_page:10,
+					}
+				}).then(res => {
+					console.log(res.data)
+					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();
+				})
+			},
+			godetile(item){
+				console.log(item)
+				uni.navigateTo({
+					url: '/pages/customer/detile?id='+item.id
+				});
+			},
+			// 拨打电话
+			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>
+
+<style lang="scss">
+	.tags{
+		color: #726CFF;
+		font-size: 24rpx;
+	}
+	.list{
+		padding: 15px;
+		overflow: auto;
+		.contents{
+			background-color: #F6F6F6;
+			border-radius: 10px;
+			margin-bottom: 10px;
+			.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;
+					.medal{
+						margin-right: 10px;
+					}
+				}
+			}
+			.cont{
+				padding: 0px 15px 10px;
+				font-size: 24rpx;
+				.title{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					color: #222222;
+					.name{
+						font-size: 32rpx;
+						font-weight: bold;
+						margin-right: 10px;
+					}
+					.phone{
+						font-size: 28rpx;
+					}
+				}
+				.ststus{
+					color: #666666;
+				}
+				.info,.desc{
+					color: #78758E;
+					line-height: 26px;
+				}
+				.sex{
+					margin-right: 5px;
+				}
+				.addr{
+					margin-left: 5px;
+				}
+				.type{
+					margin-left: 5px;
+					color: #3471FF;
+				}
+			}
+		}
+		.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>

pages/index/customer.vue

@@ -1,10 +1,10 @@
 <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> -->
-					<uni-nav-bar leftText=" " :fixed="true" :border="false" @clickLeft="leftClick" color="#fff" backgroundColor="#3471ff" :statusBar="true" :title="$t('customer.title')"></uni-nav-bar>
+					<uni-nav-bar leftText=" " :fixed="true" :border="false" @clickLeft="leftClick" color="#fff" backgroundColor="rgba(52,113,255,0)" :statusBar="true" :title="$t('customer.title')"></uni-nav-bar>
 					
 					<view class="topSearch">
 						<view class="left">
@@ -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="isey" @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坐标
@@ -94,15 +95,29 @@
 				columns:[],
 				list1: [],
 				datalist:[],
+				isey:false
 			}
 		},
-		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
 			uni.removeStorageSync('location')
 		},
 		onShow() {
+			// var location = uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale()
+			// if(location=='ru'){
+			// 	this.isey=true
+			// }else{
+			// 	this.isey=false
+			// }
 			this.queryList(1, 10)
 			this.options1=[{
 				text: this.$t('delete'),
@@ -138,6 +153,22 @@
 					id: 2
 				}]
 			]
+			uni.setTabBarItem({
+				index: 0,
+				text: this.$t('tabbar.home')
+			})
+			uni.setTabBarItem({
+				index: 1,
+				text: this.$t('tabbar.highseas')
+			})
+			uni.setTabBarItem({
+				index: 2,
+				text: this.$t('tabbar.customer')
+			})
+			uni.setTabBarItem({
+				index: 3,
+				text: this.$t('tabbar.mine')
+			})
 		},
 		methods: {
 			searchCli(){
@@ -163,6 +194,7 @@
 				}else{
 					this.follow=e.index - 1
 				}
+				this.datalist=[]
 				this.queryList(1, 10)
 			},
 			//客户列表数据
@@ -201,7 +233,7 @@
 				var phoneNumber= item.phone
 			    if (!phoneNumber) {
 			        uni.showToast({
-			          title: '请输入电话号码',
+			          title:  this.$t('callPhonemsg'),
 			          icon: 'none',
 			        });
 			        return;
@@ -261,6 +293,12 @@
 	uni-page-body {
 		background-color: #F6F6F6 !important;
 	}
+	::v-deep .u-search__content__input{
+		font-size: 24rpx !important;
+	}
+	::v-deep .u-tabs__wrapper__nav__item__text{
+		font-size: 28rpx !important;
+	}
 	.u-swipe-action-item {
 	    margin-bottom: 10px;
 	    border-radius: 10px;
@@ -337,6 +375,7 @@
 					border-radius: 20px 0px 0px 20px;
 					padding: 3px 10px;
 					margin-right: -15px;
+					text-align: right;
 				}
 				.right{
 					display: flex;
@@ -355,7 +394,7 @@
 					justify-content: space-between;
 					color: #222222;
 					.name{
-						font-size: 32rpx;
+						font-size: 30rpx;
 						font-weight: bold;
 						margin-right: 10px;
 					}
@@ -365,6 +404,7 @@
 				}
 				.ststus{
 					color: #666666;
+					text-align: right;
 				}
 				.info,.desc{
 					color: #78758E;
@@ -386,7 +426,7 @@
 			padding: 0px 15px 10px;
 			color: #3471FF;
 			display: flex;
-			justify-content: right;
+			justify-content: flex-end;
 			view{
 				margin-left:15px;
 			}

pages/index/highseas.vue

@@ -0,0 +1,305 @@
+<template>
+	<view class="conts">
+		<z-paging  ref="paging" v-model="datalist" @query="queryList"  :empty-view-text="$t('Nodata')">	
+			<template #top>
+				<view class="top">
+					<uni-nav-bar leftText=" " :fixed="true" :border="false" @clickLeft="leftClick" color="#fff" backgroundColor="rgba(52,113,255,0)" :statusBar="true" :title="$t('navbar.highseas')"></uni-nav-bar>
+				</view>
+			</template>
+			<view class="list">
+				<view class="contents" v-for="(item, index) in datalist" :key="index">
+					<view class="top">
+						<view class=""><text :style="{color:(item.magnitude == 0 ?'#F5AB00' : item.magnitude == 1 ?'#8495B8': '#9B7200')}">{{item.magnitude_txt}}</text></view>
+						<view class="right">
+							<TimeCounter :total-seconds="item.deleted_at" :show-days="true"  @end="onCountdownEnd" />
+						</view>
+					</view>
+					<u-line margin="20rpx 0px"></u-line>
+					<view class="cont">
+						<view class="left">
+							<view class=""><text class="name">{{item.contacts}}</text></view>
+							<view class="info"><text class="addr">{{item.country_name}}</text></view>
+						</view>
+						<view class="right">
+							<view class="btnxq" @click="detailsfn(item)">{{$t('details')}}</view>
+							<view class="btnld" @click="receiveClick(item)">{{$t('receiveOrder')}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</z-paging>
+		<u-popup :show="showts"  :closeOnClickOverlay="false"  :round="20" mode="center">
+			<view class="popupcontent">
+				<view class="title">{{$t('prompt')}}</view>
+				<view class="text">
+					{{$t('receivemsg')}}
+				</view>
+			</view>
+			<view class="cent">
+				<view class="btn1" @click="showts = !showts">{{$t('cancel')}}</view>
+				<view class="btn" @click="receivefn()">{{$t('confirm')}}</view>
+			</view>
+		</u-popup>
+		<u-popup :show="showxq"  :round="20" mode="center" @close="showxq=false" bgColor="transparent">
+			<view class="popupcontent1">
+				<view class="title">{{$t('details')}}</view>
+				<view class="text" v-html="html">
+					
+				</view>
+			</view>
+			<view class="upopupqx" @click="showxq=false">
+				<image src="/static/image/mine/chaprop.png" mode=""></image>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import TimeCounter from '@/components/Countdown/time-counter.vue';
+	import { request,showToast } from '@/api/apiT.js'
+	export default {
+		components: { TimeCounter },
+		data() {
+			return {
+				current:0,
+				options1: [],
+				keyword:'',
+				follow_last:'',
+				follow:'',
+				showxq:false,
+				showts:false,
+				del_id:'',
+				columns:[],
+				list1: [],
+				datalist:[],
+				html:''
+			}
+		},
+		onLoad(e) {
+			console.log(e)
+		},
+		onShow() {
+			this.queryList(1, 10)
+			uni.setTabBarItem({
+				index: 0,
+				text: this.$t('tabbar.home')
+			})
+			uni.setTabBarItem({
+				index: 1,
+				text: this.$t('tabbar.highseas')
+			})
+			uni.setTabBarItem({
+				index: 2,
+				text: this.$t('tabbar.customer')
+			})
+			uni.setTabBarItem({
+				index: 3,
+				text: this.$t('tabbar.mine')
+			})
+		},
+		methods: {
+			//客户列表数据
+			queryList(pageNo, pageSize) {
+				var that = this;
+				request({
+					url:'customer/list',
+					method:'get',
+					data: {
+						seas:'seas',
+						page:pageNo,
+						per_page:10,
+					}
+				}).then(res => {
+					console.log(res.data)
+					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();
+				})
+			},
+			detailsfn(item){
+				this.html = item.desc_collect
+				this.showxq=true
+				
+			},
+			receiveClick(item){
+				this.del_id = item.id
+				this.showts=true
+			},
+			receivefn(){
+				this.showts=false
+				request({
+					url:'customer/claim',
+					method:'post',
+					data: {
+						customer_id:this.del_id,
+					}
+				}).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" scoped>
+	uni-page-body {
+		background-color: #F6F6F6 !important;
+	}
+	::v-deep .u-popup__content{
+		width: 85% !important;
+	}
+	.u-swipe-action-item {
+	    margin-bottom: 10px;
+	    border-radius: 10px;
+	}
+	.conts{
+		background-image: url("/static/image/customer/bg.png");
+		background-size: 100%;
+		background-repeat: no-repeat;
+		height: calc(100vh - 50px);
+	}
+	.list{
+		padding: 15px;
+		overflow: auto;
+		// height: calc(100vh - 350rpx);
+		.contents{
+			background-color: #FFFFFF;
+			border-radius: 10px;
+			margin-bottom: 10px;
+			.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;
+				}
+			}
+			.cont{
+				padding: 0px 15px 10px;
+				font-size: 24rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.name{
+					color: #222222;
+					font-size: 32rpx;
+					font-weight: bold;
+					margin-right: 10px;
+				}
+				.info{
+					color: #78758E;
+					line-height: 26px;
+				}
+				.right{
+					display: flex;
+					align-items: center;
+					.btnxq{
+						background: #ECF2FF;
+						color: #3471FF;
+						border-radius: 20px;
+						padding: 6rpx 34rpx;
+						text-align: center;
+						margin-right: 10px;
+					}
+					.btnld{
+						background: linear-gradient(to right, #3471FF, #6776FF);
+						color: white;
+						border-radius: 20px;
+						padding: 6rpx 34rpx;
+						text-align: center;
+					}
+				}
+			}
+		}
+	}
+	.popupcontent{
+		text-align: center;
+		padding: 10px 40px 20px;
+		.title{
+			font-size: 18px;
+			color: #333333;
+			line-height: 60px;
+		}
+		.text{
+			color: #666666;
+			font-size: 16px;
+		}
+	}
+	.popupcontent1{
+		padding: 10px 20px 20px;
+		border-radius: 10px;
+		background: linear-gradient(to bottom, #B1C8FF, #ffffff);
+		height: 800rpx;
+		.title{
+			text-align: center;
+			font-size: 18px;
+			color: #333333;
+			line-height: 44px;
+			
+		}
+		.text{
+			color: #666666;
+			font-size: 16px;
+			height: 89%;
+			overflow-y: scroll;
+		}
+	}
+	.upopupqx{
+		margin-top: 20px;
+		text-align: center;
+		image{
+			width: 80rpx;
+			height: 80rpx;
+		}
+	}
+	.cent{
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		padding: 0px 10px 20px;
+		text-align: center;
+		.btn1{
+			background-color: #F6F6F6;
+			border: 1px solid #F6F6F6;
+			color: #333333;
+			border-radius: 50px;
+			width: 46%;
+			margin: 10px 0px 20px;
+			height: 40px;
+			line-height: 40px;
+		}
+		.btn{
+			background-color: #3471FF;
+			color: white;
+			border-radius: 50px;
+			width: 46%;
+			margin: 10px 0px 20px;
+			height: 40px;
+			line-height: 40px;
+		}
+	}
+	
+</style>

pages/index/index.vue

@@ -1,68 +1,102 @@
 <template>
 	<view class="content">
-		<view class="contop">
+		<z-paging  ref="paging" v-model="datalist" @query="queryList"  :empty-view-text="$t('Nodata')">	
-			<view class="changeyy" @click="showlang = true">
+			<template #top>
-				<image src="/static/image/change.png" mode=""></image>{{$t('home.langbtn')}}
+				<view class="contop">
-			</view>
+					<view class="changeyy" @click="showlang = true">
-			<view class="title">
+						<image src="/static/image/change.png" mode=""></image>{{$t('home.langbtn')}}
-				{{$t('home.title')}} CRM
+					</view>
-			</view>
+					<view class="title">
-			<view class="num">
+						{{$t('home.title')}} CRM
-				{{statisticsdata.day}}<text>{{$t('home.day')}}</text>
+					</view>
-			</view>
+					<view class="num">
-		</view>
+						{{statisticsdata.day}}<text>{{$t('home.day')}}</text>
-		<view class="data-briefing">
+					</view>
-			<view class="top">
+					<view class="data-briefing">
-				<text>{{$t('home.databf')}}</text>
+						<view class="top">
-				<view class="time" @click="show = true">
+							<text>{{$t('home.databf')}}</text>
-					<image src="/static/image/time.png" mode=""></image>
+							<view class="time" @click="show = true">
-					<u--input v-model="time" border="none" disabled disabledColor="#ffffff"
+								<image src="/static/image/time.png" mode=""></image>
-						style="width: 65px;margin-left: 5px;"></u--input>
+								<view class="" style="margin:0px 5px;">{{time}}</view>
-					<u-icon name="arrow-down" color="#666666" size="16"></u-icon>
+								<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">
+		</z-paging>
-				<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>
 		<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'),
@@ -83,24 +120,49 @@
 					}, {
 						label: this.$t('en'),
 						id: 'en'
-					}]
+					},{
+						label: this.$t('ru'),
+						id: 'ru'
+					}
+					]
 				],
-				
+				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')
 			})
 			uni.setTabBarItem({
 				index: 1,
-				text: this.$t('tabbar.customer')
+				text: this.$t('tabbar.highseas')
 			})
 			uni.setTabBarItem({
 				index: 2,
+				text: this.$t('tabbar.customer')
+			})
+			uni.setTabBarItem({
+				index: 3,
 				text: this.$t('tabbar.mine')
 			})
 			this.getstatistics()
@@ -118,19 +180,26 @@
 						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);
+				uni.setStorageSync('i18locale', e.value[0].id);
 				this.showlang = false
+				console.log(uni.getLocale())
 				this.columns =[
 					[{
 						label: this.$t('zh'),
@@ -138,18 +207,46 @@
 					}, {
 						label: this.$t('en'),
 						id: 'en'
+					},{
+						label: this.$t('ru'),
+						id: 'ru'
+					}
+					]
+				];
+				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')
 				})
 				uni.setTabBarItem({
 					index: 1,
-					text: this.$t('tabbar.customer')
+					text: this.$t('tabbar.highseas')
 				})
 				uni.setTabBarItem({
 					index: 2,
+					text: this.$t('tabbar.customer')
+				})
+				uni.setTabBarItem({
+					index: 3,
 					text: this.$t('tabbar.mine')
 				})
 				var language = e.value[0].id
@@ -188,6 +285,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 +360,7 @@
 	}
 
 	.changeyy {
-		padding: 10px 15px;
+		padding: 20rpx 30rpx;
 		border-radius: 50px;
 		background-color: rgba(255, 255, 255, 0.2);
 		margin-bottom: 50rpx;
@@ -229,7 +383,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 +410,10 @@
 
 		.data-briefing {
 			background-color: #FFFFFF;
-			margin: 15px;
+			// margin: 15px;
 			padding: 15px;
 			border-radius: 10px;
-			margin-top: -21%;
+			margin-top:80rpx;
 
 			.top {
 				display: flex;
@@ -294,20 +451,84 @@
 				.grid-text {
 					color: #222222;
 					font-size: 24rpx;
+					white-space: nowrap;
+					width: 95%;
+					overflow-x: scroll;
+					text-align: center;
 				}
 			}
 
 
 		}
+	}
+	.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;
 		
-		.userlist {
+	}
-			background: linear-gradient(to bottom, #E6EDFF, #ffffff);
+	.contents{
-			background-size: 100%;
+		background-color: #FFFFFF;
-			background-repeat: no-repeat;
+		border-radius: 10px;
-
+		margin: 15px 0px;
-			.list {
+		.cont{
-				padding: 15px;
+			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>

pages/index/mine.vue

@@ -7,7 +7,7 @@
 		<view class="content">
 			<view class="contop">
 				<view class="">
-					<image class="userimg" :src="userinfo.avatar" mode=""></image>
+					<image class="userimg" :src="userinfo.avatar_url" mode=""></image>
 					<!-- <image class="userimg" src="/static/image/mine/user.png" mode=""></image> -->
 				</view>
 				<view class="right">
@@ -18,8 +18,7 @@
 					</view>
 					<view class="minemp">
 						<view  class="mineid">ID：{{userinfo.sn}}</view>
-						<!-- <view class="mp" @click="gomymp">{{$t('auth')}}</view> -->
+						<view class="mp" @click="gomymp">{{$t('navbar.businesscard')}}</view>
-						<!-- <view v-if="!isopenid" class="mp" @click="gomyauth">{{$t('auth')}}</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,24 @@
 			
 		},
 		onShow() {
+			uni.setTabBarItem({
+				index: 0,
+				text: this.$t('tabbar.home')
+			})
+			uni.setTabBarItem({
+				index: 1,
+				text: this.$t('tabbar.highseas')
+			})
+			uni.setTabBarItem({
+				index: 2,
+				text: this.$t('tabbar.customer')
+			})
+			uni.setTabBarItem({
+				index: 3,
+				text: this.$t('tabbar.mine')
+			})
 			this.getuserinfo()
+			
 		},
 		methods: {
 			getuserinfo(){
@@ -127,7 +142,7 @@
 			},
 			gomymp(){
 				uni.navigateTo({
-					url: '/pages/mine/webview'
+					url: '/pages/mine/businesscard'
 				})
 			},
 			gomyauth(){
@@ -215,14 +230,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 +259,7 @@
 						font-size: 28rpx;
 						background: #fff;
 						color: #3471FF;
-						padding: 1px 15px;
+						padding: 0px 12px;
 						border-radius: 5px 15px 15px 15px;
 					}
 				}
@@ -283,7 +298,7 @@
 		display: flex;
 		box-sizing: border-box;
 		flex-direction: column;
-	
+		margin-top: 13%;
 		.sonTitle {
 			height: 80rpx;
 			line-height: 80rpx;
@@ -316,7 +331,7 @@
 				width: 20px;
 				height: 20px;
 				position: absolute;
-				top: 45%;
+				top: 50%;
 				margin-top: -20rpx;
 				left: 12px;
 			}

pages/login/index.vue

@@ -61,6 +61,9 @@
 				borderColor="#3264ed" color="#fff" @click="pactChange" />
 			<view>{{$t('agreeMsg')}}<text @click="navigateToAgreement">{{$t('UserAgreement')}}</text>{{$t('and')}}<text @click="navigateToPrivacy">{{$t('Privacy')}}</text></view>
 		</view>
+		<view class="footer">
+			<text class="copyright">© 2024 powered by 河南晋海科技环保有限公司</text>
+		</view>
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')"  @close="close" :show="showlang" :columns="columns"
 			@cancel="cancellang" @confirm="confirmlang" :title="$t('home.langbtn')" keyName="label"></u-picker>
 	</view>
@@ -82,9 +85,12 @@
 					}, {
 						label: this.$t('en'),
 						id: 'en'
+					},{
+						label: this.$t('ru'),
+						id: 'ru'
 					}]
 				],
-				language:'zh-Hans'
+				language:uni.getLocale()
 			}
 		},
 		onLoad() {
@@ -105,7 +111,7 @@
 			confirmlang(e) {
 				uni.setLocale(e.value[0].id)
 				this.$i18n.locale = e.value[0].id
-				// uni.setStorageSync('i18locale', e.value[0].id);
+				uni.setStorageSync('i18locale', e.value[0].id);
 				this.language = e.value[0].id
 				this.showlang = false
 				this.columns =[
@@ -115,6 +121,9 @@
 					}, {
 						label: this.$t('en'),
 						id: 'en'
+					},{
+						label: this.$t('ru'),
+						id: 'ru'
 					}]
 				];
 				this.list1 = [{
@@ -186,7 +195,7 @@
 						language: this.language,
 					}
 				}).then(res => {
-					console.log(res.data.data)
+					uni.setStorageSync('i18locale',this.language);
 					if (res.data.code == -1) {
 						uni.showToast({
 							title: res.data.message,
@@ -328,4 +337,14 @@
 			}
 		}
 	}
+	.footer {
+		width: 100%;
+		text-align: center;
+		position: fixed;
+		bottom: 15px;
+		.copyright {
+			font-size: 12px;
+			color:#3471FF;
+		}
+	}
 </style>

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'
 				});
 			},

pages/mine/businesscard.vue

@@ -0,0 +1,268 @@
+<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="imageSrc" mode="" crossOrigin="anonymous" ></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 class="coles">
+						<image src="/static/image/mine/word.png" style="height:16px;width: 16px;" mode=""></image>
+						<view class="">HTTPS://HESUCAR.COM</view>
+					</view>
+					<view class="coles">
+						<view class="">{{userinfo.company}}</view>
+					</view>
+				</view>
+				<view class="code">
+					<image :src="imageSrcewm" mode="" crossOrigin="anonymous" ></image>
+					<view>{{userinfo.socialize==null||userinfo.socialize=='null'?'':userinfo.socialize}}</view>
+				</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 v-if="showPreview" class="preview-mask" @click="showPreview = false">
+		  <image :src="previewUrl" mode="aspectFit"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { request,showToast } from '@/api/apiT.js'
+	import html2canvas from 'html2canvas';
+	export default {
+		data() {
+			return {
+				userinfo:{},
+				showPreview: false,
+				previewUrl: '',
+				imageSrc:'',
+				imageSrcewm:'',
+			}
+		},
+		onLoad() {
+			this.getinfo()
+		},
+		methods: {
+			leftClick(){
+				uni.navigateBack({})
+			},
+			getinfo(){
+				var that= this;
+				request({
+					url:'user/getInfo',
+					method:'get',
+				}).then(res => {
+					that.userinfo = res.data.data;
+					that.downloadImageToLocal(res.data.data.avatar_url,'imageSrc')
+					that.downloadImageToLocal(res.data.data.socialize_pic_url,'imageSrcewm')
+					
+				})
+			},
+			async downloadImageToLocal(imageUrl,item) {
+			  try {
+			    // 1. 下载图片到临时路径
+			    const { tempFilePath } = await new Promise((resolve, reject) => {
+			      uni.downloadFile({
+			        url: imageUrl,
+			        success: resolve,
+			        fail: reject,
+			      });
+			    });
+			
+			    // 2. 返回临时路径（可直接用于 <image> 显示）
+			    console.log('下载成功，临时路径:', tempFilePath);
+				if(item =='imageSrc'){
+					this.imageSrc = tempFilePath; 
+				}else{
+					this.imageSrcewm = tempFilePath; 
+				}
+			
+			  } catch (err) {
+			    console.error('下载失败:', err);
+			    throw new Error('图片下载失败');
+			  }
+			},
+			downloadImage(url, canvas) {
+				const filename1 = '_doc/' + new Date().getTime() + '.png' // url为时间戳命名方式
+				if (uni.getSystemInfoSync().platform === 'h5') {
+				   // 创建一个隐藏的 <a> 标签
+				   const link = document.createElement('a');
+				   link.href = url;
+				   link.download = filename1;
+				   // 触发点击事件
+				   link.click();
+				}else {
+					canvas.toBlob((blob) => {
+						const blobUrl = URL.createObjectURL(blob);
+						const link = document.createElement('a');
+						link.href = blobUrl;
+						link.download = filename1;
+						document.body.appendChild(link);
+						link.click();
+						document.body.removeChild(link);
+						URL.revokeObjectURL(blobUrl); // 释放内存
+					}, 'image/png');
+				}
+			},
+			goDown(){
+				const element = document.getElementById('poster');
+				var that= this
+				html2canvas(element, {
+				    backgroundColor: '#f5f5f5', //海报的背景颜色
+				    useCORS: true ,// 允许跨域
+					allowTaint: true, // 允许污染画布
+					scale: 2,       // 提高清晰度
+					logging: false  // 关闭日志（可选）
+				}).then(canvas => {
+				    // canvas 其实就是我们所讲的res 的意思 返回报文的意思
+				    let baseImg = canvas.toDataURL('image/png')
+					uni.showModal ({
+						title: this.$t('downmp'),
+						content: this.$t('downmpmsg'),
+						cancelText: this.$t('cancel'),
+						confirmText: this.$t('confirm'),
+						success: function (res) {
+							if (res.confirm) {
+								that.downloadImage(baseImg,canvas);
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.card{
+		padding:0px 15px;
+		margin-bottom: 75px;
+	}
+	.img_top{
+		background-image: url('/static/image/mine/cardbg.png');
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		text-align: center;
+		position: relative;
+		width:100%;
+		height:1080rpx;
+		padding-top: 40rpx;
+		.leftbg{
+			width: 8px;
+			height: 34px;
+			background: #3C4169;
+			margin-right: 15px;
+		}
+		.name{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex: 1;
+			margin: 0px 25px 0px 0px;
+			.left{
+				text-align: left;
+			}
+			.title{
+				color: #3C4169;
+				font-size: 28px;
+				font-weight: bold;
+				display: flex;
+				align-items: center;
+			}
+			.ftitle{
+				color: #fff;
+				font-size: 14px;
+				font-weight: bold;
+				margin-top: 20px;
+				background: #3C4169;
+				border-radius: 18px;
+				margin-left: 20px;
+				padding: 3px 15px;
+				display: inline-block;
+			}
+			image{
+				width: 100px;
+				height: 100px;
+				border-radius: 50%;
+			}
+		}
+		.conts{
+			padding: 15px 25px 10px;
+			line-height: 32px;
+			color: #3C4169;
+			.coles{
+				display: flex;
+				align-items: center;
+				font-size: 16px;
+				image{
+					width: 16px;
+					height: 16px;
+					margin-right: 5px;
+				}
+			}
+		}
+		.code{
+			// text-align: center;
+			padding:0px 15px;
+			width: 26%;
+			color: #3C4169;
+			font-size: 14px;
+			image{
+				width: 70px;
+				height: 70px;
+			}
+		}
+	}
+	.foot{
+		position: fixed;
+		bottom: 0px;
+		width: 100%;
+		height: 75px;
+		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%;
+		font-size: 28rpx;
+		height: 88rpx;
+		line-height:88rpx;
+	}
+</style>

pages/mine/changinfo.vue

@@ -4,7 +4,7 @@
 		<view class="content">
 			<view class="topimg">
 				<uni-file-picker fileMediatype="image" limit="1" :list-styles="imageStyles" :del-icon="false" disable-preview @select="select" @delete="delfn('picture')">
-					<image class="user" :src="userinfo.avatar"mode=""></image>
+					<image class="user" :src="userinfo.avatar_url"mode=""></image>
 					<!-- <image class="xj" src="/static/image/mine/xiangji.png" mode=""></image> -->
 				</uni-file-picker>
 				<view>{{$t('mine.changeavatar')}}</view>
@@ -57,25 +57,79 @@
 			<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>
 			</view>
+			<u-divider text=""></u-divider>
+			<view class="cell1">
+				<view class="item">{{$t('mine.QRcode')}}</view>
+				<view class="right">
+					<u-radio-group v-model="userinfo.socialize">
+					  <u-radio :name="$t('mine.WeChat')" class="m-r-10">{{$t('mine.WeChat')}}</u-radio>
+					  <u-radio name="WhatsApp">WhatsApp</u-radio>
+					</u-radio-group>
+				</view>
+			</view>
+			<view class="cell">
+				<view class="item">上传二维码</view>
+				<view class="right">
+					<uni-file-picker style="margin: 10px 0px;" fileMediatype="image" limit="1" :list-styles="imageStyles" :del-icon="false" disable-preview @select="selectewm" >
+						<image class="user" :src="userinfo.socialize_pic_url==null?'/static/image/mine/erwm.png':userinfo.socialize_pic_url " mode=""></image>
+					</uni-file-picker>
+				</view>
+			</view>
 		</view>
 		<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 +137,6 @@
 				areaList:[],
 				defaultIndexgj:[0],
 				company_name:'',
-				company:[],
-				company1:[],
 				defaultIndexgs:[0],
 				imageStyles: {
 					border: true,
@@ -99,6 +151,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 +189,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 +203,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 +211,7 @@
 				}).then(res => {
 					var list = res.data.data
 					this.areaList1 = list
-					this.areaList = [list]
+					this.filteredOptions = list;
 					this.select1()
 				})
 			},
@@ -164,7 +232,7 @@
 				this.company_name = val.value[0].name
 				this.showcomp = false
 			},
-			uploadfn(imgUrl){
+			uploadfn(imgUrl,name,name1){
 				var that = this;
 				uni.uploadFile({
 					url: 'http://219.157.255.213:9007/upload/uploadImage', 
@@ -179,8 +247,8 @@
 								icon: 'none'
 							});
 						}else{
-							that.userinfo.avatar = path.data.image_url
+							that.userinfo[name1] = path.data.image_url
-							that.userinfo.avatar_url = path.data.path
+							that.userinfo[name] = path.data.path
 							console.log(that.form)
 						}
 					}
@@ -198,7 +266,12 @@
 			select(e){
 				const tempFilePaths = e.tempFilePaths;
 				const imgUrl=tempFilePaths[0]
-				this.uploadfn(imgUrl)
+				this.uploadfn(imgUrl,'avatar','avatar_url')
+			},
+			selectewm(e){
+				const tempFilePaths = e.tempFilePaths;
+				const imgUrl=tempFilePaths[0]
+				this.uploadfn(imgUrl,'socialize_pic','socialize_pic_url')
 			},
 			leftClick(){
 				uni.navigateBack({})
@@ -217,6 +290,9 @@
 						position:this.userinfo.position,
 						country_id:this.userinfo.country_id,
 						sign:this.userinfo.sign,
+						socialize:this.userinfo.socialize,
+						socialize_pic:this.userinfo.socialize_pic,
+						socialize_pic_url:this.userinfo.socialize_pic_url,
 					}
 				}).then(res => {
 					uni.showToast({
@@ -256,6 +332,7 @@
 	}
 	.content{
 		background: #FFFFFF;
+		padding-bottom: 100px;
 		.topimg{
 			text-align: center;
 			position: relative;
@@ -284,6 +361,13 @@
 			width: 90px;
 		}
 	}
+	.cell{
+		padding: 18px 20px;
+		font-weight: 500;
+		.item{
+			width: 90px;
+		}
+	}
 	.right{
 		text-align: right;
 	}
@@ -311,4 +395,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>

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="cont">
-						<view class="top">
+						<view class=""><text class="name">{{item.contacts}}</text><text>{{item.phone}}</text></view>
-							<view class="name">{{item.contacts}}</view>
+						<view class="btn"  @click="restoreFn(item)"><text> {{$t('mine.restore')}}</text></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>
 				</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){
+			restoreFn(item){
-				uni.navigateTo({
+				var that=this
-					url: '/pages/mine/recyclebindetil?id='+item.id
+				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;
+			padding: 15px 12px;
-			font-size: 24rpx;
+			font-size: 28rpx;
-			.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{
 			display: flex;
-			justify-content: right;
+			align-items: center;
-			padding-bottom: 10px;
+			justify-content: space-between;
-			padding-right: 15px;
 		}
-		
 		.btn{
 			background: linear-gradient(to right, #3471FF, #6776FF);
 			color: white;

pages/mine/recyclebindetil.vue

@@ -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>

uni_modules/z-paging/components/z-paging/i18n/index.js

@@ -1,7 +1,9 @@
+import ru from './ru.json'
 import en from './en.json'
 import zhHans from './zh-Hans.json'
 import zhHant from './zh-Hant.json'
 export default {
+	ru,
 	en,
 	'zh-Hans': zhHans,
 	'zh-Hant': zhHant

uni_modules/z-paging/components/z-paging/i18n/ru.json

@@ -0,0 +1,23 @@
+{
+	"zp.refresher.default": "Потяните для обновления",
+	"zp.refresher.pulling": "Отпустите для обновления",
+	"zp.refresher.refreshing": "Обновление...",
+	"zp.refresher.complete": "Успешно обновлено",
+	"zp.refresher.f2": "Отпустите для перехода на второй этаж",
+	
+	"zp.loadingMore.default": "Нажмите чтобы загрузить ещё",
+	"zp.loadingMore.loading": "Загрузка...",
+	"zp.loadingMore.noMore": "Больше нет данных",
+	"zp.loadingMore.fail": "Ошибка загрузки, нажмите чтобы повторить",
+	
+	"zp.emptyView.title": "Нет данных",
+	"zp.emptyView.reload": "Обновить",
+	"zp.emptyView.error": "Ошибка загрузки",
+	
+	"zp.refresherUpdateTime.title": "Последнее обновление: ",
+	"zp.refresherUpdateTime.none": "Нет данных",
+	"zp.refresherUpdateTime.today": "Сегодня",
+	"zp.refresherUpdateTime.yesterday": "Вчера",
+	
+	"zp.systemLoading.title": "Загрузка..."
+}

uni_modules/z-paging/components/z-paging/js/modules/i18n.js

@@ -7,7 +7,8 @@ import u from '.././z-paging-utils'
 import c from '.././z-paging-constant'
 import interceptor from '../z-paging-interceptor'
 
-const language = uni.getSystemInfoSync().language;
+const language = uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale();
+console.log(uni.getLocale())
 export default {
 	data() {
 		return {
@@ -17,7 +18,7 @@ export default {
 	computed: {
 		finalLanguage() {
 			try {
-				const local = uni.getLocale();
+				const local = uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale();
 				const language = this.language;
 				return local === 'auto' ? interceptor._handleLanguage2Local(language, this._language2Local(language)) : local;
 			} catch (e) {
@@ -94,6 +95,7 @@ export default {
 		},
 		// 获取国际化转换后的文本
 		_getI18nText(key, value) {
+			console.log(this.finalLanguage)
 			const dataType = Object.prototype.toString.call(value);
 			if (dataType === '[object Object]') {
 				const nextValue = value[this.finalLanguage];
@@ -113,6 +115,7 @@ export default {
 				return 'zh-Hant';
 			}
 			if (formatedLanguage.indexOf('en') !== -1) return 'en';
+			if (formatedLanguage.indexOf('ru') !== -1) return 'ru';
 			return language;
 		}
 	}