许成详 6 年之前
父節點
當前提交
78c1d1588d

+ 2
- 2
src/pages/sales/login/index.vue 查看文件

@@ -86,7 +86,7 @@ export default {
86 86
         if (this.seconds < 60 && this.seconds >= 1) {
87 87
           this.runTime()
88 88
         } else if (this.seconds < 1) {
89
-          this.seconds = 60
89
+          this.seconds = 59
90 90
         }
91 91
       }, 1000)
92 92
     },
@@ -101,7 +101,7 @@ export default {
101 101
       }
102 102
       // console.log(this.postData)
103 103
       this.submitData(this.postData).then((res) => {
104
-        this.$toast(res)
104
+        // this.$toast(res)
105 105
         window.location.href = this.getUrl('mainPage/coffeeIndex')
106 106
       })
107 107
     }

+ 8
- 4
src/pages/user/mainPage/coffeeIndex/index.vue 查看文件

@@ -4,7 +4,7 @@
4 4
       <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.CustomerName : ''" @selectCase="showVanPicker"></topCaseInfo>
5 5
     </div>
6 6
     <nav class="flex-h" v-if="userInfo.customer.MapUser !== ''">
7
-      <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
7
+      <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>
8 8
     </nav>
9 9
     <div class="content flex-item">
10 10
       <div>
@@ -21,7 +21,7 @@
21 21
                   <span>本月已用:{{caseTotal.monthtotal}}杯</span>
22 22
                 </div>
23 23
               </div>
24
-              <a>点单记录</a>
24
+              <router-link :to="{name: 'orderList'}">点单记录</router-link>
25 25
             </div>
26 26
             <div class="areaListParent flex-h">
27 27
               <div class="flex-item">
@@ -54,7 +54,7 @@
54 54
                     <span>万</span>
55 55
                   </div>
56 56
                 </div>
57
-                <a :href="getUrl('salesRecord')">销售记录</a>
57
+                <a @click="toSalesHistory">销售记录</a>
58 58
                 <!-- <router-link :to="{name: 'salesRecord',query: {}}">销售记录</router-link> -->
59 59
               </div>
60 60
               <myCard v-for="(item,index) in cardList" :key="index" :data='item' @share='share'></myCard>
