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

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/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>
@@ -87,6 +87,7 @@ 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: '',
@@ -152,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: {
@@ -167,6 +171,9 @@ export default {
       this.getCaseTableList({
         caseid: this.topCaseInfoData.CaseId
       })
+      this.getCaseTotal({
+        caseid: this.topCaseInfoData.CaseId
+      })
     })
   },
   methods: {
@@ -176,6 +183,9 @@ export default {
     ...caseTableActions([
       'getCaseTableList',
     ]),
+    ...mapCaseActions([
+      'getCaseTotal',
+    ]),
     selectCase (val) { // 选择案场
       this.topCaseInfoData.CaseName = val.CaseName
       this.topCaseInfoData.CaseId = val.CaseId

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>
@@ -103,7 +103,10 @@ export default {
     },
     bindMobile () {
       this.$router.push({ name: 'bindMobile' })
-    }
+    },
+    toGoodsOrder () {
+      this.$router.push({ name: 'orderList' })
+    },
   }
 }
 </script>

src/pages/user/orderList/index.vue

@@ -1,13 +1,13 @@
 <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">
+            <li v-for="(item,index) in orders.list" :key="index">
               <orderListItem :data="item"></orderListItem>
             </li>
           </ul>
@@ -20,111 +20,41 @@
 <script>
 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,
-        }],
-      }],
+      page: 1,
+      pagesize: 10,
     }
   },
-  computed: {},
+  computed: {
+    ...mapState({
+      userInfo: x => x.userCenter.userInfo,
+    }),
+    ...mapOrdersState({
+      orders: x => x.orders,
+    }),
+  },
   components: {
     topCaseInfo,
     orderListItem,
   },
-  created () { },
+  created () {
+    this.getCustomerGoodsOrder({
+      page: this.page,
+      pagesize: this.pagesize,
+    })
+  },
   methods: {
-    
+    ...mapOrdersActions([
+      'getCustomerGoodsOrder',
+    ])
   }
 }
 </script>

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/util/api.js

@@ -93,11 +93,23 @@ const $api = {
       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