xcx

src/components/courseItem/index.vue

@@ -10,7 +10,9 @@
         <div class="content">
           <div class="title flex-h">
             <div class="flex-item">
-              <span>{{data.title}}</span>
+              <div>
+                <span>{{data.title}}</span>
+              </div>
             </div>
             <div v-if="data.getWay=='ticket'">
               <span>{{data.defaultPrice}}</span><br>

src/components/courseItem/page.scss

@@ -21,13 +21,19 @@
       .title{
         align-items: center;
         &>.flex-item{
-          span{
+          >div{
             width: 100%;
-            font-size: .15rem;
-            display: block;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            color: #323b45;
+            position: relative;
+            overflow: hidden;
+            span{
+              width: 100%;
+              font-size: .15rem;
+              display: block;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              color: #323b45;
+              overflow: hidden;
+            }
           }
           &+div{
             text-align: right;

src/components/orderListItem/index.vue

@@ -1,17 +1,21 @@
 <template>
   <div class="orderListItem">
     <div class="title flex-h">
-      <div class="orange" v-if="data.Status === 0">
+      <div class="orange" v-if="returnStatus(data.MakeStatus) === '已下单'">
         <i class="iconfont icon-dengdai"></i><br>
-        <span>制作中</span>
+        <span>{{returnStatus(data.MakeStatus)}}</span>
       </div>
-      <div class="grey" v-if="data.Status === -1">
+      <div class="orange" v-if="returnStatus(data.MakeStatus) === '制作中'">
+        <i class="iconfont icon-dengdai"></i><br>
+        <span>{{returnStatus(data.MakeStatus)}}</span>
+      </div>
+      <div class="grey" v-if="returnStatus(data.MakeStatus) === '已取消'">
         <i class="iconfont icon-quxiao"></i><br>
-        <span>已取消</span>
+        <span>{{returnStatus(data.MakeStatus)}}</span>
       </div>
-      <div class="green" v-if="data.Status === 1">
+      <div class="green" v-if="returnStatus(data.MakeStatus) === '已完成'">
         <i class="iconfont icon-gouxuan"></i><br>
-        <span>已完成</span>
+        <span>{{returnStatus(data.MakeStatus)}}</span>
       </div>
       <div class="flex-item">
         <div>
@@ -41,6 +45,7 @@
 </template>
 
 <script>
+import dict from '../../util/contants'
 
 export default {
   name: '',
@@ -49,23 +54,27 @@ export default {
     return {
 
     }
-  },
-  computed: {
-
   },
   components: {
 
   },
   created () {
-
+    // console.log(dict)
+    // console.log(JSON.stringify(this.data.MakeStatus))
   },
   methods: {
-    
+    returnStatus (val) {
+      for (var n = 0; n < dict.orderStatus.length; n++) {
+        if(val === dict.orderStatus[n].key){
+          return dict.orderStatus[n].value
+        }
+      }
+    },
   }
 }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/lessonDetail/index.vue

@@ -2,29 +2,29 @@
   <div class="mainPage">
     <div class="title">课程详情</div>
     <div class="content" :class="{'opacity' : courseOrderDetail.IsDone === 1, 'gray': courseOrderDetail.IsDone === 1}">
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>订单编号</span>
-        <span>{{courseOrderDetail.OrdersNo !== undefined ? courseOrderDetail.OrdersNo : ''}}</span>
+        <span class="flex-item" style="font-size:.11rem;">{{courseOrderDetail.OrdersNo !== undefined ? courseOrderDetail.OrdersNo : ''}}</span>
       </div>
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>课程名称</span>
-        <span>{{courseOrderDetail.CourseName}}</span>
+        <span class="flex-item">{{courseOrderDetail.CourseName}}</span>
       </div>
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>课时数</span>
-        <span>{{courseOrderDetail.JoinNum}}/{{courseOrderDetail.CourseNum}}</span>
+        <span class="flex-item">{{courseOrderDetail.JoinNum}}/{{courseOrderDetail.CourseNum}}</span>
       </div>
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>类型</span>
-        <span>{{returnLocationName(courseOrderDetail.LocationId)}}</span>
+        <span class="flex-item">{{returnLocationName(courseOrderDetail.LocationId)}}</span>
       </div>
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>商品价格</span>
-        <span>¥{{courseOrderDetail.Price}}</span>
+        <span class="flex-item">¥{{courseOrderDetail.Price}}</span>
       </div>
-      <div class="list-item">
+      <div class="list-item flex-h">
         <span>下单时间</span>
-        <span>{{toolClass.dateFormat(courseOrderDetail.CreateDate)}}</span>
+        <span class="flex-item">{{toolClass.dateFormat(courseOrderDetail.CreateDate)}}</span>
       </div>
       <!-- <div class="list-item">
         <span>地点</span>

src/pages/user/lessonDetail/page.scss

@@ -21,12 +21,13 @@
     .list-item{
       display: flex;
       justify-content: space-between;
-      align-items: flex-start;
+      align-items: center;
       padding: 0 .22rem;
       margin-bottom: .1rem;
       span{
         display: block;
         color: #666;
+        white-space: nowrap;
       }
       span:nth-of-type(2){
         width: 60%;

src/pages/user/lessonOrder/index.vue

@@ -5,7 +5,7 @@
         <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>{{returnLocationName(item.LocationId)}}</span></div>
-            <img src="" class="cover" width="100%" height="100%" alt="">
+            <img :src="item.CourseImg" class="cover" width="100%" height="100%" alt="">
           </div>
           <div class="card-msg">
             <div class="title">{{item.CourseName}}</div>

src/pages/user/majorProjects/index.vue

@@ -160,12 +160,15 @@ export default {
     },
     returnDate (val) {
       val = new Date(val)
-      return val.getFullYear() + '.' + this.returnNum(val.getMonth()+1) + '.' + this.returnNum(val.getDate())
+      return val.getFullYear() + '.' + this.returnNum(val.getMonth() + 1) + '.' + this.returnNum(val.getDate())
     },
     initData () { // 初始化数据
       this.getProjectInfo({ id: this.$route.query.id }).then((res) => {
         // console.log(JSON.stringify(res))
         // this.initList
+        if (res.Courses === null) {
+          res.Courses = []
+        }
         var aArr = []
         for (var n = 0; n < res.Courses.length; n++) {
           aArr.push({
@@ -217,5 +220,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss";
+@import 'page.scss';
 </style>

src/pages/user/majorProjectsDetail/index.vue

@@ -41,12 +41,12 @@
             <div class="flex-item">
               <div class="img">
                 <router-link :to="{name: '', query: {}}">
-                  <img :src="courseDetail.CaseInfo.CaseIcon" class="centerLabel cover" alt="">
+                  <img v-if="courseDetail.CaseInfo !== undefined" :src="courseDetail.CaseInfo.CaseIcon" class="centerLabel cover" alt="">
                   <div class="flex-h">
                     <i class="iconfont icon-dingwei"></i>
                     <div class="flex-item">
                       <div>
-                        <span>{{courseDetail.CaseInfo.CaseName}}（{{courseDetail.CaseInfo.CaseAddress}}）</span>
+                        <span v-if="courseDetail.CaseInfo !== undefined">{{courseDetail.CaseInfo.CaseName}}（{{courseDetail.CaseInfo.CaseAddress}}）</span>
                       </div>
                     </div>
                   </div>
@@ -112,6 +112,9 @@ export default {
   created () {
     this.getCourseDetailInfo({ id: this.$route.query.id }).then((res) => {
       var arr = res.CourseDetail
+      if(arr === null){
+        arr = []
+      }
       this.courseTimeList = arr.sort(function (a, b) { return new Date(a.BeginDate).getTime() > new Date(b.BeginDate).getTime() ? 1 : -1 })
       // console.log(JSON.stringify(res))
     })

src/pages/user/placeOrder/index.vue

@@ -19,7 +19,8 @@
             <!-- <span>本月已用：150杯</span> -->
           </div>
         </div>
-        <router-link :to="{name: 'coffeeIndex', query: {}}">返回选择桌号</router-link>
+        <a @click="reback">返回选择桌号</a>
+        <!-- <router-link :to="{name: 'coffeeIndex', query: {}}">返回选择桌号</router-link> -->
       </div>
       <div class="content flex-item flex-h">
         <div class="slideMenus">
@@ -103,103 +104,103 @@ export default {
       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: [],
-      // }
+        //   {
+        //   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: [],
+        // }
       ],
       swiperOption: {
         observer: true,
@@ -286,7 +287,7 @@ export default {
             status: aArr[x].list[y].Status,
             price: aArr[x].list[y].Price,
           })
-          if(aArr[x].list[y].Specs !== null){
+          if (aArr[x].list[y].Specs !== null) {
             for (var z = 0; z < aArr[x].list[y].Specs.length; z++) {
               this.menuList[x].list[y].spec.push({
                 value: aArr[x].list[y].Specs[z].SpecName,
@@ -301,6 +302,14 @@ export default {
       }
       // console.log(JSON.stringify(this.menuList))
     },
+    reback () { // 返回桌位选择
+      this.$dialog.confirm({
+        title: '提示',
+        message: '返回页面将清空当前选择的商品，确定要返回吗?'
+      }).then(() => {
+        this.$router.push({name: 'coffeeIndex'})
+      })
+    },
     placeOrder () { // 下单
       this.$router.push({ name: 'orderList', query: {} })
     },

src/util/contants.js

@@ -0,0 +1,18 @@
+
+const dict = {
+  orderStatus: [{ // 商品订单状态字典
+    value: '已下单',
+    key: 'not started'
+  }, {
+    value: '制作中',
+    key: 'doing'
+  }, {
+    value: '已完成',
+    key: 'finished'
+  }, {
+    value: '已取消',
+    key: 'cancel'
+  }]
+}
+
+export default dict