换地址 crm.x.hnxinyouhe.com

App.vue

@@ -12,15 +12,9 @@
 	export default {
 		onLaunch: function() {
 			// #ifdef H5
-			console.log(
-				`%c hello uniapp %c v${version} `,
-				'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px;  color: #fff',
-				'background:#007aff ;padding: 1px; border-radius: 0 3px 3px 0;  color: #fff; font-weight: bold;'
-			)
 			// #endif
 			// 线上示例使用
 			// console.log('%c uni-app官方团队诚邀优秀前 端工程师加盟，一起打造更卓越的uni-app & uniCloud，欢迎投递简历到 hr2013@dcloud.io', 'color: red');
-			console.log('App Launch');
 			// #ifdef APP-PLUS
 			// App平台检测升级，服务端代码是通过uniCloud的云函数实现的，详情可参考：https://ext.dcloud.net.cn/plugin?id=4542
 			if (plus.runtime.appid !== 'HBuilder') { // 真机运行不需要检查更新，真机运行时appid固定为'HBuilder'，这是调试基座的appid
@@ -33,22 +27,27 @@
 				success: (res) => {
 					// 成功
 					this.setUniverifyErrorMsg();
-					console.log("preLogin success: ", res);
+					// console.log("preLogin success: ", res);
 				},
 				fail: (res) => {
 					this.setUniverifyLogin(false);
 					this.setUniverifyErrorMsg(res.errMsg);
 					// 失败
-					console.log("preLogin fail res: ", res);
+					// console.log("preLogin fail res: ", res);
 				}
 			})
 			// #endif
 		},
 		onShow: function() {
 			console.log('App Show')
+			if(window.location.host=='219.157.255.213:8085'){
+				window.location.href="https://crm.x.hnxinyouhe.com"
+			}
+			// console.log(window.location.host)
+			// console.log(window.location.href)
 		},
 		onHide: function() {
-			console.log('App Hide')
+			// console.log('App Hide')
 		},
 		globalData: {
 			test: ''

api/apiT.js

@@ -1,8 +1,10 @@
 
- const baseUrl = "http://219.157.255.213:9007/"; //这里放置url域名32044
+ // const baseUrl = "http://219.157.255.213:9006/"; //这里放置url域名32044
  // const baseUrl = "http://api.crm.hnxinyouhe.com/"; //这里放置url域名32044
- // const baseUrl = "http://192.168.50.9:8787/"; //这里放置url域名32044
  // const baseUrl = "http://219.157.255.213:25329/"; //这里放置url域名32044
+ const baseUrl = "https://crm-server.x.hnxinyouhe.com/"; //这里放置url域名32044
+ // const baseUrl = "https://api.fcrm.hnxinyouhe.com/"; //这里放置url域名32044
+ // const baseUrl = "https://crm-server.smt.hnxinyouhe.com/"; //这里放置url域名32044
  // const baseUrl = "/api/"; //这里放置url域名32044
 export function request(options){//封装的requset
 	let { url,data,method } = options;
@@ -10,12 +12,20 @@ export function request(options){//封装的requset
 	uni.showLoading({
 		title: ''
 	});
-	
+	var lang = uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale()
+	if(lang=='zh-Hans'){
+		lang='zh_CN'
+	}
+	console.log(lang)
 	return new Promise((resolve,rejext)=>{
 		uni.request({//这里是uniapp网络请求的api
 		    url: baseUrl + url, //仅为示例，并非真实接口地址。
 		    data,
-			header:{'content-type': 'application/x-www-form-urlencoded','Authorization': 'Bearer ' +  uni.getStorageSync('token')},
+			header:{
+				'content-type': 'application/x-www-form-urlencoded',
+				'Authorization': 'Bearer ' +  uni.getStorageSync('token'),
+				'fdesk-language':lang
+			},
 			method:method||"GET",//默认请求方式是get
 		    success: (res) => {
 				if(res.data.code==401){
@@ -35,7 +45,7 @@ export function request(options){//封装的requset
 		    },
 			complete: (data)=>{
 				
-				console.log(data.code)
+				// console.log(data.code)
 				uni.hideLoading();
 			}
 		});

common/locales/en.js

@@ -54,22 +54,24 @@ export default {
 		WhatsAppinput:'Please enter WhatsApp',
 		Emailinput:'Please enter your email address',
 		Customerph:'Preferences',
-		Cstomerfj:'Classification',
+		Cstomerfj:'Follow-up Stage',
+		Cstomerfjinput:'Select Follow-up Stage',
 		Country:'Country',
 		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',
-		
+		flRemarks:'Follow-up description',
+		flRemarksinputhd:'Please enter the follow-up description~'
 	},
 	mine: {
 		desc: 'This is template page',
 		title:'Account',
 		msg:'Message Notification',
+		workreport:'daily work report',
 		cpassword:'Change Password',
 		contact:'Contact Service',
 		feedback:'Work order',
@@ -100,7 +102,11 @@ export default {
 		positioninput:'Please fill in the position',
 		QRcode:'QR code',
 		WeChat:'WeChat',
-		UploadQRcode:'Upload QR code'
+		UploadQRcode:'Upload QR code',
+		Reportdate:'Report date',
+		Presenter:'Presenter',
+		newcustomernum:"Today's new customer count",
+		workcontent:"Today's job responsibilities"
 	},
 	call:'Call',
 	delete:'Delete',
@@ -154,7 +160,7 @@ export default {
 	Confirmpassword:'Confirm password',
 	Confirmbtn:'Confirm modification',
 	edtbtn:'edit',
-	zh:'Chinese',
+	zh:'中文',
 	en:'English',
 	ru:'Russian',
 	subsuccess:'Successful',
@@ -194,6 +200,9 @@ export default {
 	versionmsg:'It is already the latest version！',
 	receiveOrder:'Collect Order',
 	loading:'loading',
+	imgloading:'Image uploading in progress!',
 	downmp:'Download business card',
 	downmpmsg:'Are you sure to download the current business card image?',
+	callmsg:'Are you sure you want to make the call?',
+	transfer:"Transfer"
 }

common/locales/ru.js

@@ -54,20 +54,23 @@ export default {
 		Emailinput: "Введите Email",
 		Customerph: "Предпочтения клиента",
 		Customerphinput: "Выберите предпочтения клиента",
-		Cstomerfj: "Классификация клиентов",
+		Cstomerfj:'Этап сопровождения',
-		Cstomerfjinput: "Выберите классификацию",
+		Cstomerfjinput:'Выберите этап сопровождения',
 		Cstomertag: "Метка клиента",
 		Cstomertaginput: "Выберите",
 		Country: "Страна",
 		Countryinput: "Выберите страну",
 		Company: "Компания",
 		Companyinput: "Определить местоположение",
-		CustomerScreening: "Фильтрация клиентов"
+		CustomerScreening: "Фильтрация клиентов",
+		flRemarks:'Описание последующих действий',
+		flRemarksinputhd:'Пожалуйста, введите описание последующих действий~'
 	},
 	mine: {
 		desc: "мой",
 		title: "мой",
 		msg: "Уведомления",
+		workreport:'Дневник',
 		cpassword: "Изменить пароль",
 		contact: "Связаться с поддержкой",
 		feedback: "Отправить заявку",
@@ -98,7 +101,11 @@ export default {
 		positioninput: "Введите должность",
 		QRcode: "QR-код",
 		WeChat: "Микросхема",
-		UploadQRcode: "Загрузить QR-код"
+		UploadQRcode: "Загрузить QR-код",
+		Reportdate:'Дата представления доклада',
+		Presenter:'Докладчик',
+		newcustomernum:"Количество новых клиентов сегодня",
+		workcontent:"Содержание работы"
 	},
 	call: "Позвонить",
 	delete: "Удалить",
@@ -152,9 +159,9 @@ export default {
 	Confirmpassword: "Подтвердите пароль",
 	Confirmbtn: "Подтвердить изменение",
 	edtbtn: "Редактировать данные",
-	zh: "Китайский",
+	zh:'中文',
-	en: "Английский",
+	en:'English',
-	ru: "Русский",
+	ru:'Russian',
 	subsuccess: "Успешно отправлено",
 	onedaygj: "Через 1 день",
 	threedaygj: "Через 3 дня",
@@ -192,6 +199,9 @@ export default {
 	versionmsg: "Уже последняя версия!",
 	receiveOrder: "Принять заказ",
 	loading: "Загрузка",
+	imgloading:'Идёт загрузка изображения!',
 	downmp:'Скачать визитку',
 	downmpmsg:'Вы уверены в загрузке текущей карты?',
+	callmsg:'Вы уверены, что хотите совершить звонок?',
+	transfer:"Перевести"
 }

common/locales/zh.js

@@ -54,20 +54,23 @@ export default {
 		Emailinput:'请输入Email',
 		Customerph:'客户偏好',
 		Customerphinput:'请选择客户偏好',
-		Cstomerfj:'客户分级',
+		Cstomerfj:'跟进阶段',
-		Cstomerfjinput:'请选择客户分级',
+		Cstomerfjinput:'请选择跟进阶段',
 		Cstomertag:'客户标签',
 		Cstomertaginput:'请选择',
 		Country:'国家',
 		Countryinput:'请选择国家',
 		Company:'公司',
 		Companyinput:'去定位',
-		CustomerScreening:'客户筛选'	
+		CustomerScreening:'客户筛选'	,
+		flRemarks:'跟进描述',
+		flRemarksinputhd:'请输入跟进描述~'
 	},
 	mine: {
 		desc: '我的',
 		title:'我的',
 		msg:'消息通知',
+		workreport:'工作日报',
 		cpassword:'修改密码',
 		contact:'联系客服',
 		feedback:'提交工单',
@@ -84,7 +87,7 @@ export default {
 		Versionup:'版本更新',
 		Privacy:'隐私政策',
 		UserAgreement:'用户协议',
-		copyright:'© 2024 powered by 河南晋海科技环保有限公司',
+		copyright:'© 2024 powered by 河南新友合科技有限公司',
 		logoff:'账户注销',
 		logoffmsg:'以下信息将被清空无法找回',
 		logoffts1:'身份、账号信息',
@@ -98,7 +101,11 @@ export default {
 		positioninput:'请填写职位',
 		QRcode:'二维码',
 		WeChat:'微信',
-		UploadQRcode:'上传二维码'
+		UploadQRcode:'上传二维码',
+		Reportdate:'汇报日期',
+		Presenter:'汇报人',
+		newcustomernum:'今日新客户开发数量',
+		workcontent:'今日工作内容'
 	},
 	call:'呼叫',
 	delete:'删除',
@@ -153,8 +160,8 @@ export default {
 	Confirmbtn:'确认修改',
 	edtbtn:'编辑资料',
 	zh:'中文',
-	en:'英语',
+	en:'English',
-	ru:'俄语',
+	ru:'Russian',
 	subsuccess:'提交成功',
 	onedaygj:'1天后',
 	threedaygj:'3天后',
@@ -192,6 +199,9 @@ export default {
 	versionmsg:'已是最新版本！',
 	receiveOrder:'领单',
 	loading:'加载中',
+	imgloading:'图片上传中!',
 	downmp:'下载名片',
 	downmpmsg:'确定下载当前名片图吗?',
+	callmsg:'确定拨打电话吗?',
+	transfer:"转移"
 }

main.js

@@ -23,7 +23,7 @@ import Eyu from '@/common/locales/ru.js';
 // 引入并使用vue-i18n
 import VueI18n from 'vue-i18n'
 Vue.use(VueI18n)
-console.log(uni.getLocale())
+// console.log(uni.getLocale())
 let i18nConfig = {
   locale: uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale(),// 获取已设置的语言
 	messages: {

pages.json

@@ -248,6 +248,24 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle":"custom"// 去掉微信小程序顶部导航 
 					}
+				},
+				{
+					"path" : "workreport",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"enablePullDownRefresh": false,
+						"navigationStyle":"custom"// 去掉微信小程序顶部导航 
+					}
+				},
+				{
+					"path" : "workreportdetil",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"enablePullDownRefresh": false,
+						"navigationStyle":"custom"// 去掉微信小程序顶部导航 
+					}
 				}
 			]
 		}

pages/customer/add.vue

@@ -39,7 +39,7 @@
 			</view>
 			<u-line></u-line>
 			<view class="cell">
-				<view class="item">{{$t('mine.lxcall')}} <text class="red">*</text></view>
+				<view class="item">{{$t('mine.lxcall')}}</view>
 				<view class="right">
 					<input :placeholder="$t('mine.lxcallinputhd')"  v-model="form.phone" />
 				</view>
@@ -58,15 +58,14 @@
 					<input :placeholder="$t('customer.WhatsAppinput')"  v-model="form.WhatsApp" />
 				</view>
 			</view>
-			<u-line></u-line>
+			<!-- <u-line></u-line>
 			<view class="cell">
 				<view class="item">{{$t('customer.Customerph')}} <text class="red">*</text></view>
 				<view class="right select"  @click="showcartype = true">
 					<view class="" :class="['content2', { placeholder: !car_type_name }]">{{car_type_name || $t('customer.Customerphinput')}}</view>
-					<!-- <input :placeholder="$t('customer.Customerphinput')" disabled v-model="car_type_name" /> -->
 					<u-icon class="arrowright" name="arrow-right" size="18" color="#747474"></u-icon>
 				</view>
-			</view>
+			</view> -->
 			<u-line></u-line>
 			<view class="cell">
 				<view class="item">{{$t('customer.Cstomerfj')}}</view>
@@ -188,7 +187,7 @@
 				  describe: '',
 				  grade:'',
 				  country_id:'',
-				  car_type_id:'',
+				  // car_type_id:'',
 				  channel_id:'',
 				  magnitude:'',
 				  address:'',
@@ -204,17 +203,15 @@
 			this.getChannel()
 			this.getMagnitude()
 			this.getGrade()
-			this.carType()
+			// this.carType()
 			this.area()
 		},
 		onShow() {
-			console.log(uni.getStorageSync('location'))
 			if(uni.getStorageSync('location')){
 				this.location = JSON.parse(uni.getStorageSync('location'))
 				this.form.address = this.location.address
 				this.form.lng = this.location.lng
 				this.form.lat = this.location.lat
-				console.log(this.location)
 			}
 		},
 		mounted() {
@@ -331,11 +328,9 @@
 			// 国家搜索处理函数
 			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;
@@ -345,8 +340,6 @@
 			handleSelect(item) {
 			  this.selectedLabel = item.name; // 回显选中的值
 			  this.actives = item.id
-			  console.log("选中的值:", item.id);
-			  console.log("选中的值:", item.name);
 			},
 			arerfn(){
 				this.showarea = false; // 关闭弹窗
@@ -368,7 +361,6 @@
 					});
 					return false
 				}
-				console.log(this.form)
 				request({
 					url:'customer/save',
 					method:'post',

pages/customer/detile.vue

@@ -13,13 +13,25 @@
 				<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="">
+							<u-tooltip :text="datas.phone" :copyText="datas.phone" :showCopy="true">
+								<text class="name" @click.stop>{{datas.phone}}</text>
+							</u-tooltip>
+						</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.email!=''">
-					<view v-if="datas.WhatsApp!=''">WhatsAPP: {{datas.WhatsApp}}</view>
+						<u-tooltip :text="datas.email" :copyText="datas.email" :showCopy="true">
+							<text @click.stop>Email: {{datas.email}}</text>
+						</u-tooltip>
+					</view>
+					<view v-if="datas.WhatsApp!=''">
+						<u-tooltip :text="datas.WhatsApp" :copyText="datas.WhatsApp" :showCopy="true">
+							<text @click.stop>WhatsAPP: {{datas.WhatsApp}}</text>
+						</u-tooltip>
+					</view>
 					<view v-if="datas.address!=''">{{$t('customer.Company')}}: {{datas.address}}</view>
 					<view v-if="datas.describe!=''">{{$t('remarks')}}: {{datas.describe}}</view>
 				</view>
@@ -73,13 +85,14 @@
 			<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">
 					<view slot="desc" class="desc">
-						<view class="flex"  v-if="item.type==0">
+						<view class="flex">
 							<view class="">
 								<view class="lingh">
 									{{$t('times')}} ：{{item.created_at}}
 								</view>
-								<view class="">{{$t('address')}}：{{item.address}}</view>
+								<view class=""  v-if="item.type==0">{{$t('address')}}：{{item.address}}</view>
-								<view class="lingh">{{$t('customer.Visitcontent')}}：{{item.audio_text}}</view>
+								<view class="lingh"  v-if="item.type==0">{{$t('customer.Visitcontent')}}：{{item.audio_text}}</view>
+								<view class="lingh"  v-if="item.type==1">{{$t('customer.flRemarks')}}：{{item.audio_text}}</view>
 							</view>
 							<view class="">
 								<!-- <image :src="item.oss_picture" mode=""></image> -->
@@ -90,19 +103,6 @@
 								></u-album>
 							</view>
 						</view>
-						<view class="" v-else>
-							<view class="lingh">
-								{{$t('times')}}：{{item.created_at}}
-							</view>
-							<view class="">
-								<u-album
-								    :urls="isurls(item.oss_picture)"
-								    keyName="src"
-									:singleSize="80"
-								></u-album>
-								<!-- <image :src="item.oss_picture" mode=""></image> -->
-							</view>
-						</view>
 					</view>
 				</u-steps-item>
 			</u-steps>
@@ -162,7 +162,6 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options);
 			this.id = options.id;
 			var that = this
 			this.getGrade()
@@ -176,7 +175,6 @@
 				this.form.address = this.location.address
 				this.form.lng = this.location.lng
 				this.form.lat = this.location.lat
-				console.log(this.location)
 			}
 			this.followlistfn()
 		},
@@ -234,7 +232,6 @@
 					}
 				}).then(res => {
 					this.followList = res.data.data
-					console.log(res.data.data)
 				})
 			},
 			//添加跟进
@@ -314,7 +311,6 @@
 			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',

pages/customer/editdetile.vue

@@ -39,7 +39,7 @@
 			</view>
 			<u-line></u-line>
 			<view class="cell">
-				<view class="item">{{$t('mine.lxcall')}} <text class="red">*</text></view>
+				<view class="item">{{$t('mine.lxcall')}}</view>
 				<view class="right">
 					<input :placeholder="$t('mine.lxcallinputhd')"  v-model="form.phone" />
 				</view>
@@ -59,14 +59,13 @@
 				</view>
 			</view>
 			<u-line></u-line>
-			<view class="cell">
+			<!-- <view class="cell">
 				<view class="item">{{$t('customer.Customerph')}} <text class="red">*</text></view>
 				<view class="right select"  @click="showcartype = true">
-					<!-- <input :placeholder="$t('customer.Customerphinput')" disabled v-model="car_type_name" /> -->
 					<view class="" :class="['content2', { placeholder: !car_type_name }]">{{car_type_name || $t('customer.Customerphinput')}}</view>
 					<u-icon class="arrowright" name="arrow-right" size="18" color="#747474"></u-icon>
 				</view>
-			</view>
+			</view> -->
 			<u-line></u-line>
 			<view class="cell">
 				<view class="item">{{$t('customer.Country')}}</view>
@@ -180,7 +179,7 @@
 				  describe: '',
 				  grade:'',
 				  country_id:'',
-				  car_type_id:'',
+				  // car_type_id:'',
 				  channel_id:'',
 				  magnitude:'',
 				  address:'', 
@@ -192,12 +191,11 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options);
 			this.id = options.id;
 			var that = this
 			this.getChannel()
 			this.getMagnitude()
-			this.carType()
+			// this.carType()
 			this.area()
 			this.customerdetailfn()
 			
@@ -208,7 +206,6 @@
 				this.form.address = this.location.address
 				this.form.lng = this.location.lng
 				this.form.lat = this.location.lat
-				console.log(this.location)
 			}
 			this.followlistfn()
 		},
