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

src/pages/user/majorProjectsDetail/index.vue

       message: x => x.index.message,
       project: x => x.index.project,
       cms: x => x.index.cms,
+      user: x => x.userCenter.userInfo
     }),
     ...mapProjectState({
       courseDetail: x => x.courseDetail
         this.courseDetail.CourseImgs.sort(this.getSortFun('asc', 'Sort'))
         this.detailImage = this.courseDetail.CourseImgs
       }
-      console.log(this.detailImage)
+      // console.log(this.detailImage)
       this.courseTimeList = arr.sort(function (a, b) { return new Date(a.BeginDate).getTime() > new Date(b.BeginDate).getTime() ? 1 : -1 })
       let nowDate = Date.now()
       let endData = new Date(this.courseDetail.EndDate).getTime()
   methods: {
     ...mapProjectActions([
       'getCourseDetailInfo',
+      'placeCourseOrderBefore',
     ]),
     getSortFun (order, sortBy) {
       var ordAlpah = (order == 'asc') ? '>' : '<'
       if (nowDate > endData) {
         this.$toast('该课程已过期')
       } else {
-        this.$router.push({ name: 'placeOrderForCourse', query: { id: this.courseDetail.CourseId } })
+        this.placeCourseOrderBefore({
+          order: {
+            CourseId: this.courseDetail.CourseId,
+            CaseId: this.courseDetail.CaseId,
+            CustomerId: this.user.CustomerId,
+            Price: this.courseDetail.Price
+          },
+          customercouponid: ''
+        }).then((res) => {
+          // console.log(JSON.stringify(res))
+          this.$router.push({ name: 'placeOrderForCourse', query: { id: this.courseDetail.CourseId, ordersid: res.OrdersId } })
+        })
       }
     },
     openMap () {

src/pages/user/placeOrderForCourse/index.vue

   },
   created () {
     this.getCouponList().then((res) => {
+      res = res || []
       this.getCourseDetailInfo({ id: this.$route.query.id }).then((result) => {
         var arr = result.CourseDetail, caseid = result.CaseId
         // console.log(arr)
         return false
       }
       this.placeOrderForCourse({
-        order: {
-          CourseId: this.courseDetail.CourseId,
-          CaseId: this.courseDetail.CaseId,
-          CustomerId: this.user.CustomerId,
-          Price: this.courseDetail.Price
-        },
-        customercouponid: this.postData.customercouponid
+        id: this.$route.query.ordersid,
+        payload: {
+          customercouponid: this.postData.customercouponid,
+        }
       }).then((res) => {
         // console.log(JSON.stringify(res))
         this.$dialog.alert({

src/store/majorProjects/majorProjects.js

     }
   },
   actions: {
-    placeOrderForCourse (context, { order, customercouponid }) { // 课程下单
+    placeCourseOrderBefore (context, { order, customercouponid }) { // 课程预下单
       return new Promise((resolve, reject) => {
-        Ajax(api.majorProjects.placeCourseOrder.url, {
-          method: api.majorProjects.placeCourseOrder.method,
+        Ajax(api.majorProjects.placeCourseOrderBefore.url, {
+          method: api.majorProjects.placeCourseOrderBefore.method,
           data: {
             info: window.JSON.stringify(order),
             customercouponid,
         })
       })
     },
+    placeOrderForCourse (context, { id, payload }) { // 课程下单
+      return new Promise((resolve, reject) => {
+        Ajax(api.majorProjects.placeCourseOrder.url, {
+          method: api.majorProjects.placeCourseOrder.method,
+          urlData: {
+            id,
+          },
+          data: {
+            customercouponid: payload.customercouponid
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
     getProjectInfo (context, { id }) { // 获取课程列表
       return new Promise((resolve) => {
         Ajax(api.majorProjects.getCourseList.url, {

src/util/api.js

       method: 'get',
       url: `${baseUrl}${guest}/course/:id`
     },
-    placeCourseOrder: { // 课程下单
+    placeCourseOrderBefore: { // 课程预下单
       method: 'post',
       url: `${baseUrl}${wechat}/order/course`
     },
+    placeCourseOrder: { // 课程下单
+      method: 'put',
+      url: `${baseUrl}${wechat}/order/course/:id`
+    },
   },
   card: {
     myCustomer: { // 我的客户