xcx

config/index.js

@@ -24,8 +24,8 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        target: 'http://192.168.0.62:8080', //wf
-        // target: 'http://192.168.0.11:8080', //ys
+        // target: 'http://192.168.0.62:8080', //wf
+        target: 'http://192.168.0.11:8080', //ys
         // target: 'http://dev.ycjcjy.com', //zys
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

src/common/css/reset.css

@@ -69,4 +69,8 @@ select option {
 
 .van-picker{
 	z-index: 101;
+}
+
+.van-dialog__message{
+	text-align: center;
 }

src/module/user/placeOrderForCourse/index.vue

@@ -12,7 +12,7 @@
                     <span>精品课程名称</span>
                   </div>
                 </div>
-                <span>满手</span>
+                <span>{{courseDetail.CourseName}}</span>
               </li>
               <li class="flex-h">
                 <div class="flex-item">
@@ -20,7 +20,7 @@
                     <span>预计开班时间</span>
                   </div>
                 </div>
-                <span>满手</span>
+                <span>{{returnDate(courseDetail.BeginDate)}}</span>
               </li>
               <li class="flex-h">
                 <div class="flex-item">
@@ -28,7 +28,7 @@
                     <span>时间描述</span>
                   </div>
                 </div>
-                <span>满手</span>
+                <span v-if="courseTimeList.length">{{returnCourseTime(courseTimeList[0].BeginDate,courseTimeList[0].EndDate)}}</span>
               </li>
               <li class="flex-h">
                 <div class="flex-item">
@@ -36,7 +36,7 @@
                     <span>地点</span>
                   </div>
                 </div>
-                <span>满手</span>
+                <!-- <span>{{courseDetail.CaseInfo.CaseAddress}}</span> -->
               </li>
               <li class="flex-h">
                 <div class="flex-item">
@@ -44,7 +44,7 @@
                     <span>价格</span>
                   </div>
                 </div>
-                <span>满手</span>
+                <span>￥{{courseDetail.Price}}</span>
               </li>
             </ul>
             <div class="selectTicket">
@@ -91,10 +91,10 @@
     <div class="flex-h">
       <div class="flex-item">
         <div>
-          <span>总计￥<em>109</em>.00</span>
+          <span>总计￥<em>{{courseDetail.Price}}</em></span>
         </div>
       </div>
-      <router-link :to="{name: '', query: {}}">确认订单</router-link>
+      <a @click="placeOrder">确认订单</a>
     </div>
     <div class="layer" :class="{'show': showLayer}"> 
       <div>
@@ -112,12 +112,15 @@
 </template>
 
 <script>
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: mapProjectActions, mapState: mapProjectState } = createNamespacedHelpers('majorProjects')
 
 export default {
   name: '',
   data () {
     return {
       agreementOff: false, // 是否同意协议
+      courseTimeList: [],
       postData: {
         CouponId: '',
         CouponName: '',
@@ -138,9 +141,66 @@ export default {
       }],
     }
   },
-  computed: {},
-  created () { },
+  computed: {
+    ...mapState({
+      orgid: x => x.app.orgId,
+      fiveA: x => x.index.fiveA,
+      banner: x => x.index.banner,
+      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
+    }),
+  },
+  created () {
+    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 })
+    })
+  },
   methods: {
+    placeOrder () { // 下单
+      if(!this.agreementOff){
+        this.$toast('请先阅读服务协议并同意')
+        return false
+      }
+      this.placeOrderForCourse({
+        order: {
+          CourseId: this.courseDetail.CourseId,
+          CaseId: this.courseDetail.CaseId,
+          CustomerId: this.user.CustomerId,
+          Price: this.courseDetail.Price
+        },
+        coupons: []
+      }).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.$dialog.alert({
+          message: '下单成功！'
+        }).then(() => {
+          // this.$router.push({name: 'majorProjects'})
+          window.history.go(-2)
+        })
+      })
+    },
+    ...mapProjectActions([
+      'getCourseDetailInfo',
+      'placeOrderForCourse',
+    ]),
+    returnCourseTime (val, endVal) { // 返回课时时间
+      val = new Date(val)
+      endVal = new Date(endVal)
+      return this.returnNum(val.getMonth() + 1) + '/' + this.returnNum(val.getDate()) + ' 周' + '日一二三四五六'.split('')[new Date(val).getDay()] + ' ' + this.returnNum(val.getHours()) + ':' + this.returnNum(val.getMinutes()) + '~' + this.returnNum(endVal.getHours()) + ':' + this.returnNum(endVal.getMinutes())
+    },
+    returnNum (val) {
+      return val > 9 ? val : '0' + val
+    },
+    returnDate (val) {
+      val = new Date(val)
+      return this.returnNum(val.getMonth() + 1) + '月' + this.returnNum(val.getDate()) + '日'
+    },
     onConfirm (value, index) {
       this.postData.CouponId = value.id
       this.postData.CouponName = value.value

src/module/user/placeOrderForCourse/page.scss

@@ -70,7 +70,7 @@
             }
           }
           >*{
-            line-height: .32rem;
+            line-height: .26rem;
             font-size: .13rem;
             margin-left: .1rem;
           }

src/store/majorProjects/majorProjects.js

@@ -17,6 +17,21 @@ export default {
     }
   },
   actions: {
+    placeOrderForCourse (context, { order, coupons = [] }) { // 课程下单
+      return new Promise((resolve, reject) => {
+        Ajax(api.majorProjects.placeCourseOrder.url, {
+          method: api.majorProjects.placeCourseOrder.method,
+          data: {
+            info: window.JSON.stringify(order),
+            coupons: window.JSON.stringify(coupons),
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
     getProjectInfo (context, { id }) { // 获取课程列表
       return new Promise((resolve) => {
         Ajax(api.majorProjects.getCourseList.url, {
@@ -32,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

@@ -66,7 +66,9 @@ http.submitData = (data) => { // 绑定手机号
 export default {
   namespaced: true,
   state: {
-    userInfo: {},
+    userInfo: {
+      CustomerId: '1',
+    },
     caseInfo: {}
   },
   mutations: {

src/util/ajax.js

@@ -1,6 +1,7 @@
 import axios from 'axios'
 import qs from 'qs'
 import router from '../module/user/router'
+import { Toast } from 'vant'
 
 const Axios = axios.create({
   timeout: 60000,
@@ -15,7 +16,7 @@ const Axios = axios.create({
 
 Axios.interceptors.request.use((config) => {
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
-  config.urlData = {...config.urlData, org: 1}
+  config.urlData = {...config.urlData, org: 'MQ'}
   let urlData = qs.stringify(config.urlData)
   let queryData = qs.stringify(config.queryData)
   // 判断是通过斜杠传参还是通过query传参
@@ -54,7 +55,7 @@ const ajax = (...args) => {
       } else if (code === 401) {
         // reject(code)
       } else {
-        Message({
+        Toast({
           message: message,
           type: 'error'
         })

src/util/api.js

@@ -35,6 +35,10 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${guest}/course/:id`
     },
+    placeCourseOrder: { // 课程下单
+      method: 'post',
+      url: `${baseUrl}${wechat}/order/course`
+    },
   },
   user: {
     info: { // 获取用户信息