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

src/pages/sales/App.vue

@@ -1,15 +1,40 @@
 <template>
-  <div id="app">
+  <div id="app" v-if="showPage">
     <router-view></router-view>
   </div>
 </template>
 
 <script>
-  import '../../common/css/reset.css'
+import '../../common/css/reset.css'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: actions } = createNamespacedHelpers('userCenter')
 
   export default {
     name: 'app',
-    components: {}
+    data () {
+      return {
+        showPage: false
+      }
+    },
+    computed: {
+      ...mapState({
+        userInfo: x => x.userCenter.userInfo,
+        org: x => x.app.orgId
+      })
+    },
+    created () {
+      if (location.search && this.toolClass.UrlSearch(location.search).code) {
+        this.code = this.toolClass.UrlSearch(location.search).code
+      } else {
+        this.code = null
+      }
+      this.getUserInfo({ org: this.org, code: this.code }).then(() => {
+        this.showPage = true
+      })
+    },
+    methods: {
+      ...actions(['getUserInfo'])
+    }
   }
 </script>
 

src/pages/sales/login/index.vue

@@ -86,17 +86,23 @@ export default {
         if (this.seconds < 60 && this.seconds >= 1) {
           this.runTime()
         } else if (this.seconds < 1) {
-          this.seconds = 60
+          this.seconds = 59
         }
       }, 1000)
     },
+    getUrl (val) {
+      var url = window.location.pathname
+      return url.replace('sales.html', 'user.html') + '#/' + val
+    },
     submit () {
       if (!this.postData.captcha) {
         this.$toast('请先获取验证码')
         return
       }
+      // console.log(this.postData)
       this.submitData(this.postData).then((res) => {
-        this.$toast(res)
+        // this.$toast(res)
+        window.location.href = this.getUrl('mainPage/coffeeIndex')
       })
     }
   }

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

@@ -4,7 +4,7 @@
       <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <nav class="flex-h" v-if="userInfo.customer.MapUser !== ''">
-      <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
+      <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" v-if="userInfo.customer.UserTypeId !== 'manager' || item.id !== '3'" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
     </nav>
     <div class="content flex-item">
       <div>
@@ -21,7 +21,7 @@
                   <span>本月已用：{{caseTotal.monthtotal}}杯</span>
                 </div>
               </div>
-              <a>点单记录</a>
+              <router-link :to="{name: 'orderList'}">点单记录</router-link>
             </div>
             <div class="areaListParent flex-h">
               <div class="flex-item">
@@ -54,7 +54,7 @@
                     <span>万</span>
                   </div>
                 </div>
-                <a :href="getUrl('salesRecord')">销售记录</a>
+                <a @click="toSalesHistory">销售记录</a>
                 <!-- <router-link :to="{name: 'salesRecord',query: {}}">销售记录</router-link> -->
               </div>
               <myCard v-for="(item,index) in cardList" :key="index" :data='item' @share='share'></myCard>
