Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

package.json

@@ -81,6 +81,7 @@
     "style-loader": "^0.22.0",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
+    "vue-fullcalendar": "^1.0.9",
     "vue-jest": "^1.0.2",
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",

src/pages/system/newOrder/index.vue

@@ -0,0 +1,19 @@
+<template>
+  <div class="mainPage">
+    <router-view></router-view>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {}
+  },
+  components: {}
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

src/pages/system/newOrder/newOrderList/index.vue

@@ -0,0 +1,107 @@
+<template>
+  <div class="subPage">
+    <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="danger">营业</el-button>
+        </div>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+    <div class="order-list-box">
+      <div v-for="(item,index) in list" :key="index">
+        <div class="print-area">
+          <div style="padding:25px 20px 5px;border-bottom:2px solid #cccccc;">
+            <i class="iconfont icon-yinchenglogo" style="font-size:70px;color:red;position: relative;bottom: 20px;margin-right:10px;"></i>
+            <div style="display:inline-block;">
+              <span style="display:block;font-size:20px;font-weight:700;">A区域1号桌</span>
+              <span style="display:block;margin-top:10px">下单时间：21:30:39</span>
+              <span style="display:block;margin-top:10px">已等待：<span style="color:red;font-weight:700;">30:29</span></span>
+            </div>
+          </div>
+          <div style="padding:10px 20px 5px;border-bottom:1px solid #cccccc;">
+            <div>卡布奇诺</div>
+            <div style="margin-top:8px;">
+              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc">热</span>
+              <span style="display:inline-block;width:20%;text-align:right">x 1</span>
+            </div>
+            <div style="margin-top:8px;">
+              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc">冷</span>
+              <span style="display:inline-block;width:20%;text-align:right">x 2</span>
+            </div>
+          </div>
+          <div style="padding:10px 20px 5px;border-bottom:1px solid #cccccc;">
+            <div>卡布奇诺</div>
+            <div style="margin-top:8px;">
+              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc">热</span>
+              <span style="display:inline-block;width:20%;text-align:right">x 1</span>
+            </div>
+            <div style="margin-top:8px;">
+              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc">冷</span>
+              <span style="display:inline-block;width:20%;text-align:right">x 2</span>
+            </div>
+          </div>
+          <div style="padding:10px 20px;border-bottom:1px solid #cccccc">备注：请赶快制作</div>
+          <div style="padding:10px 20px;">下单人：xxxxx</div>
+        </div>
+        <div class="btns">
+          <span>取消</span>
+          <span>确定</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {
+      total: 0,
+      postData: { // 表格搜索条件
+        phone: '', // 手机号
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
+      },
+      currentList: [],
+      list: [1, 2, 3, 4, 5, 1, 2, 3, 4, 5]
+    }
+  },
+  components: {
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+  methods: {
+    FormatDate (date) {
+      return this.toolClass.dateFormat(date)
+    },
+    handleCurrentChange (val) {
+      this.getList()
+    },
+    searchList (key) { // 搜索列表
+      this.postData.phone = key
+      this.postData.page = 1
+      this.getList()
+    },
+    getList () {
+      this.$ajax(this.$api.dataStatistics.getCustomerList.url, {
+        method: this.$api.dataStatistics.getCustomerList.method,
+        queryData: this.postData
+      }).then(res => {
+        this.currentList = res.list
+        this.postData.page = res.page
+        this.total = res.pagenum
+      })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/system/newOrder/newOrderList/page.scss

@@ -0,0 +1,33 @@
+.order-list-box{
+  padding: 50px;
+  border-radius: 3px;
+  overflow: scroll;
+  width: 95%;
+  height: 100%;
+  >div{
+    display: inline-block;
+    width:300px;
+    height:400px;
+    margin:10px;
+    box-shadow: 0px 2px 10px 0px rgba(193, 204, 217, 0.5);
+  }
+  .btns{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    span{
+      padding: 5px 25px;
+      border-radius: 8px;
+      display: block;
+    }
+    span:nth-of-type(1){
+      color: red;
+      border:1px solid red;
+      margin-right: 10px;
+    }
+    span:nth-of-type(2){
+      color: #fff;
+      background-color: red;
+    }
+  }
+}

src/pages/system/page.js

@@ -78,6 +78,9 @@ import phoneVerificationList from './verificationManager/phoneVerification/verif
 import dataStatistics from './dataStatistics/index' // 数据统计
 import frontEndUserList from './dataStatistics/frontEndUserList/index' // 课程管理
 
+import newOrder from './newOrder/index' // 商品订单系统
+import newOrderList from './newOrder/newOrderList/index' // 新订单列表
+
 export default {
   router: [
     {
@@ -414,6 +417,16 @@ export default {
             children: []
           }]
         }]
+      }, { // 商品订单系统
+        path: 'newOrder',
+        name: 'newOrder',
+        component: newOrder,
+        children: [{ // 新订单列表
+          path: 'newOrderList',
+          name: 'newOrderList',
+          component: newOrderList,
+          children: []
+        }]
       }, { // 数据统计
         path: 'dataStatistics',
         name: 'dataStatistics',