From ab44ac839bfcd8ba663ab37083151560e9f9e8e7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 13 Nov 2025 12:35:44 +0800
Subject: [PATCH] v1.9 测试优惠相关功能 修复部分bug

---
 src/components/scm/AddCouponRuleCpps.vue       | 66 +++++++++++++++++++++---------------------------------------------
 src/components/scm/addIntegralRuleConfig.vue   | 46 +++++++++++++---------------------------------
 src/components/scm/addIntegralRuleFee.vue      | 55 ++++++++++++++++---------------------------------------
 src/components/scm/giftCouponPropertyPool.vue  | 52 +++++++++++++++-------------------------------------
 src/components/scm/integralRuleConfig.vue      |  2 +-
 src/components/scm/integralRuleFees.vue        |  2 +-
 src/components/scm/withholdGold.vue            | 27 ++++++++-------------------
 src/components/scm/withholdIntegral.vue        | 52 +++++++++++++++-------------------------------------
 src/views/scm/communityIntegralList.vue        | 30 ++++++++++++++++--------------
 src/views/scm/couponMarketList.vue             |  2 +-
 src/views/scm/couponPropertyPoolManageList.vue |  4 +---
 src/views/scm/couponPropertyUserManageList.vue | 32 +++++++++++++++-----------------
 src/views/scm/couponRuleList.vue               |  2 +-
 src/views/scm/goldList.vue                     |  5 ++---
 src/views/scm/integralRuleList.vue             |  2 +-
 15 files changed, 127 insertions(+), 252 deletions(-)

diff --git a/src/components/scm/AddCouponRuleCpps.vue b/src/components/scm/AddCouponRuleCpps.vue
index b9d193f..13376a5 100644
--- a/src/components/scm/AddCouponRuleCpps.vue
+++ b/src/components/scm/AddCouponRuleCpps.vue
@@ -1,55 +1,26 @@
 <template>
-  <el-dialog
-    :title="$t('couponRuleCpps.addCoupon')"
-    :visible.sync="visible"
-    width="50%"
-    @close="handleClose">
-    <el-form 
-      ref="form" 
-      :model="form" 
-      :rules="rules" 
-      label-width="120px">
-      <el-form-item 
-        :label="$t('couponRuleCpps.coupon')" 
-        prop="cppId">
-        <el-select 
-          v-model="form.cppId" 
-          :placeholder="$t('couponRuleCpps.couponPlaceholder')"
-          style="width: 100%">
-          <el-option
-            v-for="item in couponOptions"
-            :key="item.cppId"
-            :label="item.couponName"
-            :value="item.cppId">
+  <el-dialog :title="$t('couponRuleCpps.addCoupon')" :visible.sync="visible" width="50%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('couponRuleCpps.coupon')" prop="cppId">
+        <el-select v-model="form.cppId" :placeholder="$t('couponRuleCpps.couponPlaceholder')" style="width: 100%">
+          <el-option v-for="item in couponOptions" :key="item.cppId" :label="item.couponName" :value="item.cppId">
           </el-option>
         </el-select>
       </el-form-item>
-      
-      <el-form-item 
-        :label="$t('couponRuleCpps.quantity')" 
-        prop="quantity">
-        <el-input 
-          v-model="form.quantity" 
-          :placeholder="$t('couponRuleCpps.quantityPlaceholder')" />
+
+      <el-form-item :label="$t('couponRuleCpps.quantity')" prop="quantity">
+        <el-input v-model="form.quantity" :placeholder="$t('couponRuleCpps.quantityPlaceholder')" />
       </el-form-item>
-      
-      <el-form-item 
-        :label="$t('couponRuleCpps.frequency')" 
-        prop="giftFrequency">
-        <el-select 
-          v-model="form.giftFrequency" 
-          :placeholder="$t('couponRuleCpps.frequencyPlaceholder')"
+
+      <el-form-item :label="$t('couponRuleCpps.frequency')" prop="giftFrequency">
+        <el-select v-model="form.giftFrequency" :placeholder="$t('couponRuleCpps.frequencyPlaceholder')"
           style="width: 100%">
