diff --git a/src/components/GetCode.vue b/src/components/GetCode.vue index 44a8087..38e72b0 100644 --- a/src/components/GetCode.vue +++ b/src/components/GetCode.vue @@ -121,6 +121,7 @@ export default { type: "error" }); this.state = ''; + this.$emit('reGetGCCode') }); }, diff --git a/src/router/index.js b/src/router/index.js index 77047d8..f148708 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -148,6 +148,10 @@ const router = new VueRouter({ routes }); +// 跳转路由后进行回到顶部 +router.afterEach((to, from) => { + window.scrollTo(0, 0); +}) // 添加路由导航守卫 非登录状态禁止进入wallet router.beforeEach((to, from, next) => { diff --git a/src/views/college/detail.vue b/src/views/college/detail.vue index 29562a1..25a5796 100644 --- a/src/views/college/detail.vue +++ b/src/views/college/detail.vue @@ -4,7 +4,7 @@
- {{$t('college.college')}} + {{$t('college.college')}} {{article.category_name}} {{$t('college.article')}} diff --git a/src/views/components/inner-transfer.vue b/src/views/components/inner-transfer.vue index 70016c4..2b72482 100644 --- a/src/views/components/inner-transfer.vue +++ b/src/views/components/inner-transfer.vue @@ -218,7 +218,17 @@ export default { } }, components: {}, - watch: {}, + watch: { + fromValue(n){ + if(n[0]==2){ + this.toValue = [1]; + this.form.to_account = this.toValue[0]; + }else if(n[0]==1){ + this.toValue = [2]; + this.form.to_account = this.toValue[0]; + } + }, + }, methods: { // from切换 fromChange($ev) { @@ -228,6 +238,7 @@ export default { } this.$refs.to.$refs.panel.clearCheckedNodes(); this.$refs.to.$refs.panel.lazyLoad(); + this.getUserCoinAssets(); }, toChange() { this.form.to_account = this.toValue[0]; @@ -302,6 +313,7 @@ export default { this.form.amount = ""; this.getUserCoinAssets(); this.$emit('changeAssets') + location.reload() }) .catch(() => {}); }, diff --git a/src/views/forgotPwd/index.vue b/src/views/forgotPwd/index.vue index 3465f67..844b8f3 100644 --- a/src/views/forgotPwd/index.vue +++ b/src/views/forgotPwd/index.vue @@ -41,7 +41,7 @@
- +
@@ -55,8 +55,8 @@ -

Remembered your password? - Log In +

{{$t("login.Remembered")}} + {{$t("common.sign_in")}}

@@ -74,12 +74,15 @@ export default { account: "", password : "", password_confirmation : "", + gc_code: '', + gc_key: '' }, codes : { google_code : '', email_code : '', sms_code : '' - } + }, + Graph_che: '' } }, @@ -117,7 +120,7 @@ export default { // get gc code from api gett_gc_code(){ Member.sendGCode().then( (res) =>{ - this.gc_key = res.key + this.user.gc_key = res.key this.Graph_che = res.img // console.log("gc",res); this.$message({ diff --git a/src/views/profile/certification.vue b/src/views/profile/certification.vue index e1228e0..1c8ce1e 100644 --- a/src/views/profile/certification.vue +++ b/src/views/profile/certification.vue @@ -36,6 +36,7 @@ v-model="form.birthday" type="date" :placeholder="$t('profile.selectDate')" + :picker-options="pickerOptions" > @@ -287,7 +288,12 @@ export default { front_img: "", back_img: "", hand_img: "" - } + }, + pickerOptions:{ + disabledDate(time) { + return time.getTime() > Date.now(); + }, + }, }; }, computed: { @@ -353,6 +359,10 @@ export default { let data = this.form; data.country_code = this.country.country_code; if (utils.validate("#auth")) { + if(!data.birthday){ + this.$message.error(this.$t("profile.selectDate")); + return; + } Profile.primaryAuth(data) .then(res => { this.$message.success(this.$t("profile.preliminary")); diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue index 43807e3..0c43a2d 100644 --- a/src/views/wallet/exchange-assets.vue +++ b/src/views/wallet/exchange-assets.vue @@ -667,6 +667,7 @@ export default { Wallet.withdraw(this.withdraw) .then(data => { + console.log(data,'1111'); // this.$message(this.$t("wallet.operationComplete") ); $("#withdraw").modal("hide"); this.verShow = false