|
|
@@ -714,11 +714,17 @@
|
|
|
@click="markPromotion(order)"
|
|
|
>取消推广
|
|
|
</div>
|
|
|
- <div
|
|
|
+ <!--<div
|
|
|
class="default-btn text-btn operate-btn"
|
|
|
v-else
|
|
|
@click="markPromotion(order)"
|
|
|
>标记推广
|
|
|
+ </div>-->
|
|
|
+ <div
|
|
|
+ class="default-btn text-btn operate-btn"
|
|
|
+ v-if="order.status === 1"
|
|
|
+ @click="orderConfirmPay(order)"
|
|
|
+ >确认支付
|
|
|
</div>
|
|
|
<div
|
|
|
class="default-btn text-btn operate-btn"
|
|
|
@@ -1191,6 +1197,8 @@ export default {
|
|
|
printChannel: "Lightning",
|
|
|
orderCreateBatchLoading: false,
|
|
|
exportDeliveryLoading: false
|
|
|
+ exportDeliveryLoading:false,
|
|
|
+ confirmPayLoading: false,
|
|
|
}
|
|
|
},
|
|
|
components: {
|
|
|
@@ -1249,6 +1257,23 @@ export default {
|
|
|
|
|
|
},
|
|
|
methods: {
|
|
|
+ orderConfirmPay(order){
|
|
|
+ this.$confirm('确定完成支付吗？', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ let dataBody = {"orderNumbers": order.orderNumber, "payType":9};
|
|
|
+ this.$http({
|
|
|
+ url: this.$http.adornUrl('/order/order/pay'),
|
|
|
+ method: 'post',
|
|
|
+ data:this.$http.adornData(dataBody)
|
|
|
+ }).then(({ data }) => {
|
|
|
+ this.$message.success("下单确认成功")
|
|
|
+ this.getDataList(this.page)
|
|
|
+ })
|
|
|
+ });
|
|
|
+ },
|
|
|
scanDelivery(order){
|
|
|
|
|
|
},
|
|
|
@@ -1586,7 +1611,6 @@ export default {
|
|
|
current: page == null ? this.page.currentPage : page.currentPage,
|
|
|
size: page == null ? this.page.pageSize : page.pageSize,
|
|
|
'orderNumber': this.dataForm.orderNumber,
|
|
|
- // 'prodName': this.dataForm.prodName,
|
|
|
'orderType': this.dataForm.orderType,
|
|
|
'orderMold': this.dataForm.orderMold,
|
|
|
'payType': this.dataForm.payType,
|