@@ -236,12 +233,12 @@
 						that.defaultIndexqd=[index]
 					}
 				})
-				that.carTypeList1.forEach((item,index) => {
+				// that.carTypeList1.forEach((item,index) => {
-					if(item.id == that.form.car_type_id){
+				// 	if(item.id == that.form.car_type_id){
-						that.car_type_name = item.name
+				// 		that.car_type_name = item.name
-						that.defaultIndexph=[index]
+				// 		that.defaultIndexph=[index]
-					}
+				// 	}
-				})
+				// })
 				that.magnitudeList1.forEach((item,index) => {
 					if(item.id == that.form.magnitude){
 						that.magnitude_name = item.name
@@ -276,7 +273,6 @@
 					}
 				}).then(res => {
 					this.followList = res.data.data
-					console.log(res.data.data)
 				})
 			},
 			//添加跟进
@@ -381,11 +377,9 @@
 			// 搜索处理函数
 			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;
@@ -397,8 +391,6 @@
 			  // this.searchKeyword = item.name
 			  this.actives = item.id
 			  // this.showPicker = false; // 关闭弹窗
-			  console.log("选中的值:", item.id);
-			  console.log("选中的值:", item.name);
 			},
 			arerfn(){
 				 this.showarea = false; // 关闭弹窗

pages/customer/followsuccess.vue

@@ -64,7 +64,6 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options);
 			this.id = options.id;
 		},
 		methods: {
@@ -72,7 +71,6 @@
 				uni.navigateBack({})
 			},
 			active(item){
-				console.log(item)
 				if(item=='auto'){
 					this.shownexttime = true
 				}
@@ -100,7 +98,6 @@
 				this.shownexttime = false
 				this.nexttime = e.value
 				this.time = this.result(e.value, e.mode)
-				console.log(this.nexttime)
 			},
 			getLaterDate(dayNum, dateTime = null) {
 				// 如果为null,则格式化当前时间为时间戳
@@ -138,7 +135,6 @@
 				if(this.actives==7){
 					nexttime = this.getLaterDate(7)
 				}
-				console.log(nexttime)
 				request({
 					url:'customer/followNext',
 					method:'post',

pages/customer/followup.vue

@@ -74,16 +74,17 @@
 					</uni-file-picker>
 				</view>
 			</view>
-			<u-line v-if="form.type==0"></u-line>
+			<u-line></u-line>
-			<view class="cell1"  v-if="form.type==0">
+			<view class="cell1">
-				<view>{{$t('customer.Visitcontent')}}</view>
+				<view v-if="form.type==0">{{$t('customer.Visitcontent')}}</view>
+				<view v-if="form.type==1">{{$t('customer.flRemarks')}}</view>
 				<view class="yuyin">
-					<textarea auto-height v-model="form.audio_text" :placeholder="$t('customer.Visiinputhd')"/>
+					<textarea v-if="form.type==0" auto-height v-model="form.audio_text" :placeholder="$t('customer.Visiinputhd')"/>
-					<!-- <image src="/static/image/customer/yuyin.png" mode="" @tap="startRecognizebd"></image> -->
+					<textarea v-if="form.type==1" auto-height v-model="form.audio_text" :placeholder="$t('customer.flRemarksinputhd')"/>
 				</view>
 			</view>
-			<u-line v-if="form.type==0"></u-line>
+			<u-line></u-line>
-			<view class="cell1" v-if="form.type==0">
+			<view class="cell1">
 				<view>{{$t('customer.Remarks')}}</view>
 				<view class="yuyin">
 					<textarea auto-height v-model="form.remark" :placeholder="$t('customer.Remarksinputhd')"/>
@@ -99,26 +100,14 @@
 			<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">
 					<view slot="desc" class="desc">
-						<view class="flex"  v-if="item.type==0">
+						<view class="flex" >
 							<view class="">
 								<view class="lingh">
 									{{$t('times')}} ：{{item.created_at}}
 								</view>
-								<view class="">{{$t('address')}}：{{item.address}}</view>
+								<view class=""  v-if="item.type==0">{{$t('address')}}：{{item.address}}</view>
-								<view class="lingh">{{$t('customer.Visitcontent')}}：{{item.audio_text}}</view>
+								<view class="lingh"  v-if="item.type==0">{{$t('customer.Visitcontent')}}：{{item.audio_text}}</view>
-							</view>
+								<view class="lingh"  v-if="item.type==1">{{$t('customer.flRemarks')}}：{{item.audio_text}}</view>
-							<view class="">
-								<!-- <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="lingh">
-								{{$t('times')}}：{{item.created_at}}
 							</view>
 							<view class="">
 								<!-- <image :src="item.oss_picture" mode=""></image> -->
@@ -199,7 +188,6 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options);
 			this.getlocahost()
 			this.id = options.id;
 			this.form.customer_id = options.id;
@@ -292,13 +280,13 @@
 					success: (res) => {
 					  if (res.data.results && res.data.results.length > 0) {
 						this.form.address = res.data.results[0].formatted_address; // 获取格式化地址
-						console.log(res.data.results[0].formatted_address)
+						// console.log(res.data.results[0].formatted_address)
 					  } else {
-						console.error('未找到地址');
+						// console.error('未找到地址');
 					  }
 					},
 					fail: (err) => {
-					  console.error('请求失败：', err);
+					  // console.error('请求失败：', err);
 					},
 				});
 			},
@@ -307,17 +295,15 @@
 				uni.getLocation({
 				  type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02
 				  success: function (res) {
-				    console.log('当前位置的经度：' + res.longitude);
-				    console.log('当前位置的纬度：' + res.latitude);
 					that.getarrd(res.longitude,res.latitude)
 				    // 如果需要将经纬度转换为具体地址，可以使用逆地理编码
 				    // 这里调用 uni.chooseLocation 或第三方地图服务（如高德、腾讯地图）
 				  },
 				  fail: function (err) {
-				    console.log('获取位置失败：', err);
+				    // console.log('获取位置失败：', err);
 				  },
 				  complete: function () {
-				    console.log('获取位置完成');
+				    // console.log('获取位置完成');
 				  }
 				});
 			},
@@ -325,11 +311,11 @@
 				if (navigator.geolocation) {
 					navigator.geolocation.getCurrentPosition(
 						(position) => {
-							console.log('当前位置的经度：' + position.coords.longitude);
+							// console.log('当前位置的经度：' + position.coords.longitude);
-							console.log('当前位置的纬度：' + position.coords.latitude);
+							// console.log('当前位置的纬度：' + position.coords.latitude);
 							this.getarrd(position.coords.longitude,position.coords.latitude)
 							this.error = '';
-							console.log("获取位置成功：", position);
+							// console.log("获取位置成功：", position);
 						},
 						(error) => {
 							this.unigetLocation()
@@ -338,7 +324,7 @@
 							// 	title: this.error,
 							// 	icon: 'none'
 							// });
-							console.error("获取位置失败：", error);
+							// console.error("获取位置失败：", error);
 						},
 						{
 							enableHighAccuracy: true,
@@ -353,7 +339,7 @@
 					// 	title: this.error,
 					// 	icon: 'none'
 					// });
-					console.error("浏览器不支持 Geolocation API");
+					// console.error("浏览器不支持 Geolocation API");
 				}
 			},
 			getErrorMessage(error) {
@@ -379,7 +365,7 @@
 				}).then(res => {
 					this.datas = res.data.data
 					this.followList = res.data.data
-					console.log(res.data.data)
+					// console.log(res.data.data)
 				})
 			},
 			//保存跟进
