diff --git a/src/utils/dict.js b/src/utils/dict.js
index 3b4666c..28dcf26 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -212,6 +212,12 @@ export const DICT_TYPE = {
   MEMBER_CAR:"member_car",
   //活动类型
   MEMBER_ACTIVE:"member_active",
+  //规则
+  BALANCE_CHANGE_RULE:"balance_change_rule",
+  //主体
+  BALANCE_CHANGE_MAIN:"balance_change_main",
+  //类型 
+  BALANCE_CHANGE_TYPE:"balance_change_type",
 
 
 }
diff --git a/src/views/base/customer/CustomerMember.vue b/src/views/base/customer/CustomerMember.vue
index 2336a63..8f9da1f 100644
--- a/src/views/base/customer/CustomerMember.vue
+++ b/src/views/base/customer/CustomerMember.vue
@@ -1,8 +1,9 @@
 <template>
   <div>
+    <!--  会员信息  -->
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>{{ formData.levelName }}</span>
+        <span style="font-weight: bold">{{ formData.levelName }}</span>
       </div>
       <!--客户基本信息-->
       <el-descriptions class="margin-top" :column="3" border>
@@ -89,13 +90,61 @@
         </el-descriptions-item>
 
       </el-descriptions>
-      </el-card>
+    </el-card>
+    <!--  余额卡券  -->
+    <el-row >
+      <el-col :span="8">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span style="font-weight: bold">余额/积分</span>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="16">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span style="font-weight: bold">卡券</span>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+    <!--  可参与活动  -->
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span style="font-weight: bold">可参与活动</span>
+      </div>
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+        <el-table-column width="100" label="活动名称" align="left" prop="name"/>
+        <el-table-column label="活动描述" show-overflow-tooltip align="left" prop="remark"/>
+        <el-table-column label="活动开始时间" align="center" prop="beginTime" width="150">
+          <template v-slot="scope">
+            <span>{{ parseTime(scope.row.beginTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动结束时间" align="center" prop="endTime" width="150">
+          <template v-slot="scope">
+            <span>{{ parseTime(scope.row.endTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="100" label="操作" align="center" class-name="small-padding fixed-width">
+          <template v-slot="scope">
+            <el-button size="mini" type="text" icon="el-icon-delete"
+                       v-hasPermi="['member:active-main:delete']">删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页组件 -->
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                  @pagination="getActiveList"/>
+    </el-card>
+
   </div>
 </template>
 
 <script>
 import * as CustomerMainApi from '@/api/base/customer';
-
+import * as ActiveMainApi from '@/api/member/active';
 export default {
   name: "CustomerMember",
   data() {
@@ -104,20 +153,44 @@ export default {
       param: {},
       //当前客户数据
       formData: {},
+      // 遮罩层
+      loading: true,
+      //可参与活动列表
+      list:[],
+      // 总条数
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        isNow:'1'
+      },
     };
   },
   created() {
     const row = this.$route.query.row
     this.param = row
     this.getById(row.id)
+    this.getActiveList()
+
   },
   methods: {
     /**通过id客户信息查询*/
     async getById(id) {
       const res = await CustomerMainApi.getCustomerMain(id);
       this.formData = res.data;
-      console.log(this.formData)
-    }
+    },
+    /**可参与活动列表*/
+    async getActiveList() {
+      try {
+        this.loading = true;
+        const res = await ActiveMainApi.getActiveMainPage(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
 
   }
 }