Merge branch 'dev' of http://git.omniview.pro/fangdi/housemanage/web/majorproject into dev

src/views/home.vue

@@ -434,6 +434,7 @@ export default {
   created() {
     let _this = this
 	  window.clickDate=_this.clickDate
+    this.getConfig()
   },
   computed: {
     validRange(){ //限制日历只展示当前月的日期
@@ -458,6 +459,24 @@ export default {
     }
   },
   methods: {
+    /**
+     * 判断是否开启自定义字段
+     */
+    getConfig(){
+
+      this.$ajax.get({
+        url: this.$api.GET_CONFIG,
+      }).then(res => {
+        if (res.code === '200') {
+
+          this.openConfig = this.$com.confirm(res, 'data.content', []).customKeyEnable
+          // 是否开启自定义字段存入cookie
+          this.$cookie.set('customKeyEnable', this.openConfig)
+          let isXuHui = this.$com.confirm(res, 'data.content', [])
+          this.$store.commit('CHANGE_ISXUHUI', isXuHui.projectArea == 'xuhui')
+        }
+      })
+    },
     //日历组件
  	  myCanlendar(){
       let dateArr = [...this.$moment(new Date()).format('YYYY-MM-DD').split('-')]