@@ -173,9 +173,13 @@ export default {
     ...mapCaseActions([
       'getCaseTotal',
     ]),
+    toSalesHistory () {
+      console.log(this.getUrl('salesRecord'))
+      window.location.href = this.getUrl('salesRecord')
+    },
     getUrl (val) {
       var url = window.location.pathname
-      return url.replace('user.html', 'sales.html') + '' + val
+      return url.replace('user.html', 'sales.html') + '#/' + val
     },
     showVanPicker () {
       this.showSelect = true

src/pages/user/orderList/index.vue

@@ -17,6 +17,7 @@
                 <orderListItem :data="item"></orderListItem>
               </li>
             </ul>
+            <span v-if="noData" style="width:100%;display:block;text-align:center;font-size:.11rem;color:#ccc;">暂无数据</span>
           </scroll>
         </div>
       </div>
@@ -38,6 +39,7 @@ export default {
   name: '',
   data () {
     return {
+      noData: false,
       pullUpLoad: true,
       pullUpLoadThreshold: 40,
       startY: 0,
@@ -76,6 +78,11 @@ export default {
     this.getCustomerGoodsOrder({
       page: this.page,
       pagesize: this.pagesize,
+    }).then((res) => {
+      // console.log(JSON.stringify(res))
+      if(res.list === null){
+        this.noData = true
+      }
     })
   },
   methods: {

src/pages/user/placeOrder/index.vue

@@ -16,7 +16,7 @@
         <div class="flex-item">
           <div>
             <span>桌号：{{tableNo}}</span>
-            <!-- <span>本月已用：150杯</span> -->
+            <span v-if="userInfo.customer.MapUser !== ''">本月已用：{{caseTotal.monthtotal}}杯</span>
           </div>
         </div>
         <a @click="reback">返回选择桌号</a>
@@ -78,6 +78,7 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: caseTableActions } = createNamespacedHelpers('placeOrderForCoffee')
+const { mapState: mapCaseState, mapActions: mapCaseActions } = createNamespacedHelpers('case')
 import orderItem from '../../../components/orderItem/index'
 import orderPopup from '../../../components/orderPopup/index'
 import calcMenu from '../../../components/calcMenu/index'
@@ -89,6 +90,20 @@ export default {
   data () {
     const _self = this
     return {
+      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, // 订单金额
+          OrdersNum: 0,
+          Remark: '',
+        },
+        detail: [],
+        coupon: [],
+      },
       tableNo: decodeURI(this.$route.query.tableno),
       tableId: decodeURI(this.$route.query.tableid),
       areaId: decodeURI(this.$route.query.areaid),
@@ -131,6 +146,9 @@ export default {
       goodsTypeList: x => x.placeOrderForCoffee.goodsTypeList,
       goodsList: x => x.placeOrderForCoffee.goodsList
     }),
+    ...mapCaseState({
+      caseTotal: x => x.caseTotal,
+    }),
     MySwiper () {
       return this.$refs.mySwiper.swiper
     },
@@ -147,7 +165,7 @@ export default {
     sumPrice () {
       let price = 0
       this.selGoods.map(x => {
-        price += x.price*x.num - 0
+        price += x.price * x.num - 0
       })
       return price
     }
@@ -170,17 +188,28 @@ export default {
         // console.log(JSON.stringify(res))
         this.mapArr()
       })
+      this.getCaseTotal({
+        caseid: this.caseId
+      })
     })
   },
   methods: {
     ...caseTableActions([
       'getGoodsTypeList',
       'getGoodsList',
+      'toPay',
+    ]),
+    ...mapCaseActions([
+      'getCaseTotal',
     ]),
     toPlaceOrder () { // 下单 
-      if(this.selGoods.length){
-        this.$router.push({name: 'placeOrderDetail', query: {info: JSON.stringify(this.selGoods), caseid: encodeURI(this.caseId), areaid: encodeURI(this.areaId), areaname: encodeURI(this.areaName), areaid: encodeURI(this.areaId), tableid: encodeURI(this.tableId), tableno: encodeURI(this.tableNo)}})
-      }else{
+      if (this.selGoods.length) {
+        if (this.userInfo.customer.MapUser === '') {
+          this.$router.push({ name: 'placeOrderDetail', query: { info: JSON.stringify(this.selGoods), caseid: encodeURI(this.caseId), areaid: encodeURI(this.areaId), areaname: encodeURI(this.areaName), areaid: encodeURI(this.areaId), tableid: encodeURI(this.tableId), tableno: encodeURI(this.tableNo) } })
+        } else {
+          this.showCalcMenu = true
+        } 
+      } else {
         this.$toast('您还没有选择商品哦~')
       }
     },
@@ -236,7 +265,41 @@ export default {
       })
     },
     placeOrder () { // 下单
-      this.$router.push({ name: 'orderList', query: {} })
+      // this.$router.push({ name: 'orderList', query: {} })
+      this.postData.info.OrgId = this.orgId
+      this.postData.info.UserId = this.userInfo.CustomerId
+      this.postData.info.UserName = this.userInfo.customer.CustomerName
+      this.postData.info.PayType = 'sys user'
+      var orderInfo = this.selGoods
+      this.postData.detail = []
+      var amount = 0
+      var num = 0
+      for (var n = 0; n < orderInfo.length; n++) {
+        this.postData.detail.push({
+          GoodsId: orderInfo[n].id,
+          GoodsName: orderInfo[n].name,
+          SpecId: orderInfo[n].spec,
+          SpecName: orderInfo[n].specname,
+          Number: orderInfo[n].num - 0,
+          Price: String(orderInfo[n].price-0),
+        })
+        amount += (orderInfo[n].price-0) * orderInfo[n].num
+        num += orderInfo[n].num-0
+      }
+      this.postData.info.Amount = String(amount)
+      this.postData.info.OrdersNum = num
+      // 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(() => {
+          this.$router.push({name: 'orderList'})
+        })
+      })
     },
     closeCalcMenu () { // 关闭已选菜单
       this.showCalcMenu = false
@@ -249,7 +312,6 @@ export default {
       this.currentSpec = null
     },
     selectSpec (val) { // 选规格
-      console.log(val)
       this.currentSpec = val
       this.showPopup = true
     },
@@ -259,8 +321,8 @@ export default {
     calcMenus (val) { // 计算清单
       var ishas = false
       const _that = this
-      this.selGoods.map((goods,inx) => {
-        if(goods.id === val.id && goods.spec === (val.spec || '')){
+      this.selGoods.map((goods, inx) => {
+        if (goods.id === val.id && goods.spec === (val.spec || '')) {
           ishas = true
           _that.selGoods[inx].num = val.defaultNum
         }
@@ -275,43 +337,6 @@ export default {
           specname: (val.specname || ''),
         })
       }
-      console.log(this.selGoods)
-      // var settlementList = this.settlementList
-      // val.spec.map(spec => {
-      //   settlementList.filter
-      // })
-
-
-      // var bool = true, arr = this.settlementList.slice()
-      // if (val.specId === null) {
-      //   for (var n = 0; n < arr.length; n++) {
-      //     if (arr[n].id === val.id && arr[n].specId === null) {
-      //       bool = false
-      //       arr[n] = val
-      //     }
-      //   }
-      //   if (bool) {
-      //     arr.push(val)
-      //   }
-      // } else {
-      //   for (var n = 0; n < arr.length; n++) {
-      //     if (arr[n].specId === val.specId) {
-      //       bool = false
-      //       arr[n] = val
-      //     }
-      //   }
-      //   if (bool) {
-      //     arr.push(val)
-      //   }
-      // }
-      // for (var n = 0; n < arr.length; n++) {
-      //   if (arr[n].num === 0 || arr[n].defaultNum === 0) {
-      //     arr.splice(n, 1)
-      //   }
-      // }
-      // this.settlementList = arr
-      // console.log(JSON.stringify(this.settlementList))
-      // this.calcTotalNum()
     },
     calcTotalNum () { // 计算总数量、价格
       var num = 0, price = 0

src/store/index.js

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

src/store/login/login.js

@@ -37,14 +37,14 @@ export default {
   state: {},
   mutations: {},
   actions: {
-    getCaptcha (data) {
+    getCaptcha ({ commit }, data) {
       return new Promise((resolve) => {
         http.getCaptcha(data).then((res) => {
           resolve(res)
         })
       })
     },
-    submitData(data) {
+    submitData({ commit }, data) {
       return new Promise((resolve) => {
         http.submitData(data).then((res) => {
           resolve(res)