Commit 1b71c962 authored by pengyunqian's avatar pengyunqian

Merge branch 'feature/distribution' into test

parents a9a87897 46096a00
......@@ -7,7 +7,7 @@
margin-bottom: 30px;
}
.dioFor {
padding-left: 10%;
margin-left: 5%;
width: 70%;
}
.diotab {
......
......@@ -156,13 +156,14 @@
size="small"
@click="refund(scope.row)"
v-show="
scope.row.order_status_text == '已支付' ||
scope.row.order_status_text == '已拒绝'
scope.row.order_status == '2' ||
scope.row.order_status == '6' ||
scope.row.order_status == '8'
"
>退款</el-button
>
<el-button-group
v-show="scope.row.order_status_text == '待退款'"
v-show="scope.row.order_status == '3'"
>
<el-button type="text" size="small" @click="agree(scope.row)"
>同意</el-button
......@@ -692,7 +693,6 @@ export default {
};
const res = await orderItemList(params);
this.refundGoods = res.result;
console.log(res.result);
for (var i in res.result) {
this.refundGoods[i].refundableQuantity = Number(
res.result[i].goods_num - res.result[i].refund_count
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment