diff --git a/src/api/marketing.js b/src/api/marketing.js
index b8d0779..433354e 100644
--- a/src/api/marketing.js
+++ b/src/api/marketing.js
@@ -733,6 +733,15 @@ export function exchangeQuotaList(apiName = 'list',data) {
   // list=持有信息列表，record_list=变更记录列表
   return request.get(`user/exchange_quota/quota_${apiName}`,data)
 }
+// 酒卡额度 - 配置获取
+export function exchangeQuotaConfigGet(data = {}) {
+  return request.get(`user/exchange_quota/quota_get_config`,data)
+}
+// 酒卡额度 - 配置编辑
+export function exchangeQuotaConfigSet(data) {
+  return request.post(`user/exchange_quota/quota_set_config`,data)
+}
+
 // 兑换积分 - 顶部统计
 export function exchangeIntegralTitle() {
   return request.get(`user/exchange_quota/integral_title`)
diff --git a/src/router/modules/marketing.js b/src/router/modules/marketing.js
index 3f78809..509d8ec 100644
--- a/src/router/modules/marketing.js
+++ b/src/router/modules/marketing.js
@@ -457,24 +457,6 @@ const marketingRouter =
         redirect: 'noRedirect',
         component: () => import('@/views/marketing/exchange/index'),
         children: [
-          {
-            path: 'quota',
-            name: `exchangeQuota`,
-            meta: {
-              title: '酒卡额度',
-              noCache: true
-            },
-            component: () => import('@/views/marketing/exchange/quota/index')
-          },
-          {
-            path: 'vegetable',
-            name: `exchangeVegetableQuota`,
-            meta: {
-              title: '菜卡额度',
-              noCache: true
-            },
-            component: () => import('@/views/marketing/exchange/quota/vegetable')
-          },
           {
             path: 'integral',
             name: `exchangeIntegral`,
@@ -493,24 +475,68 @@ const marketingRouter =
             },
             component: () => import('@/views/marketing/exchange/pickupPoint/index')
           },
+          // 额度与积分
+          {
+            path: 'quota',
+            name: `exchangeQuota`,
+            meta: {
+              title: '瓶装酒额度',
+              noCache: true,
+              quota_type: 1,
+            },
+            component: () => import('@/views/marketing/exchange/quota/index')
+          },
+          {
+            path: 'vegetable',
+            name: `exchangeVegetableQuota`,
+            meta: {
+              title: '菜卡额度',
+              noCache: true,
+              quota_type: 2,
+            },
+            component: () => import('@/views/marketing/exchange/quota/index')
+          },
           {
             path: 'wine',
             name: `exchangeQuotaWine`,
             meta: {
               title: '封坛酒额度',
-              noCache: true
+              noCache: true,
+              quota_type: 3,
             },
-            component: () => import('@/views/marketing/exchange/quota/wine')
+            component: () => import('@/views/marketing/exchange/quota/index')
           },
           {
             path: 'oil',
             name: `exchangeQuotaOil`,
             meta: {
-              title: '油卡额度',
+              title: '加油卡额度',
+              noCache: true,
+              quota_type: 4,
+            },
+            component: () => import('@/views/marketing/exchange/quota/index')
+          },
+          {
+            path: 'quota_integral',
+            name: `exchangeQuotaIntegral`,
+            meta: {
+              title: '惠民积分',
+              noCache: true,
+              quota_type: 5,
+            },
+            component: () => import('@/views/marketing/exchange/quota/index')
+          },
+          {
+            path: 'quota_integral_set',
+            name: `exchangeQuotaIntegral`,
+            meta: {
+              title: '基本设置',// 惠民积分基本设置
               noCache: true
             },
-            component: () => import('@/views/marketing/exchange/quota/oil')
+            component: () => import('@/views/marketing/exchange/quota/integral_set')
           },
+
+
         ]
       },
       {
@@ -618,7 +644,36 @@ const marketingRouter =
           },
         ]
       },
