Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/pages/user/bindMobile/bindMobile.vue

@@ -155,6 +155,7 @@ export default {
       }, 1000)
     },
     submit () {
+      var _that = this
       if (!this.postData.captcha) {
         this.$toast('请先获取验证码')
         return
@@ -169,6 +170,9 @@ export default {
       }
       this.submitData(this.postData).then((res) => {
         this.$toast(res)
+        setTimeout(function(){
+          _that.$router.push({name: 'userCenter'})
+        },300)
       })
     }
   }

src/pages/user/fiveA/index.vue

@@ -17,13 +17,14 @@
           </div>
           <h5>结识更多朋友</h5>
           <div class="courseList flex-h">
-            <ul class="flex-item">
-              <router-link tag="li" :to="{name:'',query:{}}" v-for="(item,index) in courseList" :key="index">
+            <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>
             </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>
+          <router-link :to="{name:'',query:{}}" class="more" v-if="!fiveANoData">查看更多</router-link>
           <div style="width:100%;height:.1rem;background:#f8f8f8;margin:0 auto;"></div>
           <h5>资讯</h5>
           <div class="newsList flex-h">
@@ -50,8 +51,9 @@ export default {
   name: '',
   data () {
     return {
+      fiveANoData: false,
       active: {
-        index: 1,
+        index: 0,
         locationid: ''
       },
       swiperOption: {
@@ -65,63 +67,8 @@ export default {
         LocationId: "selected",
         LocationName: "精选"
       }],
-      courseList: [{ // 课程列表
-        id: '',
-        title: '课程名称',
-        img: '',
-        time: '2018.04.04 18:30-20:00',
-        address: '南京南',
-        tag: ['儿童教育', '小小外交官'],
-        courseType: '团体课',
-        defaultPrice: '168/节',
-        getWay: 'ticket'
-      }, {
-        id: '',
-        title: '课程名称',
-        img: '',
-        time: '2018.04.04 18:30-20:00',
-        address: '南京南',
-        tag: ['儿童教育', '小小外交官'],
-        courseType: '团体课',
-        defaultPrice: '168/节',
-        getWay: 'free'
-      }, {
-        id: '',
-        title: '课程名称',
-        img: '',
-        time: '2018.04.04 18:30-20:00',
-        address: '南京南',
-        tag: ['儿童教育', '小小外交官'],
-        courseType: '团体课',
-        defaultPrice: '168/节',
-        getWay: 'free'
-      }],
-      newsList: [{ // 资讯列表
-        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
-        time: '2018年5月25日',
-        img: '',
-        id: ''
-      }, {
-        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
-        time: '2018年5月25日',
-        img: '',
-        id: ''
-      }, {
-        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
-        time: '2018年5月25日',
-        img: '',
-        id: ''
-      }, {
-        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
-        time: '2018年5月25日',
-        img: '',
-        id: ''
-      }, {
-        title: '我是标题我是标题我是标题我是标题我是标题我是标题',
-        time: '2018年5月25日',
-        img: '',
-        id: ''
-      }]
+      courseList: [], // 课程列表
+      newsList: [], // 资讯列表
     }
   },
   computed: {
@@ -129,7 +76,8 @@ export default {
       orgid: x => x.app.orgId,
       navList: x => x.fiveA.nav,
       banner: x => x.fiveA.banner,
-      cms: x => x.fiveA.cms
+      cms: x => x.fiveA.cms,
+      fiveAList: x => x.fiveA.fiveAList,
     }),
     MySwiper () {
       return this.$refs.mySwiper.swiper
@@ -147,22 +95,65 @@ export default {
   created () {
     this.getNav({ orgid: this.orgid, issys: '0' }).then(() => {
       this.nav = this.nav.concat(this.navList)
-      this.active.locationid = this.nav[this.active.index].LocationId
+      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
+        }
+      }
+      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
       })
     })
   },
   methods: {
-    ...mapFiveAActions(['getNav']),
-    ...mapFiveAActions(['getFiveAInfo']),
+    ...mapFiveAActions([
+      'getNav',
+      'getFiveAInfo',
+      'getFiveAList',
+    ]),
     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,
+          time: this.toolClass.dateFormat(arr[n].BeginDate),
+          address: arr[n].CaseInfo.CaseAddress,
+          tag: arr[n].CourseTags || [],
+          courseType: '',
+          defaultPrice: arr[n].Price + '/节',
+          getWay: 'ticket'
+        })
+      }
+    },
     jump (item) {
       console.log(item)
       item.ForwardType = item.ForwardType || ''
@@ -180,5 +171,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/mainPage/indexPage/index.vue

@@ -83,7 +83,6 @@ export default {
       locationId: '',
       swiperOption: {
         observer: true,
-        loop: true,
         autoplay: {
           disableOnInteraction: false,
         }
@@ -126,11 +125,13 @@ export default {
       this.locationId = 'index'
       this.getIndexInfo({ orgid: this.orgid, locationid: this.locationId }).then(() => {
         this.newsList = this.cms
-        for (let i = 0; i < this.project.length; i++) {
-          if (this.project[i].CmsCaseImgs != null) {
-            for (let j = 0; j < this.project[i].CmsCaseImgs.length; j++) {
-              if (this.project[i].CmsCaseImgs[j].ImageType === 'cover') {
-                this.project[i].CaseImageUrl = this.project[i].CmsCaseImgs[j].CaseImageUrl
+        if (this.project !== undefined && this.project !== null) {
+          for (let i = 0; i < this.project.length; i++) {
+            if (this.project[i].CmsCaseImgs != null) {
+              for (let j = 0; j < this.project[i].CmsCaseImgs.length; j++) {
+                if (this.project[i].CmsCaseImgs[j].ImageType === 'cover') {
+                  this.project[i].CaseImageUrl = this.project[i].CmsCaseImgs[j].CaseImageUrl
+                }
               }
             }
           }
@@ -157,5 +158,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/router.js

@@ -124,7 +124,10 @@ const router = new Router({
 })
 
 router.beforeEach((to, from, next) => {
-  
+  // console.log(to)
+  // if(){
+    
+  // }
   next()
 })
 

src/store/fiveA/fiveA.js

@@ -20,7 +20,7 @@ http.getNav = (data) => {
 }
 
 http.getBanner = (data) => {
-  console.log(data)
+  // console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.index.banner.url, {
       method: api.index.banner.method,
@@ -37,7 +37,7 @@ http.getBanner = (data) => {
 }
 
 http.getList = (data) => {
-  console.log(data)
+  // console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.index.list.url, {
       method: api.index.list.method
@@ -50,7 +50,7 @@ http.getList = (data) => {
 }
 
 http.getCms = (data) => {
-  console.log(data)
+  // console.log(data)
   return new Promise((resolve, reject) => {
     Ajax(api.index.cms.url, {
       method: api.index.cms.method,
@@ -72,7 +72,8 @@ export default {
     nav: [],
     banner: [],
     list: [],
-    cms: []
+    cms: [],
+    fiveAList: [],
   },
   mutations: {
     setNav (state, data) {
@@ -86,9 +87,25 @@ export default {
     },
     setCms (state, data) {
       state.cms = data
-    }
+    },
+    setFiveAList (state, data) {
+      state.fiveAList = data
+    },
   },
   actions: {
+    getFiveAList (context, { ...payload }) { // 获取5A列表
+      return new Promise((resolve) => {
+        Ajax(api.index.getFiveAList.url, {
+          method: api.index.getFiveAList.method,
+          queryData: {
+            ...payload
+          },
+        }).then(res => {
+          context.commit('setFiveAList', res)
+          resolve(res)
+        })
+      })
+    },
     getNav (context, data) {
       return new Promise((resolve) => {
         http.getNav(data).then((res) => {
@@ -96,10 +113,9 @@ export default {
           resolve(res)
         })
       })
-      
     },
     getFiveAInfo (context, data) {
-      console.log(data)
+      // console.log(data)
       http.getBanner(data).then((res) => {
         context.commit('setBanner', res)
       })

src/store/userCenter/userCenter.js

@@ -93,10 +93,10 @@ export default {
       state.courseLocationList = data
     },
     setCourseOrder (state, { res, page }) { // 设置我的课程订单信息
-      if (page === 1) {
+      if (page <= 1) {
         state.courseOrderList = res
       } else {
-        state.courseOrderList = { ...res, list: [...state.courseOrderList.list, res.list] }
+        state.courseOrderList = {...res, list: [...state.courseOrderList.list, ...res.list]}
       }
     }
   },

src/util/api.js

@@ -25,6 +25,10 @@ const $api = {
     cms: { // 获取cms消息
       method: 'get',
       url: `${baseUrl}${guest}/cms/news`
+    },
+    getFiveAList: { // 获取5A列表
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/course`
     }
   },
   caseForCoffee: {