调整注册

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -772,7 +772,7 @@
         function check(){
             let str = window.location.href
             if(str.indexOf('360') > 1) {
-                $('#tilA').attr('href', 'http://worktime.ttkuaiban.com/#/register?form=360')
+                $('#tilA').attr('href', 'http://worktime.ttkuaiban.com/#/register?from=360')
             } else {
                 $('#tilA').attr('href', 'http://worktime.ttkuaiban.com/#/register')
             }

fhKeeper/formulahousekeeper/timesheet/src/views/Register.vue

@@ -139,8 +139,11 @@
                             return;
                         }
                         let formObj = this.ruleForm
-                        if(window.location.href.indexOf('360') > 1) {
-                            formObj.from = '360'
+                        if(this.$route.query != {}) {
+                            formObj = {
+                                ...this.$route.query,
+                                ...formObj
+                            }
                         }
                         var _this = this;
                         this.logining = true;