diff --git a/src/views/marketing/exchange/quota/index.vue b/src/views/marketing/exchange/quota/index.vue
index 819d0ab..09d0f8d 100644
--- a/src/views/marketing/exchange/quota/index.vue
+++ b/src/views/marketing/exchange/quota/index.vue
@@ -19,7 +19,7 @@
         <el-tab-pane :label="'持有'+ quotaName + quotaTitle + '信息'" name="list">
           <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
             <el-table-column prop="id" label="ID" min-width="50" align="center"/>
-            <el-table-column label="用户信息" prop="nickname" min-width="150" align="center">
+            <el-table-column label="用户信息" min-width="230" align="center">
               <template slot-scope="scope">
                 <div class="user-content">
                   <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
@@ -32,11 +32,24 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column :label="'总获得' + quotaTitle" prop="total_quota" min-width="120" align="center"/>
-            <el-table-column :label="'已使用' + quotaTitle" prop="use_quota" min-width="120" align="center"/>
-            <el-table-column :label="'剩余' + quotaTitle" prop="surplus_quota" min-width="120" align="center"/>
-            <el-table-column :label="'冻结' + quotaTitle" prop="freeze_quota" min-width="120" align="center"/>
-            <el-table-column :label="'可用' + quotaTitle" prop="number" min-width="120" align="center">
+            <el-table-column label="绑定商户" min-width="230" align="center" v-if="tableFrom.quota_type == 5">
+              <template slot-scope="scope">
+                <div class="user-content" v-if="scope.row.mer">
+                  <div class="user-avatar">
+                    <img :src="scope.row.mer.mer_avatar || moren" />
+                  </div>
+                  <div class="user-info">
+                    <div class="nickname">{{ scope.row.mer.mer_name || '' }}</div>
+                    <div class="user-id">ID：{{ scope.row.mer.mer_id || '' }}</div>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column :label="'总获得' + quotaTitle" prop="total_quota" min-width="100" align="center"/>
+            <el-table-column :label="'已使用' + quotaTitle" prop="use_quota" min-width="100" align="center"/>
+            <el-table-column :label="'剩余' + quotaTitle" prop="surplus_quota" min-width="100" align="center"/>
+            <el-table-column :label="'冻结' + quotaTitle" prop="freeze_quota" min-width="100" align="center"/>
+            <el-table-column :label="'可用' + quotaTitle" prop="number" min-width="100" align="center">
               <template slot-scope="scope">
                 {{ (scope.row.surplus_quota - scope.row.freeze_quota).toFixed(2) }}
               </template>
@@ -46,7 +59,7 @@
         <el-tab-pane :label="quotaName + quotaTitle + '变更记录'" name="record_list">
           <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
             <el-table-column prop="id" label="ID" min-width="50" align="center"/>
-            <el-table-column label="用户信息" prop="nickname" min-width="150" align="center">
+            <el-table-column label="用户信息" min-width="230" align="center">
               <template slot-scope="scope">
                 <div class="user-content">
                   <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
@@ -59,17 +72,30 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="变更前数量" prop="change_front" min-width="120" align="center"/>
-            <el-table-column label="变更数量" prop="change_quantity" min-width="120" align="center"/>
-            <el-table-column label="变更类型" min-width="120" align="center">
+            <el-table-column label="绑定商户" min-width="230" align="center" v-if="tableFrom.quota_type == 5">
+              <template slot-scope="scope">
+                <div class="user-content" v-if="scope.row.mer">
+                  <div class="user-avatar">
+                    <img :src="scope.row.mer.mer_avatar || moren" />
+                  </div>
+                  <div class="user-info">
+                    <div class="nickname">{{ scope.row.mer.mer_name || '' }}</div>
+                    <div class="user-id">ID：{{ scope.row.mer.mer_id || '' }}</div>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="变更前数量" prop="change_front" min-width="100" align="center"/>
+            <el-table-column label="变更数量" prop="change_quantity" min-width="100" align="center"/>
+            <el-table-column label="变更类型" min-width="100" align="center">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.change_type == 1" type="success" effect="dark">增加</el-tag>
                 <el-tag v-else type="danger" effect="dark">减少</el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="变更后数量" prop="change_after" min-width="120" align="center"/>
