Merge branch 'feature/v4.8.67_ws' of qmx/jy into feature/v4.8.67

src/jfw/modules/app/src/web/templates/frontRouter/userMerge/free/confirm.html

@@ -98,6 +98,7 @@
                 checkedColor: '#2CB7CA',
                 // from默认为'', 值为bindPhone时表示从手机号绑定页面/jyapp/account/phone/bind?mode=mergeBind过来的
                 from: '',
+                direct: '',
                 token: '',
                 userName:{
                     wx:'',
@@ -120,10 +121,14 @@
             },
             created () {
                 this.token = utils.getParam('token')
-                var from = utils.getParam('from')
-                if (from) {
-                    this.from = from
-                }
+              var from = utils.getParam('from')
+              if (from) {
+                this.from = from
+              }
+              var direct = utils.getParam('toDirect')
+              if (direct) {
+                this.direct = direct
+              }
                 this.getInfo()
             },
             methods: {
@@ -252,6 +257,8 @@
                         JyObj.refreshAppointTab('subscribe', 1)
                         JyObj.refreshAppointTab('box', 1)
                         JyObj.refreshAppointTab('me', 1)
+                    }else if (this.direct !==""){
+                        window.location.replace(this.direct)
                     } else {
                         history.go(-2)
                     }