Merge remote-tracking branch 'origin/release-201843-wangcz' into dev

# Conflicts:
#	nuxt.config.js

components/register/EnterpriseRegistration.vue

@@ -847,7 +847,11 @@
                   }
                 }
               } else {
-                window.location.href = '/overRegister/overEnterprise'
+                let returnUrl = ''
+                if (this.$route.query.returnURL) {
+                  returnUrl = decodeURIComponent(this.$route.query.returnURL)
+                }
+                window.location.href = returnUrl || '/overRegister/overEnterprise'
               }
             } else {
               return Promise.reject(response.data)

components/register/PersonalRegistration.vue

@@ -606,8 +606,11 @@
                   }
                 } else {
                   let userUU = response.data.content.userUU
-                  console.log(userUU)
-                  window.location.href = `/overRegister/${userUU}`
+                  let returnUrl = ''
+                  if (this.$route.query.returnURL) {
+                    returnUrl = decodeURIComponent(this.$route.query.returnURL)
+                  }
+                  window.location.href = returnUrl || `/overRegister/${userUU}`
                 }
               } else {
                 return Promise.reject(response.data)

nuxt.config.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'https://sso.ubtob.com/' : 'http://tsso.usoftchina.com')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'https://sso.usoftchina.com/' : 'http://188.131.128.107:24004/')
 
 module.exports = {
   router: {