Parcourir la source

语言格式化

李天标 il y a 5 ans
Parent
commit
c1020ca2eb

+ 60 - 4
common/lang/en.js

@@ -2,12 +2,68 @@ export default {
 	lang: 'en',
 	login: {
 		title: 'backstage management',
+		username:'Please enter a user name',
+		password:'Please enter your password',
+		login:'login'
 	},
 	tabs:{
 		tab1:"home",
-		tab2:"机器销售",
-		tab3:"机器排行",
-		tab4:"机器状态",
-		tab5:"我的"
+		tab2:"machine sales",
+		tab3:"ranking",
+		tab4:"machine status",
+		tab5:"me"
+	},
+	mainStatistics:{
+		title:'Statistical charts',
+		name:'Name',
+		company:'sunzee',
+		dayTotalMoney:'Total income today',
+		dayTotalNum:'Quantity sold today',
+		weekTotalMoney:'week money',
+		weekTotalNum:'week number',
+		monthTotalMoney:'monthMoney',
+		monthTotalNum:'monthNumber',
+		yearTotalMoney:'year money',
+		yearTotalNum:'year number',
+		machineTotalNum:'machine number',
+		machineUseNum:'working machine',
+		day:'Sales today',
+		week:'Sales this week',
+		month:'Sales of this month',
+		year:'Current year sales',
+	},
+	merchantList:{
+		title:'Machine Sales',
+		total:'Total sales',
+		data:'Temporarily no data',
+	},
+	equipmentStatusList:{
+		title:'equipment status',
+		red:'Red means machine alarm',
+		green:'Green means the machine is normal',
+		sleep:'sleep state:Machine sleep',
+		unsleep:'sleep state:Did not sleep',
+		equipmentNo:'equipmentNo',
+		area:'area',
+		temperature :'Temperature of the furnace head',
+		equipmentTemperature:'equipmentTemperature',
+		humidity:'equipmentHumidity',
+		alarm:'alarm content'
+	},
+	equipmentStatics:{
+		title:'Machine Sales Ranking',
+		day:'Today sales ranking',
+		week:'Sales ranking of the week',
+		month:'Sales ranking for this month',
+		year:'Current sales ranking'
+	},
+	user:{
+		title:'me',
+		bindLogout:'exit',
+		equipmentname:'modify device name'
+	},
+	equipmentname:{
+		title:'modify device name',
+		updata:'update',
 	}
 }

+ 56 - 0
common/lang/zh.js

