Merge branch 'dev' of git.proginn.com:proginn/proginn-frontend into dev

pages/user/_id.vue

@@ -241,7 +241,15 @@ export default {
   }
 }
 </script>
-
+<script>
+  var _hmt = _hmt || [];
+  (function() {
+    var hm = document.createElement("script");
+    hm.src = "https://hm.baidu.com/hm.js?18455f493c982100e5a82ec978a8d06e";
+    var s = document.getElementsByTagName("script")[0];
+    s.parentNode.insertBefore(hm, s);
+  })();
+</script>
 <style lang='less' scoped>
 @max768: ~"(max-width: 768px)";
 .community-u {

pages/wo/cash.vue

@@ -105,13 +105,13 @@ export default {
      * 点击提现
      */
     async doGet() {
-      if(!this.coins.trim()) {
+      if(!(this.coins + '').replace(/[^\d\.]/g, '')) {
         this.$message('请输入提现金额')
         return
       }
       // 错误处理
-      let coinsNum = +this.coins.trim()
-      if(!coinsNum || this.coins.match(/\./) || coinsNum < 0 ) {
+      let coinsNum = +(this.coins + '').replace(/[^\d\.]/g, '')
+      if(!coinsNum || !(this.coins + '').match(/^\d+(\.\d{1,2}){0,1}$/) || coinsNum <= 1 ) {
         this.$message('请输入正确的提现金额')
         return
       }