xcx

src/pages/user/lessonOrder/index.vue

@@ -1,20 +1,20 @@
 <template>
   <div class="mainPage">
-    <scroll ref='scroll' :isloading='isloading' class='wrapper' :data='list' :pullUpLoad='pullUpLoadObj' :startY='parseInt(startY)' @pullingUp='getList'>
+    <scroll ref='scroll' :isloading='isloading' class='wrapper' :data='courseOrderList.list' :pullUpLoad='pullUpLoadObj' :startY='parseInt(startY)' @pullingUp='getList'>
       <div class="box">
-        <div class="order-card flex-h" v-for="(item,index) in list" :key='index' :class="{'opacity' : item.useType == '已失效'}" @click="toDetail(item)">
+        <div class="order-card flex-h" v-for="(item,index) in courseOrderList.list" :key='index' :class="{'opacity' : item.status === 1}" @click="toDetail(item)">
           <div class="card-pic">
-            <div :class="{'gray-location' : item.useType == '已失效'}"><span>{{item.LocationName}}</span></div>
+            <div :class="{'gray-location' : item.status === 1}"><span>{{item.LocationName}}</span></div>
             <img src="" class="cover" width="100%" height="100%" alt="">
           </div>
           <div class="card-msg">
-            <div class="title">{{item.title}}</div>
-            <div class="text">付款方式：{{item.payType}}</div>
-            <div class="text">下单时间：{{item.time}}</div>
+            <div class="title">{{item.CourseName}}</div>
+            <div class="text">付款方式：{{item.CourseObtaimType === 'cheng-coin' ? '城币支付' : '优惠券抵用'}}</div>
+            <div class="text">下单时间：{{toolClass.dateFormat(item.CreateDate)}}</div>
           </div>
           <div class="card-price">
-            <div class="price">￥ {{item.price}}</div>
-            <div class="type" :class="{'un-use' : item.useType == '未使用'}">{{item.useType}}</div>
+            <div class="price" style="white-space: nowrap;">￥ {{item.Price}}</div>
+            <div class="type" :class="{'un-use' : item.IsDone === 0}">{{item.IsDone === 0 ? '未使用' : '已使用'}}</div>
           </div>
         </div>
         <!-- <noMore v-if="hasPic"></noMore> -->