@@ -421,7 +407,6 @@
 			confirm(e) {
 				this.show = false
 				this.form.firstFollowtime = this.result(e.value, e.mode)
-				console.log(this.result(e.value, e.mode))
 			},
 			cancelnext() {
 				this.shownexttime = false
@@ -429,7 +414,6 @@
 			confirmnext(e) {
 				this.shownexttime = false
 				this.nexttime = this.result(e.value, e.mode)
-				console.log(this.nexttime)
 				request({
 					url:'customer/followNext',
 					method:'post',
@@ -451,26 +435,30 @@
 				
 			},
 			change(e) {
-				// console.log('change', e)
 			},
 			
 			delfn(name){
-				console.log(name)
 				that.carinfo[name] =''
 			},
 			uploadfn(imgUrl,name){
 				var that = this;
+				uni.showLoading({
+					title:this.$t('imgloading')
+				});
 				uni.uploadFile({
 					// url: 'http://api.crm.hnxinyouhe.com/upload',
-					url: 'http://219.157.255.213:9007/upload/uploadImage', 
+					// url: 'https://api.fcrm.hnxinyouhe.com/upload/uploadImage', 
+					// url: 'https://crm-server.smt.hnxinyouhe.com/upload/uploadImage', 
+					// url: 'http://219.157.255.213:9006/upload/uploadImage', 
+					url: 'https://crm-server.x.hnxinyouhe.com/upload/uploadImage', 
 					filePath: imgUrl,
 					name: 'files',
 					header:{'Authorization': 'Bearer ' +  uni.getStorageSync('token')},
 					success: (uploadFileRes) => {
 						const path=JSON.parse(uploadFileRes.data)
+						uni.hideLoading();
 						if(path.code==0){
 							that.form[name] = path.data.path
-							console.log(that.form)
 						}else{
 							uni.showToast({
 								title: path.message,
@@ -503,10 +491,10 @@
 				options.engine = 'baidu';
 				that.form.audio_text = "";
 				plus.speech.startRecognize(options, function (s) {
-					console.log(s);
+					// console.log(s);
 					that.form.audio_text += s;
 				}, function (e) {
-					console.log("语音识别失败：" + e.message);
+					// console.log("语音识别失败：" + e.message);
 				});
 			},
 			async startRecognize () {
@@ -524,12 +512,12 @@
 				options.punctuation = false; // 是否需要标点符号 
 				options.timeout = 10 * 1000; //语音录入持续时长
 				plus.speech.startRecognize(options, function(s) {
-					console.log(s);
+					// console.log(s);
 					that.form.remark += s;
 					// 关闭语音
 					plus.speech.stopRecognize();
 				}, function (e) {
-					console.log("语音识别失败：" + e.message);
+					// console.log("语音识别失败：" + e.message);
 				});
 			},
 			// #ifdef APP-PLUS

pages/customer/map.nvue

@@ -21,7 +21,7 @@ export default {
 	  postMessagefn(e){
 		  uni.setStorageSync('location', e.detail.data);
 		  uni.navigateBack({})
-		  console.log(JSON.parse(e.detail.data))
+		  // console.log(JSON.parse(e.detail.data))
 	  },
 	  leftClick(){
 	  	uni.navigateBack({})
@@ -37,16 +37,16 @@ export default {
 			  obj.lat=res.latitude
 			  var arr=[]
 			  arr.push(obj)
-	  			  console.log(arr)
+	  			  // console.log(arr)
 				  
 	  			// that.src = 'http://dap?arr='+encodeURIComponent(JSON.stringify(arr))
 	  			that.src = 'http://219.157.255.213:8082?arr='+encodeURIComponent(JSON.stringify(arr))
 	  	  },
 	  	  fail: function (err) {
-	  	    console.log('获取位置失败：', err);
+	  	    // console.log('获取位置失败：', err);
 	  	  },
 	  	  complete: function () {
-	  	    console.log('获取位置完成');
+	  	    // console.log('获取位置完成');
 	  	  }
 	  	})
 	  },

pages/customer/maph5.vue

@@ -50,7 +50,7 @@ export default {
 		  this.center.lat = e.lat
 		  this.center.lng = e.lng
 	  }
-	  console.log(e)
+	  // console.log(e)
 		this.initMap()
   },
   methods:{
@@ -76,15 +76,15 @@ export default {
 		confirm(item){
 			var that = this
 			// var latlng = JSON.parse(JSON.stringify(place.geometry.location))
-			console.log("place===", item.description)
+			// console.log("place===", item.description)
 			that.value = item.description
 			that.cityInfo.address=item.description
 			var geocoder = new google.maps.Geocoder();
 			// var address = document.getElementById("address").value;
 			geocoder.geocode( { 'address': item.description}, function(results, status) {
-				console.log(results)
+				// console.log(results)
 				var latlng = JSON.parse(JSON.stringify(results[0].geometry.location))
-				console.log(latlng)
+				// console.log(latlng)
 				// // 将地图中心点指向用户所选位置，并设置标记
 				that.map.setCenter(latlng);
 				that.cityInfo.lat=latlng.lat
@@ -140,13 +140,13 @@ export default {
 			    const geocoder = new google.maps.Geocoder();
 			    geocoder.geocode({ location: position }, (results, status) => {
 			      if (status === 'OK' && results[0]) {
-					  console.log(results)
+					  // console.log(results)
-					  console.log(position)
+					  // 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)
+					// console.log(that.cityInfo)
 			      } else {
 			        alert('无法获取地址信息');
 			      }
@@ -158,17 +158,17 @@ export default {
 			uni.getLocation({
 			  type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02
 			  success: function (res) {
-			    console.log('当前位置的经度：' + res.longitude);
+			    // console.log('当前位置的经度：' + res.longitude);
-			    console.log('当前位置的纬度：' + res.latitude);
+			    // console.log('当前位置的纬度：' + res.latitude);
 				that.addmapmarkfn(res.latitude,res.longitude)
 			    // 如果需要将经纬度转换为具体地址，可以使用逆地理编码
 			    // 这里调用 uni.chooseLocation 或第三方地图服务（如高德、腾讯地图）
 			  },
 			  fail: function (err) {
-			    console.log('获取位置失败：', err);
+			    // console.log('获取位置失败：', err);
 			  },
 			  complete: function () {
-			    console.log('获取位置完成');
+			    // console.log('获取位置完成');
 			  }
 			});
 		},
@@ -183,11 +183,11 @@ export default {
 					if (navigator.geolocation) {
 						navigator.geolocation.getCurrentPosition(
 							(position) => {
-								console.log('当前位置的经度：' + position.coords.longitude);
+								// console.log('当前位置的经度：' + position.coords.longitude);
-								console.log('当前位置的纬度：' + position.coords.latitude);
+								// console.log('当前位置的纬度：' + position.coords.latitude);
 								that.addmapmarkfn(position.coords.latitude,position.coords.longitude)
 								this.error = '';
-								console.log("获取位置成功：", position);
+								// console.log("获取位置成功：", position);
 							},
 							(error) => {
 								that.unigetLocation()
@@ -196,7 +196,7 @@ export default {
 								// 	title: this.error,
 								// 	icon: 'none'
 								// });
-								console.error("获取位置失败：", error);
+								// console.error("获取位置失败：", error);
 							},
 							{
 								enableHighAccuracy: true,
@@ -211,14 +211,14 @@ export default {
 						// 	title: this.error,
 						// 	icon: 'none'
 						// });
-						console.error("浏览器不支持 Geolocation API");
+						// console.error("浏览器不支持 Geolocation API");
 					}
 				}
 				
 		      
 		    })
 		    .catch((e) => {
-		      console.log(e)
+		      // console.log(e)
 		    })
 		}
   },

pages/customer/tagcustomer.vue

@@ -49,7 +49,6 @@
 			}
 		},
 		onLoad(e) {
-			console.log(e)
 			this.tag_id = e.tag_id
 			this.tag_name = e.name
 		},
@@ -69,7 +68,6 @@
 						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);
@@ -81,7 +79,6 @@
 				})
 			},
 			godetile(item){
-				console.log(item)
 				uni.navigateTo({
 					url: '/pages/customer/detile?id='+item.id
 				});
@@ -96,16 +93,27 @@
 			        });
 			        return;
 			    }
-			
+				uni.showModal ({
-			    uni.makePhoneCall({
+					title: this.$t('prompt'),
-			        phoneNumber: phoneNumber,
+					content: this.$t('callmsg'),
-			        success: () => {
+					cancelText: this.$t('cancel'),
-			          console.log('拨打电话成功');
+					confirmText: this.$t('confirm'),
-			        },
+					success: function (res) {
-			        fail: (err) => {
+						if (res.confirm) {
-			          console.log('拨打电话失败', err);
+							uni.makePhoneCall({
-			        },
+							    phoneNumber: phoneNumber,
-			    });
+							    success: () => {
+							      // console.log('拨打电话成功');
+							    },
+							    fail: (err) => {
+							      // console.log('拨打电话失败', err);
+							    },
+							});
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				});
 			},
 			editClick(item){
 				uni.navigateTo({

pages/index/customer.vue

@@ -8,13 +8,16 @@
 					
 					<view class="topSearch">
 						<view class="left">
+							<view @click="showPicker = true" class="searchl">
+								{{country_name || $t('customer.Country')}}
+							</view>
 							<u-search v-model="keyword" bgColor="#fff" search-icon=" " :show-action="false" :placeholder="$t('customer.inputhd')"></u-search>
 							<view @click="searchCli" class="search">
 								<image src="/static/image/customer/search1.png" mode=""></image>
 							</view>
 						</view>
 						<view class="right">
-							<image src="/static/image/customer/search.png" @click="show = true" mode=""></image>
+							<image src="/static/image/customer/search.png" @click="showtagfn()" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -26,8 +29,8 @@
 				<u-swipe-action>
 					<u-swipe-action-item :options="options1" v-for="(item, index) in datalist" :key="index"  @click="delClick(item)">
 						<view class="contents" >
-							<view class=""  @click="godetile(item)">
+							<view class="" >
-								<view class="top">
+								<view class="top"  @click="godetile(item)">
 									<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>
@@ -37,14 +40,21 @@
 								<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="">
-										<view class="ststus">{{item.grade_txt}}</view>
+											<text class="name">{{item.contacts}}</text>
+											<u-tooltip :text="item.phone" :copyText="item.phone" :showCopy="true">
+												<text class="phone" @click.stop>{{item.phone}}</text>
+											</u-tooltip>
+										</view>
+										<view class="ststus"  @click="godetile(item)">{{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 class="info" @click="godetile(item)">
+										<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="desc1">
+								<!-- <view class="userzy"  @click="cede(item)"><image src="/static/image/customer/zhuany.png" mode=""></image> {{$t('transfer')}}</view> -->
 								<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> -->
@@ -54,7 +64,8 @@
 				</u-swipe-action>
 			</view>
 		</z-paging>
-		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="show" :columns="columns" @cancel="cancel" @close="cancel" @confirm="confirm" :title="$t('customer.CustomerScreening')" keyName="label"></u-picker>
+		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="show" :columns="alluserlist" @cancel="cancel" @close="cancel" @confirm="confirm" :title="$t('transfer')" keyName="name"></u-picker>
+		<!-- <u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="show" :columns="columns" @cancel="cancel" @close="cancel" @confirm="confirm" :title="$t('customer.CustomerScreening')" keyName="label"></u-picker> -->
 		<u-popup :show="showts"  :closeOnClickOverlay="false"  :round="20" mode="center">
 			<view class="popupcontent">
 				<view class="title">{{$t('prompt')}}</view>
@@ -74,7 +85,70 @@
 				</view>
 			</movable-view>
 		</movable-area>
+		<u-popup closeOnClickOverlay :show="showPicker" mode="bottom"  :round="10"  @close="close('showPicker')">
+			<view class="text">
+				<view class="qx" @click="closearer('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>
+		<!-- 客户标签 -->
+		<u-popup closeOnClickOverlay :show="showtag" mode="bottom"  :round="10"   @close="closetag('showtag')" :closeable="false" >
+			<view class="text">
+				<view class="qx" @click="close('showtag') ">{{$t('cancel')}}</view>
+				<view class="qd" @click="showtagqd">{{$t('confirm')}}</view>
+			</view>
+			<view class="popup-content">
+				<view>
+					<view class="name">{{$t('customer.CustomerScreening')}}</view>
+					<view class="row">
+						<view class="col4 tagitem"  v-for="(items, indexs) in columns"  :class="{ 'tagactive': isActivetime(items.id) }"    @click="tagSelecttime(items)" :key="indexs">
+						   {{ items.label }}
+						</view>
+					</view>
+				</view>
+				<scroll-view scroll-y class="tag-list">
+					<view
+						v-for="(item, index) in taglist"
+						:key="index"
+						class="tags"
+					>
+						<view class="name">{{ item.name }}</view>
+						<view class="row">
+							<view class="col4 tagitem"  v-for="(item1, index1) in item.tags"  :class="{ 'tagactive': isActive(item1.group_id, item1.id) }"    @click="tagSelect(item1)" :key="index1">
+							   {{ item1.name }}
+							</view>
+						</view>
+						
+					</view>
+				</scroll-view>
+			</view>
+		</u-popup>
 	</view>
+	
 </template>
 
 <script>
@@ -82,6 +156,15 @@
 	export default {
 		data() {
 			return {
+				showtag: false,
+				actives:'',
+				showPicker: false, // 控制选择器显示
+				searchKeyword: "", // 搜索关键词
+				selectedLabel: "", // 选中的值（显示在输入框中）
+				filteredOptions: [], // 过滤后的数据
+				country_name:'',
+				country_id:'',
+				tag_id:[],
 				current:0,
 				options1: [],
 				x: 300,		//x坐标
@@ -95,11 +178,14 @@
 				columns:[],
 				list1: [],
 				datalist:[],
-				isey:false
+				isey:false,
+				activeMap: {}, // 存储每个父级下选中的子项 { 父ID: 子ID }
+				taglist:[],
+				alluserlist:[],
+				customer_id:''
 			}
 		},
 		onLoad(e) {
-			console.log(e)
 			if(e.tab){
 				this.follow=e.tab - 1
 				this.current = e.tab
@@ -110,6 +196,7 @@
 			this.x = windowWidth-70
 			this.y = windowHeight-55
 			uni.removeStorageSync('location')
+			this.area()
 		},
 		onShow() {
 			// var location = uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale()
@@ -138,21 +225,19 @@
 				name: this.$t('lost'),
 				id:'lost'
 			}]
-			this.columns=[
+			this.columns=[{
-				[{
+				label: this.$t('all'),
-					label: this.$t('all'),
+				id:''
-					id:''
+			},{
-				},{
+				label:this.$t('tday'),
-					label:this.$t('tday'),
+				id: 0
-					id: 0
+			}, {
-				}, {
+				label: this.$t('threeday'),
-					label: this.$t('threeday'),
+				id: 1
-					id: 1
+			}, {
-				}, {
+				label: this.$t('sevenday'),
-					label: this.$t('sevenday'),
+				id: 2
-					id: 2
+			}]
-				}]
-			]
 			uni.setTabBarItem({
 				index: 0,
 				text: this.$t('tabbar.home')
@@ -171,24 +256,126 @@
 			})
 		},
 		methods: {
+			//获取转移用户
+			getalluser(){
+				request({
+					url:'user/getUsers?abbr=xinyouhe',
+					method:'get',
+				}).then(res => {
+					var list = res.data.data
+					this.alluserlist = [list]
+				})
+			},
+			// 搜索处理函数
+			handleSearch() {
+				var that = this
+			  if (this.searchKeyword) {
+				this.filteredOptions = this.areaList1.filter((item) => item.name.includes(this.searchKeyword));
+			  } else {
+				// 如果搜索框为空，显示全部数据
+				this.filteredOptions = this.areaList1;
+			  }
+			},
+			// 选择选项
+			handleSelect(item) {
+				this.selectedLabel = item.name; // 回显选中的值
+			  // this.searchKeyword = item.name
+			  this.actives = item.id
+			  // this.showPicker = false; // 关闭弹窗
+			},
+			arerfn(){
+				 this.showPicker = false; // 关闭弹窗
+				 this.country_name = this.selectedLabel
+				 this.country_id = this.actives
+				 this.queryList(1, 10)
+			},
+			closearer(){
+				this.showPicker = false; // 关闭弹窗
+				this.country_name =''
+				this.country_id = ''
+				this.queryList(1, 10)
+			},
+			//国家
+			area(){
+				request({
+					url:'area/getCountry',
+					method:'get',
+				}).then(res => {
+					var list = res.data.data
+					this.areaList1 = list
+					this.filteredOptions = list;
+				})
+			},
+			//标签
+			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);
+			},
+			isActive(parentId, childId) {
+			  return this.activeMap[parentId] === childId;
+			},
+			tagSelecttime(item) {
+				this.follow_last = item.id;
+			},
+			isActivetime(id) {
+				return this.follow_last === id;
+			},
+			showtagqd(){
+				const selectedIds = Object.values(this.activeMap).filter(id => id !== '')
+				this.tag_id = selectedIds
+				this.queryList(1, 10)
+				this.showtag = false
+			},
+			showtagfn(){
+				console.log(this.columns)
+				this.tagGroup()
+				this.showtag = true
+			},
 			searchCli(){
 				this.queryList(1, 10)
 			},
-			close() {
+			close(val){
-				this.show= false
+				this[val] = false
 			},
+			//转移客户
 			confirm(e) {
-				console.log(e)
-				this.follow_last = e.value[0].id
 				this.show = false
-				this.queryList(1, 10)
+				request({
+					url:'customer/cede',
+					method:'post',
+					data: {
+						user_id: e.value[0].id,
+						customer_id:this.customer_id
+					}
+				}).then(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none'
+					});
+					if(res.data.code ==0){
+						setTimeout(() => {
+							uni.reLaunch({
+								url: '/pages/index/customer',// 替换为你要跳转的页面路径
+							});
+						}, 1000);
+					}
+				})
+				
 			},
 			cancel() {
 				this.show  = false
 			},
 			//tab标签切换
 			tabclick(e){
-				console.log(e)
 				if(e.id=='all'){
 					this.follow=''
 				}else{
@@ -209,9 +396,10 @@
 						per_page:10,
 						keyword:this.keyword,
 						follow_last:this.follow_last,
+						country_id:this.country_id,
+						tag_id:this.tag_id,
 					}
 				}).then(res => {
-					console.log(res.data)
 					if(res.data.code ==0){
 						var datas = res.data.data.list;
 						this.$refs.paging.complete(datas);
@@ -223,7 +411,6 @@
 				})
 			},
 			godetile(item){
-				console.log(item)
 				uni.navigateTo({
 					url: '/pages/customer/detile?id='+item.id
 				});
@@ -238,16 +425,28 @@
 			        });
 			        return;
 			    }
+				uni.showModal ({
+					title: this.$t('prompt'),
+					content: this.$t('callmsg'),
+					cancelText: this.$t('cancel'),
+					confirmText: this.$t('confirm'),
+					success: function (res) {
+						if (res.confirm) {
+							uni.makePhoneCall({
+							    phoneNumber: phoneNumber,
+							    success: () => {
+							      // console.log('拨打电话成功');
+							    },
+							    fail: (err) => {
+							      // console.log('拨打电话失败', err);
+							    },
+							});
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				});
 			    
-			    uni.makePhoneCall({
-			        phoneNumber: phoneNumber,
-			        success: () => {
-			          console.log('拨打电话成功');
-			        },
-			        fail: (err) => {
-			          console.log('拨打电话失败', err);
-			        },
-			    });
 			},
 			editClick(item){
 				uni.navigateTo({
@@ -256,7 +455,6 @@
 			},
 			delClick(item){
 				this.del_id = item.id
-				this.showts=true
 			},
 			delfn(){
 				this.showts=false
@@ -285,6 +483,12 @@
 					url: '/pages/customer/add'
 				});
 			},
+			//转移客户
+			cede(item){
+				this.customer_id = item.id
+				this.getalluser()
+				this.show = true
+			}
 		}
 	}
 </script>
@@ -293,6 +497,9 @@
 	uni-page-body {
 		background-color: #F6F6F6 !important;
 	}
+	::v-deep .u-search__content{
+		padding: 0 56px 0px 70px;
+	}
 	::v-deep .u-search__content__input{
 		font-size: 24rpx !important;
 	}
@@ -325,18 +532,42 @@
 		padding: 10px 15px 5px;
 	    .left {
 	        position: relative;
-	        width: 88%;
+	        flex: 1;
 	    }
 	
 	    .right {
-	        flex: 1;
 			text-align: right;
+			margin-left: 5px;
 	        image{
 	            width: 24px;
 				height: 20px;
 	            margin-top: 5px;
 	        }
 	    }
+		.searchl{
+		    background: linear-gradient(to right, #3471FF, #6776FF);
+		    color: white;
+		    border-radius: 20px;
+		    padding: 4px 12px;
+		    text-align: center;
+		    position: absolute;
+			/* #ifdef APP-PLUS */
+				top: 3px;
+			/* #endif */
+		    top: 2px;
+		    left:5px;
+		    font-size: 12px;
+			width: 46px;           /* 你可以根据需要调整宽度 */
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			display: inline-block;
+			image{
+				width: 16px;
+				height: 16px;
+				
+			}
+		}
 		.search{
 		    background: linear-gradient(to right, #3471FF, #6776FF);
 		    color: white;
@@ -427,15 +658,20 @@
 			color: #3471FF;
 			display: flex;
 			justify-content: flex-end;
+			align-items: center;
 			view{
 				margin-left:15px;
 			}
 			image{
 				width: 14px;
 				height: 14px;
-				// vertical-align: sub;
+				vertical-align: sub;
 				margin-right: 5px;
 			}
+			.userzy image{
+				width: 18px;
+				height: 18px;
+			}
 		}
 	}
 	.popupcontent{
@@ -477,5 +713,72 @@
 			line-height: 40px;
 		}
 	}
+	.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;
+	}
+	//标签
+	.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/index/highseas.vue

@@ -76,7 +76,6 @@
 			}
 		},
 		onLoad(e) {
-			console.log(e)
 		},
 		onShow() {
 			this.queryList(1, 10)
@@ -110,7 +109,6 @@
 						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);

pages/index/index.vue

@@ -68,7 +68,11 @@
 								<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="">
+								<u-tooltip :text="item.phone" :copyText="item.phone" :showCopy="true">
+									<text class="phone" @click.stop>{{item.phone}}</text>
+								</u-tooltip>
+							</view>
 							<view class="">{{$t('nextgjtime')}}：<text>{{item.follow_next}}</text></view>
 						</view>
 					</view>
@@ -199,7 +203,6 @@
 				this.$i18n.locale = e.value[0].id
 				uni.setStorageSync('i18locale', e.value[0].id);
 				this.showlang = false
-				console.log(uni.getLocale())
 				this.columns =[
 					[{
 						label: this.$t('zh'),
@@ -249,22 +252,22 @@
 					index: 3,
 					text: this.$t('tabbar.mine')
 				})
-				var language = e.value[0].id
+				// var language = e.value[0].id
-				if(e.value[0].id=='zh-Hans'){
+				// if(e.value[0].id=='zh-Hans'){
-					language= 'zh_CN'
+				// 	language= 'zh_CN'
-				}
+				// }
-				request({
+				// request({
-					url:'user/language',
+				// 	url:'user/language',
-					method:'POST',
+				// 	method:'POST',
-					data:{
+				// 	data:{
-						language: language,
+				// 		language: language,
-					}
+				// 	}
-				}).then(res => {
+				// }).then(res => {
-					uni.showToast({
+				// 	uni.showToast({
-						title: res.data.message,
+				// 		title: res.data.message,
-						icon: 'none'
+				// 		icon: 'none'
-					});
+				// 	});
-				})
+				// })
 			},
 			//日期选择组件
 			confirm(e) {
@@ -326,16 +329,27 @@
 			        });
 			        return;
 			    }
-			
+				uni.showModal ({
-			    uni.makePhoneCall({
+					title: this.$t('prompt'),
-			        phoneNumber: phoneNumber,
+					content: this.$t('callmsg'),
-			        success: () => {
+					cancelText: this.$t('cancel'),
-			          console.log('拨打电话成功');
+					confirmText: this.$t('confirm'),
-			        },
+					success: function (res) {
-			        fail: (err) => {
+						if (res.confirm) {
-			          console.log('拨打电话失败', err);
+							uni.makePhoneCall({
-			        },
+							    phoneNumber: phoneNumber,
-			    });
+							    success: () => {
+							      // console.log('拨打电话成功');
+							    },
+							    fail: (err) => {
+							      // console.log('拨打电话失败', err);
+							    },
+							});
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				});
 			},
 			editClick(item){
 				uni.navigateTo({

pages/index/mine.vue

@@ -33,6 +33,11 @@
 						<uni-icons type="right"  class="icon" size="18"></uni-icons>
 					</view>
 				</view> -->
+				<!-- <view class="sonContent" @click="navTo('/pages/mine/workreport')">
+					<image class="son-img-bg" src="/static/image/mine/icon10.png"></image>
+					<span>{{$t('mine.workreport')}}</span>
+					<uni-icons type="right"  class="icon" size="18"></uni-icons>
+				</view> -->
 				<view class="sonContent" @click="navTo('/pages/mine/resetPwd')">
 					<image class="son-img-bg" src="/static/image/mine/icon2.png"></image>
 					<span>{{$t('mine.cpassword')}}</span>
@@ -48,11 +53,11 @@
 					<span>{{$t('mine.feedback')}}</span>
 					<uni-icons type="right"  class="icon" size="18"></uni-icons>
 				</view> -->
-				<view class="sonContent" v-if="!isopenid" @click="gomyauth">
+				<!-- <view class="sonContent" v-if="!isopenid" @click="gomyauth">
 					<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>
+				</view> -->
 				<view class="sonContent" @click="navTo('/pages/mine/about')">
 					<image class="son-img-bg" src="/static/image/mine/icon5.png"></image>
 					<span>{{$t('mine.about')}}</span>
@@ -173,15 +178,27 @@
 			        });
 			        return;
 			    }
-			    uni.makePhoneCall({
+			   uni.showModal ({
-			        phoneNumber: phoneNumber,
+			   	title: this.$t('prompt'),
-			        success: () => {
+			   	content: this.$t('callmsg'),
-			          console.log('拨打电话成功');
+			   	cancelText: this.$t('cancel'),
-			        },
+			   	confirmText: this.$t('confirm'),
-			        fail: (err) => {
+			   	success: function (res) {
-			          console.log('拨打电话失败', err);
+			   		if (res.confirm) {
-			        },
+			   			uni.makePhoneCall({
-			    });
+			   			    phoneNumber: phoneNumber,
+			   			    success: () => {
+			   			      // console.log('拨打电话成功');
+			   			    },
+			   			    fail: (err) => {
+			   			      // console.log('拨打电话失败', err);
+			   			    },
+			   			});
+			   		} else if (res.cancel) {
+			   			// console.log('用户点击取消');
+			   		}
+			   	}
+			   });
 			},
 			//退出登录
 			logout(){

pages/index/webview.vue

@@ -14,7 +14,6 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options)
 			this.getCode(options.code,options.state)
 		},
 		methods: {
@@ -28,10 +27,8 @@
 			},
 			getCode(code,state) {
 				// var code = this.getUrlParam('code');
-				console.log(code)
 				var code_url = '';
 				if (code == null || code == '' || !code) {
-					console.log(2222222)
 					request({
 						url:'feishu/getinfo',
 						method:'post',
@@ -43,7 +40,7 @@
 						if(res.data.code ==0){
 							var data = res.data.data;
 							this.datas = data
-							console.log(data)
+							// console.log(data)
 							
 							code_url += 'https://open.feishu.cn/open-apis/authen/v1/authorize'
 							code_url += '?app_id=' + data.app_id
@@ -51,7 +48,7 @@
 							code_url += '&scope=' + data.scope
 							code_url += '&state=' + data.state;
 							
-							console.log(code_url)
+							// console.log(code_url)
 							// return;
 							window.location.href = code_url;
 						}else{
@@ -96,16 +93,16 @@
 				const route = currentPage.route; // 页面路径
 				const options = currentPage.options; // 页面参数
 				const fullUrl = `${route}?${Object.keys(options).map(key => `${key}=${options[key]}`).join('&')}`;
-				console.log('当前页面完整 URL:', fullUrl);
+				// console.log('当前页面完整 URL:', fullUrl);
 				request({
 					url:'feishu/getinfo',
 					method:'post',
 				}).then(res => {
 					var data = res.data.data;
 					var urls = data.url+fullUrl
-					console.log(data)
+					// console.log(data)
 					this.webUrl = 'https://open.feishu.cn/open-apis/authen/v1/authorize?app_id='+data.app_id+'&redirect_uri='+urls+'&scope='+data.scope+'&state='+data.state
-					console.log(this.webUrl)
+					// console.log(this.webUrl)
 				})
 			},
 		}

pages/login/agreement.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
-		<web-view src="http://219.157.255.213:9007/index/userAgreement" style="width: 100%; height: 100%;"></web-view>
+		<!-- <web-view src="https://api.fcrm.hnxinyouhe.com/index/userAgreement" style="width: 100%; height: 100%;"></web-view> -->
+		<!-- <web-view src="https://crm-server.smt.hnxinyouhe.com/index/userAgreement" style="width: 100%; height: 100%;"></web-view> -->
+		<!-- <web-view src="http://219.157.255.213:9006/index/userAgreement" style="width: 100%; height: 100%;"></web-view> -->
+		<web-view src="https://crm-server.x.hnxinyouhe.com/index/userAgreement" style="width: 100%; height: 100%;"></web-view>
 	</view>
 </template>
 

pages/login/agreementuser.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
-		<web-view src="http://219.157.255.213:9007/index/privacyAgreement" style="width: 100%; height: 100%;"></web-view>
+		<!-- <web-view src="https://api.fcrm.hnxinyouhe.com/index/privacyAgreement" style="width: 100%; height: 100%;"></web-view> -->
+		<!-- <web-view src="https://crm-server.smt.hnxinyouhe.com/index/privacyAgreement" style="width: 100%; height: 100%;"></web-view> -->
+		<!-- <web-view src="http://219.157.255.213:9006/index/privacyAgreement" style="width: 100%; height: 100%;"></web-view> -->
+		<web-view src="https://crm-server.x.hnxinyouhe.com/index/privacyAgreement" style="width: 100%; height: 100%;"></web-view>
 	</view>
 </template>
 

pages/login/index.vue

@@ -62,7 +62,7 @@
 			<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>
+			<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>
@@ -193,6 +193,7 @@
 						email: this.email,
 						password: this.password,
 						language: this.language,
+						abbr:'hesu'
 					}
 				}).then(res => {
 					uni.setStorageSync('i18locale',this.language);

pages/login/register.vue

@@ -122,9 +122,10 @@
 						email: this.email,
 						password: this.password,
 						code: this.code,
+						abbr:'hesu'
 					}
 				}).then(res => {
-					console.log(res.data.data)
+					// console.log(res.data.data)
 					uni.showToast({
 						title: res.data.message,
 						icon: 'none'
@@ -170,7 +171,7 @@
 						email: this.email,
 					}
 				}).then(res => {
-					console.log(res.data.data)
+					// console.log(res.data.data)
 					uni.showToast({
 						title:res.data.message,
 						icon: 'none'

pages/mine/about.vue

@@ -20,7 +20,7 @@
 		</view>
 
 		<view class="footer">
-			<text class="copyright">{{$t('mine.copyright')}}</text>
+			<text class="copyright">© 2024 powered by 河南新友合科技有限公司</text>
 		</view>
 	</view>
 </template>

pages/mine/businesscard.vue

@@ -101,7 +101,7 @@
 			    });
 			
 			    // 2. 返回临时路径（可直接用于 <image> 显示）
-			    console.log('下载成功，临时路径:', tempFilePath);
+			    // console.log('下载成功，临时路径:', tempFilePath);
 				if(item =='imageSrc'){
 					this.imageSrc = tempFilePath; 
 				}else{
@@ -109,7 +109,7 @@
 				}
 			
 			  } catch (err) {
-			    console.error('下载失败:', err);
+			    // console.error('下载失败:', err);
 			    throw new Error('图片下载失败');
 			  }
 			},
@@ -156,7 +156,7 @@
 							if (res.confirm) {
 								that.downloadImage(baseImg,canvas);
 							} else if (res.cancel) {
-								console.log('用户点击取消');
+								// console.log('用户点击取消');
 							}
 						}
 					});