-
+      {
+        path: 'contract',
+        name: 'Contract',
+        meta: {
+          title: '合同管理',
+          noCache: true
+        },
+        redirect: 'noRedirect',
+        component: () => import('@/views/marketing/contract/index'),
+        children: [
+          {
+            path: 'list',
+            name: `contractIndex`,
+            meta: {
+              title: '合同列表',
+              noCache: true
+            },
+            component: () => import('@/views/marketing/contract/contract/list')
+          },
+          {
+            path: 'set',
+            name: `contractSet`,
+            meta: {
+              title: '基本设置',
+              noCache: true
+            },
+            component: () => import('@/views/marketing/contract/contract/set')
+          },
+        ]
+      },
 
 
 
diff --git a/src/views/marketing/exchange/quota/index.vue b/src/views/marketing/exchange/quota/index.vue
index dae61c9..819d0ab 100644
--- a/src/views/marketing/exchange/quota/index.vue
+++ b/src/views/marketing/exchange/quota/index.vue
@@ -10,15 +10,13 @@
                 <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
               </el-input>
             </el-form-item>
-             <el-form-item class="width100">
-             </el-form-item>
           </el-form>
           <cards-data :card-lists="cardLists" />
         </div>
       </div>
       <!--表格信息-->
       <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="持有信息" name="list">
+        <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">
@@ -34,18 +32,18 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="总获得额度" prop="total_quota" min-width="120" align="center"/>
-            <el-table-column label="已使用额度" prop="use_quota" min-width="120" align="center"/>
-            <el-table-column label="剩余额度" prop="surplus_quota" min-width="120" align="center"/>
-            <el-table-column label="冻结额度" prop="freeze_quota" min-width="120" align="center"/>
-            <el-table-column label="可用额度" prop="number" min-width="120" align="center">
+            <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">
               <template slot-scope="scope">
                 {{ (scope.row.surplus_quota - scope.row.freeze_quota).toFixed(2) }}
               </template>
             </el-table-column>
           </el-table>
         </el-tab-pane>
-        <el-tab-pane label="变更记录" name="record_list">
+        <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">
@@ -92,13 +90,23 @@
 </template>
 
 <script>
+const nameList = {
+  1: '瓶装酒',
+  2: '菜卡',
+  3: '封坛酒',
+  4: '加油卡',
+  5: '惠民',
+};
 import {exchangeQuotaTitle, exchangeQuotaList } from '@/api/marketing'
 import cardsData from '@/components/cards/index'
