Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/layouts/HomeLayout.vue

@@ -7,7 +7,7 @@
 </style>
 <template>
   <q-layout view="hHh lpr fFf">
-    <hor-big-one  :base-data="baseinfo" ref="webhead"></hor-big-one>
+    <hor-big-one :base-data="baseinfo" ref="webhead"></hor-big-one>
     <!-- <hor-big-two v-if="headType==2" :base-data="baseinfo" ref="webhead"></hor-big-two> -->
     <q-page-container>
       <router-view />
@@ -62,23 +62,29 @@
       if (localStorage.ToDay) {
         if (localStorage.ToDay != this.ToDay) {
           localStorage.removeItem("groupinfo");
+          localStorage.removeItem("site");
           localStorage.ToDay = this.ToDay;
         }
       } else {
         localStorage.removeItem("groupinfo");
+        localStorage.removeItem("site");
         localStorage.ToDay = this.ToDay;
       }
+
       //删除基础配置
       localStorage.removeItem("baseifo");
       //获取集团数据
       if (localStorage.groupinfo) {
         var jObj = JSON.parse(window.localStorage.getItem('groupinfo'));
         this.RB_Group_Id = jObj.GroupId;
-        this.getSite();
+        if (localStorage.site) {
+        } else {
+          this.getSite();
+        }
         this.getConfigData();
       } else {
-        this.getGroupData();
         this.getSite();
+        this.getGroupData();
         //获取网站基础配置
         if (localStorage.baseifo) {
           var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
@@ -96,14 +102,13 @@
       changeHeadHandler(t) {
         this.headType = t;
       },
-      getSite()
-      {
-     
+      getSite() {
+
         this.apipost(
           "b2b_get_site", {},
           res => {
             if (res.data.resultCode == 1) {
-             
+
               var jsonData = JSON.stringify(res.data.data);
               window.localStorage.setItem("site", jsonData);
             }