pages/mine/changinfo.vue

@@ -155,10 +155,7 @@
 			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;
@@ -170,8 +167,6 @@
 			  // this.searchKeyword = item.name
 			  this.actives = item.id
 			  // this.showPicker = false; // 关闭弹窗
-			  console.log("选中的值:", item.id);
-			  console.log("选中的值:", item.name);
 			},
 			arerfn(){
 				 this.showPicker = false; // 关闭弹窗
@@ -235,7 +230,10 @@
 			uploadfn(imgUrl,name,name1){
 				var that = this;
 				uni.uploadFile({
-					url: 'http://219.157.255.213:9007/upload/uploadImage', 
+					// url: 'https://api.fcrm.hnxinyouhe.com/upload/uploadImage', 
+					// url: 'https://crm-server.smt.hnxinyouhe.com/upload/uploadImage', 
+					// url: 'http://219.157.255.213:9006/upload/uploadImage', 
+					url: 'https://crm-server.x.hnxinyouhe.com/upload/uploadImage', 
 					filePath: imgUrl,
 					name: 'files',
 					header:{'Authorization': 'Bearer ' +  uni.getStorageSync('token')},
@@ -249,7 +247,6 @@
 						}else{
 							that.userinfo[name1] = path.data.image_url
 							that.userinfo[name] = path.data.path
-							console.log(that.form)
 						}
 					}
 				});
