ytj

src/components/orderListItem/index.vue

@@ -1,24 +1,24 @@
 <template>
   <div class="orderListItem">
     <div class="title flex-h">
-      <div class="orange" v-if="data.status === 0">
+      <div class="orange" v-if="data.Status === 0">
         <i class="iconfont icon-dengdai"></i><br>
         <span>制作中</span>
       </div>
-      <div class="grey" v-if="data.status === 1">
+      <div class="grey" v-if="data.Status === -1">
         <i class="iconfont icon-quxiao"></i><br>
         <span>已取消</span>
       </div>
-      <div class="green" v-if="data.status === 2">
+      <div class="green" v-if="data.Status === 1">
         <i class="iconfont icon-gouxuan"></i><br>
         <span>已完成</span>
       </div>
       <div class="flex-item">
         <div>
-          <span>{{data.caseName}}</span>
+          <span>{{data.CaseName}}</span>
         </div>
       </div>
-      <span>{{data.creatTime}}</span>
+      <span>{{toolClass.dateFormat(data.CreateDate, 'MM/dd hh:mm')}}</span>
     </div>
     <div class="line">
       <div>
@@ -28,10 +28,10 @@
     <div class="list flex-h">
       <div class="flex-item">
         <ul>
-          <li v-for="(subItem,subIndex) in data.goodsList" :key="subIndex">
-            <span>{{subItem.name}}</span>
+          <li v-for="(subItem,subIndex) in data.Goods" :key="subIndex">
+            <span>{{subItem.GoodsName + (subItem.SpecName!==''?'('+subItem.SpecName+')':'')}}</span>
             <div>
-              <span>￥{{subItem.price === null ? subItem.specPrice : subItem.price}} x {{subItem.num === null ? subItem.specNum : subItem.num}}</span>
+              <span>￥{{subItem.Price}} x {{subItem.Number}}</span>
             </div>
           </li>
         </ul>

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/sales/coffeeIndex/index.vue

@@ -13,12 +13,12 @@
             <div class="topInfo flex-h">
               <div class="flex-item">
                 <div>
-                  <span>共计已使用：45杯</span>
+                  <span>共计已使用：{{caseTotal.total}}杯</span>
                 </div>
               </div>
               <div class="flex-item">
                 <div>
-                  <span>本月已用：0杯</span>
+                  <span>本月已用：{{caseTotal.monthtotal}}杯</span>
                 </div>
               </div>
               <a>点单记录</a>
@@ -84,8 +84,10 @@ import caseTableItem from '../../../components/caseTableItem/index'
 import topCaseInfo from '../../../components/topCaseInfo/index'
 import myCard from '../../../components/myCard/myCard'
 import customerCard from '../../../components/customerCard/customerCard'
