添加版权信息

添加俄语版
添加俄语版本
2025-04-09 11:11:16 +08:00 · 2025-04-08 09:44:59 +08:00 · 2025-04-08 09:30:48 +08:00 · 2025-04-03 16:45:32 +08:00 · 2025-04-03 14:12:52 +08:00 · 2025-04-03 14:11:00 +08:00
34 changed files with 1250 additions and 161 deletions
@@ -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;
 	}
@@ -8,7 +8,7 @@ export function request(options){//封装的requset
 	let { url,data,method } = options;
 	data = data || {},
 	uni.showLoading({
-		title: '加载中'
+		title: ''
 	});
 	
 	return new Promise((resolve,rejext)=>{
@@ -23,6 +23,7 @@ export function request(options){//封装的requset
 						title: res.data.message,
 						icon: 'none'
 					});
+					uni.clearStorageSync();
 					setTimeout(() => {
 						uni.reLaunch({
 							url: '/pages/login/index',// 替换为你要跳转的页面路径
@@ -2,6 +2,7 @@ export default {
 	// 可以以页面为单位来写，比如首页的内容，写在index字段，个人中心写在center，共同部分写在common部分
 	tabbar: {
 		home: 'home',
+		highseas: 'HighSeas',
 		customer: 'customer',
 		mine: 'mine'
 	},
@@ -9,6 +10,8 @@ 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'
 		
@@ -83,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',
@@ -94,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',
@@ -109,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',
@@ -184,5 +191,9 @@ export default {
 	remarks:'Remarks',
 	channel:'Channel',
 	Nodata:'No data available at the moment!',
-	versionmsg:'It is already the latest version！'
+	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?',
 }
@@ -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:'Вы уверены в загрузке текущей карты?',
 }
@@ -2,13 +2,16 @@ export default {
 	// 可以以页面为单位来写，比如首页的内容，写在index字段，个人中心写在center，共同部分写在common部分
 	tabbar: {
 		home: '首页',
+		highseas: '公海',
 		customer: '客户',
 		mine: '我的'
 	},
 	navbar:{
 		customerinfo:'客户资料',
 		addfollowup:'添加跟进',
+		highseas:'客户公海',
 		userList:'客户管理',
+		tagselect:'标签筛选',
 		persondata:'个人资料',
 		businesscard:'我的名片'
 	},
@@ -59,8 +62,7 @@ export default {
 		Countryinput:'请选择国家',
 		Company:'公司',
 		Companyinput:'去定位',
-		CustomerScreening:'客户筛选'
-		
+		CustomerScreening:'客户筛选'	
 	},
 	mine: {
 		desc: '我的',
@@ -82,7 +84,7 @@ export default {
 		Versionup:'版本更新',
 		Privacy:'隐私政策',
 		UserAgreement:'用户协议',
-		copyright:'©河南新友合科技有限公司 版权所有',
+		copyright:'© 2024 powered by 河南晋海科技环保有限公司',
 		logoff:'账户注销',
 		logoffmsg:'以下信息将被清空无法找回',
 		logoffts1:'身份、账号信息',
@@ -94,6 +96,9 @@ export default {
 		restore:'恢复客户',
 		position:'职位',
 		positioninput:'请填写职位',
+		QRcode:'二维码',
+		WeChat:'微信',
+		UploadQRcode:'上传二维码'
 	},
 	call:'呼叫',
 	delete:'删除',
@@ -108,6 +113,7 @@ export default {
 	confirm:'确定',
 	prompt:'提示',
 	deletemsg:'确定要删除此客户吗？',
+	receivemsg:'确定要领取此客户吗？',
 	submit:'提交',
 	gender:'性别',
 	gender0:'未知',
@@ -183,6 +189,9 @@ export default {
 	remarks:'备注',
 	channel:'渠道',
 	Nodata:'暂无数据!',
-	versionmsg:'已是最新版本！'
-	
+	versionmsg:'已是最新版本！',
+	receiveOrder:'领单',
+	loading:'加载中',
+	downmp:'下载名片',
+	downmpmsg:'确定下载当前名片图吗?',
 }
@@ -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>
@@ -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>
@@ -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等，只是后续切换语言时
@@ -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",
@@ -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",
@@ -86,6 +86,15 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle":"custom"// 去掉微信小程序顶部导航 
 			}
+		},
+		{
+			"path" : "pages/index/highseas",//客户公海
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh": false,
+				"navigationStyle":"custom"// 去掉微信小程序顶部导航 
+			}
 		}
 	],
 	"subPackages":[
@@ -154,6 +163,15 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle":"custom"// 去掉微信小程序顶部导航 
 					}
+				},
+				{
+					"path" : "tagcustomer",//标签筛选
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"enablePullDownRefresh": false,
+						"navigationStyle":"custom"// 去掉微信小程序顶部导航 
+					}
 				}
 			]
 		},{
@@ -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",
@@ -421,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;
@@ -433,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;
@@ -466,6 +462,7 @@
 		width: 92%;
 		margin-bottom: 40px;
 		margin: 15px 4%;
+		font-size: 28rpx;
 	}
 	.mapcont{
 		.header{
@@ -7,7 +7,7 @@
 					<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>
@@ -37,7 +37,7 @@
 				</view>
 				<view v-if="datas.tags.length>0">
 					<view class="conts" :class="{'expandeds':!expanded}">
-						<view class="tags"  v-for="(item, index) in datas.tags" :key="index">{{item.name}}</view>
+						<view 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 >
@@ -64,7 +64,7 @@
 		<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')}}
@@ -332,6 +332,11 @@
 					}
 				})
 			},