@@ -2,6 +2,9 @@ export default {
 	lang: 'zh',
 	login: {
 		title: '管理后台',
+		username:'请输入用户名',
+		password:'请输入密码',
+		login:'登录'
 	},
 	tabs:{
 		tab1:"首页",
@@ -9,5 +12,58 @@ export default {
 		tab3:"机器排行",
 		tab4:"机器状态",
 		tab5:"我的"
+	},
+	mainStatistics:{
+		title:'统计图表',
+		name:'用户',
+		company:'申泽智能物联',
+		dayTotalMoney:'今日收入总额',
+		dayTotalNum:'今日销售数量',
+		weekTotalMoney:'本周收入总额',
+		weekTotalNum:'本周销售数量',
+		monthTotalMoney:'本月收入总额',
+		monthTotalNum:'本月销售数量',
+		yearTotalMoney:'本年收入总额',
+		yearTotalNum:'本年销售数量',
+		machineTotalNum:'投放机器数量',
+		machineUseNum:'运营机器数量',
+		day:'今日销售情况',
+		week:'本周销售情况',
+		month:'本月销售情况',
+		year:'本年销售情况',
+	},
+	merchantList:{
+		title:'机器销售',
+		total:'总销售情况',
+		data:'暂无数据',
+	},
+	equipmentStatusList:{
+		title:'机器状态',
+		red:'红色代表机器报警',
+		green:'绿色代表机器正常',
+		sleep:'睡眠状态:机器已睡眠',
+		unsleep:'睡眠状态:未睡眠',
+		equipmentNo:'机器唯一码',
+		area:'所在地',
+		temperature :'炉头温度',
+		equipmentTemperature:'柜内温度',
+		humidity:'柜内湿度',
+		alarm:'报警内容'
+	},
+	equipmentStatics:{
+		title:'机器销售排行',
+		day:'今日销售排行',
+		week:'本周销售排行',
+		month:'本月销售排行',
+		year:'本年销售排行'
+	},
+	user:{
+		title:'我的',
+		bindLogout:'退出',
+		equipmentname:'修改设备名称'
+	},
+	equipmentname:{
+		title:'修改设备名称',
+		updata:'更改',
 	}
 }

+ 9 - 8
pages/Charts/equipmentStatistics.vue

@@ -4,12 +4,12 @@
 		<view class="head">
 		</view>
 		<view class="ri">
-			<font class="title">机器销售排行</font>
+			<font class="title">{{$t('equipmentStatics.title')}}</font>
 		</view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
 				<view class="qiun-title-dot-light">
-					<view class="dis">今日销售排行</view>
+					<view class="dis">{{$t('equipmentStatics.day')}}</view>
 				</view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('day')" class="preImg" src="/static/img/leftTriangle.png"></image>
@@ -26,11 +26,11 @@
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
 				<view class="qiun-title-dot-light">
-					<view class="dis">本周销售排行</view>
+					<view class="dis">{{$t('equipmentStatics.week')}}</view>
 				</view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('week')" class="preImg" src="/static/img/leftTriangle.png"></image>
-					<span>{{startDate2}}  {{endDate2}}</span>
+					<span>{{startDate2}} -- {{endDate2}}</span>
 					<image @click="next('week')" class="nextImg" src="/static/img/rightTriangle.png"></image>
 				</view>
 			</view>
@@ -43,11 +43,11 @@
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
 				<view class="qiun-title-dot-light">
-					<view class="dis">本月销售排行</view>
+					<view class="dis">{{$t('equipmentStatics.month')}}</view>
 				</view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('month')" class="preImg" src="/static/img/leftTriangle.png"></image>
-					<span>{{startDate3}}  {{endDate3}}</span>
+					<span>{{startDate3}} -- {{endDate3}}</span>
 					<image @click="next('month')" class="nextImg" src="/static/img/rightTriangle.png"></image>
 				</view>
 			</view>
@@ -60,11 +60,11 @@
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
 				<view class="qiun-title-dot-light">
-					<view class="dis">本年销售排行</view>
+					<view class="dis">{{$t('equipmentStatics.year')}}</view>
 				</view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('year')" class="preImg" src="/static/img/leftTriangle.png"></image>
-					<span>{{startDate4}}  {{endDate4}}</span>
+					<span>{{startDate4}} -- {{endDate4}}</span>
 					<image @click="next('year')" class="nextImg" src="/static/img/rightTriangle.png"></image>
 				</view>
 			</view>
@@ -292,6 +292,7 @@
 			// this.init2();
 		},
 		onShow() {
+			uni.setNavigationBarTitle({title: this.$t('equipmentStatics.title')});
 			this.tese = this.tese + 1;
 			var globalUser = uni.getStorageSync("globalUser");
 			if (globalUser.id == '1') {

+ 45 - 20
pages/Charts/mainStatistics.vue

@@ -5,10 +5,10 @@
 				<image class="userFlagimg" src="../../static/img/userFlag.png" mode=""></image>
 			</view>
 			<view class="pname">
-				<font class="wenzi" style="color: #BDD6F3;font-size:28upx"> 用户: {{pnameData}}</font>
+				<font class="wenzi" style="color: #BDD6F3;font-size:28upx"> {{$t('mainStatistics.name')}}: {{pnameData}}</font>
 			</view>
 			<view class="company">
-				<font style="color: #BDD6F3;font-size:28upx">申泽智能物联</font>
+				<font style="color: #BDD6F3;font-size:28upx">{{$t('mainStatistics.company')}}</font>
 			</view>
 		</view>
 		<view class="ri">
@@ -18,11 +18,11 @@
 				</view>
 				<view class="riTitle">
 					<view style="text-align:left;font-size:28upx;font-family:PingFang-SC-Medium">
-						<font class="fontLeft" style="color: #596D83;">今日收入总额:</font>
+						<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.dayTotalMoney')}}:</font>
 						<font style="color: #ED341F;">{{dayTotalMoney}}</font>
 					</view>
 					<view style="text-align:left;font-size:28upx;font-family:PingFang-SC-Medium">
-						<font class="fontLeft" style="color: #596D83;">今日销售数量:</font>
+						<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.dayTotalNum')}}:</font>
 						<font style="color: #ED341F;">{{dayTotalNum}}</font>
 					</view>
 				</view>
@@ -43,11 +43,11 @@
 				</view>
 				<view class="fourShell">
 					<view class="one">
-						<font class="fontLeft" style="color: #596D83;">本周收入总额:</font>
+						<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.weekTotalMoney')}}:</font>
 						<font style="color: #ED341F;">{{weekTotalMoney}}</font>
 					</view>
 					<view class="two">
-						<font class="fontLeft" style="color: #596D83;">本周销售数量:</font>
+						<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.weekTotalNum')}}:</font>
 						<font style="color: #ED341F;">{{weekTotalNum}}</font>
 					</view>
 				</view>
@@ -59,11 +59,11 @@
 				</view>
 				<view class="fourShell">
 					<view class="one">
-						<font class="fontLeft" style="color: #596D83;">本月收入总额:</font>
+						<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.monthTotalMoney')}}:</font>
 						<font style="color: #ED341F;">{{monthTotalMoney}}</font>
 					</view>
 					<view class="two">
-						<font class="fontLeft" style="color: #596D83;">本月销售数量:</font>
+						<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.monthTotalNum')}}:</font>
 						<font style="color: #ED341F;">{{monthTotalNum}}</font>
 					</view>
 				</view>
@@ -75,11 +75,11 @@
 				</view>
 				<view class="fourShell">
 					<view class="one">
-						<font class="fontLeft" style="color: #596D83;">本年收入总额:</font>
+						<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.yearTotalMoney')}}:</font>
 						<font style="color: #ED341F;">{{yearTotalMoney}}</font>
 					</view>
 					<view class="two">
-						<font class="fontLeft" style="color: #596D83;">本年销售数量:</font>
+						<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.yearTotalNum')}}:</font>
 						<font style="color: #ED341F;">{{yearTotalNum}}</font>
 					</view>
 				</view>
@@ -91,11 +91,11 @@
 				</view>
 				<view class="fourShell">
 					<view class="one">
-						<font class="fontLeft" style="color: #596D83;">投放机器数量:</font>
+						<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.machineTotalNum')}}:</font>
 						<font style="color: #ED341F;">{{machineTotalNum}}</font>
 					</view>
 					<view class="two">
-						<font class="fontLeft" style="color: #596D83;">运营机器数量:</font>
+						<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.machineUseNum')}}:</font>
 						<font style="color: #ED341F;">{{machineUseNum}}</font>
 					</view>
 				</view>
@@ -103,7 +103,7 @@
 		</view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light"><view class="dis">今日销售情况</view></view>
+				<view class="qiun-title-dot-light"><view class="dis">{{$t('mainStatistics.day')}}</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('day')" class="preImg" src="/static/img/leftTriangle.png"></image>
 					<span>{{startDate1}}</span>
@@ -118,10 +118,10 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light"><view class="dis">本周销售情况</view></view>
+				<view class="qiun-title-dot-light"><view class="dis">{{$t('mainStatistics.week')}}</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('week')" class="preImg" src="/static/img/leftTriangle.png"></image>
-					<span>{{startDate2}}  {{endDate2}}</span>
+					<span>{{startDate2}} -- {{endDate2}}</span>
 					<image @click="next('week')" class="nextImg" src="/static/img/rightTriangle.png"></image>
 				</view>
 			</view>
@@ -133,10 +133,10 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light"><view class="dis">本月销售情况</view></view>
+				<view class="qiun-title-dot-light"><view class="dis">{{$t('mainStatistics.month')}}</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('month')" class="preImg" src="/static/img/leftTriangle.png"></image>
-					<span>{{startDate3}}  {{endDate3}}</span>
+					<span>{{startDate3}} -- {{endDate3}}</span>
 					<image @click="next('month')" class="nextImg" src="/static/img/rightTriangle.png"></image>
 				</view>
 			</view>
@@ -148,10 +148,10 @@
 		<view class="line"></view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-				<view class="qiun-title-dot-light"><view class="dis">本年销售情况</view></view>
+				<view class="qiun-title-dot-light"><view class="dis">{{$t('mainStatistics.year')}}</view></view>
 				<view class="shijian" style="text-align: center;position: relative;">
 					<image @click="pre('year')" class="preImg" src="/static/img/leftTriangle.png"></image>
-					<span>{{startDate4}}  {{endDate4}}</span>
+					<span>{{startDate4}} -- {{endDate4}}</span>
 					<image @click="next('year')" class="nextImg" src="/static/img/rightTriangle.png"></image>
 				</view>
 			</view>
@@ -226,6 +226,7 @@
 		// 	this.init();
 		// },
 		onShow() {
+			uni.setNavigationBarTitle({title: this.$t('mainStatistics.title')});
 			// console.log("onShow");
 			var test = uni.getStorageSync('test');
 			//判断是不是初次登陆
@@ -263,10 +264,34 @@
 			},
 			day(){
 				var date = new Date();
-				var daystr = dateUtils.formateDate(date, 'yyyy年MM月dd日');
+				// var daystr = dateUtils.formateDate(date, 'yyyy年MM月dd日');
+				var daystr = dateUtils.formateDate(date, 'yyyy-MM-dd');
 				this.today = daystr;
 				var str= '星期'+'日一二三四五六'.charAt(date.getDay());
 				this.week = str;
+				if(this.$t('mainStatistics.name')=='Name'){
+					if(date.getDay()=='0'){
+						this.week = "SUN";
+					}
+					if(date.getDay()=='1'){
+						this.week = "MON";
+					}
+					if(date.getDay()=='2'){
+						this.week = "TUE";
+					}
+					if(date.getDay()=='3'){
+						this.week = "WED";
+					}
+					if(date.getDay()=='4'){
+						this.week = "THU";
+					}
+					if(date.getDay()=='5'){
+						this.week = "FRI";
+					}
+					if(date.getDay()=='6'){
+						this.week = "SAT";
+					}
+				}
 			},
 			initDateRang(day, chartType) {
 				const daystr = dateUtils.formateDate(day, 'yyyy/MM/dd');

+ 2 - 2
pages/Login/Login.vue

@@ -6,10 +6,10 @@
 		</view>
 		<form @submit="loginSubmit">
 			<view class="section">
-				<input class="input-account" name="username" placeholder="请输入用户名" />
+				<input class="input-account" name="username" :placeholder="$t('login.username')" />
 			</view>
 			<view class="section">
-				<input class="input-pwd" password name="password" placeholder="请输入密码" />
+				<input class="input-pwd" password name="password" :placeholder="$t('login.password')" />
 			</view>
 			<view class="btn-area">
 				<button type="primary" formType="submit" :loading="isLoading">{{loginBtnLabel}}</button>

+ 0 - 1
pages/User/buyPromo.vue

@@ -96,7 +96,6 @@
 						this.img = img;
 					}
 				})
