diff --git a/src/router/index.js b/src/router/index.js index cf2a5c7..d8b2262 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -85,6 +85,12 @@ const router = [ ...setting, ] }, + { + path: "/rule", + name: "Rule", + title: "用户协议", + component: resolve => require(['@/views/Rule'], resolve) + }, { path: "/login", name: "Login", diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue index e473f0b..eb20e9e 100644 --- a/src/views/Login/index.vue +++ b/src/views/Login/index.vue @@ -11,163 +11,164 @@ --> - - - - - -
- - - -   三天之内免登陆 - - - 登录 - - - -   我已同意用户协议 - - - 忘记密码    免费注册 + + + + + + + + + + +
新建账号
+ + + + + + + + + 获取验证码 + + + + + + + + + + + 确定 + + + 已有账号？登录 + + +
找回密码
@@ -235,6 +236,7 @@ export default { tel: "", code: "", }, + isChecked: false, communityCode: undefined, rules: { tel: [ @@ -334,7 +336,11 @@ export default { if (this.communityCode === undefined) { this.$message.error("先选择小区"); return; - } + }; + if (this.isChecked == false) { + this.$message.error("请阅读并同意《用户协议》"); + return; + }; loginTel(this.form).then((res) => { if (res.code === 200) { this.$message.success(res.msg); @@ -352,10 +358,10 @@ export default { this.$message.error("先选择小区"); return; } - console.log(this.getCommunityCode); sendTelCode(this.form).then((res) => { if (res) { - this.$message.success(res.msg + " " + res.data); + console.log(res) + this.$message.success(res.msg); } }); }, diff --git a/src/views/Operation/Activity/_organizers/depend/form.js b/src/views/Operation/Activity/_organizers/depend/form.js index 912131a..bad07bd 100644 --- a/src/views/Operation/Activity/_organizers/depend/form.js +++ b/src/views/Operation/Activity/_organizers/depend/form.js @@ -10,7 +10,7 @@ export const form = { } const handleConfirm = (rule,value,callback) => { - if(value.length != 20) { + if(value.length != 18) { callback('请输入正确的格式') }; callback(); @@ -21,7 +21,7 @@ export const rules = { contact:[{required:true,message:'请输入联系方式',trigger:'blur'}], tel:[{required:true,message:'请输入',trigger:'blur'}], idType:[{required:true,message:'请选择',trigger:'change'}], - idNumber:[{required:true,message:'请输入证件号码',trigger:['blur','change']},{validator: (rule,value,callback) => handleConfirm(rule,value,callback)}], + idNumber:[{required:true,message:'请输入证件号码',trigger:'blur'},{validator: (rule,value,callback) => handleConfirm(rule,value,callback)}], remarks:[{required:true,message:'请输入备注',trigger:'blur'}], } export const options = { diff --git a/src/views/Operation/BBS/_topic/depend/form.vue b/src/views/Operation/BBS/_topic/depend/form.vue index 02b8b75..49d5a48 100644 --- a/src/views/Operation/BBS/_topic/depend/form.vue +++ b/src/views/Operation/BBS/_topic/depend/form.vue @@ -118,6 +118,7 @@ export default { this.addClose() }, submit() { + // console.log(this.form) this.$refs.ruleForm.validate(async (valid) => { if (valid) { if(this.editId === null) { @@ -153,6 +154,7 @@ export default { if(val!==null){ this.title = '修改话题' this.form.id = val + this.form.imgUrls = []; topicInfo({topicId:val}).then(res=>{ let data = res.data this.form.title = data.title @@ -161,7 +163,6 @@ export default { this.form.isPublic = data.isPublic this.form.isRating = data.isRating if(data.imgList.length>0){ - console.log(data.imgList); const pic = [] for(let item of data.imgList){ let obj = { @@ -174,6 +175,7 @@ export default { pic.push(obj) } this.fileList = pic + // this.form.imgUrls.push(pic[0].name) } }) }else{ diff --git a/src/views/Rule/index.vue b/src/views/Rule/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Shop/GoodsManage/_brand/index.vue b/src/views/Shop/GoodsManage/_brand/index.vue index 3dd5f22..3c25cf7 100644 --- a/src/views/Shop/GoodsManage/_brand/index.vue +++ b/src/views/Shop/GoodsManage/_brand/index.vue @@ -2,7 +2,7 @@
品牌管理
- 新增品牌
{ if (valid) { - if (this.form.id === null) { + if (this.activeMode == 1) { let res = await brandInsert(this.form); if (res.code === 200) { this.$message.success(res.msg); @@ -183,8 +188,7 @@ export default { } else { this.$message.error(res.msg); } - } else { - console.log(this.form); + } else if (this.activeMode == 2) { let res = await brandUpdate(this.form); if (res.code === 200) { this.$message.success(res.msg); diff --git a/src/views/Shop/GoodsManage/_jcookList/index.vue b/src/views/Shop/GoodsManage/_jcookList/index.vue index fd639b6..daa80d5 100644 --- a/src/views/Shop/GoodsManage/_jcookList/index.vue +++ b/src/views/Shop/GoodsManage/_jcookList/index.vue @@ -25,7 +25,7 @@ > - 上架推送 + 上架推送 diff --git a/src/views/Shop/StoreManage/index.vue b/src/views/Shop/StoreManage/index.vue index 39d900e..dd06c68 100644 --- a/src/views/Shop/StoreManage/index.vue +++ b/src/views/Shop/StoreManage/index.vue @@ -2,7 +2,7 @@
店铺管理
- 新增店铺
{ if (valid) { - if (this.form.id === null) { + if (this.activeMode == 1) { let res = await shopInsert(this.form); if (res.code === 200) { this.$message.success(res.msg); diff --git a/web.zip b/web.zip new file mode 100644 index 0000000..2528bf7 Binary files /dev/null and b/web.zip differ