+			tagselects(item){ //标签筛选
+				uni.navigateTo({
+					url: '/pages/customer/tagcustomer?tag_id='+item.id+'&name='+item.name
+				});
+			},
 			isActive(parentId, childId) {
 			  return this.activeMap[parentId] === childId;
 			},
@@ -523,7 +528,7 @@
 				}
 			}
 			.name{
-				font-size: 32rpx;
+				font-size: 30rpx;
 				font-weight: bold;
 				margin-right: 10px;
 			}
@@ -594,7 +599,7 @@
 				color: white;
 				padding: 4px 10px;
 				border-radius: 20px;
-				font-size: 28rpx;
+				font-size: 24rpx;
 			}
 		}
 	}
@@ -617,7 +622,7 @@
 			border-radius: 8px;
 			color: #3471FF;
 			text-align: center;
-			padding: 5px 0px;
+			padding: 5px 13px;
 		}
 		.row{
 			width: 100%;
@@ -625,7 +630,7 @@
 		.col4{
 			display: inline-block;
 			margin: 4px 3px;
-			width: 30%;
+			// width: 30%;
 		}
 	}
 	.tagactive{
@@ -478,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;
@@ -510,6 +507,7 @@
 		width: 92%;
 		margin-bottom: 40px;
 		margin: 15px 4%;
+		font-size: 32rpx;
 	}
 	
 	
@@ -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')"
@@ -6,7 +6,7 @@
 				<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>
@@ -94,7 +94,7 @@
 		<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==1? $t('customer.Online') : $t('customer.Visit') "  v-for="(item, index) in followList" :key="index">
@@ -135,8 +135,7 @@
 			<empty :list="followList"></empty>
 		</view>
 		<u-gap height="100" bgColor="#fff"></u-gap>
-		<view class="foot">
-			<!-- <button class="btn1" @click="shownexttime=true">{{$t('customer.NextReminder')}}</button> -->
+		<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>
@@ -146,6 +145,8 @@
 			closeOnClickOverlay
 			v-model="firstFollow"
 			mode="datetime"
+			:cancel-text="$t('cancel')" 
+			:confirm-text="$t('confirm')" 
 			@confirm="confirm"
 			@change="change"
 			@cancel="cancel('show')"
@@ -156,6 +157,8 @@
 			closeOnClickOverlay
 			v-model="nexttime"
 			mode="datetime"
+			:cancel-text="$t('cancel')"
+			:confirm-text="$t('confirm')" 
 			@confirm="confirmnext"
 			@cancel="cancelnext"
 			@close="close('shownexttime')"
@@ -613,7 +616,7 @@
 			}
 		}
 		.name{
-			font-size: 32rpx;
+			font-size: 30rpx;
 			font-weight: bold;
 			margin-right: 10px;
 		}
