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

src/pages/user/placeOrder/index.vue

@@ -207,6 +207,7 @@ export default {
     ...caseTableActions([
       'getGoodsTypeList',
       'getGoodsList',
+      'toPayBefore',
       'toPay',
     ]),
     ...mapCaseActions([
@@ -215,7 +216,46 @@ export default {
     toPlaceOrder () { // 下单 
       if (this.selGoods.length) {
         if (this.userInfo.customer.MapUser === '' || (this.userInfo.customer.MapUser !== '' && sessionStorage.getItem('from') !== 'sales')) {
-          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) } })
+          if (this.ajaxOff) {
+            this.ajaxOff = false
+            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'
+            this.postData.info.Remark = ''
+            this.postData.from = sessionStorage.getItem('from') ? sessionStorage.getItem('from') : ''
+            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.toPayBefore({
+              info: JSON.stringify(this.postData.info),
+              detail: JSON.stringify(this.postData.detail),
+              customercouponid: '',
+              from: this.postData.from
+            }).then((res) => {
+              // console.log(JSON.stringify(res))
+              this.ajaxOff = true
+              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), ordersid: res.OrdersId } })
+            }).catch(() => {
+              this.ajaxOff = true
+            })
+          }
         } else {
           this.showCalcMenu = true
         }

src/pages/user/placeOrderDetail/index.vue

@@ -211,34 +211,10 @@ export default {
     toPayer () { // 下单
       if (this.ajaxoff) {
         this.ajaxoff = false
-        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 = this.postData.customercouponid === '' ? 'coupon' : 'vip'
-        var orderInfo = JSON.parse(this.$route.query.info)
-        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),
-          customercouponid: this.postData.customercouponid || '',
-          from: ''
+          id: this.$route.query.ordersid,
+          remark: this.postData.info.Remark,
+          customercouponid: this.postData.customercouponid
         }).then((res) => {
           this.showSuccessPopup = true
           // this.$dialog.alert({

src/store/placeOrderForCoffee/index.js

@@ -63,10 +63,10 @@ export default {
         })
       })
     },
-    toPay (context, { info, detail, customercouponid, from }) { // 下单
+    toPayBefore (context, { info, detail, customercouponid, from }) { // 预下单
       return new Promise((resolve, reject) => {
-        Ajax(api.caseForCoffee.placeGoodsOrder.url, {
-          method: api.caseForCoffee.placeGoodsOrder.method,
+        Ajax(api.caseForCoffee.placeGoodsOrderBefore.url, {
+          method: api.caseForCoffee.placeGoodsOrderBefore.method,
           data: {
             info,
             detail,
@@ -80,6 +80,24 @@ export default {
         })
       })
     },
+    toPay (context, payload) { // 下单
+      return new Promise((resolve, reject) => {
+        Ajax(api.caseForCoffee.placeGoodsOrder.url, {
+          method: api.caseForCoffee.placeGoodsOrder.method,
+          urlData: {
+            id: payload.id
+          },
+          data: {
+            remark: payload.remark,
+            customercouponid: payload.customercouponid
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(() => {
+          reject()
+        })
+      })
+    },
     getCouponList (context) { // 获取优惠券列表
       return new Promise((resolve) => {
         Ajax(api.caseForCoffee.getCouponList.url, {

src/util/api.js

@@ -47,10 +47,14 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${guest}/goods`
     },
-    placeGoodsOrder: { // 商品下单
+    placeGoodsOrderBefore: { // 商品预下单
       method: 'post',
       url: `${baseUrl}${wechat}/order/goods`
     },
+    placeGoodsOrder: { // 商品下单
+      method: 'put',
+      url: `${baseUrl}${wechat}/order/goods/:id`
+    },
     getCouponList: { // 获取优惠券列表
       method: 'get',
       url: `${baseUrl}${wechat}/customer/coupon`