+import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
+const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
 
 export default {
   name: '',
@@ -151,6 +153,9 @@ export default {
       userInfo: x => x.userCenter.userInfo,
       CaseList: x => x.app.CaseList,
       CaseTableList: x => x.placeOrderForCoffee.CaseTableList,
+    }),
+    ...mapCaseState({
+      caseTotal: x => x.caseTotal,
     })
   },
   components: {
@@ -166,6 +171,9 @@ export default {
       this.getCaseTableList({
         caseid: this.topCaseInfoData.CaseId
       })
+      this.getCaseTotal({
+        caseid: this.topCaseInfoData.CaseId
+      })
     })
   },
   methods: {
@@ -175,6 +183,9 @@ export default {
     ...caseTableActions([
       'getCaseTableList',
     ]),
+    ...mapCaseActions([
+      'getCaseTotal',
+    ]),
     selectCase (val) { // 选择案场
       this.topCaseInfoData.CaseName = val.CaseName
       this.topCaseInfoData.CaseId = val.CaseId

src/pages/sales/placeOrder/index.vue

@@ -15,7 +15,7 @@
       <div class="tableInfo flex-h">
         <div class="flex-item">
           <div>
-            <span>桌号：{{tableNo}}</span>
+            <span>桌号：{{postData.info.TableNo}}</span>
             <!-- <span>本月已用：150杯</span> -->
           </div>
         </div>
@@ -66,8 +66,7 @@
           <i class="iconfont" :class="{'icon-jiantou-up': !showCalcMenu,'icon-jiantou-down': showCalcMenu}" @click="showCalcMenu = true"></i>
         </div>
       </div>
-      <router-link :to="{name: 'placeOrderDetail', query: {info: JSON.stringify(settlementList), caseid: encodeURI(caseId), areaid: encodeURI(areaId), areaname: encodeURI(areaName), areaid: encodeURI(areaId), tableid: encodeURI(tableId), tableno: encodeURI(tableNo)}}">下单</router-link>
-      <!-- <a @click="showCalcMenu = true">下单</a> -->
+      <a @click="showCalcMenu = true">下单</a>
     </div>
     <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
     <calcMenu :show="showCalcMenu" :totalNum="totalCupNum" :data="settlementList" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
@@ -88,12 +87,7 @@ export default {
   data () {
     const _self = this
     return {
-      tableNo: decodeURI(this.$route.query.tableno),
-      tableId: decodeURI(this.$route.query.tableid),
-      areaId: decodeURI(this.$route.query.areaid),
-      areaName: decodeURI(this.$route.query.areaname),
       caseName: decodeURI(this.$route.query.casename),
-      caseId: decodeURI(this.$route.query.caseid),
       totalCupNum: 0, // 共计使用杯数
       showCalcMenu: false, // 显隐已点菜单弹窗
       currentSpec: null, // 当前选择规格
@@ -102,105 +96,21 @@ export default {
       totalPrice: 0, // 总价格
       settlementList: [], // 商品选择清单
       slideMenusActive: 0, // 左侧菜单选中索引值
-      menuList: [ // 商品数据
-      //   {
-      //   value: '咖啡',
-      //   eValue: 'Coffee',
-      //   id: '1',
-      //   status: 1,
-      //   list: [{
-      //     img: '',
-      //     name: '商品名称',
-      //     id: '1-1',
-      //     status: 1,
-      //     spec: [{
-      //       value: '去冰',
-      //       id: '1-1-1',
-      //       num: 0,
-      //       status: 0,
-      //       price: '10',
-      //     }, {
-      //       value: '少冰',
-      //       id: '1-1-2',
-      //       num: 0,
-      //       status: 1,
-      //       price: '15',
-      //     }, {
-      //       value: '正常',
-      //       id: '1-1-3',
-      //       num: 0,
-      //       status: 1,
-      //       price: '20',
-      //     }, {
-      //       value: '多冰',
-      //       id: '1-1-4',
-      //       num: 0,
-      //       status: 1,
-      //       price: '25',
-      //     }],
-      //     price: '100',
-      //   }, {
-      //     img: '',
-      //     name: '商品名称',
-      //     id: '1-2',
-      //     spec: [],
-      //     status: 0,
-      //     price: '100',
-      //   }, {
-      //     img: '',
-      //     name: '商品名称',
-      //     id: '1-3',
-      //     spec: [],
-      //     status: 1,
-      //     price: '100',
-      //   }, {
-      //     img: '',
-      //     name: '商品名称',
-      //     id: '1-4',
-      //     spec: [],
-      //     status: 1,
-      //     price: '100',
-      //   }, {
-      //     img: '',
-      //     name: '商品名称',
-      //     id: '1-5',
-      //     spec: [],
-      //     status: 1,
-      //     price: '100',
-      //   }, {
-      //     img: '',
-      //     name: '商品名称',
-      //     id: '1-6',
-      //     spec: [],
-      //     status: 1,
-      //     price: '100',
-      //   }],
-      // }, {
-      //   value: '咖啡一',
-      //   eValue: 'Coffee',
-      //   id: '2',
-      //   status: 1,
-      //   list: [],
-      // }, {
-      //   value: '咖啡二',
-      //   eValue: 'Coffee',
-      //   id: '3',
-      //   status: 1,
-      //   list: [],
-      // }, {
-      //   value: '咖啡三',
-      //   eValue: 'Coffee',
-      //   id: '4',
-      //   status: 1,
-      //   list: [],
-      // }, {
-      //   value: '咖啡四',
-      //   eValue: 'Coffee',
-      //   id: '5',
-      //   status: 1,
-      //   list: [],
-      // }
-      ],
+      menuList: [],
+      postData: {
+        info: {
+          CaseId: decodeURI(_self.$route.query.caseid),
+          AreaId: decodeURI(_self.$route.query.areaid),
+          AreaName: decodeURI(_self.$route.query.areaname),
+          TableId: decodeURI(_self.$route.query.tableid),
+          TableNo: decodeURI(_self.$route.query.tableno),
+          Amount: 0,// String(_self.returnAmount()[0]), // 订单金额
+          OrdersNum: 0, // Number(_self.returnAmount()[1]),
+          Remark: '',
+        },
+        detail: [],
+        coupon: [],
+      },
       swiperOption: {
         observer: true,
         direction: 'vertical',
@@ -242,11 +152,11 @@ export default {
   },
   created () {
     this.getGoodsTypeList({
-      caseid: this.caseId,
+      caseid: this.postData.info.CaseId,
     }).then((res) => {
       // console.log(JSON.stringify(res))
       this.getGoodsList({
-        caseid: this.caseId,
+        caseid: this.postData.info.CaseId,
       }).then((res) => {
         // console.log(JSON.stringify(res))
         this.mapArr()
@@ -257,7 +167,53 @@ export default {
     ...caseTableActions([
       'getGoodsTypeList',
       'getGoodsList',
+      'toPay',
     ]),
+    toPayer () { // 下单
+      this.postData.info.Amount = String(this.returnAmount()[0])
+      this.postData.info.OrdersNum = Number(this.returnAmount()[1])
+      this.postData.info.OrgId = this.orgId
+      this.postData.info.UserId = this.userInfo.CustomerId
+      this.postData.info.UserName = this.userInfo.CustomerName
+      this.postData.info.PayType = this.postData.coupon.length ? 'coupon' : 'vip'
+      var orderInfo = this.settlementList
+      this.postData.detail = []
+      for (var n = 0; n < orderInfo.length; n++) {
+        this.postData.detail.push({
+          GoodsId: orderInfo[n].id,
+          GoodsName: orderInfo[n].name,
+          SpecId: orderInfo[n].specId,
+          SpecName: orderInfo[n].specName,
+          Number: orderInfo[n].defaultNum === null ? orderInfo[n].num - 0 : orderInfo[n].defaultNum - 0,
+          Price: orderInfo[n].defaultNum === null ? String(orderInfo[n].price) : String(orderInfo[n].defaultPrice),
+        })
+      }
+      console.log(JSON.stringify(this.postData))
+      this.toPay({
+        info: JSON.stringify(this.postData.info),
+        detail: JSON.stringify(this.postData.detail),
+        coupon: JSON.stringify(this.postData.coupon)
+      }).then((res) => {
+        this.$dialog.alert({
+          message: '下单成功！'
+        }).then(() => {
+          window.history.go(-2)
+        })
+      })
+    },
+    returnAmount () { // 返回总金额  
+      var amount = 0, num = 0
+      for (var n = 0; n < this.settlementList.length; n++) {
+        if (this.settlementList[n].defaultPrice === null) {
+          amount += this.settlementList[n].price * this.settlementList[n].num
+          num += this.settlementList[n].num
+        } else {
+          amount += this.settlementList[n].defaultPrice * this.settlementList[n].defaultNum
+          num += this.settlementList[n].defaultNum
+        }
+      }
+      return [amount, num]
+    },
     mapArr () { // 匹配商品规格
       var aArr = this.goodsTypeList, bArr = this.goodsList
       for (var n = 0; n < aArr.length; n++) {
@@ -302,7 +258,7 @@ export default {
       // console.log(JSON.stringify(this.menuList))
     },
     placeOrder () { // 下单
-      this.$router.push({ name: 'orderList', query: {} })
+      this.toPayer()
     },
     closeCalcMenu () { // 关闭已选菜单
       this.showCalcMenu = false

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

@@ -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>{{returnLocationName(item.LocationId)}}</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,29 @@ export default {
     }
   },
   methods: {
+    ...mapUserActions([
+      '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 () {
-      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 {
@@ -124,13 +101,13 @@ export default {
         return false
       }
     },
-    toDetail () {
-      this.$router.push({name: 'lessonDetail'})
+    toDetail (item) {
+      this.$router.push({ name: 'lessonDetail', query: {id: item.CustomerCourseId} })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

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

@@ -46,7 +46,7 @@
           <span>课程订单</span>
           <i class="iconfont icon-jiantou-right"></i>
         </div>
-        <div class="menu-item flex-h">
+        <div class="menu-item flex-h" @click="toGoodsOrder">
           <span>商品订单</span>
           <i class="iconfont icon-jiantou-right"></i>
         </div>
@@ -105,7 +105,10 @@ export default {
     },
     bindMobile () {
       this.$router.push({ name: 'bindMobile' })
-    }
+    },
+    toGoodsOrder () {
+      this.$router.push({ name: 'orderList' })
+    },
   }
 }
 </script>

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/pages/user/orderList/index.vue

@@ -1,16 +1,23 @@
 <template>
   <div class="mainPage flex-v">
-    <div class="top">
-      <topCaseInfo :data="topCaseInfoData"></topCaseInfo>
-    </div>
+    <!-- <div class="top">
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer != undefined ? userInfo.customer.CustomerName : ''"></topCaseInfo>
+    </div> -->
     <div class="flex-item">
       <div class="flex-h">
         <div class="flex-item">
-          <ul>
-            <li v-for="(item,index) in list" :key="index">
+          <!-- <ul>
+            <li v-for="(item,index) in orders.list" :key="index">
               <orderListItem :data="item"></orderListItem>
             </li>
-          </ul>
+          </ul> -->
+          <scroll ref='scroll' :isloading='isloading' class='wrapper' :data='orders.list' :pullUpLoad='pullUpLoadObj' :startY='parseInt(startY)' @pullingUp='getList'>
+            <ul>
+              <li v-for="(item,index) in orders.list" :key="index">
+                <orderListItem :data="item"></orderListItem>
+              </li>
+            </ul>
+          </scroll>
         </div>
       </div>
     </div>
@@ -18,113 +25,79 @@
 </template>
 
 <script>
+import scroll from '../../../components/scroll/scroll'
+import noMore from '../../../components/noMore/noMore'
 import topCaseInfo from '../../../components/topCaseInfo/index'
 import orderListItem from '../../../components/orderListItem/index'
+import { mapState, createNamespacedHelpers } from 'vuex'
+// const { mapActions: actions } = createNamespacedHelpers('app')
+
+const { mapState: mapOrdersState, mapActions: mapOrdersActions } = createNamespacedHelpers('goodsOrder')
 
 export default {
   name: '',
   data () {
     return {
-      topCaseInfoData: {
-        caseName: 'xxx',
-        caseId: '',
-        showSelect: false,
-        userName: 'xxx'
-      },
-      list: [{
-        status: 0,
-        caseName: '案场名称',
-        creatTime: '02/16 14:20',
-        goodsList: [{
-          name: '商品名称1',
-          specName: '加冰',
-          price: null,
-          specPrice: 20,
-          num: null,
-          specNum: 2,
-        },{
-          name: '商品名称2',
-          specName: null,
-          price: 100,
-          specPrice: null,
-          num: 1,
-          specNum: null,
-        },{
-          name: '商品名称3',
-          specName: null,
-          price: 100,
-          specPrice: null,
-          num: 1,
-          specNum: null,
-        },{
-          name: '商品名称4',
-          specName: null,
-          price: 100,
-          specPrice: null,
-          num: 1,
-          specNum: null,
-        },{
-          name: '商品名称5',
-          specName: null,
-          price: 100,
-          specPrice: null,
-          num: 1,
-          specNum: null,
-        },{
-          name: '商品名称6',
-          specName: null,
-          price: 100,
-          specPrice: null,
-          num: 1,
-          specNum: null,
-        }],
-      },{
-        status: 1,
-        caseName: '案场名称',
-        creatTime: '02/16 14:20',
-        goodsList: [{
-          name: '商品名称1',
-          specName: '加冰',
-          price: null,
-          specPrice: 20,
-          num: null,
-          specNum: 2,
-        }],
-      },{
-        status: 2,
-        caseName: '案场名称',
-        creatTime: '02/16 14:20',
-        goodsList: [{
-          name: '商品名称1',
-          specName: '加冰',
-          price: null,
-          specPrice: 20,
-          num: null,
-          specNum: 2,
-        }],
-      },{
-        status: 0,
-        caseName: '案场名称',
-        creatTime: '02/16 14:20',
-        goodsList: [{
-          name: '商品名称1',
-          specName: '加冰',
-          price: null,
-          specPrice: 20,
-          num: null,
-          specNum: 2,
-        }],
-      }],
+      pullUpLoad: true,
+      pullUpLoadThreshold: 40,
+      startY: 0,
+      page: 1,
+      pagesize: 10,
+      isloading: true,
+      hasMore: true,
+    }
+  },
+  computed: {
+    ...mapState({
+      userInfo: x => x.userCenter.userInfo,
+    }),
+    ...mapOrdersState({
+      orders: x => x.orders,
+    }),
+    pullUpLoadObj: function () {
+      return this.pullUpLoad
+        ? {
+          threshold: parseInt(this.pullUpLoadThreshold),
+          txt: {
+            more: this.pullUpLoadMoreTxt,
+            noMore: this.pullUpLoadNoMoreTxt
+          }
+        }
+        : false
     }
   },
-  computed: {},
   components: {
     topCaseInfo,
     orderListItem,
+    scroll,
+    noMore,
+  },
+  created () {
+    this.getCustomerGoodsOrder({
+      page: this.page,
+      pagesize: this.pagesize,
+    })
   },
-  created () { },
   methods: {
-    
+    ...mapOrdersActions([
+      'getCustomerGoodsOrder',
+    ]),
+    getList () {
+      var _that = this
+      Math.ceil(this.orders.pagenum / this.orders.pagesize) > this.page ? this.hasMore = true : this.hasMore = false
+      // this.list.length <= 8 ? this.hasMore = true : this.hasMore = false
+      if (this.hasMore) {
+        setTimeout(() => {
+          _that.getCustomerGoodsOrder({
+            page: _that.page,
+            pagesize: _that.pagesize,
+          })
+        }, 1000)
+      } else {
+        this.$refs.scroll.forceUpdate()
+        return false
+      }
+    },
   }
 }
 </script>

src/pages/user/orderList/page.scss

@@ -13,7 +13,10 @@
       &>div{
         margin: 0 .25rem;
         overflow: visible;
-        &>ul{
+        div{
+          overflow: visible;
+        }
+        ul{
           width: 100%;
           position: relative;
           overflow: visible;
@@ -27,121 +30,6 @@
             box-shadow: 0 0 .2rem .02rem rgba(0, 0, 0, .1);
             padding: .08rem 0;
             margin: .25rem auto 0;
-            // .title{
-            //   width: 100%;
-            //   position: relative;
-            //   overflow: hidden;
-            //   align-items: center;
-            //   &>div:nth-child(1){
-            //     width: .5rem;
-            //     text-align: center;
-            //     *{
-            //       display: inline-block;
-            //       font-size: .1rem;
-            //       line-height: .17rem;
-            //     }
-            //     i{
-            //       font-size: .15rem;
-            //     }
-            //   }
-            //   &>div:nth-child(1).orange{
-            //     *{
-            //       color: #fc6243;
-            //     }
-            //   }
-            //   &>div:nth-child(1).grey{
-            //     *{
-            //       color: #ccc;
-            //     }
-            //   }
-            //   &>div:nth-child(1).green{
-            //     *{
-            //       color: #63c86f;
-            //     }
-            //   }
-            //   &>div:nth-child(2){
-            //     margin-right: .1rem;
-            //     &>div{
-            //       width: 100%;
-            //       position: relative;
-            //       overflow: hidden;
-            //       span{
-            //         width: 100%;
-            //         display: block;
-            //         font-size: .14rem;
-            //         overflow: hidden;
-            //         text-overflow: ellipsis;
-            //         white-space: nowrap;
-            //       }
-            //     }
-            //   }
-            //   &>span{
-            //     font-size: .11rem;
-            //     color: #666;
-            //     margin-right: .15rem;
-            //   }
-            // }
-            // .line{
-            //   width: 100%;
-            //   height: .2rem;
-            //   position: relative;
-            //   overflow: hidden;
-            //   &>div{
-            //     width: 100%;
-            //     position: absolute;
-            //     overflow: hidden;
-            //     left: 0;
-            //     top: 50%;
-            //     transform: translateY(-50%) translateX(-.035rem);
-            //     -webkit-transform: translateY(-50%) translateX(-.035rem);
-            //     font-size: 0;
-            //     white-space: nowrap;
-            //     i{
-            //       display: inline-block;
-            //       width: .07rem;
-            //       height: .07rem;
-            //       position: relative;
-            //       overflow: hidden;
-            //       border-radius: 100%;
-            //       background: #eee;
-            //       margin-right: .1rem;
-            //     }
-            //   }
-            // }
-            // .list{
-            //   &>div{
-            //     margin: 0 .15rem;
-            //     &>ul{
-            //       margin: .06rem auto;
-            //       &>li{
-            //         font-size: 0;
-            //         white-space: nowrap;
-            //         &>*{
-            //           display: inline-block;
-            //           vertical-align: middle;
-            //           width: 50%;
-            //           overflow: hidden;
-            //           text-overflow: ellipsis;
-            //           white-space: nowrap;
-            //         }
-            //         &>span{
-            //           line-height: .26rem;
-            //           font-size: .14rem;
-            //           color: #555;
-            //         }
-            //         &>div{
-            //           text-align: right;
-            //           font-size: 0;
-            //           span{
-            //             font-size: .11rem;
-            //             line-height: .26rem;
-            //             color: #666;
-            //           }
-            //         }
-            //       }
-            //     }
-            //   }
-            // }
           }
         }
       }

src/store/case/case.js

@@ -0,0 +1,32 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+// 请求数据
+export default {
+  namespaced: true,
+  state: {
+    caseTotal: {},
+  },
+  mutations: {
+    setCaseTotal (state, data) { // 获取案场下单数量信息
+      state.caseTotal = data
+    },
+  },
+  actions: {
+    getCaseTotal ({ commit }, { caseid }) {
+      return new Promise((resolve, reject) => {
+        Ajax(api.case.total.url, {
+          method: api.case.total.method,
+          urlData: {
+            caseid
+          }
+        }).then(res => {
+          commit("setCaseTotal", res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+  }
+}

src/store/goods/order.js

@@ -0,0 +1,31 @@
+import Ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    orders: {},
+  },
+  mutations: {
+    setGoodsOrders (state, data) { // 获取案场下单数量信息
+      state.orders = data
+    },
+  },
+  actions: {
+    getCustomerGoodsOrder ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        Ajax(api.goods.getCustOrders.url, {
+          method: api.goods.getCustOrders.method,
+          queryData: {
+            ...payload
+          },
+        }).then(res => {
+          commit("setGoodsOrders", res)
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+  }
+}

src/store/index.js

@@ -16,6 +16,8 @@ export const modules = {
   userCenter: () => require('./userCenter/userCenter').default,
   majorProjects: () => require('./majorProjects/majorProjects').default,
   placeOrderForCoffee: () => require('./placeOrderForCoffee/index').default,
+  case: () => require('./case/case').default,
+  goodsOrder: () => require('./goods/order').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

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

@@ -73,38 +73,11 @@ 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: [],
+    courseOrderDetail: {},
   },
   mutations: {
     setUserInfo (state, data) {
@@ -112,9 +85,54 @@ export default {
     },
     setCaseInfo (state, data) {
       state.caseInfo = data
+    },
+    setCourseOrderDetail (state, data) { // 设置课程订单详情
+      state.courseOrderDetail = 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: {
+    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', res)
+          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/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

@@ -80,12 +80,36 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${guest}/case`
     },
+    getCourseOrderList: { // 获取我的课程订单信息
+      method: 'get',
+      url: `${baseUrl}${wechat}/course/user`
+    },
+    getCourseLoactionList: { // 获取课程类型列表
+      method: 'get',
+      url: `${baseUrl}${guest}/cms/location`
+    },
+    getCourseOrderDetail: { // 获取课程订单详情
+      method: 'get',
+      url: `${baseUrl}${wechat}/course/user/:id`
+    },
   },
-  login:{ // 主管、销售端登陆
+  login: { // 主管、销售端登陆
     login: {
       method: 'post',
       url: `${baseUrl}${guest}/wxsignin`
     }
-  }
+  },
+  case: {
+    total: {
+      method: 'get',
+      url: `${baseUrl}${wechat}/goods/case/:caseid`
+    },
+  },
+  goods: {
+    getCustOrders: {
+      method: 'get',
+      url: `${baseUrl}${wechat}/goods/user`
+    }
+  },
 }
 export default $api