Commit 81cd04e9 authored by lihui's avatar lihui

fix: 8/2bug

parent 766b556a
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -244,14 +244,13 @@
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 == '待退款'"
>
<el-button-group v-show="scope.row.order_status == '3'">
<el-button type="text" size="small" @click="agree(scope.row)"
>同意</el-button
>
......@@ -323,6 +322,7 @@
>
<el-row>
<el-checkbox
class="check-wrap"
v-model="item.refundedGoodsSel"
:label="item.goods_name"
name="type"
......@@ -506,22 +506,27 @@ export default {
}
},
// 获取商品名称
// 活动名称的change事件 获取商品名称+获取自提点
async activityNameSel(val) {
this.orderQueryObj.goods_id = "";
const params = {
marketing_id: val,
};
const res = await getGoodsList(params);
const res = await getGoodsList(params); // 商品名称
this.getSubShopListMet(val) //自提点
// const res = await getSubShopList(params);
this.tradeNameArr = res.result;
// this.selLiftPoinArr = res.result;
// this.selLiftPoinArr = res.result;
},
// 获取自提点
async getSubShopListMet() {
async getSubShopListMet(params) {
try {
const res = await getSubShopList("");
let marketing_id = ''
if(params){
marketing_id = params
}
const res = await getSubShopList({'marketing_id':marketing_id});
this.selLiftPoinArr = res.result;
} catch (error) {
this.$message.error("发生未知错误,请稍后再试一下吧~~~");
......@@ -750,11 +755,20 @@ export default {
},
},
created() {
this.getMarketingListMet();
this.getSubShopListMet();
this.getOrderListMet();
this.getMarketingListMet(); // 活动名称
this.getSubShopListMet(); // 自提点
this.getOrderListMet(); // table列表
},
};
</script>
<style lang="less" src="./index.less" scope></style>
<style lang="less" scoped>
.check-wrap{
/deep/ .el-checkbox__label {
white-space: normal;
word-break: break-all;
}
}
</style>
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