@@ -681,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;
@@ -693,7 +695,7 @@
 		margin-right: -15px;
 	}
 	.cell1{
-		font-size: 32rpx;
+		font-size: 24rpx;
 		padding: 18px 20px;
 		align-items: center;
 		font-weight: 500;
@@ -719,19 +721,8 @@
 		color: white;
 		border-radius: 50px;
 		width: 93%;
-		height: 96rpx;
-		line-height: 96rpx;
-		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;
+		height:88rpx;
+		line-height: 88rpx;
 		margin-top: 20px;
 	}
 	.addimg{
@@ -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" />
-		<view class="btn" @click="nextfn">确定</view>
+		<input v-model="value" type="text" id="search-box" :placeholder="$t('keyword')" class="search" @input="getPlacesList" />
+		<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">
@@ -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>
@@ -4,7 +4,7 @@
 			<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" :current="current" lineColor="#fff" :scrollable="false" @click="tabclick" :inactiveStyle="{color: '#fff'}" :activeStyle="{color: '#fff',fontWeight: '500',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">
@@ -95,6 +95,7 @@
 				columns:[],
 				list1: [],
 				datalist:[],
+				isey:false
 			}
 		},
 		onLoad(e) {
@@ -111,6 +112,12 @@
 			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'),
@@ -152,10 +159,14 @@
 			})
 			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')
 			})
 		},
@@ -282,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;
@@ -358,6 +375,7 @@
 					border-radius: 20px 0px 0px 20px;
 					padding: 3px 10px;
 					margin-right: -15px;
+					text-align: right;
 				}
 				.right{
 					display: flex;
@@ -376,7 +394,7 @@
 					justify-content: space-between;
 					color: #222222;
 					.name{
-						font-size: 32rpx;
+						font-size: 30rpx;
 						font-weight: bold;
 						margin-right: 10px;
 					}
@@ -386,6 +404,7 @@
 				}
 				.ststus{
 					color: #666666;
+					text-align: right;
 				}
 				.info,.desc{
 					color: #78758E;
@@ -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>
@@ -120,7 +120,11 @@
 					}, {
 						label: this.$t('en'),
 						id: 'en'
-					}]
+					},{
+						label: this.$t('ru'),
+						id: 'ru'
+					}
+					]
 				],
 				columnstime:[
 					[{
@@ -151,10 +155,14 @@
 			})
 			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()
@@ -189,8 +197,9 @@
 				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'),
@@ -198,7 +207,11 @@
 					}, {
 						label: this.$t('en'),
 						id: 'en'
-					}]
+					},{
+						label: this.$t('ru'),
+						id: 'ru'
+					}
+					]
 				];
 				this.columnstime =[
 					[{
@@ -226,10 +239,14 @@
 				})
 				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
@@ -434,6 +451,10 @@
 				.grid-text {
 					color: #222222;
 					font-size: 24rpx;
+					white-space: nowrap;
+					width: 95%;
+					overflow-x: scroll;
+					text-align: center;
 				}
 			}

@@ -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,7 +18,7 @@
 					</view>
 					<view class="minemp">
 						<view  class="mineid">ID：{{userinfo.sn}}</view>
-						<!-- <view class="mp" @click="gomymp">{{$t('navbar.businesscard')}}</view> -->
+						<view class="mp" @click="gomymp">{{$t('navbar.businesscard')}}</view>
 					</view>
 				</view>
 			</view>
@@ -113,10 +113,14 @@
 			})
 			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.getuserinfo()
@@ -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>
@@ -13,7 +13,7 @@
 						<view class="ftitle">{{userinfo.position}}</view>
 					</view>
 				    <view>
-						<image :src="userinfo.avatar" mode=""></image>
+						<image :src="imageSrc" mode="" crossOrigin="anonymous" ></image>
 					</view>
 				</view>
 				<view class="conts">
@@ -29,10 +29,17 @@
 						<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="/static/image/mine/ewm.png" mode=""></image>
-					<text>微信</text>
+					<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>
@@ -43,6 +50,10 @@
 		<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>

@@ -52,7 +63,11 @@
 	export default {
 		data() {
 			return {
-				userinfo:{}
+				userinfo:{},
+				showPreview: false,
+				previewUrl: '',
+				imageSrc:'',
+				imageSrcewm:'',
 			}
 		},
 		onLoad() {
@@ -69,80 +84,77 @@
 					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')
+					
 				})
 			},
