5A修改

src/pages/user/fiveA/index.vue

@@ -1,36 +1,36 @@
 <template>
   <div class="mainPage flex-v">
     <nav class="flex-h">
-      <a class="flex-item" v-for="(item,index) in nav" :key="index" :class="{'active':index==active.index}" @click="changeLocation(item,index)">{{item.LocationName}}</a>
+      <a class="flex-item" v-for="(item,index) in locations" :key="index" :class="{'active':index==active.index}" @click="changeLocation(item,index)">{{item.LocationName}}</a>
     </nav>
     <div class="flex-item">
       <div>
-        <div v-for="(item,index) in nav" :key="index" v-if="index==active.index">
+        <div v-for="(item,index) in locations" :key="index" :hidden="index!==active.index">
           <div class="banner flex-h">
             <div class="flex-item">
               <swiper :options="swiperOption" ref="mySwiper">
-                <swiper-slide class="swiper-slide" v-for="(item,index) in banner" :key="index">
-                  <img :src='item.ImageUrl' class="cover" style="border-radius: .12rem;" alt=""  @click="jump(item)">
+                <swiper-slide class="swiper-slide" v-for="(banner,bindex) in item.Banners" :key="bindex">
+                  <img :src='banner.ImageUrl' class="cover" style="border-radius: .12rem;" alt=""  @click="jump(banner)">
                 </swiper-slide>
               </swiper>
             </div>
           </div>
-          <h5>结识更多朋友</h5>
+          <h5>{{item.Title}}</h5>
           <div class="courseList flex-h">
             <ul class="flex-item" v-if="!fiveANoData">
-              <router-link tag="li" v-for="(item,index) in courseList" :key="index" :to="{name:'majorProjectsDetail',query:{id: item.id}}">
-                <courseItem :data="item"></courseItem>
+              <router-link tag="li" v-for="(course,cindex) in item.Courses" :key="cindex" :to="{name:'majorProjectsDetail',query:{id: course.CourseId}}">
+                <courseItem :data="courseInfo(course)"></courseItem>
               </router-link>
             </ul>
             <span v-if="fiveANoData" style="width:100%;line-height:.3rem;display:block;text-align:center;color:#ccc;margin-bottom:.1rem;">暂无数据</span>
           </div>
           <router-link :to="{name:'',query:{}}" class="more">查看更多</router-link>
           <div style="width:100%;height:.1rem;background:#f8f8f8;margin:0 auto;"></div>
-          <h5>资讯</h5>
+          <h5>{{item.Consult}}</h5>
           <div class="newsList flex-h">
             <ul class="flex-item">
-              <router-link tag="li" :to="{name:'',query:{}}" v-for="(item,index) in newsList" :key="index">
-                <newsItem :data="item" @jump='jump'></newsItem>
+              <router-link tag="li" :to="{name:'',query:{}}" v-for="(newinfo,nindex) in item.News" :key="nindex">
+                <newsItem :data="newinfo" @jump='jump'></newsItem>
               </router-link>
             </ul>
           </div>
@@ -63,28 +63,16 @@ export default {
           disableOnInteraction: false,
         }
       },