-          <el-option
-            v-for="item in frequencyOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
+          <el-option v-for="item in frequencyOptions" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
       </el-form-item>
     </el-form>
-    
+
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button>
       <el-button type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</el-button>
@@ -128,7 +99,11 @@ export default {
       this.$refs.form.validate(async valid => {
         if (valid) {
           try {
-            await saveCouponRuleCpps(this.form)
+           const {code,msg} = await saveCouponRuleCpps(this.form)
+           if(code != 0){
+            this.$message.error(msg)
+            return
+           }
             this.$message.success(this.$t('common.operationSuccess'))
             this.visible = false
             this.$emit('success')
@@ -146,8 +121,9 @@ export default {
 .el-dialog {
   .el-form {
     padding: 0 20px;
-    
-    .el-input, .el-select {
+
+    .el-input,
+    .el-select {
       width: 100%;
     }
   }
diff --git a/src/components/scm/addIntegralRuleConfig.vue b/src/components/scm/addIntegralRuleConfig.vue
index fcc9bec..d4f6bba 100644
--- a/src/components/scm/addIntegralRuleConfig.vue
+++ b/src/components/scm/addIntegralRuleConfig.vue
@@ -1,40 +1,16 @@
 <template>
-  <el-dialog
-    :title="$t('integralRule.addConfigTitle')"
-    :visible.sync="visible"
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form 
-      ref="form" 
-      :model="form" 
-      :rules="rules" 
-      label-width="120px"
-    >
-      <el-form-item 
-        :label="$t('integralRule.configName')" 
-        prop="configId"
-      >
-        <el-select
-          v-model="form.configId"
-          :placeholder="$t('integralRule.configPlaceholder')"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in configOptions"
-            :key="item.configId"
-            :label="item.configName"
-            :value="item.configId"
-          />
+  <el-dialog :title="$t('integralRule.addConfigTitle')" :visible.sync="visible" width="50%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('integralRule.configName')" prop="configId">
+        <el-select v-model="form.configId" :placeholder="$t('integralRule.configPlaceholder')" style="width: 100%">
+          <el-option v-for="item in configOptions" :key="item.configId" :label="item.configName"
+            :value="item.configId" />
         </el-select>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button>
-      <el-button 
-        type="primary" 
-        @click="handleSubmit"
-      >{{ $t('common.confirm') }}</el-button>
+      <el-button type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</el-button>
     </span>
   </el-dialog>
 </template>
@@ -90,9 +66,13 @@ export default {
     async handleSubmit() {
       this.$refs.form.validate(async valid => {
         if (!valid) return
-        
+
         try {
-          await saveIntegralRuleConfig(this.form)
+          const {code,msg} = await saveIntegralRuleConfig(this.form)
+          if(code != 0){
+            this.$message.error(msg)
+            return
+          }
           this.$message.success(this.$t('common.operationSuccess'))
           this.visible = false
           this.$emit('success')
diff --git a/src/components/scm/addIntegralRuleFee.vue b/src/components/scm/addIntegralRuleFee.vue
index 820576f..1ba3374 100644
--- a/src/components/scm/addIntegralRuleFee.vue
+++ b/src/components/scm/addIntegralRuleFee.vue
@@ -1,45 +1,18 @@
 <template>
-  <el-dialog
-    :title="$t('integralRule.addFeeTitle')"
-    :visible.sync="visible"
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form 
-      ref="form" 
-      :model="form" 
-      :rules="rules" 
-      label-width="150px"
-    >
-      <el-form-item 
-        :label="$t('integralRule.payStartTime')" 
-        prop="payStartTime"
-      >
-        <el-date-picker
-          v-model="form.payStartTime"
-          type="datetime" value-format="yyyy-MM-dd HH:mm:ss"          :placeholder="$t('integralRule.payStartTimePlaceholder')"
-          style="width: 100%"
-          
-        />
+  <el-dialog :title="$t('integralRule.addFeeTitle')" :visible.sync="visible" width="50%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+      <el-form-item :label="$t('integralRule.payStartTime')" prop="payStartTime">
+        <el-date-picker v-model="form.payStartTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          :placeholder="$t('integralRule.payStartTimePlaceholder')" style="width: 100%" />
       </el-form-item>
-      <el-form-item 
-        :label="$t('integralRule.payEndTime')" 
-        prop="payEndTime"
-      >
-        <el-date-picker
-          v-model="form.payEndTime"
-          type="datetime" value-format="yyyy-MM-dd HH:mm:ss"          :placeholder="$t('integralRule.payEndTimePlaceholder')"
-          style="width: 100%"
-          
-        />
+      <el-form-item :label="$t('integralRule.payEndTime')" prop="payEndTime">
+        <el-date-picker v-model="form.payEndTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          :placeholder="$t('integralRule.payEndTimePlaceholder')" style="width: 100%" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button>
-      <el-button 
-        type="primary" 
-        @click="handleSubmit"
-      >{{ $t('common.confirm') }}</el-button>
+      <el-button type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</el-button>
     </span>
   </el-dialog>
 </template>
@@ -64,7 +37,7 @@ export default {
         ],
         payEndTime: [
           { required: true, message: this.$t('integralRule.payEndTimeRequired'), trigger: 'change' },
-          { 
+          {
             validator: (rule, value, callback) => {
               if (!value || !this.form.payStartTime) {
                 callback()
@@ -92,13 +65,17 @@ export default {
     async handleSubmit() {
       this.$refs.form.validate(async valid => {
         if (!valid) return
-        
+
         try {
           const params = {
             ...this.form,
             communityId: this.communityId
           }
-          await saveIntegralRuleFee(params)
+         const {code,msg} = await saveIntegralRuleFee(params)
+         if(code != 0){
+          this.$message.error(msg)
+          return
+         }
           this.$message.success(this.$t('common.operationSuccess'))
           this.visible = false
           this.$emit('success')
diff --git a/src/components/scm/giftCouponPropertyPool.vue b/src/components/scm/giftCouponPropertyPool.vue
index c1efb7f..fe21b1a 100644
--- a/src/components/scm/giftCouponPropertyPool.vue
+++ b/src/components/scm/giftCouponPropertyPool.vue
@@ -1,44 +1,18 @@
 <template>
-  <el-dialog
-    :title="$t('couponPropertyPoolManage.gift.title')"
-    :visible.sync="visible"
-    width="40%"
-    @close="handleClose"
-  >
-    <el-form
-      ref="form"
-      :model="formData"
-      :rules="rules"
-      label-width="120px"
-    >
-      <el-form-item
-        :label="$t('couponPropertyPoolManage.gift.couponName')"
-      >
-        <el-input
-          v-model="formData.couponName"
-          disabled
-        />
+  <el-dialog :title="$t('couponPropertyPoolManage.gift.title')" :visible.sync="visible" width="40%"
+    @close="handleClose">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('couponPropertyPoolManage.gift.couponName')">
+        <el-input v-model="formData.couponName" disabled />
       </el-form-item>
 
-      <el-form-item
-        :label="$t('couponPropertyPoolManage.gift.giftCount')"
-        prop="giftCount"
-      >
-        <el-input
-          v-model="formData.giftCount"
-          type="number"
-          :placeholder="$t('couponPropertyPoolManage.gift.giftCountPlaceholder')"
-        />
+      <el-form-item :label="$t('couponPropertyPoolManage.gift.giftCount')" prop="giftCount">
+        <el-input v-model="formData.giftCount" type="number"
+          :placeholder="$t('couponPropertyPoolManage.gift.giftCountPlaceholder')" />
       </el-form-item>
 
-      <el-form-item
-        :label="$t('couponPropertyPoolManage.gift.tel')"
-        prop="tel"
-      >
-        <el-input
-          v-model="formData.tel"
-          :placeholder="$t('couponPropertyPoolManage.gift.telPlaceholder')"
-        />
+      <el-form-item :label="$t('couponPropertyPoolManage.gift.tel')" prop="tel">
+        <el-input v-model="formData.tel" :placeholder="$t('couponPropertyPoolManage.gift.telPlaceholder')" />
       </el-form-item>
     </el-form>
 
@@ -94,7 +68,11 @@ export default {
       this.$refs.form.validate(async valid => {
         if (valid) {
           try {
-            await giftCouponProperty(this.formData)
+           const {code,msg} = await giftCouponProperty(this.formData)
+           if(code != 0){
+            this.$message.error(msg)
+            return
+           }
             this.$message.success(this.$t('common.operationSuccess'))
             this.visible = false
             this.$emit('success')
diff --git a/src/components/scm/integralRuleConfig.vue b/src/components/scm/integralRuleConfig.vue
index 0255f0a..70753b1 100644
--- a/src/components/scm/integralRuleConfig.vue
+++ b/src/components/scm/integralRuleConfig.vue
@@ -122,7 +122,7 @@ export default {
 
 <style scoped>
 .integral-rule-config {
-  padding: 20px;
+  padding: 0px;
 }
 
 .operation-bar {
diff --git a/src/components/scm/integralRuleFees.vue b/src/components/scm/integralRuleFees.vue
index ef054b5..b94c881 100644
--- a/src/components/scm/integralRuleFees.vue
+++ b/src/components/scm/integralRuleFees.vue
@@ -132,7 +132,7 @@ export default {
 
 <style scoped>
 .integral-rule-fees {
-  padding: 20px;
+  padding: 0px;
 }
 
 .operation-bar {
diff --git a/src/components/scm/withholdGold.vue b/src/components/scm/withholdGold.vue
index c5bbadf..bb4b2be 100644
--- a/src/components/scm/withholdGold.vue
+++ b/src/components/scm/withholdGold.vue
@@ -1,17 +1,6 @@
 <template>
-  <el-dialog
-    :title="$t('withholdGold.applyWithdraw')"
-    :visible.sync="visible"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="form"
-      :model="form"
-      :rules="rules"
-      label-width="120px"
-      label-position="right"
-    >
+  <el-dialog :title="$t('withholdGold.applyWithdraw')" :visible.sync="visible" width="50%" :before-close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="right">
       <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('withholdGold.goldAmount')" prop="amount">
@@ -67,11 +56,7 @@
 
     <span slot="footer" class="dialog-footer">
       <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
-      <el-button
-        type="primary"
-        @click="submitForm"
-        :loading="loading"
-      >
+      <el-button type="primary" @click="submitForm" :loading="loading">
         {{ $t('common.submit') }}
       </el-button>
     </span>
@@ -145,7 +130,11 @@ export default {
 
         try {
           this.loading = true
-          await applyGoldWithHold(this.form)
+          const { code, msg } = await applyGoldWithHold(this.form)
+          if(code != 0){
+            this.$message.error(msg)
+            return
+          }
           this.$emit('success')
           this.$message.success(this.$t('common.operationSuccess'))
           this.visible = false
diff --git a/src/components/scm/withholdIntegral.vue b/src/components/scm/withholdIntegral.vue
index 63674d2..b86a28f 100644
--- a/src/components/scm/withholdIntegral.vue
+++ b/src/components/scm/withholdIntegral.vue
@@ -1,10 +1,5 @@
 <template>
-  <el-dialog
-    :title="$t('withholdIntegral.applyWithdraw')"
-    :visible.sync="visible"
-    width="50%"
-    center
-  >
+  <el-dialog :title="$t('withholdIntegral.applyWithdraw')" :visible.sync="visible" width="50%" center>
     <el-form ref="form" :model="formData" label-width="120px" :rules="rules">
       <el-row>
         <el-col :span="12">
@@ -14,10 +9,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('withholdIntegral.withdrawPoints')" prop="applyAmount">
-            <el-input 
-              v-model="formData.applyAmount" 
-              :placeholder="$t('withholdIntegral.withdrawPointsPlaceholder')"
-            />
+            <el-input v-model="formData.applyAmount" :placeholder="$t('withholdIntegral.withdrawPointsPlaceholder')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -25,18 +17,12 @@
       <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('withholdIntegral.applicant')" prop="applyUserName">
-            <el-input 
-              v-model="formData.applyUserName" 
-              :placeholder="$t('withholdIntegral.applicantPlaceholder')"
-            />
+            <el-input v-model="formData.applyUserName" :placeholder="$t('withholdIntegral.applicantPlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('withholdIntegral.applicantPhone')" prop="applyUserTel">
-            <el-input 
-              v-model="formData.applyUserTel" 
-              :placeholder="$t('withholdIntegral.applicantPhonePlaceholder')"
-            />
+            <el-input v-model="formData.applyUserTel" :placeholder="$t('withholdIntegral.applicantPhonePlaceholder')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -44,18 +30,12 @@
       <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('withholdIntegral.bankAccount')" prop="bankNum">
-            <el-input 
-              v-model="formData.bankNum" 
-              :placeholder="$t('withholdIntegral.bankAccountPlaceholder')"
-            />
+            <el-input v-model="formData.bankNum" :placeholder="$t('withholdIntegral.bankAccountPlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('withholdIntegral.accountName')" prop="bankNumName">
-            <el-input 
-              v-model="formData.bankNumName" 
-              :placeholder="$t('withholdIntegral.accountNamePlaceholder')"
-            />
+            <el-input v-model="formData.bankNumName" :placeholder="$t('withholdIntegral.accountNamePlaceholder')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -63,20 +43,14 @@
       <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('withholdIntegral.bank')" prop="bankName">
-            <el-input 
-              v-model="formData.bankName" 
-              type="textarea"
-              :placeholder="$t('withholdIntegral.bankPlaceholder')"
-            />
+            <el-input v-model="formData.bankName" type="textarea"
+              :placeholder="$t('withholdIntegral.bankPlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('withholdIntegral.applicationNote')" prop="remark">
-            <el-input 
-              v-model="formData.remark" 
-              type="textarea"
-              :placeholder="$t('withholdIntegral.applicationNotePlaceholder')"
-            />
+            <el-input v-model="formData.remark" type="textarea"
+              :placeholder="$t('withholdIntegral.applicationNotePlaceholder')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -162,7 +136,11 @@ export default {
           if (!valid) return
 
           this.loading = true
-          await applyIntegralWithdrawal(this.formData)
+          const { code, msg } = await applyIntegralWithdrawal(this.formData)
+          if (code != 0) {
+            this.$message.error(msg)
+            return
+          }
           this.$emit('success')
           this.$message.success(this.$t('common.operationSuccess'))
           this.close()
diff --git a/src/views/scm/communityIntegralList.vue b/src/views/scm/communityIntegralList.vue
index 51d5d54..f927cd7 100644
--- a/src/views/scm/communityIntegralList.vue
+++ b/src/views/scm/communityIntegralList.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="community-integral-container ">
-    <el-card >
-      <div class="white-bg padding-lg padding-top border-radius">
+    <el-card>
+      <div class="white-bg border-radius">
         <div class="flex justify-between">
-          <h3>{{ $t('communityIntegral.title') }}</h3>
+          <span>{{ $t('communityIntegral.title') }}</span>
         </div>
 
         <!-- 业主信息 -->
@@ -33,7 +33,7 @@
                 <label>
                   {{ communityIntegralInfo.amount }}
                   <el-link type="primary" @click="openApplyWithholdIntegral">{{ $t('communityIntegral.withdraw')
-                  }}</el-link>
+                    }}</el-link>
                 </label>
               </div>
             </el-col>
@@ -42,7 +42,7 @@
 
         <divider></divider>
 
-        <div class="margin-top-sm">
+        <div class="margin-top">
           <el-tabs v-model="communityIntegralInfo._currentTab"
             @tab-click="changeTab(communityIntegralInfo._currentTab)">
             <el-tab-pane :label="$t('communityIntegral.transactionDetails')" name="communityIntegralDetail">
@@ -117,7 +117,12 @@ export default {
     changeTab(tab) {
       this.communityIntegralInfo._currentTab = tab
       setTimeout(() => {
-        this.$refs[tab].open(this.communityIntegralInfo.curIntegralRule)
+        this.$refs[tab].open({
+          integralId: this.communityIntegralInfo.integralId,
+          integralName: this.communityIntegralInfo.integralName,
+          amount: this.communityIntegralInfo.amount,
+          communityId: this.communityIntegralInfo.communityId
+        })
       }, 500);
     },
     openApplyWithholdIntegral() {
@@ -137,19 +142,17 @@ export default {
 </script>
 
 <style scoped>
-.community-integral-container {padding: 20px;}
+.community-integral-container {
+  margin:20px
+}
 
 .white-bg {
   background-color: #fff;
 }
 
-.padding-lg {
-  
-}
+.padding-lg {}
 
-.padding-top {
-  
-}
+.padding-top {}
 
 .border-radius {
   border-radius: 4px;
@@ -176,7 +179,6 @@ export default {
 }
 
 .col-form-label {
-  font-weight: bold;
   margin-right: 10px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/scm/couponMarketList.vue b/src/views/scm/couponMarketList.vue
index 4808031..e3edd6a 100644
--- a/src/views/scm/couponMarketList.vue
+++ b/src/views/scm/couponMarketList.vue
@@ -8,7 +8,7 @@
           {{ $t('common.search') }}
         </el-button>
       </div>
-      <el-row :gutter="20">
+      <el-row :gutter="20" class="margin-top-sm">
         <el-col :span="3"></el-col>
         <el-col :span="12">
           <el-link v-for="(item, index) in couponMarketInfo.suppliers" :key="index" type="primary"
diff --git a/src/views/scm/couponPropertyPoolManageList.vue b/src/views/scm/couponPropertyPoolManageList.vue
index e704a10..ef7d131 100644
--- a/src/views/scm/couponPropertyPoolManageList.vue
+++ b/src/views/scm/couponPropertyPoolManageList.vue
@@ -40,9 +40,7 @@
       <div slot="header" class="flex justify-between">
         <span>{{ $t('couponPropertyPoolManage.list.title') }}</span>
         <div style="float:right">
-          <el-button type="text" @click="handleShowDoc">
-            {{ $t('common.document') }}
-          </el-button>
+   
           <el-button type="primary" size="small" @click="handleAdd">
             {{ $t('couponPropertyPoolManage.list.add') }}
           </el-button>
diff --git a/src/views/scm/couponPropertyUserManageList.vue b/src/views/scm/couponPropertyUserManageList.vue
index fc8c183..b0d80e2 100644
--- a/src/views/scm/couponPropertyUserManageList.vue
+++ b/src/views/scm/couponPropertyUserManageList.vue
@@ -6,19 +6,26 @@
         <span>{{ $t('couponPropertyUserManage.search.title') }}</span>
       </div>
       <el-row :gutter="20">
-        <el-col :span="6">
+        <el-col :span="4">
           <el-input v-model="searchForm.couponId" :placeholder="$t('couponPropertyUserManage.search.couponId')"
             clearable />
         </el-col>
-        <el-col :span="6">
+        <el-col :span="4">
           <el-input v-model="searchForm.couponName" :placeholder="$t('couponPropertyUserManage.search.couponName')"
             clearable />
         </el-col>
-        <el-col :span="6">
+        <el-col :span="4">
           <el-input v-model="searchForm.validityDay" :placeholder="$t('couponPropertyUserManage.search.validityDay')"
             clearable />
         </el-col>
-        <el-col :span="6">
+        <el-col :span="4">
+          <el-input v-model="searchForm.couponUserName" :placeholder="$t('couponPropertyUserManage.search.userName')"
+            clearable />
+        </el-col>
+        <el-col :span="4">
+          <el-input v-model="searchForm.tel" :placeholder="$t('couponPropertyUserManage.search.tel')" clearable />
+        </el-col>
+        <el-col :span="4">
           <el-button type="primary" @click="handleSearch">
             {{ $t('common.search') }}
           </el-button>
@@ -26,14 +33,8 @@
       </el-row>
 
       <el-row :gutter="20" style="margin-top: 15px;">
-        <el-col :span="6">
-          <el-input v-model="searchForm.userName" :placeholder="$t('couponPropertyUserManage.search.userName')"
-            clearable />
-        </el-col>
-        <el-col :span="6">
-          <el-input v-model="searchForm.tel" :placeholder="$t('couponPropertyUserManage.search.tel')" clearable />
-        </el-col>
-        <el-col :span="6">
+
+        <el-col :span="4">
           <el-select v-model="searchForm.toType" :placeholder="$t('couponPropertyUserManage.search.toType')"
             style="width:100%">
             <el-option :label="$t('couponPropertyUserManage.search.selectToType')" value="" />
@@ -43,10 +44,7 @@
             <el-option :label="$t('couponPropertyUserManage.search.parking')" value="4004" />
           </el-select>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20" style="margin-top: 15px;">
-        <el-col :span="6">
+        <el-col :span="4">
           <el-select v-model="searchForm.state" :placeholder="$t('couponPropertyUserManage.search.state')"
             style="width:100%">
             <el-option :label="$t('couponPropertyUserManage.search.selectState')" value="" />
@@ -105,7 +103,7 @@ export default {
         couponId: '',
         couponName: '',
         validityDay: '',
-        userName: '',
+        couponUserName: '',
         tel: '',
         toType: '',
         state: '',
diff --git a/src/views/scm/couponRuleList.vue b/src/views/scm/couponRuleList.vue
index 29c6834..187caed 100644
--- a/src/views/scm/couponRuleList.vue
+++ b/src/views/scm/couponRuleList.vue
@@ -7,7 +7,7 @@
       <el-col :span="20" class="right-panel">
         <el-card class="box-card">
           <div slot="header" class="text-left">
-            <h5>{{ currentCouponRule.ruleName }}</h5>
+            <span>{{ currentCouponRule.ruleName }}</span>
             <div class="role-context">{{ currentCouponRule.remark }}</div>
           </div>
           <el-tabs v-model="activeTab" @tab-click="handleTabClick(activeTab)">
diff --git a/src/views/scm/goldList.vue b/src/views/scm/goldList.vue
index c4efb0b..25330a9 100644
--- a/src/views/scm/goldList.vue
+++ b/src/views/scm/goldList.vue
@@ -3,13 +3,13 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <div class="flex justify-between">
-          <h3>{{ $t('gold.title') }}</h3>
+          <span>{{ $t('gold.title') }}</span>
           <div></div>
         </div>
       </div>
 
       <!-- 业主信息 -->
-      <div class="margin-top">
+      <div class="">
         <el-row>
           <el-col :span="6">
             <div class="form-group">
@@ -174,7 +174,6 @@ export default {
     border-radius: 4px;
 
     .el-form-item__label {
-      font-weight: bold;
       color: #606266;
     }
 
diff --git a/src/views/scm/integralRuleList.vue b/src/views/scm/integralRuleList.vue
index 2bf42fe..44aaa6d 100644
--- a/src/views/scm/integralRuleList.vue
+++ b/src/views/scm/integralRuleList.vue
@@ -7,7 +7,7 @@
       <el-col :span="20" class="right-panel">
         <el-card class="box-card">
           <div slot="header" class="text-left">
-            <h5>{{ integralRuleInfo.curIntegralRule.ruleName }}</h5>
+            <span>{{ integralRuleInfo.curIntegralRule.ruleName }}</span>
             <div class="role-context">{{ integralRuleInfo.curIntegralRule.remark }}</div>
           </div>
           <el-tabs v-model="integralRuleInfo.tabName" @tab-click="handleTabClick(integralRuleInfo.tabName)">
--
libgit2 0.21.4