Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into ymf

src/views/marketing_center/components/couponDialog.vue

@@ -197,7 +197,7 @@
 				</el-form-item>
 				<div v-if="form.couponType != 2 && form.couponType != 4 && form.couponType != 6">
 					<el-form-item label="指定门槛商品" prop="goodsType">
-						<el-radio-group v-model="goodsType">
+						<el-radio-group v-model="goodsType" @change="goodRadioChnage">
 							<el-radio label="全部商品可用" :value="1"></el-radio>
 							<el-radio label="部分商品可用" :value="2"></el-radio>
 						</el-radio-group>
@@ -524,6 +524,13 @@ function selectFoodsConfirm(e) {
 	form.value.foods = e.join(",");
 }
 
+// 切换商品类型
+function goodRadioChnage(e) {
+	console.log(e);
+	form.value.foods = '';
+	goodsTypeCascaderValue.value = [];
+}
+
 // 选择的店铺列表
 const shops = ref([]);
 function shopsChange(e) {

src/views/marketing_center/components/getDetailDialog.vue

@@ -77,6 +77,7 @@
 					></el-table-column>
 					<el-table-column label="使用时间" prop="useTime"></el-table-column>
 					<el-table-column label="获得来源" prop="source"></el-table-column>
+					<el-table-column label="关联订单" prop="targetId"></el-table-column>
 					<el-table-column label="状态" prop="status">
 						<template #default="scope">
 							<el-tag

src/views/marketing_center/consume_ticket/components/dialogForm.vue

@@ -314,6 +314,8 @@ function resetHandle() {
 
 // 显示弹窗
 function show(t, obj = null) {
+	console.log(obj);
+	
 	let m = titleOptions.couponTypeList.find((item) => item.value == t);
 	if (obj && obj.id) {
 		titleOptions.title = `编辑${m.label}`;
@@ -326,7 +328,7 @@ function show(t, obj = null) {
 			infiniteGiveNum.value = false;
 		}
 
-		if (form.value.useLimit == infiniteFlagNum.value) {
+		if (form.value.getLimit == infiniteFlagNum.value) {
 			infiniteUseLimit.value = false;
 		}
 	} else {