@@ -173,9 +173,13 @@ export default {
173 173
     ...mapCaseActions([
174 174
       'getCaseTotal',
175 175
     ]),
176
+    toSalesHistory () {
177
+      console.log(this.getUrl('salesRecord'))
178
+      window.location.href = this.getUrl('salesRecord')
179
+    },
176 180
     getUrl (val) {
177 181
       var url = window.location.pathname
178
-      return url.replace('user.html', 'sales.html') + '' + val
182
+      return url.replace('user.html', 'sales.html') + '#/' + val
179 183
     },
180 184
     showVanPicker () {
181 185
       this.showSelect = true

+ 7
- 0
src/pages/user/orderList/index.vue 查看文件

@@ -17,6 +17,7 @@
17 17
                 <orderListItem :data="item"></orderListItem>
18 18
               </li>
19 19
             </ul>
20
+            <span v-if="noData" style="width:100%;display:block;text-align:center;font-size:.11rem;color:#ccc;">暂无数据</span>
20 21
           </scroll>
21 22
         </div>
22 23
       </div>
@@ -38,6 +39,7 @@ export default {
38 39
   name: '',
39 40
   data () {
40 41
     return {
42
+      noData: false,
41 43
       pullUpLoad: true,
42 44
       pullUpLoadThreshold: 40,
43 45
       startY: 0,
@@ -76,6 +78,11 @@ export default {
76 78
     this.getCustomerGoodsOrder({
77 79
       page: this.page,
78 80
       pagesize: this.pagesize,
81
+    }).then((res) => {
82
+      // console.log(JSON.stringify(res))
83
+      if(res.list === null){
84
+        this.noData = true
85
+      }
79 86
     })
80 87
   },
81 88
   methods: {

+ 60
- 45
src/pages/user/placeOrder/index.vue 查看文件

@@ -89,6 +89,20 @@ export default {
89 89
   data () {
90 90
     const _self = this
91 91
     return {
92
+      postData: {
93
+        info: {
94
+          CaseId: decodeURI(_self.$route.query.caseid),
95
+          AreaId: decodeURI(_self.$route.query.areaid),
96
+          AreaName: decodeURI(_self.$route.query.areaname),
97
+          TableId: decodeURI(_self.$route.query.tableid),
98
+          TableNo: decodeURI(_self.$route.query.tableno),
99
+          Amount: 0, // 订单金额
100
+          OrdersNum: 0,
101
+          Remark: '',
102
+        },
103
+        detail: [],
104
+        coupon: [],
105
+      },
92 106
       tableNo: decodeURI(this.$route.query.tableno),
93 107
       tableId: decodeURI(this.$route.query.tableid),
94 108
       areaId: decodeURI(this.$route.query.areaid),
@@ -147,7 +161,7 @@ export default {
147 161
     sumPrice () {
148 162
       let price = 0
149 163
       this.selGoods.map(x => {
150
-        price += x.price*x.num - 0
164
+        price += x.price * x.num - 0
151 165
       })
152 166
       return price
153 167
     }
@@ -176,11 +190,16 @@ export default {
176 190
     ...caseTableActions([
177 191
       'getGoodsTypeList',
178 192
       'getGoodsList',
193
+      'toPay',
179 194
     ]),
180 195
     toPlaceOrder () { // 下单 
181
-      if(this.selGoods.length){
182
-        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)}})
183
-      }else{
196
+      if (this.selGoods.length) {
197
+        if (this.userInfo.customer.MapUser === '') {
198
+          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) } })
199
+        } else {
200
+          this.showCalcMenu = true
201
+        } 
202
+      } else {
184 203
         this.$toast('您还没有选择商品哦~')
185 204
       }
186 205
     },
@@ -236,7 +255,41 @@ export default {
236 255
       })
237 256
     },
238 257
     placeOrder () { // 下单
239
-      this.$router.push({ name: 'orderList', query: {} })
258
+      // this.$router.push({ name: 'orderList', query: {} })
259
+      this.postData.info.OrgId = this.orgId
260
+      this.postData.info.UserId = this.userInfo.CustomerId
261
+      this.postData.info.UserName = this.userInfo.customer.CustomerName
262
+      this.postData.info.PayType = 'sys user'
263
+      var orderInfo = this.selGoods
264
+      this.postData.detail = []
265
+      var amount = 0
266
+      var num = 0
267
+      for (var n = 0; n < orderInfo.length; n++) {
268
+        this.postData.detail.push({
269
+          GoodsId: orderInfo[n].id,
270
+          GoodsName: orderInfo[n].name,
271
+          SpecId: orderInfo[n].spec,
272
+          SpecName: orderInfo[n].specname,
273
+          Number: orderInfo[n].num - 0,
274
+          Price: String(orderInfo[n].price-0),
275
+        })
276
+        amount += (orderInfo[n].price-0) * orderInfo[n].num
277
+        num += orderInfo[n].num-0
278
+      }
279
+      this.postData.info.Amount = String(amount)
280
+      this.postData.info.OrdersNum = num
281
+      // console.log(JSON.stringify(this.postData))
282
+      this.toPay({
283
+        info: JSON.stringify(this.postData.info),
284
+        detail: JSON.stringify(this.postData.detail),
285
+        coupon: JSON.stringify(this.postData.coupon)
286
+      }).then((res) => {
287
+        this.$dialog.alert({
288
+          message: '下单成功!'
289
+        }).then(() => {
290
+          this.$router.push({name: 'orderList'})
291
+        })
292
+      })
240 293
     },
241 294
     closeCalcMenu () { // 关闭已选菜单
242 295
       this.showCalcMenu = false
@@ -249,7 +302,6 @@ export default {
249 302
       this.currentSpec = null
250 303
     },
251 304
     selectSpec (val) { // 选规格
252
-      console.log(val)
253 305
       this.currentSpec = val
254 306
       this.showPopup = true
255 307
     },
@@ -259,8 +311,8 @@ export default {
259 311
     calcMenus (val) { // 计算清单
260 312
       var ishas = false
261 313
       const _that = this
262
-      this.selGoods.map((goods,inx) => {
263
-        if(goods.id === val.id && goods.spec === (val.spec || '')){
314
+      this.selGoods.map((goods, inx) => {
315
+        if (goods.id === val.id && goods.spec === (val.spec || '')) {
264 316
           ishas = true
265 317
           _that.selGoods[inx].num = val.defaultNum
266 318
         }
@@ -275,43 +327,6 @@ export default {
275 327
           specname: (val.specname || ''),
276 328
         })
277 329
       }
278
-      console.log(this.selGoods)
279
-      // var settlementList = this.settlementList
280
-      // val.spec.map(spec => {
281
-      //   settlementList.filter
282
-      // })
283
-
284
-
285
-      // var bool = true, arr = this.settlementList.slice()
286
-      // if (val.specId === null) {
287
-      //   for (var n = 0; n < arr.length; n++) {
288
-      //     if (arr[n].id === val.id && arr[n].specId === null) {
289
-      //       bool = false
290
-      //       arr[n] = val
291
-      //     }
292
-      //   }
293
-      //   if (bool) {
294
-      //     arr.push(val)
295
-      //   }
296
-      // } else {
297
-      //   for (var n = 0; n < arr.length; n++) {
298
-      //     if (arr[n].specId === val.specId) {
299
-      //       bool = false
300
-      //       arr[n] = val
301
-      //     }
302
-      //   }
303
-      //   if (bool) {
304
-      //     arr.push(val)
305
-      //   }
306
-      // }
307
-      // for (var n = 0; n < arr.length; n++) {
308
-      //   if (arr[n].num === 0 || arr[n].defaultNum === 0) {
309
-      //     arr.splice(n, 1)
310
-      //   }
311
-      // }
312
-      // this.settlementList = arr
313
-      // console.log(JSON.stringify(this.settlementList))
314
-      // this.calcTotalNum()
315 330
     },
316 331
     calcTotalNum () { // 计算总数量、价格
317 332
       var num = 0, price = 0