add: 修复

src/views/marketing_center/wisdom_recharge/index.vue

@@ -1,23 +1,11 @@
 <template>
 	<div class="gyq_container">
 		<div class="gyq_content">
-			<HeaderCard
+			<HeaderCard name="智慧充值" intro="允许客户充值并使用余额支付" icon="zhcz" showSwitch v-model:isOpen="form.isEnable"></HeaderCard>
-				name="智慧充值"
-				intro="允许客户充值并使用余额支付"
-				icon="zhcz"
-				showSwitch
-				v-model:isOpen="form.isEnable"
-			></HeaderCard>
 			<div style="padding-top: 14px">
 				<el-tabs v-model="tabsValue">
 					<el-tab-pane label="基础设置" :name="1">
-						<el-form
+						<el-form ref="formRef" :model="form" :rules="rules" label-width="120" label-position="right">
-							ref="formRef"
-							:model="form"
-							:rules="rules"
-							label-width="120"
-							label-position="right"
-						>
 							<el-form-item label="充值面额" required>
 								<el-button type="primary" @click="AddDialogRef.open()">
 									添加面额
@@ -26,18 +14,9 @@
 							<el-form-item prop="rechargeDetailList">
 								<el-table :data="form.rechargeDetailList" border stripe>
 									<el-table-column label="ID" prop="id"></el-table-column>
-									<el-table-column
+									<el-table-column label="充值金额（元）" prop="amount"></el-table-column>
-										label="充值金额（元）"
+									<el-table-column label="赠送金额" prop="rewardAmount"></el-table-column>
-										prop="amount"
+									<el-table-column label="赠送积分" prop="rewardPoints"></el-table-column>
-									></el-table-column>
-									<el-table-column
-										label="赠送金额"
-										prop="rewardAmount"
-									></el-table-column>
-									<el-table-column
-										label="赠送积分"
-										prop="rewardPoints"
-									></el-table-column>
 									<el-table-column label="赠送优惠券" prop="couponInfoList">
 										<template #default="scope">
 											<div class="column">
@@ -53,60 +32,34 @@
 									</el-table-column>
 									<el-table-column label="操作" width="120">
 										<template #default="scope">
-											<el-button
+											<el-button type="primary" link @click="AddDialogRef.open(scope.row, scope.$index)">
-												type="primary"
-												link
-												@click="AddDialogRef.open(scope.row, scope.$index)"
-											>
 												编辑
 											</el-button>
-											<el-button
+											<el-button type="danger" link @click="
-												type="danger"
-												link
-												@click="
 												form.rechargeDetailList.splice(scope.$index, 1)
-												"
+												">
-											>
 												删除
 											</el-button>
 										</template>
 									</el-table-column>
 								</el-table>
 							</el-form-item>
-							<el-form-item
+							<el-form-item label="选择门店" prop="useType" v-if="shopInfo.isHeadShop">
-								label="选择门店"
-								prop="useType"
-								v-if="shopInfo.isHeadShop"
-							>
 								<el-radio-group v-model="form.useType">
 									<el-radio label="全部门店" value="all"></el-radio>
 									<el-radio label="指定门店可用" value="part"></el-radio>
 								</el-radio-group>
 							</el-form-item>
 							<el-form-item label="选择门店" v-if="form.useType == 'part'">
-								<el-select
+								<el-select v-model="form.shopIdList" multiple clearable placeholder="请选择门店" style="width: 300px">
-									v-model="form.shopIdList"
+									<el-option :label="item.shopName" :value="item.id" v-for="item in branchList"
-									multiple
+										:key="item.id"></el-option>
-									clearable
-									placeholder="请选择门店"
-									style="width: 300px"
-								>
-									<el-option
-										:label="item.shopName"
-										:value="item.id"
-										v-for="item in branchList"
-										:key="item.id"
-									></el-option>
 								</el-select>
 							</el-form-item>
 							<el-form-item label="自定义金额">
 								<div class="column">
 									<div class="center">
-										<el-switch
+										<el-switch v-model="form.isCustom" :active-value="1" :inactive-value="0" />
-											v-model="form.isCustom"
-											:active-value="1"
-											:inactive-value="0"
-										/>
 										<span class="tips">自定义金额不参与赠送优惠</span>
 									</div>
 								</div>
@@ -114,11 +67,7 @@
 							<el-form-item label="充值并下单">
 								<div class="column">
 									<div class="center">
-										<el-switch
+										<el-switch v-model="form.isOrder" :active-value="1" :inactive-value="0" />
-											v-model="form.isOrder"
-											:active-value="1"
-											:inactive-value="0"
-										/>
 										<span class="tips">开启后，订单支付页面显示充值选项</span>
 									</div>
 								</div>
@@ -126,13 +75,8 @@
 							<el-form-item label="充值说明" prop="remark">
 								<div class="column">
 									<div class="item">
-										<el-input
+										<el-input type="textarea" :rows="4" :maxlength="250" v-model="form.remark"
-											type="textarea"
+											placeholder="填写内容"></el-input>
-											:rows="4"
-											:maxlength="250"
-											v-model="form.remark"
-											placeholder="填写内容"
-										></el-input>
 									</div>
 									<div class="item textarea-num">
 										{{ form.remark.length }}/250字内，单文本
@@ -294,45 +238,43 @@ onMounted(async () => {
 </script>
 
 <style scoped lang="scss">
-<<<<<<< HEAD
 .gyq_container {
 	padding: 14px;
+
 	.gyq_content {
 		padding: 14px;
 		background-color: #fff;
 		border-radius: 8px;
 	}
-=======
+
-.container {
-  padding: 14px;
-  .content {
-    padding: 14px;
-    background-color: #fff;
-    border-radius: 8px;
-  }
->>>>>>> b5635f70ae9ce11a8b36341d218349454a0f5e88
 }
+
 .column {
 	flex: 1;
 	display: flex;
 	flex-direction: column;
 	gap: 8px;
+
 	.item {
 		flex: 1;
 	}
 }
+
 .center {
 	display: flex;
 	align-items: center;
 	gap: 10px;
 }
+
 .tips {
 	color: #666;
 }
+
 .footer {
 	display: flex;
 	justify-content: center;
 }
+
 .textarea-num {
 	color: #999;
 	display: flex;