@@ -277,7 +274,6 @@
 				uni.navigateBack({})
 			},
 			bcFn(){
-				console.log(this.userinfo)
 				request({
 					url:'user/save',
 					method:'POST',

pages/mine/recyclebin.vue

@@ -41,7 +41,6 @@
 						recycle:'recycle'
 					}
 				}).then(res => {
-					console.log(res.data)
 					if(res.data.code ==0){
 						var datas = res.data.data.list;
 						this.$refs.paging.complete(datas);

pages/mine/resetPwd.vue

@@ -130,7 +130,6 @@
 				})
 			},
 			getVcode() {
-				console.log(this.email)
 				if(this.email==''){
 					uni.showToast({
 						title:this.$t('emailerr'),
@@ -161,7 +160,6 @@
 						email: this.email,
 					}
 				}).then(res => {
-					console.log(res.data.data)
 					uni.showToast({
 						title:res.data.message,
 						icon: 'none'

pages/mine/workreport.vue

@@ -0,0 +1,99 @@
+<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('mine.workreport')"></uni-nav-bar>
+			</template>
+			<view class="contents" >
+				<view class="colls" v-for="(item, index) in datalist" :key="index" @click="godetilfn(item)">
+					<view class="cont">
+						<view class=""><text class="name">{{item.user.name}}的工作日报</text></view>
+						<view class="time">{{item.updated_at}}</view>
+						<view class="dynamic-ellipsis">今日工作内容:<text>{{item.text}}</text></view>
+					</view>
+				</view>
+			</view>
+		</z-paging>
+	</view>
+</template>
+
+<script>
+	import { request,showToast } from '@/api/apiT.js'
+	export default {
+		data() {
+			return {
+				datalist:[]
+			}
+		},
+		methods: {
+			leftClick(){
+				uni.navigateBack({})
+			},
+			//客户列表数据
+			queryList(pageNo, pageSize) {
+				var that = this;
+				request({
+					url:'daily/list',
+					method:'get',
+					data: {
+						page:pageNo,
+						per_page:10,
+					}
+				}).then(res => {
+					if(res.data.code ==0){
+						var datas = res.data.data.data;
+						this.$refs.paging.complete(datas);
+					}else{
+					} 
+					uni.stopPullDownRefresh();
+				})
+			},
+			godetilfn(item){
+				var that=this
+				uni.navigateTo({
+					url: '/pages/mine/workreportdetil?id='+item.id
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.contents{
+		background-color: #FFFFFF;
+		padding: 15px;
+		.colls{
+			
+			background: #F6F6F6;
+			border-radius: 10px;
+			margin-bottom: 10px;
+		}
+		.top{
+			padding: 10px 15px 0px;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+		}
+		.name{
+			font-size: 32rpx;
+			font-weight: bold;
+			margin-right: 10px;
+		}
+		.cont{
+			padding: 15px 12px;
+			font-size: 28rpx;
+			.time{
+				color: #999999;
+				font-size: 24rpx;
+			}
+		}
+		.dynamic-ellipsis {
+		  display: -webkit-box;
+		  -webkit-box-orient: vertical;
+		  overflow: hidden;
+		  text-overflow: ellipsis;
+		  -webkit-line-clamp: 2;
+		}
+	}
+</style>

pages/mine/workreportdetil.vue

@@ -0,0 +1,168 @@
+<template>
+	<view>
+		<uni-nav-bar leftText=" " :fixed="true" :border="false" leftIcon="back" @clickLeft="leftClick" color="#000000" backgroundColor="#fff" :statusBar="true" :title="$t('mine.workreport')"></uni-nav-bar>
+		<view class="content">
+			<view class="cell1">
+				<view >{{$t('mine.Reportdate')}}</view>
+				<view class="right">
+					<input :placeholder="$t('mine.nicknameinputhd')" v-model="time" disabled></input>
+				</view>
+			</view>
+			<u-divider text=""></u-divider>
+			<view class="cell1">
+				<view >{{$t('mine.Presenter')}}</view>
+				<view class="right">
+					<input type="text" v-model="username" disabled></input>
+				</view>
+			</view>
+			<!-- <u-divider text=""></u-divider>
+			<view class="cell1">
+				<view >{{$t('mine.newcustomernum')}}</view>
+				<view class="right">
+					<input  type="number" v-model="userinfo.follow"></input>
+				</view>
+			</view> -->
+			<u-divider text=""></u-divider>
+			<view class="cell">
+				<view>{{$t('mine.workcontent')}}</view>
+				<view class="yuyin">
+					<textarea auto-height :placeholder="$t('mine.workcontent')" v-model="userinfo.text"/>
+				</view>
+			</view>
+			<view class="cell">
+				<view>{{$t('customer.Remarks')}}</view>
+				<view class="yuyin">
+					<textarea auto-height  :placeholder="$t('customer.Remarksinputhd')" v-model="userinfo.remark"/>
+				</view>
+			</view>
+		</view>
+		<view class="foot" v-if="userinfo.self==0">
+			<button class="btn"  @click="bcFn">{{$t('submit')}}</button>
+		</view>	
+	</view>
+</template>
+<script>
+	import { nextTick } from "vue"
+	import { request,showToast } from '@/api/apiT.js'
+	export default {
+		data() {
+			return {
+				id:'',
+				userinfo:{},
+				time:'',
+				username:''
+			}
+		},
+		onLoad(options) {
+			this.id = options.id;
+			this.getinfo()
+		},
+		methods: {
+			// 搜索处理函数
+			getinfo(){
+				var that= this;
+				request({
+					url:'daily/detail',
+					method:'get',
+					data: {
+						id:this.id,
+					}
+				}).then(res => {
+					that.userinfo = res.data.data
+					that.username = res.data.data.user.name
+					that.time = res.data.data.updated_at.split(' ')[0];
+				})
+			},
+			leftClick(){
+				uni.navigateBack({})
+			},
+			bcFn(){
+				request({
+					url:'daily/save',
+					method:'POST',
+					data:{
+						id:this.id,
+						text:this.userinfo.text,
+						remark:this.userinfo.remark,
+					}
+				}).then(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none'
+					});
+					if(res.data.code ==0){
+						setTimeout(() => {
+							uni.reLaunch({
+								url: '/pages/index/mine',// 替换为你要跳转的页面路径
+							});
+						}, 1000);
+						
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	textarea {
+	  min-height: 200rpx;// 设置默认高度 ，解决设置自适应高度之后高度无效问题
+	  margin-top: 15px;
+	  background-color: #F6F6F6;
+	  padding: 15px;
+	  border-radius: 10px;
+	}
+	.m-r-10{
+		margin-right: 10px;
+	}
+	.u-divider{
+		margin: 0px 0px !important;
+	}
+	.content{
+		background: #FFFFFF;
+		padding-bottom: 100px;
+		.user{
+			width: 200rpx;
+			height: 200rpx;
+		}
+		.xj{
+			width: 60rpx;
+			height: 52rpx;
+			position: absolute;
+			right: 46%;
+			top: 33%;
+		}
+	}
+	.cell1{
+		display: flex;
+		justify-content:space-between;
+		padding: 18px 20px;
+		align-items: center;
+		font-weight: 500;
+		.item{
+			width: 90px;
+		}
+	}
+	.cell{
+		padding: 18px 20px;
+		font-weight: 500;
+	}
+	.right{
+		text-align: right;
+	}
+	.foot{
+		position: fixed;
+		bottom: 0px;
+		width: 100%;
+		height: 160rpx;
+		background: #FFFFFF;
+	}
+	.btn{
+		background: linear-gradient(to right, #3471FF, #6776FF);
+		color: white;
+		border-radius: 50px;
+		width: 84%;
+		margin: 20px 8%;
+		font-size: 32rpx;
+	}
+</style>

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

@@ -8,7 +8,7 @@ import c from '.././z-paging-constant'
 import interceptor from '../z-paging-interceptor'
 
 const language = uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale();
-console.log(uni.getLocale())
+// console.log(uni.getLocale())
 export default {
 	data() {
 		return {
@@ -95,7 +95,7 @@ export default {
 		},
 		// 获取国际化转换后的文本
 		_getI18nText(key, value) {
-			console.log(this.finalLanguage)
+			// console.log(this.finalLanguage)
 			const dataType = Object.prototype.toString.call(value);
 			if (dataType === '[object Object]') {
 				const nextValue = value[this.finalLanguage];