fix：“修复海外版本存在部分中文的问题（包括一些提示）”

common/lang/en.js

@@ -71,8 +71,8 @@ export default {
 		closeStatus:'Door closing',
 		opensuccess:'open success',
 		title:'Equipment status',
-		red:'Red means machine alarm',
-		green:'Green means the machine is normal',
+		red:'Red means alarm',
+		green:'Green means normal',
 		sleep:'Sleep state：Machine sleep',
 		unsleep:'Sleep state：Did not sleep',
 		sleepDesc:'sleep desc',
@@ -125,8 +125,8 @@ export default {
 		suspendBusiness:'Suspend Business',
 		previousPage:'Previous Page',
 		nextPage:'Next Page',
-		equipmentClientID:'Device code',
-		deviceName:'Device name',
+		equipmentClientID:'Code',
+		deviceName:'Name',
 		devicePlaceholder:'Enter the last 6 digits of the device code',
 		deviceNamePlaceholder:'Enter key word',
 		search:'Search',
@@ -165,12 +165,14 @@ export default {
 		payment:'Modify the payment method',
 	},
 	dosugar:{
-		equipmentClientID:'Enter the machine code',
+		equipmentClientID:'Machine code',
 		placeholder:'Enter the last 6 digits of the device code',
 		search:'search',
 		chooseEquipment:'choose equipment',
 		chooseProduct:'choose product',
 		list:'today sugar list',
+		isDosugar:'Whether to make sugar remotely?',
+		reSearch:'requery',
 		submit:'submit',
 	},
 	flowers:{
@@ -182,9 +184,11 @@ export default {
 		buleSugar:'All bule sugar flower:',
 		redSugar:'All red sugar flower:',
 		whileSugar:'All while sugar flower:',
+		sure:'Confirm the change?',
 	},
 	volume:{
-		volu:'Current volume'
+		volu:'Current volume',
+		sure:'Confirm the change?',
 	},
 	parameters:{
 		general:'General parameters',
@@ -220,13 +224,15 @@ export default {
 		guanxiumian:'close sleep',
 		status1:'closed',
 		status2:'enable',
-		zhou:''
+		zhou:'',
+		setAlarm:'Set alarm',
+		isDelete:'Delete or not?',
 	},
 	updatePassword:{
 		adminPwd:'adminPwd',
 		guestPwd:'guestPwd',
 		update:'submit',
-		sure:'Are you sure?'
+		sure:'Confirm the change?'
 	},
 	updatePrice:{
 		A01:'Rose elf',
@@ -284,6 +290,9 @@ export default {
 		equimentType:'equimentType',
 		QR:'scan QR codes',
 		binding:'Apply for binding',
+		noMessage:'The message cannot be empty',
+		failed:'Failed to identify QR code, please upload again!',
+		illegal:'Illegal QR code: ',
 	},
 	generalParameters:{
 		headTemperature:'Head temperature',
@@ -331,5 +340,22 @@ export default {
 	common:{
 		name:'name:',
 		ID:'ID:',
+		tip:'prompt',
+		noDevice:'The machine could not be found',
+		addDevice:'The machine has been added',
+		success:'Sent successfully',
+		noData:'No data',
+		cancel:'Cancel',
+		ok:'OK',
+		allDevice:'Full machine',
 	},
+	timePicker:{
+		selectDate:'Select date',
+		hours:'',
+		min:'',
+		sec:'',
+		selection:'Time',
+		cancel:'Cancel',
+		ok:'OK',
+	}
 }

common/lang/ko.js

@@ -70,8 +70,8 @@ export default {
 		cancel:'취소',
 		opensuccess:'오픈 도어 성공',
 		title:'기계 상태',
-		red:'빨간색은 기계 경보를 뜻합니다',
-		green:'녹색은 기계가 정상임을 의미합니다',
+		red:' 빨간색은 경보입니다',
+		green:'녹색은 정상입니다',
 		sleep:'절전 상태: 절전 모드 켜짐',
 		unsleep:'절전 상태: 절전 모드가 해제됨',
 		sleepDesc:'수면 설명',
@@ -164,12 +164,14 @@ export default {
 		payment:'지불 방식을 수정하다',
 	},
 	dosugar:{
-		equipmentClientID:'기계 인코딩 입력',
+		equipmentClientID:'기계 번호',
 		placeholder:'장비 인코딩의 마지막 6자리',
 		search:'검색',
 		chooseEquipment:'클릭하여 기계 선택',
 		chooseProduct:'클릭하여 상품 선택',
 		list:'오늘의 제작 목록',
+		isDosugar:'원격으로 설탕을 만드는지 여부 ?',
+		reSearch:'다시 조회하다',
 		submit:'제출',
 	},
 	flowers:{
@@ -181,9 +183,11 @@ export default {
 		buleSugar:'모든블루슈가상품:',
 		redSugar:'모든흑설탕상품:',
 		whileSugar:'모든설탕상품:',
+		sure:' 수정 확인?',
 	},
 	volume:{
-		volu:'현재 볼륨'
+		volu:'현재 볼륨',
+		sure:' 수정 확인?',
 	},
 	parameters:{
 		general:'공통 인자',
@@ -219,7 +223,9 @@ export default {
 		guanxiumian:'휴면 종료',
 		status1:'닫힘',
 		status2:'열다',
-		zhou:''
+		zhou:'',
+		setAlarm:'알람을 설정하다',
+		isDelete:'삭제할지 여부?',
 	},
 	updatePassword:{
 		adminPwd:'관리자 암호',
@@ -283,6 +289,9 @@ export default {
 		equimentType:'기계 모델',
 		QR:'쓸 야드',
 		binding:'바인딩 신청',
+		noMessage:'정보는 비워두면 안 된다',
+		failed:'2차원 코드 식별에 실패했습니다, 다시 업로드하십시오!',
+		illegal:'비합법적 QR코드: ',
 	},
 	generalParameters:{
 		headTemperature:'버너 헤드의 작업 온도',
@@ -325,10 +334,27 @@ export default {
 	payment:{
 		on:'가동',
 		off:'닫기',
-		success:' 발송 성공 ',
+		success:'발송 성공',
 	},
 	common:{
 		name:'이름：',
 		ID:'번호：',
+		tip:'제시',
+		noDevice:'이 기계를 찾을 수 없습니다',
+		addDevice:'기기가 추가됨',
+		success:'발송 성공',
+		noData:'데이터 없음',
+		cancel:'취소',
+		ok:'확인',
+		allDevice:'모든 기계',
 	},
+	timePicker:{
+		selectDate:'날짜 선택',
+		hours:'',
+		min:'',
+		sec:'',
+		selection:'현재 선택',
+		cancel:'취소',
+		ok:'확인',
+	}
 }

common/lang/zh.js

@@ -170,6 +170,8 @@ export default {
 		chooseEquipment:'点击选择机器',
 		chooseProduct:'点击选择商品',
 		list:'今日做糖列表',
+		isDosugar:'是否远程做糖？',
+		reSearch:'重新查询',
 		submit:'提交',
 	},
 	flowers:{
@@ -181,9 +183,11 @@ export default {
 		buleSugar:'所有蓝糖花型：',
 		redSugar:'所有红糖花型：',
 		whileSugar:'所有白糖花型：',
+		sure:'确定修改？'
 	},
 	volume:{
-		volu:'当前音量'
+		volu:'当前音量',
+		sure:'确定修改？'
 	},
 	parameters:{
 		general:'通用参数',
@@ -219,7 +223,9 @@ export default {
 		guanxiumian:'结束休眠',
 		status1:'已关闭',
 		status2:'已启用',
-		zhou:'周'
+		zhou:'周',
+		setAlarm:'设置闹钟',
+		isDelete:'是否删除？',
 	},
 	updatePassword:{
 		adminPwd:'管理员密码',
@@ -283,6 +289,9 @@ export default {
 		equimentType:'机型',
 		QR:'扫码',
 		binding:'申请绑定',
+		noMessage:'信息不能为空',
+		failed:'识别二维码失败，请重新上传！',
+		illegal:'不合法二维码：',
 	},
 	generalParameters:{
 		headTemperature:'炉头工作温度',
@@ -330,5 +339,22 @@ export default {
 	common:{
 		name:'名称：',
 		ID:'编号：',
+		tip:'提示',
+		noDevice:'找不到该机器',
+		addDevice:'已添加该机器',
+		success:'发送成功',
+		noData:'暂无数据',
+		cancel:'取消',
+		ok:'确定',
+		allDevice:'全部机器',
 	},
+	timePicker:{
+		selectDate:'选择日期',
+		hours:'时',
+		min:'分',
+		sec:'秒',
+		selection:'当前选择',
+		cancel:'取消',
+		ok:'确定',
+	}
 }

packageA/components/mx-datepicker/mx-datepicker.vue

@@ -63,29 +63,29 @@
 		<view v-if="showTimePicker" class="picker">
 			<view class="picker-modal picker-time">
 				<view class="picker-modal-header">
-					<text class="picker-modal-header-title">选择日期</text>
+					<text class="picker-modal-header-title">{{$t('timePicker.selectDate')}}</text>
 				</view>
 				<picker-view class="picker-modal-time" indicator-class="picker-modal-time-item" :value="timeValue" @change="onTimeChange">
 					<picker-view-column>
-						<view v-for="(v,i) in 24" :key="i">{{i<10?'0'+i:i}}时</view>
+						<view v-for="(v,i) in 24" :key="i">{{i<10?'0'+i:i}}{{$t('timePicker.hours')}}</view>
 					</picker-view-column>
 					<picker-view-column>
-						<view v-for="(v,i) in 60" :key="i">{{i<10?'0'+i:i}}分</view>
+						<view v-for="(v,i) in 60" :key="i">{{i<10?'0'+i:i}}{{$t('timePicker.min')}}</view>
 					</picker-view-column>
 					<picker-view-column v-if="showSeconds">
-						<view v-for="(v,i) in 60" :key="i">{{i<10?'0'+i:i}}秒</view>
+						<view v-for="(v,i) in 60" :key="i">{{i<10?'0'+i:i}}{{$t('timePicker.sec')}}</view>
 					</picker-view-column>
 				</picker-view>
 				<view class="picker-modal-footer">
 					<view class="picker-modal-footer-info">
 						<view class="picker-display">
-							<text>当前选择</text>
+							<text>{{$t('timePicker.selection')}}</text>
 							<text class="picker-display-text">{{PickerTimeTitle}}</text>
 						</view>
 					</view>
 					<view class="picker-modal-footer-btn">
-						<view class="picker-btn" :hover-stay-time="100" hover-class="picker-btn-active" @click="onCancelTime">取消</view>
-						<view class="picker-btn" :style="{color}" :hover-stay-time="100" hover-class="picker-btn-active" @click="onConfirmTime">确定</view>
+						<view class="picker-btn" :hover-stay-time="100" hover-class="picker-btn-active" @click="onCancelTime">{{$t('timePicker.cancel')}}</view>
+						<view class="picker-btn" :style="{color}" :hover-stay-time="100" hover-class="picker-btn-active" @click="onConfirmTime">{{$t('timePicker.ok')}}</view>
 					</view>
 				</view>
 			</view>

packageA/pages/remote/advancedParameters.vue

@@ -262,8 +262,8 @@
 				}
 				if(n==0){
 					uni.showModal({
-						title: "提示",
-						content: "找不到该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.noDevice'),
 						success: (res) => {
 					
 						}
@@ -308,7 +308,7 @@
 					var code = res.code;
 					if(code==false){
 						uni.showToast({
-							title: res.message,
+							title: this.$t('common.noData'),
 							duration: 2000
 						});
 						return;
@@ -365,7 +365,7 @@
 				this.updateParameters(param).then(res => {
 					if (res.data == 'SUCCESS') {
 						uni.showToast({
-							title: '发送成功',
+							title: this.$t('common.success'),
 							duration: 1000
 						});
 					}

packageA/pages/remote/alarmClockItem.vue

@@ -44,6 +44,7 @@
 		<!-- //多选下拉框 -->
 		<view class="select-item">
 			<ld-select :multiple="true" :list="equipmentNameList" label-key="label" value-key="value"
+				:cancel-text="$t('common.cancel')" :confirm-text="$t('common.ok')"
 				:placeholder="$t('alarmClock.placeholder')" clearable v-model="equipmentIds" @change="selectChange2"></ld-select>
 		</view>
 		<view class="uni-list">
@@ -129,6 +130,9 @@
 		onShow() {
 			this.globalUser = uni.getStorageSync("globalUser");
 			this.clock = uni.getStorageSync("clock");
+			uni.setNavigationBarTitle({
+				title: this.$t('alarmClock.setAlarm')
+			});
 			var token = uni.getStorageSync("token");
 			if (this.clock == "add") {
 				this.Sunday = false;
@@ -184,7 +188,7 @@
 						var equipmentNameList = this.equipmentNameList;
 						var co = {};
 						co["value"] = 'all';
-						co["label"] = '全部机器';
+						co["label"] = this.$t('common.allDevice');
 						equipmentNameList.push(co);
 						for (var i = 0; i < listName.length; i++) {
 							var cov = {};
@@ -432,8 +436,8 @@
 				}
 				if (n == 0) {
 					uni.showModal({
-						title: "提示",
-						content: "找不到该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.noDevice'),
 						success: (res) => {
 
 						}
@@ -441,8 +445,8 @@
 				}
 				if (n > 0) {
 					uni.showModal({
-						title: "提示",
-						content: "已添加该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.addDevice'),
 						success: (res) => {
 
 						}
@@ -510,7 +514,7 @@
 				this.addAlarmClockItem(alarmClock)
 					.then(res => {
 						uni.showModal({
-							title: "提示",
+							title: this.$t('common.tip'),
 							content: res.message,
 							success: (re) => {
 								if (re.confirm) {
@@ -558,8 +562,8 @@
 			},
 			delet() {
 				uni.showModal({
-					title: "提示",
-					content: "是否删除？",
+					title: this.$t('common.tip'),
+					content: this.$t('alarmClock.isDelete'),
 					success: (res) => {
 						if (res.confirm) {
 							var eids = '';
@@ -583,7 +587,7 @@
 								method: "POST",
 								success: (res) => {
 									uni.showModal({
-										title: "提示",
+										title: this.$t('common.tip'),
 										content: res.data.message,
 										success: (re) => {
 											if (re.confirm) {
@@ -666,6 +670,7 @@
 		padding-top: 15upx;
 		padding-bottom: 25upx;
 		display: flex;
+		align-items: center;
 		flex-direction: row;
 		justify-content: flex-start;
 	}
@@ -679,7 +684,7 @@
 
 	.search-input {
 		width: 45%;
-		text-align: center;
+		/* text-align: center; */
 		font-size: 26upx;
 		font-family: "PingFang-SC-Bold";
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
@@ -696,7 +701,7 @@
 
 	.search-button {
 		width: 20%;
-		padding-left: 7upx;
+		padding-left: 20upx;
 		text-align: center;
 	}
 
@@ -717,9 +722,8 @@
 	}
 
 	.button {
-		margin: auto;
-		width: 60%;
-		height: 100upx;
+		margin: 30px;
+		width: 50%;
 	}
 
 	.p1 {

packageA/pages/remote/dosugar.vue

@@ -130,8 +130,8 @@
 				}
 				if(n==0){
 					uni.showModal({
-						title: "提示",
-						content: "找不到该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.noDevice'),
 						success: (res) => {
 					
 						}
@@ -186,8 +186,8 @@
 			},
 			dosugar() {
 				uni.showModal({
-					title: "提示",
-					content: "是否远程做糖？",
+					title: this.$t('common.tip'),
+					content: this.$t('dosugar.isDosugar'),
 					success: (res) => {
 						if (res.confirm) {
 							var that = this;
@@ -216,7 +216,7 @@
 									var code = res.data.code;
 									if (code == true) {
 										uni.showToast({
-											title: "发送成功",
+											title: this.$t('common.success'),
 											duration: 2000
 										});
 										var sugar = res.data.data;
@@ -254,7 +254,7 @@
 						var code = res.data.code;
 						if (code == true) {
 							uni.showModal({
-								title: "提示",
+								title: this.$t('common.tip'),
 								content: res.data.message,
 								success: (res) => {
 
@@ -264,9 +264,9 @@
 							// var sugar = res.data.data;
 						} else {
 							uni.showModal({
-								title: "提示",
+								title: this.$t('common.tip'),
 								content: res.data.message,
-								confirmText: "重新查询",
+								confirmText: this.$t('dosugar.reSearch'),
 								success: (res) => {
 									if (res.confirm) {
 										this.selectSugar(no);

packageA/pages/remote/flowerShow.vue

@@ -177,8 +177,8 @@
 				}
 				if (n == 0) {
 					uni.showModal({
-						title: "提示",
-						content: "找不到该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.noDevice'),
 						success: (res) => {
 
 						}
@@ -300,8 +300,8 @@
 			},
 			updateProducts() {
 				uni.showModal({
-					title: "提示",
-					content: "是否修改？",
+					title: this.$t('common.tip'),
+					content: this.$t('flowers.sure'),
 					success: (res) => {
 						if (res.confirm) {
 							// var that = this;
@@ -325,7 +325,7 @@
 									var code = res.data.code;
 									if (code == true) {
 										uni.showToast({
-											title: "发送成功",
+											title: this.$t('common.success'),
 											duration: 2000
 										});
 									} else {
@@ -366,9 +366,9 @@
 							// var sugar = res.data.data;
 						} else {
 							uni.showModal({
-								title: "提示",
+								title: this.$t('common.tip'),
 								content: res.data.message,
-								confirmText: "重新查询",
+								confirmText: this.$t('dosugar.reSearch'),
 								success: (res) => {
 									if (res.confirm) {
 										this.selectSugar(no);

packageA/pages/remote/generalParameters.vue

@@ -357,8 +357,8 @@
 				}
 				if(n==0){
 					uni.showModal({
-						title: "提示",
-						content: "找不到该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.noDevice'),
 						success: (res) => {
 					
 						}
@@ -509,7 +509,7 @@
 				this.updateParameters(param).then(res => {
 					if (res.data == 'SUCCESS') {
 						uni.showToast({
-							title: '发送成功',
+							title: this.$t('common.success'),
 							duration: 1000
 						});
 					}

packageA/pages/remote/humidityParameters.vue

@@ -159,8 +159,8 @@
 				}
 				if(n==0){
 					uni.showModal({
-						title: "提示",
-						content: "找不到该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.noDevice'),
 						success: (res) => {
 					
 						}
@@ -193,7 +193,7 @@
 				this.humidityParameters(param).then(res => {
 					if (res.data == 'SUCCESS') {
 						uni.showToast({
-							title: '发送成功success',
+							title: this.$t('common.success'),
 							duration: 1000
 						});
 					}

packageA/pages/remote/remoteList.vue

@@ -126,7 +126,6 @@
 				});
 			},
 			payment() {
-				console.log("点击");
 				uni.navigateTo({
 					url: '/packageB/pages/remote/updatePayment',
 				});

packageA/pages/remote/updatePassword.vue

@@ -17,6 +17,7 @@
 		<!-- //多选下拉框 -->
 		<view class="select-item">
 			<ld-select :multiple="true" :list="equipmentNameList" label-key="label" value-key="value"
+				:cancel-text="$t('common.cancel')" :confirm-text="$t('common.ok')"
 				:placeholder="$t('alarmClock.placeholder')" clearable v-model="equipmentIds" @change="selectChange2"></ld-select>
 		</view>
 		<view class="search">
@@ -102,7 +103,7 @@
 						var equipmentNameList = this.equipmentNameList;
 						var co = {};
 						co["value"] = 'all';
-						co["label"] = '全部机器ALL machine';
+						co["label"] = this.$t('common.allDevice');
 						equipmentNameList.push(co);
 						for (var i = 0; i < listName.length; i++) {
 							var cov = {};
@@ -162,8 +163,8 @@
 				}
 				if (n == 0) {
 					uni.showModal({
-						title: "提示",
-						content: "找不到该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.noDevice'),
 						success: (res) => {
 
 						}
@@ -171,8 +172,8 @@
 				}
 				if (n > 0) {
 					uni.showModal({
-						title: "提示",
-						content: "已添加该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.addDevice'),
 						success: (res) => {
 
 						}

packageA/pages/remote/volume.vue

@@ -113,8 +113,8 @@
 				}
 				if (n == 0) {
 					uni.showModal({
-						title: "提示",
-						content: "找不到该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.noDevice'),
 						success: (res) => {
 
 						}
@@ -136,8 +136,8 @@
 			},
 			update() {
 				uni.showModal({
-					title: "提示",
-					content: "是否修改音量？",
+					title: this.$t('common.tip'),
+					content: this.$t('volume.sure'),
 					success: (res) => {
 						if (res.confirm) {
 							const param = {};
@@ -147,7 +147,7 @@
 								this.updata(param)
 									.then(res => {
 										uni.showModal({
-											title: '提示',
+											title: this.$t('common.tip'),
 											content: res.message,
 										});
 									}, _ => void uni.stopPullDownRefresh());

packageB/pages/remote/updatePayment.vue

@@ -148,8 +148,8 @@
 				}
 				if (n == 0) {
 					uni.showModal({
-						title: "提示",
-						content: "找不到该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.noDevice'),
 						success: (res) => {
 
 						}
@@ -223,8 +223,8 @@
 				}
 				this.paymentType = this.paymentList.join(',')
 				uni.showModal({
-					title: "提示",
-					content: "是否修改？",
+					title: that.$t('equipmentStatusList.tip'),
+					content:that.$t('updatePassword.sure') ,
 					success: (res) => {
 						if (res.confirm) {
 							var token = uni.getStorageSync("token");

packageB/pages/remote/updatePrice.vue

@@ -563,7 +563,7 @@
 						var equipmentNameList = this.equipmentNameList;
 						var co = {};
 						co["value"] = 'all';
-						co["label"] = '全部机器ALL machine';
+						co["label"] = this.$t('common.allDevice');
 						equipmentNameList.push(co);
 						for (var i = 0; i < listName.length; i++) {
 							var cov = {};
@@ -626,8 +626,8 @@
 				}
 				if (n == 0) {
 					uni.showModal({
-						title: "提示",
-						content: "找不到该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.noDevice'),
 						success: (res) => {
 
 						}
@@ -635,8 +635,8 @@
 				}
 				if (n > 0) {
 					uni.showModal({
-						title: "提示",
-						content: "已添加该机器",
+						title: this.$t('common.tip'),
+						content: this.$t('common.addDevice'),
 						success: (res) => {
 
 						}

packageB/pages/user/bangdingMachine.vue

@@ -90,7 +90,7 @@
 						success: (res) => {
 							console.log(res.data)
 							uni.showModal({
-								title: '提示',
+								title: this.$t('common.tip'),
 								content: res.data,
 								success: function(res) {
 									if (res.confirm) {} else if (res.cancel) {}
@@ -100,8 +100,8 @@
 					});
 				} else {
 					uni.showModal({
-						title: '提示',
-						content: '信息不能为空',
+						title: this.$t('common.tip'),
+						content: this.$t('bangdingMachine.noMessage'),
 						success: function(res) {
 							if (res.confirm) {} else if (res.cancel) {}
 						}
@@ -149,7 +149,7 @@
 						Qrcode.qrcode.callback = res1 => {
 							if (res1 == "error decoding QR Code") {
 								uni.showToast({
-									title: "识别二维码失败，请重新上传！",
+									title: this.$t('bangdingMachine.failed'),
 									duration: 2000,
 									icon: 'none'
 								})
@@ -195,7 +195,7 @@
 						Qrcode.qrcode.callback = (codeRes) => {
 							if (codeRes.indexOf('error') >= 0) {
 								// 二维码识别失败
-								this.qrCodeRes = '不合法二维码：' + codeRes
+								this.qrCodeRes = this.$t('bangdingMachine.illegal') + codeRes
 							} else {
 								// 二维码识别成功
 								let r = this.decodeStr(codeRes)

pages/Charts/mainStatistics.vue

@@ -1051,7 +1051,7 @@
 					method: "POST",
 					success: (res) => {
 						uni.showModal({
-							title: "提示",
+							title: this.$t('common.tip'),
 							content: res.data.message,
 							success: (res) => {
 

pages/User/equipmentStatusList.vue

@@ -536,7 +536,7 @@
 				if(this.index === 1) {
 					if(this.searchClientId === null || this.searchClientId === '') {
 						uni.showToast({
-							title: '请输入设备编码后6位',
+							title: this.$t('equipmentStatusList.devicePlaceholder'),
 							icon: "none",
 							duration: 2000
 						});
@@ -553,7 +553,7 @@
 				} else {
 					if(this.searchDeviceName === null || this.searchDeviceName === '') {
 						uni.showToast({
-							title: '请输入设备名称关键字',
+							title: this.$t('equipmentStatusList.deviceNamePlaceholder'),
 							icon: "none",
 							duration: 2000
 						});
@@ -670,7 +670,7 @@
 									if (list == "SUCCESS") {
 										uni.showModal({
 											title: that.$t('equipmentStatusList.kaiji'),
-											content: '发送成功',
+											content: that.$t('equipmentStatusList.successReturn'),
 											success: function(res) {}
 										})
 									} else {