+
 export default {
   name: "preSaleProductList",
   components: { cardsData },
   data() {
     return {
+      quotaTitle: '额度',
+      quotaName: '',
       activeName: 'list',
       listLoading: true,
       tableData: {
@@ -108,16 +116,29 @@ export default {
       tableFrom: {
         page: 1,
         limit: 20,
-        uid: ''
+        uid: '',
+        quota_type: ''
       },
       loading: false,
       cardLists: [],
     };
   },
-  watch: {},
+  watch: {
+    // 路由变更
+    '$route' () {
+      this.tableFrom.quota_type = this.$route.meta.quota_type || 0;
+    },
+    // 商户类型变更
+    'tableFrom.quota_type' () {
+      let quotaType = this.tableFrom.quota_type || 0;
+      this.quotaTitle = Number(quotaType) === 5 ? '积分' : '额度'
+      this.quotaName = nameList[quotaType] || ''
+      this.getStatistics();
+      this.getList(1);
+    },
+  },
   mounted() {
-    this.getStatistics();
-    this.getList('');
+    this.tableFrom.quota_type = this.$route.meta.quota_type || 0;
   },
   methods: {
     // 获取统计数据
@@ -155,7 +176,6 @@ export default {
     },
     handleClick(tab, event){
       this.tableData = this.$options.data().tableData;
-      this.tableFrom = this.$options.data().tableFrom;
 
       this.getList(1);
     }
diff --git a/src/views/marketing/exchange/quota/oil.vue b/src/views/marketing/exchange/quota/oil.vue
deleted file mode 100644
index b50df93..0000000
--- a/src/views/marketing/exchange/quota/oil.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-  <div class="divBox">
-    <el-card class="box-card">
-      <!--顶部搜索栏-->
-      <div slot="header" class="clearfix">
-        <div class="container">
-          <el-form inline size="small" label-width="80px">
-            <el-form-item label="搜索：">
-              <el-input v-model="tableFrom.uid" @keyup.enter.native="getList(1)" placeholder="请输入用户ID" class="selWidth" clearable>
-                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
-              </el-input>
-            </el-form-item>
-             <el-form-item class="width100">
-             </el-form-item>
-          </el-form>
-          <cards-data :card-lists="cardLists" />
-        </div>
-      </div>
-      <!--表格信息-->
-      <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="持有信息" 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">
-              <template slot-scope="scope">
-                <div class="user-content">
-                  <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
-                    <img :src="scope.row.avatar" />
-                  </div>
-                  <div class="user-info">
-                    <div class="nickname">{{ scope.row.nickname }}</div>
-                    <div class="user-id">ID：{{ scope.row.uid }}</div>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column label="总获得额度" prop="total_quota" min-width="120" align="center"/>
-            <el-table-column label="已使用额度" prop="use_quota" min-width="120" align="center"/>
-            <el-table-column label="剩余额度" prop="surplus_quota" min-width="120" align="center"/>
-            <el-table-column label="冻结额度" prop="freeze_quota" min-width="120" align="center"/>
-            <el-table-column label="可用额度" prop="number" min-width="120" align="center">
-              <template slot-scope="scope">
-                {{ (scope.row.surplus_quota - scope.row.freeze_quota).toFixed(2) }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="变更记录" 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">
-              <template slot-scope="scope">
-                <div class="user-content">
-                  <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
-                    <img :src="scope.row.avatar" />
-                  </div>
-                  <div class="user-info">
-                    <div class="nickname">{{ scope.row.nickname }}</div>
-                    <div class="user-id">ID：{{ scope.row.uid }}</div>
-                  </div>
-                </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">
-              <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>
-        </el-tab-pane>
-      </el-tabs>
-      <!--分页-->
-      <div class="block">
-        <el-pagination
-          :page-sizes="[20, 40, 60, 80]"
-          :page-size="tableFrom.limit"
-          :current-page="tableFrom.page"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="tableData.total"
-          @size-change="handleSizeChange"
-          @current-change="pageChange"
-        />
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script>
-import {exchangeQuotaTitle, exchangeQuotaList } from '@/api/marketing'
-import cardsData from '@/components/cards/index'
-export default {
-  name: "preSaleProductList",
-  components: { cardsData },
-  data() {
-    return {
-      activeName: 'list',
-      listLoading: true,
-      tableData: {
-        data: [],
-        total: 0,
-      },
-      tableFrom: {
-        page: 1,
-        limit: 20,
-        uid: '',
-        quota_type: 4
-      },
-      loading: false,
-      cardLists: [],
-    };
-  },
-  watch: {},
-  mounted() {
-    this.getStatistics();
-    this.getList('');
-  },
-  methods: {
-    // 获取统计数据
-    getStatistics() {
-      let _this = this;
-      exchangeQuotaTitle(_this.tableFrom).then((res) => {
-        this.cardLists = res.data
-      }).catch((res) => {
-        this.$message.error(res.message)
-      })
-    },
-    // 获取列表
-    getList(num) {
-      let _this = this;
-      this.listLoading = true;
-      this.tableFrom.page = num ? num : this.tableFrom.page;
-      exchangeQuotaList(_this.activeName,this.tableFrom)
-        .then((res) => {
-          this.tableData.data = res.data.list;
-          this.tableData.total = res.data.count;
-          this.listLoading = false;
-        })
-        .catch((res) => {
-          this.listLoading = false;
-          this.$message.error(res.message);
-        });
-    },
-    pageChange(page) {
-      this.tableFrom.page = page;
-      this.getList('');
-    },
-    handleSizeChange(val) {
-      this.tableFrom.limit = val;
-      this.getList('');
-    },
-    handleClick(tab, event){
-      this.tableData = this.$options.data().tableData;
-      this.tableFrom = this.$options.data().tableFrom;
-
-      this.getList(1);
-    }
-
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.selWidth {
-  width: 350px !important;
-}
-/deep/ .cell{
-  padding: 0!important;
-}
-.seachTiele {
-  line-height: 35px;
-}
-.title{
-  margin-bottom: 16px;
-  color: #17233d;
-  font-size: 14px;
-  font-weight: bold;
-}
-.scollhide::-webkit-scrollbar {
-  display: none; /* Chrome Safari */
-}
-.user-content{
-  --user-content-height-: 80px;
-
-  height: var(--user-content-height-);
-  width: 100%;
-  display: inline-flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: center;
-  align-items: center;
-  .user-avatar{
-    height: var(--user-content-height-);
-    width: var(--user-content-height-);
-    display: inline-flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: center;
-    align-items: center;
-    img{
-      height: 80%!important;
-      width: 80%!important;
-      border-radius: 50% !important;
-    }
-  }
-  .user-info{
-    height: var(--user-content-height-);
-    display: inline-flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-    justify-content: center;
-    align-items: flex-start;
-    .nickname{
-      font-size: 15px;
-      font-weight: bold;
-      line-height: calc(var(--user-content-height- * 65%));
-    }
-    .user-id{
-      font-size: 13px;
-      line-height: calc(var(--user-content-height- * 35%));
-    }
-  }
-}
-</style>
diff --git a/src/views/marketing/exchange/quota/vegetable.vue b/src/views/marketing/exchange/quota/vegetable.vue
deleted file mode 100644
index 7258474..0000000
--- a/src/views/marketing/exchange/quota/vegetable.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-  <div class="divBox">
-    <el-card class="box-card">
-      <!--顶部搜索栏-->
-      <div slot="header" class="clearfix">
-        <div class="container">
-          <el-form inline size="small" label-width="80px">
-            <el-form-item label="搜索：">
-              <el-input v-model="tableFrom.uid" @keyup.enter.native="getList(1)" placeholder="请输入用户ID" class="selWidth" clearable>
-                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
-              </el-input>
-            </el-form-item>
-             <el-form-item class="width100">
-             </el-form-item>
-          </el-form>
-          <cards-data :card-lists="cardLists" />
-        </div>
-      </div>
-      <!--表格信息-->
-      <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="持有信息" 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">
-              <template slot-scope="scope">
-                <div class="user-content">
-                  <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
-                    <img :src="scope.row.avatar" />
-                  </div>
-                  <div class="user-info">
-                    <div class="nickname">{{ scope.row.nickname }}</div>
-                    <div class="user-id">ID：{{ scope.row.uid }}</div>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column label="总获得额度" prop="total_quota" min-width="120" align="center"/>
-            <el-table-column label="已使用额度" prop="use_quota" min-width="120" align="center"/>
-            <el-table-column label="剩余额度" prop="surplus_quota" min-width="120" align="center"/>
-            <el-table-column label="冻结额度" prop="freeze_quota" min-width="120" align="center"/>
-            <el-table-column label="可用额度" prop="number" min-width="120" align="center">
-              <template slot-scope="scope">
-                {{ (scope.row.surplus_quota - scope.row.freeze_quota).toFixed(2) }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="变更记录" 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">
-              <template slot-scope="scope">
-                <div class="user-content">
-                  <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
-                    <img :src="scope.row.avatar" />
-                  </div>
-                  <div class="user-info">
-                    <div class="nickname">{{ scope.row.nickname }}</div>
-                    <div class="user-id">ID：{{ scope.row.uid }}</div>
-                  </div>
-                </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">
-              <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>
-        </el-tab-pane>
-      </el-tabs>
-      <!--分页-->
-      <div class="block">
-        <el-pagination
-          :page-sizes="[20, 40, 60, 80]"
-          :page-size="tableFrom.limit"
-          :current-page="tableFrom.page"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="tableData.total"
-          @size-change="handleSizeChange"
-          @current-change="pageChange"
-        />
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script>
-import {exchangeQuotaTitle, exchangeQuotaList } from '@/api/marketing'
-import cardsData from '@/components/cards/index'
-export default {
-  name: "preSaleProductList",
-  components: { cardsData },
-  data() {
-    return {
-      activeName: 'list',
-      listLoading: true,
-      tableData: {
-        data: [],
-        total: 0,
-      },
-      tableFrom: {
-        page: 1,
-        limit: 20,
-        uid: '',
-        quota_type: 2
-      },
-      loading: false,
-      cardLists: [],
-    };
-  },
-  watch: {},
-  mounted() {
-    this.getStatistics();
-    this.getList('');
-  },
-  methods: {
-    // 获取统计数据
-    getStatistics() {
-      let _this = this;
-      exchangeQuotaTitle(_this.tableFrom).then((res) => {
-        this.cardLists = res.data
-      }).catch((res) => {
-        this.$message.error(res.message)
-      })
-    },
-    // 获取列表
-    getList(num) {
-      let _this = this;
-      this.listLoading = true;
-      this.tableFrom.page = num ? num : this.tableFrom.page;
-      exchangeQuotaList(_this.activeName,this.tableFrom)
-        .then((res) => {
-          this.tableData.data = res.data.list;
-          this.tableData.total = res.data.count;
-          this.listLoading = false;
-        })
-        .catch((res) => {
-          this.listLoading = false;
-          this.$message.error(res.message);
-        });
-    },
-    pageChange(page) {
-      this.tableFrom.page = page;
-      this.getList('');
-    },
-    handleSizeChange(val) {
-      this.tableFrom.limit = val;
-      this.getList('');
-    },
-    handleClick(tab, event){
-      this.tableData = this.$options.data().tableData;
-      this.tableFrom = this.$options.data().tableFrom;
-
-      this.getList(1);
-    }
-
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.selWidth {
-  width: 350px !important;
-}
-/deep/ .cell{
-  padding: 0!important;
-}
-.seachTiele {
-  line-height: 35px;
-}
-.title{
-  margin-bottom: 16px;
-  color: #17233d;
-  font-size: 14px;
-  font-weight: bold;
-}
-.scollhide::-webkit-scrollbar {
-  display: none; /* Chrome Safari */
-}
-.user-content{
-  --user-content-height-: 80px;
-
-  height: var(--user-content-height-);
-  width: 100%;
-  display: inline-flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: center;
-  align-items: center;
-  .user-avatar{
-    height: var(--user-content-height-);
-    width: var(--user-content-height-);
-    display: inline-flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: center;
-    align-items: center;
-    img{
-      height: 80%!important;
-      width: 80%!important;
-      border-radius: 50% !important;
-    }
-  }
-  .user-info{
-    height: var(--user-content-height-);
-    display: inline-flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-    justify-content: center;
-    align-items: flex-start;
-    .nickname{
-      font-size: 15px;
-      font-weight: bold;
-      line-height: calc(var(--user-content-height- * 65%));
-    }
-    .user-id{
-      font-size: 13px;
-      line-height: calc(var(--user-content-height- * 35%));
-    }
-  }
-}
-</style>
diff --git a/src/views/marketing/exchange/quota/wine.vue b/src/views/marketing/exchange/quota/wine.vue
deleted file mode 100644
index 3943fea..0000000
--- a/src/views/marketing/exchange/quota/wine.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-  <div class="divBox">
-    <el-card class="box-card">
-      <!--顶部搜索栏-->
-      <div slot="header" class="clearfix">
-        <div class="container">
-          <el-form inline size="small" label-width="80px">
-            <el-form-item label="搜索：">
-              <el-input v-model="tableFrom.uid" @keyup.enter.native="getList(1)" placeholder="请输入用户ID" class="selWidth" clearable>
-                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
-              </el-input>
-            </el-form-item>
-             <el-form-item class="width100">
-             </el-form-item>
-          </el-form>
-          <cards-data :card-lists="cardLists" />
-        </div>
-      </div>
-      <!--表格信息-->
-      <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="持有信息" 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">
-              <template slot-scope="scope">
-                <div class="user-content">
-                  <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
-                    <img :src="scope.row.avatar" />
-                  </div>
-                  <div class="user-info">
-                    <div class="nickname">{{ scope.row.nickname }}</div>
-                    <div class="user-id">ID：{{ scope.row.uid }}</div>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column label="总获得额度" prop="total_quota" min-width="120" align="center"/>
-            <el-table-column label="已使用额度" prop="use_quota" min-width="120" align="center"/>
-            <el-table-column label="剩余额度" prop="surplus_quota" min-width="120" align="center"/>
-            <el-table-column label="冻结额度" prop="freeze_quota" min-width="120" align="center"/>
-            <el-table-column label="可用额度" prop="number" min-width="120" align="center">
-              <template slot-scope="scope">
-                {{ (scope.row.surplus_quota - scope.row.freeze_quota).toFixed(2) }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="变更记录" 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">
-              <template slot-scope="scope">
-                <div class="user-content">
-                  <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
-                    <img :src="scope.row.avatar" />
-                  </div>
-                  <div class="user-info">
-                    <div class="nickname">{{ scope.row.nickname }}</div>
-                    <div class="user-id">ID：{{ scope.row.uid }}</div>
-                  </div>
-                </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">
-              <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>
-        </el-tab-pane>
-      </el-tabs>
-      <!--分页-->
-      <div class="block">
-        <el-pagination
-          :page-sizes="[20, 40, 60, 80]"
-          :page-size="tableFrom.limit"
-          :current-page="tableFrom.page"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="tableData.total"
-          @size-change="handleSizeChange"
-          @current-change="pageChange"
-        />
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script>
-import {exchangeQuotaTitle, exchangeQuotaList } from '@/api/marketing'
-import cardsData from '@/components/cards/index'
-export default {
-  name: "preSaleProductList",
-  components: { cardsData },
-  data() {
-    return {
-      activeName: 'list',
-      listLoading: true,
-      tableData: {
-        data: [],
-        total: 0,
-      },
-      tableFrom: {
-        page: 1,
-        limit: 20,
-        uid: '',
-        quota_type: 3
-      },
-      loading: false,
-      cardLists: [],
-    };
-  },
-  watch: {},
-  mounted() {
-    this.getStatistics();
-    this.getList('');
-  },
-  methods: {
-    // 获取统计数据
-    getStatistics() {
-      let _this = this;
-      exchangeQuotaTitle(_this.tableFrom).then((res) => {
-        this.cardLists = res.data
-      }).catch((res) => {
-        this.$message.error(res.message)
-      })
-    },
-    // 获取列表
-    getList(num) {
-      let _this = this;
-      this.listLoading = true;
-      this.tableFrom.page = num ? num : this.tableFrom.page;
-      exchangeQuotaList(_this.activeName,this.tableFrom)
-        .then((res) => {
-          this.tableData.data = res.data.list;
-          this.tableData.total = res.data.count;
-          this.listLoading = false;
-        })
-        .catch((res) => {
-          this.listLoading = false;
-          this.$message.error(res.message);
-        });
-    },
-    pageChange(page) {
-      this.tableFrom.page = page;
-      this.getList('');
-    },
-    handleSizeChange(val) {
-      this.tableFrom.limit = val;
-      this.getList('');
-    },
-    handleClick(tab, event){
-      this.tableData = this.$options.data().tableData;
-      this.tableFrom = this.$options.data().tableFrom;
-
-      this.getList(1);
-    }
-
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.selWidth {
-  width: 350px !important;
-}
-/deep/ .cell{
-  padding: 0!important;
-}
-.seachTiele {
-  line-height: 35px;
-}
-.title{
-  margin-bottom: 16px;
-  color: #17233d;
-  font-size: 14px;
-  font-weight: bold;
-}
-.scollhide::-webkit-scrollbar {
-  display: none; /* Chrome Safari */
-}
-.user-content{
-  --user-content-height-: 80px;
-
-  height: var(--user-content-height-);
-  width: 100%;
-  display: inline-flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: center;
-  align-items: center;
-  .user-avatar{
-    height: var(--user-content-height-);
-    width: var(--user-content-height-);
-    display: inline-flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    justify-content: center;
-    align-items: center;
-    img{
-      height: 80%!important;
-      width: 80%!important;
-      border-radius: 50% !important;
-    }
-  }
-  .user-info{
-    height: var(--user-content-height-);
-    display: inline-flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-    justify-content: center;
-    align-items: flex-start;
-    .nickname{
-      font-size: 15px;
-      font-weight: bold;
-      line-height: calc(var(--user-content-height- * 65%));
-    }
-    .user-id{
-      font-size: 13px;
-      line-height: calc(var(--user-content-height- * 35%));
-    }
-  }
-}
-</style>