lhl %!s(int64=4) %!d(string=hai) anos
pai
achega
dcd85780d1

+ 16 - 5
components/uni-load-more/uni-load-more.vue

@@ -24,7 +24,8 @@
 	</view>
 </template>
 
-<script>
+<script>
+	import { mapState, mapMutations } from 'vuex';
 	export default {
 		name: "uni-load-more",
 		props: {
@@ -45,16 +46,26 @@
 				type: Object,
 				default () {
 					return {
-						contentdown: "上拉显示更多",
-						contentrefresh: "正在加载...",
-						contentnomore: "没有更多数据了"
+						contentdown: this.$t('hea.sljzgd'),
+						contentrefresh: this.$t('hea.loading'),
+						contentnomore: this.$t('hea.nomore')
 					};
 				}
 			}
 		},
 		data() {
 			return {}
-		}
+		},
+		computed: {
+			...mapState(['lang'])
+		},
+		watch: {
+			lang(val) {
+				this.$set(this.contentText,'contentdown',this.$t('hea.sljzgd'))
+				this.$set(this.contentText,'contentrefresh',this.$t('hea.loading'))
+				this.$set(this.contentText,'contentnomore',this.$t('hea.nomore'))
+			}
+		},
 	}
 </script>
 

+ 20 - 20
lang/en.js

