diff --git a/src/api/evaluation.js b/src/api/evaluation.js index 6202b12..5a1c35b 100644 --- a/src/api/evaluation.js +++ b/src/api/evaluation.js @@ -1,7 +1,12 @@ export default { - // -- 领取优惠券 -- + // -- 提交评论 -- add: { url: "/mall/web/evaluation/add", method: "post" - } + }, + // -- 验证是否符合评价规则和有没有登录 -- + getEvaluationNews: { + url: "/mall/web/evaluation/:bookNo", + method: "get" + }, }; diff --git a/src/models/evaluation-model.js b/src/models/evaluation-model.js index 9e67858..46bb0b4 100644 --- a/src/models/evaluation-model.js +++ b/src/models/evaluation-model.js @@ -2,12 +2,17 @@ import utilsModel from "./utils-model"; import evaluation from "../api/evaluation.js"; export default { - // 获取优惠券信息 + // 提交评价 add: (data, token) => utilsModel.config(evaluation.add).request({ data: data, headers: { "encodeToken": token } + }), + // 验证是否符合评价规则和有没有登录 + getEvaluationNews: (params) => + utilsModel.config(evaluation.getEvaluationNews).request({ + params: params }) }; diff --git a/src/view/put-money.vue b/src/view/put-money.vue index 87fe845..19a6db4 100644 --- a/src/view/put-money.vue +++ b/src/view/put-money.vue @@ -63,7 +63,7 @@ if (!rule.test(val)) { this.inputCue = '( 请输入正整数金额!)' this.inputVal = '' - this.isActive = true + this.isActive = false return }else { this.isActive = true; @@ -81,6 +81,11 @@ ).then(res => { if (res.code == 0){ this.$router.push({path:'/put-money-success'}); + } else if (res.code == 666) { + this.$vux.toast.text(res.msg,'middle') + setTimeout(function(){ + window.location.href='/mall/web/user/login' + },2000); } else { this.$vux.toast.text(res.msg,'middle') } diff --git a/src/view/service-evaluation.vue b/src/view/service-evaluation.vue index 5deb6c5..c5229c3 100644 --- a/src/view/service-evaluation.vue +++ b/src/view/service-evaluation.vue @@ -97,6 +97,8 @@ export default { statusShow: false, //提示信息 alertTip: '请完整填写评价', + //用于判断是否可进行提交评论 + isCanEvaluation: false, }; }, components: { @@ -115,6 +117,7 @@ export default { }, //提示 submit() { + if(!isCanEvaluation) return; if ( this.timeScore == 0 || this.serviceScore == 0 || @@ -187,8 +190,26 @@ export default { this.name = this.getParam("name") this.time = this.getParam("bookTime") this.code = this.getParam("code") - // this.$vux.toast.text(this.getParam("name"),'middle') - // this.$vux.toast.text(this.getParam("time"),'middle') + //判断用户是否登录 + model.getEvaluationNews(this.getParam("bookNo")) + .then(res => { + let code = res.code; + if (code == 0) { + //成功 + if (!res.response.userId){ + this.alertTip = res.msg + this.alertShow = true; + setTimeout(() => { + this.alertShow = false; + }, 3000); + } else { + this.isCanEvaluation = true + } + } else if (code == 1) { + this.code = 4; + this.statusShow = true; + } + }); } };