-				console.log(pri)
 			}
 		},
 

+ 4 - 3
pages/User/equipmentName.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<view class="xiugai">
-			修改设备名称
+			{{$t('equipmentname.title')}}
 		</view>
 		<view v-for="(list,index) in listName" :key="index" class="body">
 			<view class="input-two">
@@ -10,7 +10,7 @@
 			</view>
 			<view class="button2">
 				<button type="primary" @click="updata1()" class="button">
-					<p class="p">更改</p>
+					<p class="p">{{$t('equipmentname.updata')}}</p>
 				</button>
 			</view>
 		
@@ -50,6 +50,7 @@
 			}, 800);
 		},
 		onShow() {
+			uni.setNavigationBarTitle({title: this.$t('equipmentname.title')});
 			// uni.startPullDownRefresh();
 			var me = this;
 			var name = uni.getStorageSync("name");
@@ -156,7 +157,7 @@
 	
 	.button {
 		/* padding: 5upx 10upx 10upx 0upx; */
-		width: 80upx;
+		width: 120upx;
 		height: 60upx;
 		border-radius: 10upx;
 	}

+ 12 - 11
pages/User/equipmentStatusList.vue

@@ -56,39 +56,39 @@
 	<view v-else>
 		<uni-collapse :show-animation="true">
 			<view class="titleFlag">
-				<image class="img" src="../../static/img/red.png" ></image>  <font class="wenziT">红色代表机器报警</font>
-				<image class="img" src="../../static/img/green.png"></image>  <font class="wenziT">绿色代表机器正常</font>
+				<image class="img" src="../../static/img/red.png" ></image>  <font class="wenziT">{{$t('equipmentStatusList.red')}}</font>
+				<image class="img" src="../../static/img/green.png"></image>  <font class="wenziT">{{$t('equipmentStatusList.green')}}</font>
 			</view>
 			<view class="titlelist" style="position: relative;" v-for="equipment in merchantList[0].equipmentList" :key="equipment.id">
 				<span class="status-css" :class="equipment.hasTodayAlarm===true?statusError : statusNormal"></span>
 				<uni-collapse-item :title="getEquipmentTitle(equipment)">
 					<view style="padding: 20upx;background-color: antiquewhite;">
 						<view class="swithBox" v-if="equipment.isSleep">
-							<view class="swichFont">睡眠状态:机器已睡眠</view>
+							<view class="swichFont">{{$t('equipmentStatusList.sleep')}}</view>
 							<view class="switch">
 								<switch style="transform:scale(0.65)"  checked @change="change(equipment.id,0)" />
 							</view>
 						</view>
 						<view class="swithBox" v-else>
-							<view class="swichFont">睡眠状态:未睡眠</view>
+							<view class="swichFont">{{$t('equipmentStatusList.unsleep')}}</view>
 							<view class="switch">
 								<switch style="transform:scale(0.65)" @change="change(equipment.id,1)" />
 							</view>
 						</view>
 						<view class="line1"></view>
-						<view><span>机器唯一码:</span><span>{{equipment.clientId}}</span></view>
-						<view><span>所在地:</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
-						<view><span>炉头温度:</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
-						<view><span>柜内湿度:</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
-						<view><span>柜内温度:</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
+						<view><span>{{$t('equipmentStatusList.equipmentNo')}}:</span><span>{{equipment.clientId}}</span></view>
+						<view><span>{{$t('equipmentStatusList.area')}}:</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
+						<view><span>{{$t('equipmentStatusList.temperature')}}:</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
+						<view><span>{{$t('equipmentStatusList.humidity')}}:</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
+						<view><span>{{$t('equipmentStatusList.equipmentTemperature')}}:</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
 						<view class="" v-if="equipment.hasTodayAlarm">
-							<view><span>报警内容:</span></view>
+							<view><span>{{$t('equipmentStatusList.alarm')}}:</span></view>
 							<view v-for="(alarm,index) in equipment.alarmList" :key="index">
 								<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}}  {{alarm.alarmContent}}</span></view>
 							</view>
 						</view>
 						<view class="" v-else>