@@ -1,6 +1,23 @@
 module.exports = {
 	hea: {
-		cjsy: 'Primary income',
+		tj: 'Submit',
+		txms: 'Fill in description',
+		bcms: 'remarks',
+		scms: "Please provide relevant screenshots and descriptions for the superior's review (up to two)",
+		zc: 'Register',
+		srsj: 'Please enter mobile phone number',
+		srxmm: 'Please enter a new password',
+		srmm: 'Please enter the password',
+		srxmmt: 'Please enter password again',
+		sryzm: 'Please enter the verification code',
+		yzm: 'Verification',
+		qrxg: 'Confirm modification',
+		tjcg: 'Submitted successfully',
+		backhome: 'Back home',
+		qdd: 'Please wait patiently for review',
+		loading: 'Loading',
+		nomore: 'No more',
+		sljzgd: 'Pull up to load more',
 		vipzs: 'VIP exclusive',
 		dsy: 'degree profit',
 		wyyz: 'I want help',
@@ -23,26 +40,9 @@ module.exports = {
 		wdtd: 'My team',
 		wdtg: 'My promotion',
 		wdtgrs: 'My promotion number',
-		login: 'Login',
-		gwsy: 'Home page',
-		gscp: 'Company products',
-		faal: 'Project examples',
-		gywm: 'About us',
-		yyxz: 'Language',
-		ljgd: "More"
+		login: 'Login'
 	},
 	foo: {
-		hwsc: 'Oversea markets',
-		cplb: 'Product list',
-		faal: 'Project examples',
-		zyj: 'Aerator series',
-		gzwm: 'Follow us',
-		fdgzh: 'Futi WeChat official account',
-		fddy:'Futi Tick Tok official account',
-		zz: 'Manufacture',
-		jz: 'Value',
-		wh: 'Culture',
-		zzkhty: "Focus on customers'experience, innovation advancing technology development",
-		qywh: 'The company has a happy, dedicated and professional staff team, who inherit "perfect oneself to be excellent " team cooperation spirit, adhere to the " strict management,innovation, high quality,  market extension"operation policy, adhere to the" do exactly what customer may consider "business philosophy.We always provide high quality products, with excellent service,reasonable price and fast delivery,abide by customers\'commitment as our enterprise purpose.',
+		
 	}
 }

+ 19 - 18
lang/zh_cn.js

@@ -1,5 +1,23 @@
 module.exports =  {
     hea:{
+		tj: '提交',
+		txms: '填写描述',
+		bcms: '补充描述',
+		scms: '请提供相关截图及描述,以便上级审核(最多两张)',
+		zc: '注册',
+		srsj: '请输入手机号',
+		srxmm: '请输入新密码',
+		srmm: '请输入密码',
+		srxmmt: '请重复输入新密码',
+		sryzm: '请输入验证码',
+		yzm: '验证码',
+		qrxg: '确定修改',
+		tjcg: '提交成功',
+		qdd: '请耐心等待审核',
+		backhome: '返回首页',
+		loading: '正在加载...',
+		nomore: '没有更多数据了',
+		sljzgd: '上拉显示更多',
 		vipzs: '黑钻VIP义工专属',
 		dsy: '度收益',
 		wyyz: '我要援助',
@@ -24,25 +42,8 @@ module.exports =  {
 		wdtg: '我的推广',
 		wdtgrs: '我的推广人数',
 		login: '登录',
-       gwsy:'官网首页',
-       gscp:'公司产品',
-       faal:'方案案例',
-       gywm:'关于我们',
-       yyxz:'Language',
-       ljgd:"了解更多"
     },
     foo:{
-        hwsc:'海外市场',
-      cplb:'产品列表',
-       faal:'方案案例',
-        zyj:'增氧机系列',
-        gzwm:'关注我们',
-        fdgzh:'富地公众号',
-		fddy:'富地抖音号',
-        zz:'制造',
-        jz:'价值',
-        wh:'文化',
-        zzkhty:"专注客户体验 创新引导技术",
-        qywh:'公司拥有一支乐业、敬业、专业的员工队伍,传承“完善小我成就大我”的团队协作精神,坚持“严管理”求创新、高品质、拓市场”的经营方针,秉承“您所想的就是我们所做”的经营理念我们一贯坚持高品质,优质服务合理价格,快速的交货期,信守客户承诺的企业宗旨',
+       
     }
 }

+ 6 - 6
pages/public/forget.vue

@@ -9,25 +9,25 @@
 		<view class="login_text">
 			<view class="login_input flex">
 				<view class="login_img"><image src="../../static/icon/icon-phone.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="phone" focus placeholder="请输入手机号" /></view>
+				<view class="login_name"><input class="uni-input" v-model="phone" focus :placeholder="$t('hea.srsj')" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="../../static/icon/icon-code.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="password" focus placeholder="请输入新密码" /></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="password" focus :placeholder="$t('hea.srxmm')" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="../../static/icon/icon-code.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="repassword" focus placeholder="请重复输入新密码" /></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="repassword" focus :placeholder="$t('hea.srxmmt')" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="../../static/icon/icon-yzm.png"></image></view>
 				<view class="login_name flex">
-					<input class="uni-input width" v-model="code" focus placeholder="请输入验证码" />
-					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
+					<input class="uni-input width" v-model="code" focus :placeholder="$t('hea.sryzm')" />
+					<view class="code" @click="verification">{{ countDown == 0 ? $t('hea.yzm') : countDown }}</view>
 				</view>
 			</view>
 			<view>
-				<button type="green" @click="loding?register():''" class="uni-button uni-button-green">确定修改</button>
+				<button type="green" @click="loding?register():''" class="uni-button uni-button-green">{{$t('hea.qrxg')}}</button>
 			</view>
 		</view>
 	</view>

+ 2 - 2
pages/public/login.vue

@@ -8,11 +8,11 @@
 		<view class="login_text">
 			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/icon-phone.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="username" focus placeholder="请输入手机号" /></view>
+				<view class="login_name"><input class="uni-input" v-model="username" focus :placeholder="$t('hea.srsj')" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="../../static/icon/icon-code.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus placeholder="请输入密码" /></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus :placeholder="$t('hea.srxmm')" /></view>
 			</view>
 			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">{{$t('hea.login')}}</button></view>
 			<!-- <view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true"

+ 8 - 8
pages/public/register.vue

@@ -9,32 +9,32 @@
 		<view class="login_text">
 			<view class="login_input flex">
 				<view class="login_img"><image src="../../static/icon/icon-phone.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="phone" focus placeholder="请输入手机号" /></view>
+				<view class="login_name"><input class="uni-input" v-model="phone" focus :placeholder="$t('hea.srsj')" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="../../static/icon/icon-code.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="password" focus placeholder="请输入密码" /></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="password" focus :placeholder="$t('hea.srmm')" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="../../static/icon/icon-code.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="repassword" focus placeholder="请重复输入密码" /></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="repassword" focus :placeholder="$t('hea.srxmmt')" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img"><image src="../../static/icon/icon-yzm.png"></image></view>
 				<view class="login_name flex">
-					<input class="uni-input width" v-model="code" focus placeholder="请输入验证码" />
-					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
+					<input class="uni-input width" v-model="code" focus :placeholder="$t('hea.sryzm')" />
+					<view class="code" @click="verification">{{ countDown == 0 ? $t('hea.yzm') : countDown }}</view>
 				</view>
 			</view>
-			<view><button type="green" @click="register" class="uni-button uni-button-green">注册</button></view>
+			<view><button type="green" @click="register" class="uni-button uni-button-green">{{$t('hea.zc')}}</button></view>
 			<!-- <view><button class="uni-button uni-button-green uni-button-green-plain" type="green" plain="true" hover-class="none" @click="login">返回登录</button></view> -->
 			<view class=" flex bombtn">
 				<navigator url="./forget">
-					<view class="bbtn">忘记密码</view>
+					<view class="bbtn">{{$t('hea.wjmm')}}</view>
 				</navigator>
 				<view class="jg">
 				</view>
-				<view class="bbtn" @click="login">账号登录</view>
+				<view class="bbtn" @click="login">{{$t('hea.login')}}</view>
 			</view>
 		</view>
 	</view>

+ 3 - 3
pages/public/success.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="content">
 		<image src="../../static/img/success.png" mode="" class="okimg"></image>
-		<text class="tit">提交成功</text>
-		<text class="tit1">请耐心等待审核</text>
+		<text class="tit">{{$t('hea.tjcg')}}</text>
+		<text class="tit1">{{$t('hea.qdd')}}</text>
 		<view class="btn-wrapper" >
-			<navigator url="/pages/index/index" open-type="switchTab" class="bank">返回首页</navigator>
+			<navigator url="/pages/index/index" open-type="switchTab" class="bank">{{$t('hea.backhome')}}</navigator>
 		</view>
 	</view>
 </template>

+ 4 - 4
pages/upload/upload.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="upload-title">
-			请提供相关截图及描述,以便上级审核(最多两张)
+			{{$t('hea.scms')}}
 		</view>
 		<view class="upload-box">
 			<view class="upload-img flex">
@@ -14,14 +14,14 @@
 			<view class="upload-content">
 				<view class="describe">
 					<view class="title">
-						补充描述
+						{{$t('hea.bcms')}}
 					</view>
-					<textarea class="title1" value=""  placeholder="填写描述" maxlength="140" focus="focus" />
+					<textarea class="title1" value=""  :placeholder="$t('hea.txms')" maxlength="140" focus="focus" />
 				</view>
 			</view>
 		</view>
 		<view class="submit" @click="sub">
-			提交
+			{{$t('hea.tj')}}
 		</view>
 	</view>
 </template>

+ 11 - 0
pages/user/applyList.vue

@@ -46,6 +46,7 @@ import uniPopup from '@/components/uni-popup/uni-popup.vue';
 import { getApplyList, passApply, cancelApply } from '../../api/apply.js';
 import empty from '@/components/empty';
 import { tabbar } from '@/components/tabbar/tabbar.js'
+import { mapState, mapMutations } from 'vuex';
 export default {
 	components: {
 		empty,
@@ -92,6 +93,16 @@ export default {
 			fail: res => {}
 		});
 	},
+	computed: {
+		...mapState(['lang'])
+	},
+	watch: {
+		lang(val) {
+			this.$set(this.navList[0],'text',this.$t('hea.wsh'))
+			this.$set(this.navList[1],'text',this.$t('hea.ysh'))
+			
+		}
+	},
 	onLoad() {
 		this.loadData();
 	},