xcx

src/components/qrCodeCard/qrCodeCard.vue

@@ -10,8 +10,8 @@ export default {
   name: 'qrCodeCard',
   props: {
     msg: {
-      type: Object,
-      default: () => {}
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -27,13 +27,7 @@ export default {
   },
   methods: {
     InitCodeRules (info) {
-      let codeText
-      for (var Key in this.lessonType
-      ) {
-        if (parseInt(Key) === this.msg.course_type) {
-          codeText = this.lessonType[Key] + '-1'
-        }
-      }
+      let codeText = info
       const ele = document.querySelector('#QRcode')
       this.qrCode = new QRCode(ele, {
         text: codeText,
@@ -49,7 +43,7 @@ export default {
     QRCode
   },
   mounted () {
-    this.InitCodeRules()
+    this.InitCodeRules(this.msg)
   }
 }
 </script>

src/pages/user/card/index.vue

@@ -156,10 +156,10 @@ export default {
       this.active = index
     },
     toUse (item) {
-      console.log(item)
+      // console.log(item)
     },
     getList () {
-      console.log(111)
+      // console.log(111)
     },
     toCardDetail (item) {
       this.$router.push({ name: 'cardDetail' })

src/pages/user/coupons/index.vue

@@ -83,10 +83,10 @@ export default {
       this.active = index
     },
     toUse (item) {
-      console.log(item)
+      // console.log(item)
     },
     getList () {
-      console.log(111)
+      // console.log(111)
     }
   }
 }

src/pages/user/lessonDetail/index.vue

@@ -1,55 +1,52 @@
 <template>
   <div class="mainPage">
     <div class="title">课程详情</div>
-    <div class="content" :class="{'opacity' : useType == '已失效' || useType == '已使用', 'gray': useType == '已使用' || useType == '已失效'}">
+    <div class="content" :class="{'opacity' : courseOrderDetail.IsDone === 1, 'gray': courseOrderDetail.IsDone === 1}">
       <div class="list-item">
         <span>订单编号</span>
-        <span>144215646445464</span>
+        <span>{{courseOrderDetail.OrdersNo !== undefined ? courseOrderDetail.OrdersNo : ''}}</span>
       </div>
       <div class="list-item">
-        <span>订单名称</span>
-        <span>拉伸柔韧度</span>
+        <span>课程名称</span>
+        <span>{{courseOrderDetail.CourseName}}</span>
       </div>
       <div class="list-item">
-        <span>节课数</span>
-        <span>2节课</span>
+        <span>课时数</span>
+        <span>{{courseOrderDetail.JoinNum}}/{{courseOrderDetail.CourseNum}}</span>
       </div>
       <div class="list-item">
         <span>类型</span>
-        <span>健身</span>
+        <span>{{returnLocationName(courseOrderDetail.LocationId)}}</span>
       </div>
       <div class="list-item">
         <span>商品价格</span>
-        <span>¥1999</span>
+        <span>¥{{courseOrderDetail.Price}}</span>
       </div>
       <div class="list-item">
         <span>下单时间</span>
-        <span>2018/04/12 14:26:09</span>
+        <span>{{toolClass.dateFormat(courseOrderDetail.CreateDate)}}</span>
       </div>
-      <div class="list-item">
-        <span>课程时间</span>
-        <span>2018/04/12 12:00至14:00 计划备注（每周六 19:30)</span>
-      </div>
-      <div class="list-item">
+      <!-- <div class="list-item">
         <span>地点</span>
-        <span>悦见山G99</span>
-      </div>
+        <span>{{returnCaseName(courseOrderDetail.CaseId)}}</span>
+      </div> -->
       <div class="list-item">
         <span>付款方式</span>
-        <span>优惠券抵用 <div class="coupon-name">小拉伸柔韧度体验券</div></span>
+        <span>{{courseOrderDetail.CourseObtaimType === 'cheng-coin' ? '城币支付' : '优惠券抵用'}}</span>
+        <!-- <span>优惠券抵用 <div class="coupon-name">小拉伸柔韧度体验券</div></span> -->
       </div>
       <div class="half-cic">
         <span></span>
         <span></span>
       </div>
-      <div class="qr-code">
-        <qrCode :msg='msg'></qrCode>
-        <div class="number">32237489123</div>
+      <div class="qr-code" v-if="courseOrderDetail.IsDone === 0">
+        <qrCode :msg="courseOrderDetail.QrCodeString"></qrCode>
+        <!-- <div class="number">32237489123</div> -->
       </div>
     </div>
     <div class="useType">
-      <img :src="used" alt="已使用" v-if="useType == '已使用'" width="100%" height="100%">
-      <img :src="failure" alt="已失效" v-if="useType == '已失效'" width="100%" height="100%">
+      <img :src="used" alt="已使用" v-if="courseOrderDetail.IsDone === 1" width="100%" height="100%">
+      <!-- <img :src="failure" alt="已失效" v-if="useType == '已失效'" width="100%" height="100%"> -->
     </div>
   </div>
 </template>
@@ -58,6 +55,9 @@
 import qrCode from '../../../components/qrCodeCard/qrCodeCard'
 import used from '../../../common/icon/already.png'
 import failure from '../../../common/icon/inv.png'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: actions } = createNamespacedHelpers('app')
+const { mapActions: mapUserActions, mapState: mapUserState } = createNamespacedHelpers('userCenter')
 export default {
   data () {
     return {
@@ -70,15 +70,55 @@ export default {
       failure,
     }
   },
+  created () {
+    this.getCourseLocationList().then(() => {
+      this.getCaseList().then(() => {
+        this.getCourseOrderDetail({
+          id: this.$route.query.id
+        }).then((res) => {
+          // console.log(JSON.stringify(res))
+        })
+      })
+    })
+  },
+  computed: {
+    ...mapUserState({
+      courseOrderDetail: x => x.courseOrderDetail,
+      courseLocationList: x => x.courseLocationList,
+    }),
+    ...mapState({
+      CaseList: x => x.app.CaseList,
+    })
+  },
   methods: {
-
+    ...mapUserActions([
+      'getCourseOrderDetail',
+      'getCourseLocationList',
+    ]),
+    ...actions([
+      'getCaseList',
+    ]),
+    returnLocationName (id) {
+      for (var n = 0; n < this.courseLocationList.length; n++) {
+        if (this.courseLocationList[n].LocationId === id) {
+          return this.courseLocationList[n].LocationName
+        }
+      }
+    },
+    returnCaseName (id) {
+      for (var n = 0; n < this.CaseList.length; n++) {
+        if (this.CaseList[n].CaseId === id) {
+          return this.CaseList[n].CaseName
+        }
+      }
+    },
   },
   components: {
-    qrCode
+    qrCode,
   }
 }
 </script>
 
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/lessonOrder/index.vue

@@ -4,7 +4,7 @@
       <div class="box">
         <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.status === 1}"><span>{{item.LocationName}}</span></div>
+            <div :class="{'gray-location' : item.status === 1}"><span>{{returnLocationName(item.LocationId)}}</span></div>
             <img src="" class="cover" width="100%" height="100%" alt="">
           </div>
           <div class="card-msg">
@@ -49,7 +49,7 @@ export default {
   created () {
     var _that = this
     this.getCourseLocationList().then((res) => {
-      console.log(JSON.stringify(res))
+      // console.log(JSON.stringify(res))
       this.getCourseOrderList({ page: this.page })
     })
   },
@@ -75,6 +75,13 @@ export default {
       'getCourseOrderList',
       'getCourseLocationList',
     ]),
+    returnLocationName (id) {
+      for (var n = 0; n < this.courseLocationList.length; n++) {
+        if (this.courseLocationList[n].LocationId === id) {
+          return this.courseLocationList[n].LocationName
+        }
+      }
+    },
     getList () {
       var _that = this
       Math.ceil(this.courseOrderList.pagenum / this.courseOrderList.pagesize) > this.page ? this.hasMore = true : this.hasMore = false
@@ -84,7 +91,7 @@ export default {
           this.getCourseOrderList({
             page: _that.page + 1
           }).then((res) => {
-            if(res.list.length){
+            if (res.list.length) {
               _that.page += 1
             }
           })
@@ -94,8 +101,8 @@ export default {
         return false
       }
     },
-    toDetail () {
-      this.$router.push({ name: 'lessonDetail' })
+    toDetail (item) {
+      this.$router.push({ name: 'lessonDetail', query: {id: item.CustomerCourseId} })
     }
   }
 }

src/store/majorProjects/majorProjects.js

@@ -47,7 +47,7 @@ export default {
         })
       })
     },
