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

# Conflicts:
#	plugins/axios-nuxt.js

.eslintrc.js

@@ -11,6 +11,9 @@ module.exports = {
     'html'
   ],
   // add your custom rules here
-  rules: {},
+  rules: {
+    "space-before-function-paren": [0, "ignore"],
+    "indent": 'off'
+  },
   globals: {}
 }

pages/index.vue

@@ -16,19 +16,19 @@
       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)
-      //     // commit('login/REQUEST_LOGIN_STYLE_SUCCESS', response.data)
-      //   }, err => {
-      //     // commit('login/REQUEST_LOGIN_STYLE_FAILURE', err)
-      //   })
-    },
-    asyncData ({store, route}) {
-      return Promise.all([
-        store.dispatch('GetLoginStyle', {appId: route.query.appId})
-      ])
+      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