Merge branch 'develop' into feature-v1.0

src/view/put-money.vue

@@ -101,7 +101,7 @@
 			getParam(name) {
                 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");               
                 var r = window.location.search.substr(1).match(reg);
-                this.$vux.toast.text(window.location.search,'middle')
+                this.$vux.toast.text(window.location,'middle')
             //    this.$vux.toast.text(r,'middle')
 				if (r != null) return unescape(r[2]);
 				return null;