From 805a6c273afef893adec423ac5313ef5644879e8 Mon Sep 17 00:00:00 2001
From: fengchengzhi <fengchengzhi@3ncto.com>
Date: Wed, 25 Jul 2018 16:05:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js             |   2 +-
 src/view/put-money-success.vue  |  27 +++++-
 src/view/put-money.vue          | 163 ++++++++++++++++++--------------
 src/view/service-evaluation.vue |  12 +--
 4 files changed, 120 insertions(+), 84 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index c5f32d6..0aea480 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -29,7 +29,7 @@ let router = new Router({
         {
             path: '/put-money-success',
             name: '提现成功',
-            component: putMoneySuccess
+            component: putMoneySuccess,
         },
         {
             path: '/service-evaluation',
diff --git a/src/view/put-money-success.vue b/src/view/put-money-success.vue
index a7fd749..c81aa25 100644
--- a/src/view/put-money-success.vue
+++ b/src/view/put-money-success.vue
@@ -13,7 +13,7 @@
                     <span>1-3个工作日</span>
                 </div>
                 <div class="money-news">
-                    <p>提现金额：￥ <span>800</span></p>
+                    <p>提现金额：￥ <span>{{amount}}</span></p>
                 </div>
             </div>    
             <button class="goHome">返回首页</button>       
@@ -24,14 +24,33 @@
 <script>
 
     export default{   
+        data () {
+            return {
+                amount: 0
+            }
+        },
+        created(){
+            this.getParams()
+        },
         methods:{       
             //返回上一页
             goBack() {
                 history.go(-1)
+            },
+            getParams () {
+                // 取到路由带过来的参数 
+                this.amount = this.$route.params.amount     
+                console.log(this.$route.params)
+                console.log(this.amount)        
             }
         },       
-        mounted() {
-			//this.isWeixin ()
-		}
+        mounted() {			
+            console.log(this.$route)
+        },
+        watch: {
+            // 监测路由变化,只要变化了就调用获取路由参数方法将数据存储本组件即可
+            '$route': 'getParams'
+        }
+
     }
 </script>
diff --git a/src/view/put-money.vue b/src/view/put-money.vue
index 9f35b6c..f0e6409 100644
--- a/src/view/put-money.vue
+++ b/src/view/put-money.vue
@@ -39,79 +39,96 @@
 </template>
 
 <script>
-    import putMoney from "../models/put-money-model.js";
-    import  { Alert,Toast } from 'vux'
-    import configs from '../configs';
-    var locationUrl = configs.locationUrl;
-    export default{
-        data() {
-			return {
-                //提现金额验证提示
-                inputCue : '(请输入整数金额)',
-                //默认一开始输入款的值不符合验证规则
-                isActive:false,
-                inputVal: null,
-                //余额
-                currentAmount: 0,
-			}
-        },
-        components: {
-            Toast,
-        },
-        watch:{
-            //验证输入框的值
-            inputVal: function (val) {
-                var rule = /^[1-9]\d*$/;
-                if (!rule.test(val)) {
-                   this.inputCue = '( 请输入正整数金额！)'
-                   this.inputVal = ''
-                   this.isActive = false
-                   return
-                }else {
-                    this.isActive = true;
-                    this.inputCue = ''
-                }
+import putMoney from "../models/put-money-model.js";
+import { Alert, Toast } from "vux";
+import configs from "../configs";
+var locationUrl = configs.locationUrl;
+export default {
+  data() {
+    return {
+      //提现金额验证提示
+      inputCue: "(请输入整数金额)",
+      //默认一开始输入款的值不符合验证规则
+      isActive: false,
+      inputVal: null,
+      //余额
+      currentAmount: 0
+    };
+  },
+  components: {
+    Toast
+  },
+  watch: {
+    //验证输入框的值
+    inputVal: function(val) {
+      var rule = /^[1-9]\d*$/;
+      if (!rule.test(val)) {
+        this.inputCue = "( 请输入正整数金额！)";
+        this.inputVal = "";
+        this.isActive = false;
+        return;
+      } else {
+        this.isActive = true;
+        this.inputCue = "";
+      }
+    }
+  },
+  methods: {
+    //提交申请
+    submit() {
+      if (this.isActive) {
+        
+        this.$router.push({
+            name: "提现成功",
+            params: { amount: this.inputVal }
+        });
+
+        return;
+        //判断是否在微信环境下操作
+        var ua = navigator.userAgent.toLowerCase();
+        if (!ua.match(/MicroMessenger/i) == "micromessenger") {
+          this.$vux.toast.text("请登录微信进行操作", "middle");
+          return;
+        }
+        putMoney.putMoney({ amount: this.inputVal * 100 }).then(res => {
+            if (res.code == 0) {
+                this.$router.push({
+                    name: "提现成功",
+                    params: { amount: this.inputVal }
+                });
+            } else if (res.code == 666) {
+                this.$vux.toast.text(res.msg, "middle");
+                setTimeout(function() {
+                window.location.href =
+                    locationUrl +
+                    "/mall/web/user/login?callback=" +
+                    encodeURIComponent(window.location.href);
+                }, 1000);
+            } else {
+                this.$vux.toast.text(res.msg, "middle");
             }
-        },
-        methods:{
-            //提交申请
-            submit() {   
-                if(this.isActive) {                            
-                    putMoney.putMoney(
-                        {amount:this.inputVal*100}
-                    ).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 = locationUrl + '/mall/web/user/login?callback=' + encodeURIComponent(window.location.href);
-                            }, 1000);
-                        } else {
-                            this.$vux.toast.text(res.msg,'middle')
-                        }
-                        // this.$vux.toast.text(res)
-                    })
-                }
-            },
-            //返回上一页
-            goBack() {
-                history.go(-1)
-            },
-            //获取链接参数
-			getParam(name) {
-                var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");   
-                var url = window.location.href 
-                url = window.location.href.substring(url.indexOf('?')+1,url.length)
-                var r = url.match(reg);
-                if (r != null) return unescape(r[2]);
-                return null;
-			}		
-        },       
-        mounted() {
-            //获取余额值
-            this.currentAmount = (this.getParam("currentAmount")/100).toFixed(2)
-            //this.$vux.toast.text(this.currentAmount,'middle')
-		}
+            // this.$vux.toast.text(res)
+        });
+      }
+    },
+    //返回上一页
+    goBack() {
+      history.go(-1);
+    },
+    //获取链接参数
+    getParam(name) {
+      var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+      var url = window.location.href;
+      url = window.location.href.substring(url.indexOf("?") + 1, url.length);
+      var r = url.match(reg);
+      if (r != null) return unescape(r[2]);
+      return null;
     }
+  },
+  mounted() {
+    //获取余额值
+    this.currentAmount = (this.getParam("currentAmount") / 100).toFixed(2);
+    //this.$vux.toast.text(this.currentAmount,'middle')
+  }
+};
 </script>
\ No newline at end of file
diff --git a/src/view/service-evaluation.vue b/src/view/service-evaluation.vue
index e6c683b..cc005f0 100644
--- a/src/view/service-evaluation.vue
+++ b/src/view/service-evaluation.vue
@@ -135,14 +135,14 @@ export default {
                 var cookieName = "1hjz_mall_login_access_token=";
                 var token = strCookie.slice(cookieName.length);
 
-                model
+            model
                 .add(
                     {
-                    timeScore: this.timeScore,
-                    serviceScore: this.serviceScore,
-                    professionScore: this.professionScore,
-                    content: this.content,
-                    bookNo: this.getParam("bookNo")
+                        timeScore: this.timeScore,
+                        serviceScore: this.serviceScore,
+                        professionScore: this.professionScore,
+                        content: this.content,
+                        bookNo: this.getParam("bookNo")
                     },
                     token
                 )