Merge remote-tracking branch 'origin/release-201837-wangcz' into release-201837-wangcz

# Conflicts:
#	plugins/axios-nuxt.js

assets/scss/mobileCommon.scss

@@ -31,6 +31,11 @@
 }
 .page-part{
   margin-bottom:.4rem;
+  & > span{
+    font-size:.26rem;
+    color:#000;
+    line-height:.35rem;
+  }
   .img-list{
     .item{
       display:inline-block;

components/mobile/reset/stepMobile.vue

@@ -72,11 +72,11 @@
         } else {
           this.$indicator.open('获取中...')
           let _this = this
-          this.$http.get('/sso/personal/register/checkCode', {params: {mobile: this.info, timestamp: new Date().getTime() + ''}})
+          this.$http.get('/sso/resetPwd/check/mobile', {params: {mobile: this.info, timestamp: new Date().getTime() + ''}})
             .then(response => {
               this.$indicator.close()
-              if (response.data) {
-                this.tokenCode = response.data.token
+              if (response.data.content) {
+                this.tokenCode = response.data.content.token
                 this.$toast({
                   message: '验证码已经发送到您的手机，请注意查收',
                   iconClass: 'el-icon-success'

components/mobile/reset/stepSecurity .vue

@@ -44,7 +44,10 @@
           answer1: '',
           answer2: ''
         },
-        questions: '',
+        questions: [
+          {question: ''},
+          {question: ''}
+        ],
         token: ''
       }
     },

components/register/PersonalRegistration.vue

@@ -794,7 +794,7 @@
           color: #999;
           span{
             display:inline-block;
-            width:50%;
+            width:49%;
             vertical-align:top;
             font-size:20px;
             text-align: center;

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://192.168.253.6:23232/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'https://sso.usoftchina.com/' : 'http://192.168.253.6:23232/')
 
 module.exports = {
   router: {

pages/index.vue

@@ -15,20 +15,20 @@
     layout (context) {
       return context.store.state.option.isMobile ? 'mobile' : 'isCityFooter'
     },
-    created() {
-      this.$http.get('/sso/login/page/style', { params: {appId: this.$route.query.appId} })
-        .then(response => {
-          console.log(response.data)
-          this.$store.commit('login/REQUEST_LOGIN_STYLE_SUCCESS', response.data)
-        }, err => {
-          this.$store.commit('login/REQUEST_LOGIN_STYLE_FAILURE', err)
-        })
-    },
-    // asyncData ({store, route}) {
-    //   return Promise.all([
-    //     store.dispatch('GetLoginStyle', {appId: route.query.appId})
-    //   ])
+    // created() {
+    //   this.$http.get('/sso/login/page/style', { params: {appId: this.$route.query.appId} })
+    //     .then(response => {
+    //       console.log(response.data)
+    //       this.$store.commit('login/REQUEST_LOGIN_STYLE_SUCCESS', response.data)
+    //     }, err => {
+    //       this.$store.commit('login/REQUEST_LOGIN_STYLE_FAILURE', err)
+    //     })
     // },
+    asyncData ({store, route}) {
+      return Promise.all([
+        store.dispatch('GetLoginStyle', {appId: route.query.appId})
+      ])
+    },
     components: {
       Login,
       LoginMobile

plugins/axios-nuxt.js

@@ -7,7 +7,6 @@ export function axiosHttp(store, req) {
     baseUrl: '/'
   })
   service.interceptors.request.use(config => {
-    // console.log(config.url)
     if (process.server) {
       const cookie = req.headers['cookie']
       store.commit('option/SET_COOKIES', cookie)
@@ -17,7 +16,13 @@ export function axiosHttp(store, req) {
       config.headers.cookie = store.state.option.cookies + '; ' +  store.state.option.sessionId
       config.headers['User-Agent'] = store.state.option.userAgent
     }
-    // console.log(config.headers)
+    console.log(config.url)
+    // if (typeof window === 'undefined') {
+      // config.headers.cookie = store.state.option.cookies + '; ' + store.state.option.sessionId
+      // // config.headers['User-Agent'] = Vue.$store.state.option.userAgent
+    // } else {
+      // console.log(store)
+    // }
     return config
   }, error => {
     return Promise.reject(error)

server.js

@@ -73,7 +73,7 @@ else {
 function listen() {
   // Listen the server
   app.listen(port, '0.0.0.0')
-  console.log('Server listening on `localhost:' + port + '`.')
+  console.log('Server listening on ' + host + ':' + port)
 }
 // Listen the server
 // app.listen(port)