-			saveImgFile(baseImg){
-				const bitmap = new plus.nativeObj.Bitmap('test')
-				bitmap.loadBase64Data(
-				    baseImg,
-				    function () {
-				        const url = '_doc/' + new Date().getTime() + '.png' // url为时间戳命名方式
-				        bitmap.save(
-				            url,
-				            {
-				                overwrite: true // 是否覆盖
-				            },
-				            i => {
-				                plus.gallery.save(
-				                    i.target,
-				                    function () {
-										uni.showToast({
-											title: '图片保存至相册成功',
-											icon: 'none'
-										});
-				                        bitmap.clear()
-				                    },
-				                    function (e) {
-										uni.showToast({
-											title: '图片保存至相册失败',
-											icon: 'none'
-										});
-				                        // console.log('图片保存至相册失败:' + JSON.stringify(e))
-				                        bitmap.clear()
-				                    }
-				                )
-				            },
-				            e => {
-								uni.showToast({
-									title: '图片保存失败1',
-									icon: 'none'
-								});
-				                bitmap.clear()
-				            }
-				        )
-				    },
-				    e => {
-				        uni.showToast({
-				        	title: '图片保存失败2',
-				        	icon: 'none'
-				        });
-				        bitmap.clear()
-				    }
-				)
+			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, filename) {
-				// 创建一个隐藏的 <a> 标签
-				const link = document.createElement('a');
-				link.href = url;
-				link.download = filename;
-				// 触发点击事件
-				link.click();
+			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 // 允许跨域
+				    useCORS: true ,// 允许跨域
+					allowTaint: true, // 允许污染画布
+					scale: 2,       // 提高清晰度
+					logging: false  // 关闭日志（可选）
 				}).then(canvas => {
 				    // canvas 其实就是我们所讲的res 的意思 返回报文的意思
 				    let baseImg = canvas.toDataURL('image/png')
 					uni.showModal ({
-						title: '下载名片',
-						content: '确定下载当前名片图吗？',
+						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, 'screenshot.png');
+								that.downloadImage(baseImg,canvas);
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
@@ -156,7 +168,8 @@

 <style lang="scss">
 	.card{
-		padding: 15px;
+		padding:0px 15px;
+		margin-bottom: 75px;
 	}
 	.img_top{
 		background-image: url('/static/image/mine/cardbg.png');
@@ -164,13 +177,13 @@
 		background-repeat: no-repeat;
 		text-align: center;
 		position: relative;
-		width:690rpx;
-		height:1060rpx;
-		padding-top: 60rpx;
+		width:100%;
+		height:1080rpx;
+		padding-top: 40rpx;
 		.leftbg{
-			width: 10px;
+			width: 8px;
 			height: 34px;
-			background: linear-gradient(to bottom, #3471FF, #BD67FF);
+			background: #3C4169;
 			margin-right: 15px;
 		}
 		.name{
@@ -179,6 +192,9 @@
 			justify-content: space-between;
 			flex: 1;
 			margin: 0px 25px 0px 0px;
+			.left{
+				text-align: left;
+			}
 			.title{
 				color: #3C4169;
 				font-size: 28px;
@@ -187,10 +203,15 @@
 				align-items: center;
 			}
 			.ftitle{
-				color: #222222;
-				font-size: 16px;
+				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;
@@ -199,9 +220,9 @@
 			}
 		}
 		.conts{
-			padding: 15px 25px;
+			padding: 15px 25px 10px;
 			line-height: 32px;
-			margin-bottom: 20px;
+			color: #3C4169;
 			.coles{
 				display: flex;
 				align-items: center;
@@ -214,15 +235,14 @@
 			}
 		}
 		.code{
-			background-color: rgba(255,255,255,50%);
-			border-radius: 10px;
-			text-align: center;
-			width: 340rpx;
-			margin: auto;
-			padding: 15px;
+			// text-align: center;
+			padding:0px 15px;
+			width: 26%;
+			color: #3C4169;
+			font-size: 14px;
 			image{
-				width: 160px;
-				height: 160px;
+				width: 70px;
+				height: 70px;
 			}
 		}
 	}
@@ -230,7 +250,7 @@
 		position: fixed;
 		bottom: 0px;
 		width: 100%;
-		height: 90px;
+		height: 75px;
 		background: #FFFFFF;
 		z-index: 1;
 	}
@@ -241,5 +261,8 @@
 		width: 92%;
 		margin-bottom: 40px;
 		margin: 15px 4%;
+		font-size: 28rpx;
+		height: 88rpx;
+		line-height:88rpx;
 	}
 </style>
@@ -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>
@@ -62,6 +62,24 @@
 					<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>
@@ -214,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', 
@@ -229,8 +247,8 @@
 								icon: 'none'
 							});
 						}else{
-							that.userinfo.avatar = path.data.image_url
-							that.userinfo.avatar_url = path.data.path
+							that.userinfo[name1] = path.data.image_url
+							that.userinfo[name] = path.data.path
 							console.log(that.form)
 						}
 					}