-    getCourseDetailInfo (context, { id }) { // 获取课程列表
+    getCourseDetailInfo (context, { id }) { // 获取课程详情信息
       return new Promise((resolve) => {
         Ajax(api.majorProjects.getCourseDetail.url, {
           method: api.majorProjects.getCourseDetail.method,

src/store/userCenter/userCenter.js

@@ -77,6 +77,7 @@ export default {
     caseInfo: {},
     courseOrderList: {},
     courseLocationList: [],
+    courseOrderDetail: {},
   },
   mutations: {
     setUserInfo (state, data) {
@@ -85,6 +86,9 @@ export default {
     setCaseInfo (state, data) {
       state.caseInfo = data
     },
+    setCourseOrderDetail (state, data) { // 设置课程订单详情
+      state.courseOrderDetail = data
+    },
     setCourseLocationList (state, data) { // 设置课程类型列表
       state.courseLocationList = data
     },
@@ -92,17 +96,28 @@ export default {
       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] }
       }
     }
   },
   actions: {
+    getCourseOrderDetail (context, payload) { // 获取课程类型列表
+      return new Promise((resolve) => {
+        Ajax(api.user.getCourseOrderDetail.url, {
+          method: api.user.getCourseOrderDetail.method,
+          urlData: { ...payload }
+        }).then(res => {
+          context.commit('setCourseOrderDetail', res)
+          resolve(res)
+        })
+      })
+    },
     getCourseLocationList (context) { // 获取课程类型列表
       return new Promise((resolve) => {
         Ajax(api.user.getCourseLoactionList.url, {
           method: api.user.getCourseLoactionList.method,
         }).then(res => {
-          context.commit('setCourseLocationList')
+          context.commit('setCourseLocationList', res)
           resolve(res)
         })
       })
@@ -111,7 +126,7 @@ export default {
       return new Promise((resolve) => {
         Ajax(api.user.getCourseOrderList.url, {
           method: api.user.getCourseOrderList.method,
-          queryData: {...payload}
+          queryData: { ...payload }
         }).then(res => {
           context.commit('setCourseOrder', { res, page: payload.page })
           resolve(res)

src/util/ajax.js

@@ -49,7 +49,7 @@ Axios.interceptors.request.use((config) => {
 const ajax = (...args) => {
   return new Promise((resolve, reject) => {
     Axios(...args).then(({ data }) => {
-      console.log(111)
+      // console.log(111)
       const { code, message, result } = data
       if (code === 200) {
         resolve(result)

src/util/api.js

@@ -88,6 +88,10 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${guest}/cms/location`
     },
+    getCourseOrderDetail: { // 获取课程订单详情
+      method: 'get',
+      url: `${baseUrl}${wechat}/course/user/:id`
+    },
   },
   login:{ // 主管、销售端登陆
     login: {