-      nav: [{
-        LocationId: "selected",
-        LocationName: "精选"
-      }],
-      courseList: [], // 课程列表
-      newsList: [], // 资讯列表
+      locations: [],
     }
   },
   computed: {
-    ...mapState({
-      orgid: x => x.app.orgId,
-      navList: x => x.fiveA.nav,
-      banner: x => x.fiveA.banner,
-      cms: x => x.fiveA.cms,
-      fiveAList: x => x.fiveA.fiveAList,
-    }),
     MySwiper () {
       return this.$refs.mySwiper.swiper
     },
     MySwiperMsg () {
       return this.$refs.MySwiperMsg.swiper
-    }
+    },
   },
   components: {
     newsItem,
@@ -93,72 +81,36 @@ export default {
     courseItem,
   },
   created () {
-    this.getNav({ orgid: this.orgid, issys: '0' }).then(() => {
-      this.nav = this.nav.concat(this.navList)
-      if (this.$route.query.id !== undefined) {
-        for (var n = 0; n < this.nav.length; n++) {
-          if (this.nav[n].LocationId === this.$route.query.id) {
-            this.active.index = n
-            this.active.locationid = this.nav[n].LocationId
-          }
-        }
-      } else {
-        this.active.index = 0
-        this.active.locationid = this.nav[0].LocationId
-      }
-      this.getFiveAList({ locationid: this.active.locationid, orgid: this.orgid }).then((res) => {
-        // console.log(JSON.stringify(res))
-        this.courseList = []
-        if (res !== null) {
-          this.fiveANoData = false
-          this.returnCourseList(res)
-        } else {
-          this.fiveANoData = true
-        }
-      })
-      this.getFiveAInfo({ orgid: this.orgid, locationid: this.active.locationid }).then(() => {
-        this.newsList = this.cms
-      })
+    const _that = this
+    this.getLocationDetails().then(res => {
+      _that.locations = res
     })
   },
   methods: {
     ...mapFiveAActions([
-      'getNav',
-      'getFiveAInfo',
-      'getFiveAList',
+      'getLocationDetails',
     ]),
     changeLocation (item, index) {
       this.active.index = index
-      this.active.locationid = item.LocationId
-      this.getFiveAList({ locationid: this.active.locationid, orgid: this.orgid }).then((res) => {
-        // console.log(JSON.stringify(res))
-        this.courseList = []
-        if (res !== null) {
-          this.fiveANoData = false
-          this.returnCourseList(res)
-        } else {
-          this.fiveANoData = true
-        }
-      })
-      this.getFiveAInfo({ orgid: this.orgid, locationid: this.active.locationid }).then(() => {
-        this.newsList = this.cms
-      })
     },
-    returnCourseList (arr) { // 转换课程列表格式
-      for (var n = 0; n < arr.length; n++) {
-        this.courseList.push({
-          id: arr[n].CourseId,
-          title: arr[n].CourseName,
-          img: arr[n].CourseImg,
-          remark: arr[n].Remark,
-          address: arr[n].CaseInfo.CaseAddress,
-          tag: arr[n].CourseTags || [],
+    courseInfo (course) {
+      return {
+          id: course.CourseId,
+          title: course.CourseName,
+          img: course.CourseImg,
+          remark: course.Remark,
+          address: course.CaseAddress,
+          tag: course.CourseTags || [],
           courseType: '',
-          defaultPrice: arr[n].Price + '/节',
+          defaultPrice: course.Price + '/节',
           getWay: 'ticket'
-        })
-      }
+        }
     },
+    // returnCourseList (arr) { // 转换课程列表格式
+    //   for (var n = 0; n < arr.length; n++) {
+    //     this.courseList.push()
+    //   }
+    // },
     jump (item) {
       // console.log(item)
       item.ForwardType = item.ForwardType || ''

src/store/fiveA/fiveA.js

@@ -66,6 +66,18 @@ http.getCms = (data) => {
   })
 }
 
+http.getLocationDetails = (data) => {
+  return new Promise((resolve, reject) => {
+    Ajax(api.index.locationDetails.url, {
+      method: api.index.locationDetails.method,
+    }).then(res => {
+      resolve(res)
+    }).catch((err) => {
+      reject(err)
+    })
+  })
+}
+
 export default {
   namespaced: true,
   state: {
@@ -74,6 +86,7 @@ export default {
     list: [],
     cms: [],
     fiveAList: [],
+    locationDetails: [],
   },
   mutations: {
     setNav (state, data) {
@@ -91,6 +104,9 @@ export default {
     setFiveAList (state, data) {
       state.fiveAList = data
     },
+    setLocationDetails (state, data) {
+      state.locationDetails = data
+    }
   },
   actions: {
     getFiveAList (context, { ...payload }) { // 获取5A列表
@@ -116,15 +132,23 @@ export default {
     },
     getFiveAInfo (context, data) {
       // console.log(data)
-      // http.getBanner(data).then((res) => {
-      //   context.commit('setBanner', res)
-      // })
+      http.getBanner(data).then((res) => {
+        context.commit('setBanner', res)
+      })
       // http.getList(data).then((res) => {
       //   context.commit('setList', res)
       // })
       http.getCms(data).then((res) => {
         context.commit('setCms', res)
       })
+    },
+    getLocationDetails (context, data) {
+      return new Promise((resolve) => {
+        http.getLocationDetails(data).then((res) => {
+          context.commit('setLocationDetails', res)
+          resolve(res)
+        })
+      })
     }
   }
 }

src/util/api.js

@@ -28,7 +28,11 @@ const $api = {
     getFiveAList: { // 获取5A列表
       method: 'get',
       url: `${baseUrl}${guest}/cms/course`
-    }
+    },
+    locationDetails: {
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/location/detail`
+    },
   },
   caseForCoffee: {
     getCaseTableList: { // 获取案场桌位列表