diff --git a/pages/warehouse/buy.vue b/pages/warehouse/buy.vue
index 36d40cc..377d098 100644
--- a/pages/warehouse/buy.vue
+++ b/pages/warehouse/buy.vue
@@ -115,7 +115,8 @@
show:false,
tiqushow:false,
orderObj:{},
- selectedIndex:-1
+ selectedIndex:-1,
+ tiquSelected:{}
};
},
onLoad(params) {
@@ -214,6 +215,7 @@
},
changeStatusHandle(item){
this.tiqushow = true;
+ this.tiquSelected = item;
},
/**
* 订单tab点击
@@ -247,7 +249,15 @@
})
},
tiquconfirmHandle(){
-
+ let params={
+ pay_voucher:this.tiquSelected.id,
+ id:item.id,
+ status:4
+ }
+ orderPay(params).then(res=>{
+ this.getList()
+ this.tiqushow = false;
+ })
},
cancelHandle(){
this.show = false;
diff --git a/pages/warehouse/weituo.vue b/pages/warehouse/weituo.vue
index 8279bd9..8c2f970 100644
--- a/pages/warehouse/weituo.vue
+++ b/pages/warehouse/weituo.vue
@@ -34,7 +34,7 @@
委托价格
- ¥{{value}}
+ ¥{{orderDetails.order_amount}}
@@ -103,27 +103,13 @@
},
getOrderDetails(){
orderDetail({id:this.id,custom: { auth: true }}).then(res=>{
-
+ this.value = res.data.order_amount
this.orderDetails = Object.assign({},this.orderDetails,res.data);
this.orderInfo = res.data.order_goods
this.warehouse = res.data.warehouse
})
},
- getTime(time){
- // 时间戳
- let timestamp = time
- // 此处时间戳以毫秒为单位
- let date = new Date(parseInt(timestamp) * 1000);
- let Year = date.getFullYear();
- let Moth = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
- let Day = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
- let Hour = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
- let Minute = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
- let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
- let GMT = Year + '-' + Moth + '-' + Day + ' '+ Hour +':'+ Minute + ':' + Sechond;
- return GMT
- // console.log(GMT) // 2022-09-07 15:56:07
- },
+
// 微信支付
async pay(pay_list) {
let that = this;