-            <el-table-column label="变更时间" prop="create_time" min-width="120" align="center"/>
-            <el-table-column label="备注" prop="remark" min-width="120" align="center"/>
+            <el-table-column label="变更后数量" prop="change_after" min-width="100" align="center"/>
+            <el-table-column label="变更时间" prop="create_time" min-width="100" align="center"/>
+            <el-table-column label="备注" prop="remark" min-width="150" align="center"/>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -105,6 +131,7 @@ export default {
   components: { cardsData },
   data() {
     return {
+      moren: require("@/assets/images/f.png"),
       quotaTitle: '额度',
       quotaName: '',
       activeName: 'list',
diff --git a/src/views/marketing/exchange/quota/integral_set.vue b/src/views/marketing/exchange/quota/integral_set.vue
index 739eef3..1a491e7 100644
--- a/src/views/marketing/exchange/quota/integral_set.vue
+++ b/src/views/marketing/exchange/quota/integral_set.vue
@@ -2,36 +2,44 @@
   <div class="divBox">
     <el-card class="box-card">
       <el-form ref="config" :model="config" label-width="200px" class="demo-config">
-        <el-form-item label="积分赠送比例：">
-          <el-input v-model="config.quota_integral_rate" :precision="2" :step="0.01" :min="0" type="number" class="selWidth">
-            <template slot="append">倍</template>
-          </el-input>
-          <div class="tips">会员在中小型餐厅消费获得的积分倍数，以实际支付金额为准。</div>
-        </el-form-item>
-        <el-form-item label="补差支付比例：">
-          <el-input v-model="config.quota_integral_diff_rate" :precision="2" :step="0.01" :min="0" type="number" class="selWidth">
-            <template slot="append">%</template>
-          </el-input>
-          <div class="tips">会员使用积分兑换酒水时，超出积分抵扣部分的金额支付比例。</div>
-        </el-form-item>
-        <el-form-item label="消费升级：">
-          <el-radio-group v-model.number="config.quota_integral_upgrade_switch">
+        <el-form-item label="惠民积分：">
+          <el-radio-group v-model.number="config.quota_integral_switch">
             <el-radio :label="0">关闭</el-radio>
             <el-radio :label="1">开启</el-radio>
           </el-radio-group>
-          <div class="tips">开启后，用户使用现金支付达到指定金额后升级到指定分销商等级</div>
-        </el-form-item>
-        <el-form-item label="升级条件" v-show="config.quota_integral_upgrade_switch == 1">
-          <el-input v-model="config.quota_integral_upgrade_money" :precision="2" :step="0.01" :min="0" type="number" class="selWidth">
-            <template slot="prepend">总消费</template>
-            <template slot="append">元，升级到</template>
-          </el-input>
-          <el-select v-model.number="config.quota_integral_upgrade_level" placeholder="请选择" class="filter-item selWidth mr20">
-            <el-option v-for="(item,index) in distributionLevelList" :key="index" :label="item.brokerage_name" :value="item.user_brokerage_id">
-              {{ item.brokerage_name }}
-            </el-option>
-          </el-select>
         </el-form-item>
+        <div v-show="config.quota_integral_switch == 1">
+          <el-form-item label="积分赠送比例：">
+            <el-input v-model="config.quota_integral_rate" :precision="2" :step="0.01" :min="0" type="number" class="selWidth">
+              <template slot="append">倍</template>
+            </el-input>
+            <div class="tips">会员在中小型餐厅消费获得的积分倍数，以实际支付金额为准。</div>
+          </el-form-item>
+          <el-form-item label="补差支付比例：">
+            <el-input v-model="config.quota_integral_diff_rate" :precision="2" :step="0.01" :min="0" type="number" class="selWidth">
+              <template slot="append">%</template>
+            </el-input>
+            <div class="tips">会员使用积分兑换酒水时，超出积分抵扣部分的金额支付比例。</div>
+          </el-form-item>
+          <el-form-item label="消费升级：">
+            <el-radio-group v-model.number="config.quota_integral_upgrade_switch">
+              <el-radio :label="0">关闭</el-radio>
+              <el-radio :label="1">开启</el-radio>
+            </el-radio-group>
+            <div class="tips">开启后，用户使用现金支付达到指定金额后升级到指定分销商等级</div>
+          </el-form-item>
+          <el-form-item label="升级条件" v-show="config.quota_integral_upgrade_switch == 1">
+            <el-input v-model="config.quota_integral_upgrade_money" :precision="2" :step="0.01" :min="0" type="number" class="selWidth">
+              <template slot="prepend">总消费</template>
+              <template slot="append">元，升级到</template>
+            </el-input>
+            <el-select v-model.number="config.quota_integral_upgrade_level" placeholder="请选择" class="filter-item selWidth mr20">
+              <el-option v-for="(item,index) in distributionLevelList" :key="index" :label="item.brokerage_name" :value="item.user_brokerage_id">
+                {{ item.brokerage_name }}
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
         <!-- 提交按钮 -->
         <el-form-item>
           <el-button type="primary" @click="setConfig()">保存</el-button>
@@ -52,6 +60,7 @@ export default {
       distributionLevelList: [],
       // 配置信息
       config: {
+        quota_integral_switch: 0,
         quota_integral_rate: 0.00,
         quota_integral_diff_rate: 0.00,
         quota_integral_upgrade_switch: 0,