@@ -27,6 +27,8 @@
 // 上拉加载组件
 import scroll from '../../../components/scroll/scroll'
 import noMore from '../../../components/noMore/noMore'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: mapUserActions, mapState: mapUserState } = createNamespacedHelpers('userCenter')
 export default {
   data () {
     return {
@@ -34,65 +36,28 @@ export default {
       pullUpLoad: true,
       pullUpLoadThreshold: 40,
       startY: 0,
+      page: 1,
       isloading: true,
       hasMore: true,
-      list: [
-        {
-          LocationName: '社交',
-          title: '小小外交官课程',
-          payType: '优惠券抵用',
-          time: '2018-7-18 12:19',
-          price: 199,
-          useType: '未使用'
-        },
-        {
-          LocationName: '社交',
-          title: '小小外交官课程',
-          payType: '优惠券抵用',
-          time: '2018-7-18 12:19',
-          price: 199,
-          useType: '已使用'
-        },
-        {
-          LocationName: '社交',
-          title: '小小外交官课程',
-          payType: '优惠券抵用',
-          time: '2018-7-18 12:19',
-          price: 199,
-          useType: '已失效'
-        },
-        {
-          LocationName: '社交',
-          title: '小小外交官课程',
-          payType: '优惠券抵用',
-          time: '2018-7-18 12:19',
-          price: 199,
-          useType: '已失效'
-        },
-        {
-          LocationName: '社交',
-          title: '小小外交官课程',
-          payType: '优惠券抵用',
-          time: '2018-7-18 12:19',
-          price: 199,
-          useType: '已失效'
-        },
-        {
-          LocationName: '社交',
-          title: '小小外交官课程',
-          payType: '优惠券抵用',
-          time: '2018-7-18 12:19',
-          price: 199,
-          useType: '已失效'
-        }
-      ]
+      list: []
     }
   },
   components: {
     scroll,
     noMore
   },
+  created () {
+    var _that = this
+    this.getCourseLocationList().then((res) => {
+      console.log(JSON.stringify(res))
+      this.getCourseOrderList({ page: this.page })
+    })
+  },
   computed: {
+    ...mapUserState({
+      courseOrderList: x => x.courseOrderList,
+      courseLocationList: x => x.courseLocationList,
+    }),
     pullUpLoadObj: function () {
       return this.pullUpLoad
         ? {
@@ -106,17 +71,22 @@ export default {
     }
   },
   methods: {
+    ...mapUserActions([
+      'getCourseOrderList',
+      'getCourseLocationList',
+    ]),
     getList () {
-      this.list.length <= 8 ? this.hasMore = true : this.hasMore = false
+      var _that = this
+      Math.ceil(this.courseOrderList.pagenum / this.courseOrderList.pagesize) > this.page ? this.hasMore = true : this.hasMore = false
+      // this.list.length <= 8 ? this.hasMore = true : this.hasMore = false
       if (this.hasMore) {
         setTimeout(() => {
-          this.list.push({
-            LocationName: '社交',
-            title: '小小外交官课程',
-            payType: '优惠券抵用',
-            time: '2018-7-18 12:19',
-            price: 199,
-            useType: '已失效'
+          this.getCourseOrderList({
+            page: _that.page + 1
+          }).then((res) => {
+            if(res.list.length){
+              _that.page += 1
+            }
           })
         }, 1000)
       } else {
@@ -125,12 +95,12 @@ export default {
       }
     },
     toDetail () {
-      this.$router.push({name: 'lessonDetail'})
+      this.$router.push({ name: 'lessonDetail' })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/majorProjectsDetail/index.vue

@@ -113,7 +113,7 @@ export default {
     this.getCourseDetailInfo({ id: this.$route.query.id }).then((res) => {
       var arr = res.CourseDetail
       this.courseTimeList = arr.sort(function (a, b) { return new Date(a.BeginDate).getTime() > new Date(b.BeginDate).getTime() ? 1 : -1 })
-      console.log(JSON.stringify(this.courseTimeList))
+      // console.log(JSON.stringify(res))
     })
   },
   methods: {

src/store/userCenter/userCenter.js

@@ -73,38 +73,10 @@ http.submitData = (data) => { // 绑定手机号
 export default {
   namespaced: true,
   state: {
-    userInfo: {
-      AccountInfo: {
-        "city": "CITY",
-        "country": "COUNTRY",
-        "headimgurl": "http://thirdwx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/46",
-        "nickname": "NICKNAME",
-        "openid": "OPENID",
-        "province": "PROVINCE",
-        "sex": "1",
-        "unionid": "o6_bmasdasdsad6_2sgVt7hMZOPfL"
-      },
-      AccountType: "wechat",
-      CreateDate: "0001-01-01T00:00:00Z",
-      CustomerId: "1",
-      CustomerName: "测试",
-      Headimgurl: "",
-      MapUser: "",
-      MappingId: "1",
-      Name: "测试",
-      Openid: "OPENID",
-      OrgId: "1",
-      Phone: "13823838438",
-      Points: 0,
-      RecommendCase: "1",
-      RecommendId: "0",
-      RecommendName: "",
-      Sex: 1,
-      Status: 1,
-      UserType: "customer",
-      Uuid: "",
-    },
-    caseInfo: {}
+    userInfo: {},
+    caseInfo: {},
+    courseOrderList: {},
+    courseLocationList: [],
   },
   mutations: {
     setUserInfo (state, data) {
@@ -112,9 +84,40 @@ export default {
     },
     setCaseInfo (state, data) {
       state.caseInfo = data
+    },
+    setCourseLocationList (state, data) { // 设置课程类型列表
+      state.courseLocationList = data
+    },
+    setCourseOrder (state, { res, page }) { // 设置我的课程订单信息
+      if (page === 1) {
+        state.courseOrderList = res
+      } else {
+        state.courseOrderList = {...res, list: [...state.courseOrderList.list, res.list]}
+      }
     }
   },
   actions: {
+    getCourseLocationList (context) { // 获取课程类型列表
+      return new Promise((resolve) => {
+        Ajax(api.user.getCourseLoactionList.url, {
+          method: api.user.getCourseLoactionList.method,
+        }).then(res => {
+          context.commit('setCourseLocationList')
+          resolve(res)
+        })
+      })
+    },
+    getCourseOrderList (context, payload) { // 获取我的课程订单信息
+      return new Promise((resolve) => {
+        Ajax(api.user.getCourseOrderList.url, {
+          method: api.user.getCourseOrderList.method,
+          queryData: {...payload}
+        }).then(res => {
+          context.commit('setCourseOrder', { res, page: payload.page })
+          resolve(res)
+        })
+      })
+    },
     getUserInfo (context, data) {
       return new Promise((resolve) => {
         http.getUserInfo(data).then((res) => {

src/util/api.js

@@ -80,6 +80,14 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${guest}/case`
     },
+    getCourseOrderList: { // 获取我的课程订单信息
+      method: 'get',
+      url: `${baseUrl}${wechat}/course/user`
+    },
+    getCourseLoactionList: { // 获取课程类型列表
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/location`
+    },
   },
   login:{ // 主管、销售端登陆
     login: {