@@ -248,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({})
@@ -267,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({
@@ -306,6 +332,7 @@
 	}
 	.content{
 		background: #FFFFFF;
+		padding-bottom: 100px;
 		.topimg{
 			text-align: center;
 			position: relative;
@@ -334,6 +361,13 @@
 			width: 90px;
 		}
 	}
+	.cell{
+		padding: 18px 20px;
+		font-weight: 500;
+		.item{
+			width: 90px;
+		}
+	}
 	.right{
 		text-align: right;
 	}
@@ -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
@@ -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": "Загрузка..."
+}
@@ -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;
 		}
 	}
Author	SHA1	Message	Date
浅念	ac98840890	添加版权信息	2025-04-09 11:11:16 +08:00
浅念	e8ac90926b	添加俄语版	2025-04-08 09:44:59 +08:00
浅念	8beda0c969	添加俄语版本	2025-04-08 09:30:48 +08:00
浅念	9c93214b0f	调整样式	2025-04-03 16:45:32 +08:00
浅念	65334dd245	计时器组件	2025-04-03 14:12:52 +08:00
浅念	72adb34db8	调整字体大小和弹出框语言	2025-04-03 14:11:00 +08:00
浅念	9f6de3a117	Squashed commit of the following: 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 添加标签检索，添加公海页面	2025-04-03 13:23:48 +08:00
浅念	aa54e053ee	下拉组件加俄语包	2025-04-03 13:17:00 +08:00
浅念	97a896dbe8	修改语言	2025-04-03 13:13:51 +08:00
浅念	07e477972e	我的名片下载调整	2025-04-03 11:21:13 +08:00
浅念	fde5830450	名片页面	2025-04-02 15:51:39 +08:00
浅念	b60cbff6d5	调整样式	2025-04-01 17:19:32 +08:00
浅念	7fd2e63c9d	添加标签检索，添加公海页面	2025-04-01 17:18:22 +08:00
浅念	fe26dfcfb7	默认语言	2025-03-28 15:41:52 +08:00
浅念	5e8e44f88f	Squashed commit of the following: commit `f9e9899e0e` Author: 浅念 <email@sample.com> Date: Fri Mar 28 11:10:56 2025 +0800 设置默认语言为英语 commit `303121ba81` Author: 浅念 <email@sample.com> Date: Fri Mar 28 11:00:05 2025 +0800 调用接口调整 commit `37e0e55d96` Author: 浅念 <email@sample.com> Date: Fri Mar 28 10:33:48 2025 +0800 线上接口地址 commit `11dd7de521` Author: 浅念 <email@sample.com> Date: Thu Mar 27 16:54:52 2025 +0800 修改样式 commit `8ceb98b321` Author: 浅念 <email@sample.com> Date: Thu Mar 27 16:47:04 2025 +0800 隐藏我的名片 commit `f58e712684` Author: 浅念 <email@sample.com> Date: Thu Mar 27 16:44:43 2025 +0800 样式调整 commit `54ad6c9e37` Author: 浅念 <email@sample.com> Date: Thu Mar 27 16:35:21 2025 +0800 修改语言包 commit `526f934a75` Author: 浅念 <email@sample.com> Date: Thu Mar 27 16:13:47 2025 +0800 标签功能 commit `8583ff2543` Author: 浅念 <email@sample.com> Date: Wed Mar 26 17:02:04 2025 +0800 标签管理页面 commit `be8674fd51` Author: 浅念 <email@sample.com> Date: Tue Mar 25 17:29:37 2025 +0800 样式调整 commit `a5d5ce4e7c` Author: 浅念 <email@sample.com> Date: Tue Mar 25 17:23:40 2025 +0800 倒计时组件 commit `f88048b876` Author: 浅念 <email@sample.com> Date: Tue Mar 25 17:19:43 2025 +0800 首页添加跟进提醒 commit `f9a39d5aaa` Author: 浅念 <email@sample.com> Date: Tue Mar 25 13:13:39 2025 +0800 提交 commit `e3abe0bf18` Author: 浅念 <email@sample.com> Date: Tue Mar 25 13:12:24 2025 +0800 名片部分页面。地图定位。国家下拉搜索回收站	2025-03-28 14:46:49 +08:00