|
|
@@ -210,28 +210,28 @@
|
|
|
// 结算按钮
|
|
|
handlerSettleBtn() {
|
|
|
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pagesHome/marketer/submitOrder'
|
|
|
- })
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pagesHome/marketer/submitOrder'
|
|
|
+ // })
|
|
|
|
|
|
- // let params = {
|
|
|
- // payType: '2',
|
|
|
- // cartIds: [],
|
|
|
- // merchantId: this.init_list.merchantDTO.id
|
|
|
- // }
|
|
|
- // this.init_list.cartItems.map(rs => {
|
|
|
- // params.cartIds.push(rs.goodsId)
|
|
|
- // })
|
|
|
- // generateOrder(params).then(res => {
|
|
|
- // if (res.code === 'OK') {
|
|
|
- // this.handlerCallOrderBack(res.data.order.id)
|
|
|
- // } else {
|
|
|
- // uni.showToast({
|
|
|
- // title: res.msg,
|
|
|
- // })
|
|
|
- // return
|
|
|
- // }
|
|
|
- // })
|
|
|
+ let params = {
|
|
|
+ payType: '2',
|
|
|
+ cartIds: [],
|
|
|
+ merchantId: this.init_list.merchantDTO.id
|
|
|
+ }
|
|
|
+ this.init_list.cartItems.map(rs => {
|
|
|
+ params.cartIds.push(rs.goodsId)
|
|
|
+ })
|
|
|
+ generateOrder(params).then(res => {
|
|
|
+ if (res.code === 'OK') {
|
|
|
+ this.handlerCallOrderBack(res.data.order.id)
|
|
|
+ } else {
|
|
|
+ uni.showToast({
|
|
|
+ title: res.msg,
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
// 支付回调
|
|
|
handlerCallOrderBack(id) {
|