-							<view><span>报警内容:</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}  {{equipment.alarmContent}}</span></view>
+							<view><span>{{$t('equipmentStatusList.alarm')}}:</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}  {{equipment.alarmContent}}</span></view>
 						</view>
 					</view>
 				</uni-collapse-item>
@@ -136,6 +136,7 @@
 			this.getEquipmentListData();
 		},
 		onShow() {
+			uni.setNavigationBarTitle({title: this.$t('equipmentStatusList.title')});
 			this.getEquipmentListData();
 		},
 		methods: {

+ 3 - 2
pages/User/merchantList.vue

@@ -5,14 +5,14 @@
 			<view v-if="merchantList[0].equipmentList.length>1">
 				<uni-collapse :accordion="true">
 					<uni-list>
-						<uni-list-item title="总销售情况" @click="openByAdmin(merchantList[0].name,merchantList[0].id)" />
+						<uni-list-item :title="$t('merchantList.total')" @click="openByAdmin(merchantList[0].name,merchantList[0].id)" />
 						<view class="titlelist" v-for="equipment in merchantList[0].equipmentList" :key="equipment.id">
 							<uni-list-item :title="getEquipmentTitle(equipment)" @click="openByEquipment(merchantList[0].name,equipment.id)" />
 						</view>
 					</uni-list>
 				</uni-collapse>
 			</view>
-			<view v-else style="text-align: center;">暂无数据</view>
+			<view v-else style="text-align: center;">{{$t('merchantList.data')}}</view>
 		</view>
 		<view class="">
 			<mix-tree :list="list" @treeItemClick="treeItemClick"></mix-tree>
@@ -58,6 +58,7 @@
 			...mapState(['loginUser']),
 		},
 		onShow() {
+			uni.setNavigationBarTitle({title: this.$t('merchantList.title')});
 			var globalUser = uni.getStorageSync("globalUser");
 			this.id = globalUser.id;
 		},

