From 19ec410c4ed04f13c8ad1433a74510bc70922e49 Mon Sep 17 00:00:00 2001
From: fengchengzhi <fengchengzhi@3ncto.com>
Date: Tue, 24 Jul 2018 20:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/put-money.vue          |  5 ++++-
 src/view/service-evaluation.vue | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/view/put-money.vue b/src/view/put-money.vue
index 845550d..d55c01f 100644
--- a/src/view/put-money.vue
+++ b/src/view/put-money.vue
@@ -44,6 +44,7 @@
     export default{
         data() {
 			return {
+                //提现金额验证提示
                 inputCue : '(请输入整数金额)',
                 //默认一开始输入款的值不符合验证规则
                 isActive:false,
@@ -73,7 +74,8 @@
         methods:{
             //提交申请
             submit() {
-                if(this.isActive) {              
+                if(this.isActive) {   
+                    console.log(this.inputVal)           
                     putMoney.putMoney(
                         {amount:this.inputVal}
                     ).then(res => {
@@ -82,6 +84,7 @@
                         }else {
                             this.$vux.toast.text(res.msg,'middle')
                         }
+                        this.$vux.toast.text(res)
                     })
                 }
             },
diff --git a/src/view/service-evaluation.vue b/src/view/service-evaluation.vue
index 1edce86..42c71f9 100644
--- a/src/view/service-evaluation.vue
+++ b/src/view/service-evaluation.vue
@@ -68,7 +68,7 @@
         </transition>
         <transition name="alertFade">
             <div class="tips" v-show="alertShow">
-                请完整填写评价
+                {{alertTip}}
             </div>
         </transition>
         <status :code="code" v-show="statusShow"></status>
@@ -94,7 +94,9 @@ export default {
             content: "",
             alertShow: false,
             code: 4,
-            statusShow: false
+            statusShow: false,
+            //提示信息
+            alertTip: '请完整填写评价',
         };
     },
     components: {
@@ -118,6 +120,7 @@ export default {
                 this.serviceScore == 0 ||
                 this.professionScore == 0
             ) {
+                this.alertTip = '请完整填写评价'
                 this.alertShow = true;
                 setTimeout(() => {
                     this.alertShow = false;
@@ -146,6 +149,11 @@ export default {
                             this.statusShow = true;
                         } else if (code == 1) {
                             //订单不存在
+                            this.alertTip = res.msg
+                            this.alertShow = true;
+                            setTimeout(() => {
+                                this.alertShow = false;
+                            }, 3000);
                         } else if (code == 2) {
                             //不可重复评价
                             this.code = 2;
@@ -164,9 +172,9 @@ export default {
         },
         getParam(name) {
             var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-        //  var r = window.location.search.substr(1).match(reg);
-            var url = '?name=林同学&time=2018:07:07';
-            var r = url.substr(1).match(reg);           
+            var r = window.location.search.substr(1).match(reg);
+            // var url = '?name=林同学&time=2018:07:07';
+            // var r = url.substr(1).match(reg);           
             if (r != null) return unescape(r[2]);         
             return null;
         },