Merge branch 'oem3.2' into test

# Conflicts:
#	dist/index.html
#	dist/static/css/chunk-423475c9.aa1f1b5b.css
#	dist/static/css/chunk-ad7b25a2.f5a2a79b.css
#	dist/static/css/chunk-dcbd9598.2fc0dad0.css
#	dist/static/js/app.35a05b52.js
#	dist/static/js/chunk-423475c9.3ca5e64c.js
#	dist/static/js/chunk-ad7b25a2.72e154ee.js
#	dist/static/js/chunk-dcbd9598.e08d12d9.js

src/api/system/user.js

@@ -136,3 +136,11 @@ export function importTemplate() {
     method: 'get'
   })
 }
+
+export function getBaseSettingTitle(params) {
+  return request({
+    url: '/system/oem/getBaseSettingTitle',
+    method: 'get',
+    params
+  })
+}

src/permission.js

@@ -4,6 +4,9 @@ import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/auth'
+import getPageTitle from '@/utils/get-page-title'
+
+getPageTitle()
 
 NProgress.configure({ showSpinner: false })
 

src/utils/get-page-title.js

+import defaultSettings from '@/settings'
+
+import { getBaseSettingTitle } from '@/api/system/user'
+
+const title = defaultSettings.title || '胜天半子'
+
+export default function getPageTitle() {
+  getBaseSettingTitle({ type: 'SHOP' }).then(res => {
+    if (res.code == 1) {
+      document.title = res.data
+    }
+  })
+}
\ No newline at end of file