+ 19 - 13
pages/User/user.vue

@@ -15,20 +15,22 @@
 			</view>
 			<view class="tuichu">
 				<button @tap="bindLogout" class="settings">
-					<p class="p3">退出</p>
+					<p class="p3">{{$t('user.bindLogout')}}</p>
 				</button>
 			</view>
 		</view>
-			<view class="">
-					<uni-list>
-						<view v-if="Aid!='1'">
+		<view class="">
+			<uni-list>
+				<view v-if="Aid!='1'">
+					<view v-if="isForeign!='1'">
 						<uni-list-item title="优惠码" @click="open()" />
-						</view>
-						<view v-if="show">
-							<uni-list-item title="修改设备名称" @click="updataName()" />
-						</view>
-					</uni-list>
-			</view>
+					</view>
+				</view>
+				<view v-if="show">
+					<uni-list-item :title="$t('user.equipmentname')" @click="updataName()" />
+				</view>
+			</uni-list>
+		</view>
 		<view class="xiugai2">
 			<button type="primary" @click="trant()" class="xiugai2">
 				<p class="xiugai3">解除微信绑定</p>
@@ -46,7 +48,7 @@
 		mapActions,
 		mapMutations
 	} from 'vuex'
-	
+
 	export default {
 		components: {
 			uniList,
@@ -56,10 +58,11 @@
 			return {
 				name: '',
 				show: false,
+				isForeign: 0,
 				listName: [],
 				value: null,
 				id: null,
-				Aid:null,
+				Aid: null,
 				parm: {
 					name: null,
 					id: null
@@ -76,9 +79,12 @@
 			}, 800);
 		},
 		onShow() {
+			uni.setNavigationBarTitle({title: this.$t('user.title')});
 			// uni.startPullDownRefresh();
 			var globalUser = uni.getStorageSync("globalUser");
 			this.Aid = globalUser.id;
+			var isForeign = globalUser.isForeign;
+			this.isForeign = isForeign;
 			var me = this;
 			var name = uni.getStorageSync("name");
 			me.name = name;
@@ -282,6 +288,7 @@
 		-webkit-transform: translateX(-50%);
 		transform: translateX(-50%);
 	}
+
 	.xiugai2 {
 		width: 100%;
 		height: 80upx;
@@ -310,5 +317,4 @@
 		flex-direction: row;
 		justify-content: flex-start;
 	}
-
 </style>