Merge remote-tracking branch 'origin/master'

smart-office-manager-ui/admin/.env

@@ -12,5 +12,5 @@ VUE_APP_PORTAL_URL = /portal_home
 VUE_APP_PORTAL_PORT = 21085
 
 # 站点请求地址
-VUE_APP_SITETREE_URL = http://192.168.0.98:11078/base/site/siteTree
+VUE_APP_SITETREE_URL = http://8.136.255.30:11078/base/site/siteTree
 

smart-office-manager-ui/admin/src/views/Home.vue

 <template>
-  <div class="page page-home" style="min-height: 100vh;">
-    欢迎你，{{userData}}
+  <div :class="classList" style="min-height: 100vh;">
+    欢迎你，{{ userData }}
   </div>
 </template>
 
@@ -11,5 +11,18 @@ export default {
       return this.$store.state.userData.currUserName;
     },
   },
+  data() {
+    return {
+      classList: "page page-home",
+    };
+  },
+  created() {},
 };
 </script>
+<style scoped lang="less">
+.page-home {
+  margin-top: 20px !important;
+  border-radius: 8px;
+  padding-top: 10px !important;
+}
+</style>

smart-office-manager-ui/admin/vue.config.js

@@ -17,7 +17,7 @@ module.exports = {
 		hot: true,//自动保存
 		proxy: {
 			'/office': {
-				target: 'http://127.0.0.1:21085',
+				target: 'http://8.136.255.30:11078',
 				changeOrigin: true,
 				secure: false,
 				cookieDomainRewrite: 'localhost',