Browse Source

修改问题

master
liaoxinyu 2 years ago
parent
commit
9d31aedee8
  1. 1
      src/components/GetCode.vue
  2. 4
      src/router/index.js
  3. 2
      src/views/college/detail.vue
  4. 14
      src/views/components/inner-transfer.vue
  5. 13
      src/views/forgotPwd/index.vue
  6. 12
      src/views/profile/certification.vue
  7. 1
      src/views/wallet/exchange-assets.vue

1
src/components/GetCode.vue

@ -121,6 +121,7 @@ export default {
type: "error" type: "error"
}); });
this.state = ''; this.state = '';
this.$emit('reGetGCCode')
}); });
}, },

4
src/router/index.js

@ -148,6 +148,10 @@ const router = new VueRouter({
routes routes
}); });
// 跳转路由后进行回到顶部
router.afterEach((to, from) => {
window.scrollTo(0, 0);
})
// 添加路由导航守卫 非登录状态禁止进入wallet // 添加路由导航守卫 非登录状态禁止进入wallet
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {

2
src/views/college/detail.vue

@ -4,7 +4,7 @@
<div class="row"> <div class="row">
<div class="col-12 my-4" v-if="article"> <div class="col-12 my-4" v-if="article">
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/college' }">{{$t('college.college')}}</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: `/college/list/${cid}` }">{{$t('college.college')}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: `/college/list/${cid}`}">{{article.category_name}}</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: `/college/list/${cid}`}">{{article.category_name}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{path:`/college/detail/${cid}/${aid}`}">{{$t('college.article')}}</el-breadcrumb-item> <el-breadcrumb-item :to="{path:`/college/detail/${cid}/${aid}`}">{{$t('college.article')}}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>

14
src/views/components/inner-transfer.vue

@ -218,7 +218,17 @@ export default {
} }
}, },
components: {}, 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: { methods: {
// from // from
fromChange($ev) { fromChange($ev) {
@ -228,6 +238,7 @@ export default {
} }
this.$refs.to.$refs.panel.clearCheckedNodes(); this.$refs.to.$refs.panel.clearCheckedNodes();
this.$refs.to.$refs.panel.lazyLoad(); this.$refs.to.$refs.panel.lazyLoad();
this.getUserCoinAssets();
}, },
toChange() { toChange() {
this.form.to_account = this.toValue[0]; this.form.to_account = this.toValue[0];
@ -302,6 +313,7 @@ export default {
this.form.amount = ""; this.form.amount = "";
this.getUserCoinAssets(); this.getUserCoinAssets();
this.$emit('changeAssets') this.$emit('changeAssets')
location.reload()
}) })
.catch(() => {}); .catch(() => {});
}, },

13
src/views/forgotPwd/index.vue

@ -41,7 +41,7 @@
<div class="input-group mb-3" v-if="user.email_status"> <div class="input-group mb-3" v-if="user.email_status">
<input type="text" v-model="codes.email_code" required class="form-control" pattern="\d{6}" data-message="code needs 6 number" :placeholder="$t('login.email-code')" /> <input type="text" v-model="codes.email_code" required class="form-control" pattern="\d{6}" data-message="code needs 6 number" :placeholder="$t('login.email-code')" />
<div class="input-group-append"> <div class="input-group-append">
<get-code class="btn get-code btn-outline-primary" :data="{email:user.email}" :type="7" /> <get-code class="btn get-code btn-outline-primary" :data="{email:user.email,gc_code:user.gc_code,gc_key:user.gc_key}" :type="7" @reGetGCCode="gett_gc_code()" />
</div> </div>
</div> </div>
@ -55,8 +55,8 @@
</template> </template>
</form> </form>
<h2>Remembered your password? <h2>{{$t("login.Remembered")}}
<router-link to="/sign-in">Log In</router-link> <router-link to="/sign-in">{{$t("common.sign_in")}}</router-link>
</h2> </h2>
</div> </div>
</div> </div>
@ -74,12 +74,15 @@ export default {
account: "", account: "",
password : "", password : "",
password_confirmation : "", password_confirmation : "",
gc_code: '',
gc_key: ''
}, },
codes : { codes : {
google_code : '', google_code : '',
email_code : '', email_code : '',
sms_code : '' sms_code : ''
} },
Graph_che: ''
} }
}, },
@ -117,7 +120,7 @@ export default {
// get gc code from api // get gc code from api
gett_gc_code(){ gett_gc_code(){
Member.sendGCode().then( (res) =>{ Member.sendGCode().then( (res) =>{
this.gc_key = res.key this.user.gc_key = res.key
this.Graph_che = res.img this.Graph_che = res.img
// console.log("gc",res); // console.log("gc",res);
this.$message({ this.$message({

12
src/views/profile/certification.vue

@ -36,6 +36,7 @@
v-model="form.birthday" v-model="form.birthday"
type="date" type="date"
:placeholder="$t('profile.selectDate')" :placeholder="$t('profile.selectDate')"
:picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
</div> </div>
</div> </div>
@ -287,7 +288,12 @@ export default {
front_img: "", front_img: "",
back_img: "", back_img: "",
hand_img: "" hand_img: ""
} },
pickerOptions:{
disabledDate(time) {
return time.getTime() > Date.now();
},
},
}; };
}, },
computed: { computed: {
@ -353,6 +359,10 @@ export default {
let data = this.form; let data = this.form;
data.country_code = this.country.country_code; data.country_code = this.country.country_code;
if (utils.validate("#auth")) { if (utils.validate("#auth")) {
if(!data.birthday){
this.$message.error(this.$t("profile.selectDate"));
return;
}
Profile.primaryAuth(data) Profile.primaryAuth(data)
.then(res => { .then(res => {
this.$message.success(this.$t("profile.preliminary")); this.$message.success(this.$t("profile.preliminary"));

1
src/views/wallet/exchange-assets.vue

@ -667,6 +667,7 @@ export default {
Wallet.withdraw(this.withdraw) Wallet.withdraw(this.withdraw)
.then(data => { .then(data => {
console.log(data,'1111');
// this.$message(this.$t("wallet.operationComplete") ); // this.$message(this.$t("wallet.operationComplete") );
$("#withdraw").modal("hide"); $("#withdraw").modal("hide");
this.verShow = false this.verShow = false

Loading…
Cancel
Save