修改

quasar.conf.js

@@ -142,7 +142,8 @@ module.exports = function( /* ctx */ ) {
                 'QTh',
                 'QTr',
                 'QTd',
-                'QCard'
+                'QCard',
+                'QSpinner'
             ],
 
             directives: [

src/components/trip/style4.vue

@@ -68,7 +68,7 @@
       if (localStorage.baseifo) {
         this.TripConfig = JSON.parse(window.localStorage.getItem('baseifo'));
       }
-      if (this.TripConfig.TripFeatureIsOpen == 1) {
+      if (this.TripConfig.TripConfig.TripFeatureIsOpen == 1) {
         this.isShow = false
       } else {
         this.isShow = true;

src/components/trip/style5.vue

@@ -178,7 +178,7 @@
       if (localStorage.baseifo) {
         this.TripConfig = JSON.parse(window.localStorage.getItem('baseifo'));
       }
-      if (this.TripConfig.NoticeItemIsOpen == 1) {
+      if (this.TripConfig.TripConfig.NoticeItemIsOpen == 1) {
         this.isShow = false;
       } else {
         this.isShow = true;

src/components/trip/style6.vue

@@ -210,17 +210,15 @@
               <div class="detail_title">
                 {{item.title}}
               </div>
-              <div class="detail_content6" :class="{'isHiden6':item.isShow}">
+              <div class="detail_content6" :class="{'isHiden6':getHeight(item).isShow&&item.MyContent.length>100}">
                 <div v-for="(childItem,chiIndex) in item.details" :key="chiIndex">
                   【{{childItem.title}}】{{childItem.content}}
                 </div>
               </div>
-              <div class="collapse-toggle6" v-if="!item.isShow">
-                <template v-if="item.details[0].content.length>100">
-                  <i class="iconfont iconarrow-top" @click="getSideShow(item)"></i>
-                </template>
+              <div class="collapse-toggle6" v-if="!item.isShow&&item.MyContent.length>100">
+                <i class="iconfont iconarrow-top" @click="getSideShow(item)"></i>
               </div>
-              <div class="collapse-toggle6 toggle_down" v-else>
+              <div class="collapse-toggle6 toggle_down" v-else-if="item.isShow&&item.MyContent.length>100">
                 <i class="iconfont iconarrowdown" @click="getBtmShow(item)"></i>
               </div>
               <div class="intro-list">
@@ -270,6 +268,7 @@
       return {
         trips: [],
         slide: 0,
+        TripConfig: {},
       };
     },
     created() {},
@@ -489,7 +488,14 @@
           this.$set(this.tripList, j, x)
           x.dateTime = this.setDate(j);
           x.myIndex = 1;
-          x.isShow = false;
+          x.isShow = true;
+        })
+        this.tripList.forEach(x=>{
+          let str=''
+          x.details.forEach(y=>{
+            str+= y.content
+          })
+          x.MyContent = str;
         })
         this.trips = JSON.parse(JSON.stringify(this.tripList));
       },
@@ -524,6 +530,23 @@
       },
 
     },
+    computed:{
+      getHeight(){
+        if (localStorage.baseifo) {
+          this.TripConfig = JSON.parse(window.localStorage.getItem('baseifo'));
+        }
+        return function (item) {
+          if(this.TripConfig){
+            if(this.TripConfig.TripConfig.TripDayIsOpen==1){
+              item.isShow=false
+            }else{
+              item.isShow=true
+            }
+          }
+           return item
+        }
+      }
+    }
   };
 
 </script>

src/layouts/HomeLayout.vue

@@ -6,7 +6,6 @@
 </style>
 <template>
   <q-layout view="hHh lpr fFf">
-    {{headType}}
     <hor-big-one v-if="headType==1" :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>

src/pages/details.vue

@@ -73,10 +73,27 @@
   .quick-banner-block.yellow .quick-item>.active {
     background-color: rgba(102, 162, 121, .82);
   }
-
+  .detail_loadingDiv{
+    position: fixed;
+    width:100%;
+    height:100%;
+    z-index:999;
+    display:flex;
+    align-items: center;
+    justify-content: center;
+    background:rgba(0,0,0,0.5);
+  }
 </style>
 <template>
   <q-page ref="orderview">
+    <!-- loading -->
+    <div class="detail_loadingDiv" v-if="isLoading">
+      <q-spinner
+        color="primary"
+        size="3em"
+        :thickness="10"
+      />
+    </div>
     <template v-if="isShow">
       <!-- 顶部大图 -->
       <headStyle1 :dataList="dataList" v-if="TripConfig.TripConfig.IsShowBgImg==1"></headStyle1>
@@ -151,7 +168,8 @@
         isDirect: 1,
         TripConfig: {},
         isShowNav: false,
-        clickIndex: 1
+        clickIndex: 1,
+        isLoading:false
       };
     },
     components: {
@@ -182,7 +200,9 @@
     },
     methods: {
       getData() {
+        this.isLoading=true;
         this.apipost('b2b_get_GetB2BTravelInfoV1', this.msg, r => {
+          this.isLoading=false;
           if (r.data.resultCode == 1) {
             this.dataList = r.data.data;
             if (this.dataList.dayList && this.dataList.dayList.length > 0) {