diff --git a/common/js/util.js b/common/js/util.js index a006df1..de45bc7 100644 --- a/common/js/util.js +++ b/common/js/util.js @@ -4,6 +4,7 @@ import Http from './http.js' import { Weixin } from 'common/js/wx-jssdk.js'; +import validate from "./validate"; export default { /** @@ -896,5 +897,27 @@ export default { return { 'bezier_points': bezier_points }; - } + }, + /** + * 表单验证 + * @param data 表单数据(array) + * @param rule 自定义验证规则(array) + * @returns {Promise} + */ + verify(data,rule = []) { + let defaultRule = []; + // 如果存在自定义内容则合并 + if(Object.keys(rule).length > 0)defaultRule.push(...rule); + // 验证结果 + return new Promise((resolve, reject) => { + let checkRes = validate.check(data, defaultRule); + if (checkRes) { + resolve(data) + } else { + this.showToast({title: validate.error}); + reject(validate); + } + }); + }, + } diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue index 7c291cd..618299b 100644 --- a/components/ns-login/ns-login.vue +++ b/components/ns-login/ns-login.vue @@ -288,12 +288,14 @@ export default { }); }, open(url) { + + // #ifdef MP-WEIXIN // 判断:如果登录框未弹出 则弹出登录框 if(!this.popup_show){ this.$refs.completeInfoPopup.open(); return false; } - + // #endif if (url) this.url = url; // #ifdef MP-WEIXIN diff --git a/pages_promotion/fenxiao/apply_upgrade.vue b/pages_promotion/fenxiao/apply_upgrade.vue index d128527..8c79a06 100644 --- a/pages_promotion/fenxiao/apply_upgrade.vue +++ b/pages_promotion/fenxiao/apply_upgrade.vue @@ -1,22 +1,62 @@