diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 55778dd..41c4793 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -24,6 +24,17 @@
           分类箱
         </div>
       </div>
+      <div v-show="area!==''">
+        <el-divider direction="vertical"/>
+      </div>
+      <div v-show="area" class="board-div">
+        <div class="board-div-value">
+          {{ area }} km²
+        </div>
+        <div class="board-div-title">
+          面积
+        </div>
+      </div>
     </div>
     <!--工具箱-->
     <tools-container>
@@ -58,7 +69,7 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './components/popwindow'
-import { getWastebinListPage } from '@/api/biz/wastebin'
+import { getWastebinList } from '@/api/biz/wastebin'
 import ToolsContainer from './components/toolsContainer'
 import DrawTool from './components/drawTool'
 import 'leaflet.pm'
@@ -87,7 +98,8 @@
       }), // 分类箱图标
       wastebinShow: true, // 垃圾桶是否显示
       classificationShow: true, // 分类箱是否显示
-      currentData: {} // 当前弹窗数据
+      currentData: {}, // 当前弹窗数据
+      area: '' // 选区面积
     }
   },
   created() {
@@ -111,60 +123,26 @@
         sort: '',
         order: 'desc'
       }
-      getWastebinListPage(params).then(response => {
+      getWastebinList(params).then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.filter(item => item.isClassification === 0)
+          this.wastebins = this.wastebins.map(item => {
             return {
               ...item,
-              collectCompany: '环卫所',
-              collectCar: '赣B3213',
-              collectFrequency: '1次/1日',
-              servicePeople: '12',
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
           this.wastebinCount = this.wastebins.length
+          this.classifications = response.data.filter(item => item.isClassification === 1)
+          this.classifications = this.classifications.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+          this.classificationCount = this.classifications.length
         }
       })
-      this.classifications = [
-        {
-          id: '12346',
-          code: 'c0001',
-          name: 'c0001',
-          latlng: [27.73252, 116.05321],
-          lng: 27.73252,
-          lat: 116.05321,
-          road: '活力大道',
-          position: '活力大道',
-          responsiblePerson: '张三',
-          responsiblePersonTel: '13382739123',
-          collectCompany: '环卫所',
-          collectCar: '赣B3213',
-          collectFrequency: '1次/1日',
-          servicePeople: '12',
-          responseArea: '崇仁县',
-          responseAreaName: '崇仁县'
-        },
-        {
-          id: '12347',
-          code: 'c0002',
-          name: 'c0001',
-          latlng: [27.72852, 116.03721],
-          lng: 27.72852,
-          lat: 116.03721,
-          road: '活力大道',
-          position: '活力大道',
-          responsiblePerson: '张三',
-          responsiblePersonTel: '13382739123',
-          collectCompany: '环卫所',
-          collectCar: '赣B3213',
-          collectFrequency: '1次/1日',
-          servicePeople: '12',
-          responseArea: '崇仁县',
-          responseAreaName: '崇仁县'
-        }
-      ]
-      this.classificationCount = this.classifications.length
     },
     // 获取垃圾桶详情
     fetchWastebinDetail(data) {
@@ -210,22 +188,77 @@
         // 绘制完成
         this.map.on('pm:create', e => {
           this.drawLayer = e
-          debugger
+          // debugger
           // 计算面积
           var area
           if (e.shape === 'Circle') {
+            // 计算面积
             const radius = e.layer.options.radius
+            const latlng = e.layer.getLatLng()
             area = 3.1415926 * radius * radius
+            this.area = (area / 1000000).toFixed(2)
+            const circle = turf.circle([latlng.lng, latlng.lat], radius / 1000)
+            // 依次判断点的存在
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
           } else {
             // 获取选区的geojson, 用turf计算面积
             const geojson = e.layer.toGeoJSON()
             area = turf.area(geojson)
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
           }
+          this.area = (area / 1000000).toFixed(2)
           console.log('面积' + area.toString())
           // 计算区域内的垃圾桶和分类箱个数
         })
       })
     },
+    judgePointInPolygon(p, geojson) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      // 2. 多边形
+      const polygon = geojson.geometry
+      const result = turf.booleanPointInPolygon(point, polygon)
+      if (result) {
+        console.log('is in polygon')
+      }
+      return result
+    },
+    // 判断点是否在圆里
+    judgePointInCircle(p, circle) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      const result = turf.booleanPointInPolygon(point, circle)
+      if (result) {
+        console.log('is in circle')
+      }
+      return result
+    },
     // 清除绘制
     clearDraw() {
       if (this.drawLayer) {
@@ -233,6 +266,9 @@
       } else {
         this.map.pm.toggleGlobalRemovalMode()
       }
+      this.area = ''
+      this.wastebinCount = this.wastebins.length
+      this.classificationCount = this.classifications.length
     }
   }
 }
@@ -245,7 +281,7 @@
   position: relative;
   .top-board{
     height: 100px;
-    width:300px;
+    min-width:250px;
     background-color: #ffffff;
     position: absolute;
     z-index:1001;
@@ -256,7 +292,7 @@
     align-items: center;
     padding:12px;
     .board-div{
-      width: 45%;
+      min-width: 80px;
       font-size:19px;
       text-align: center;
       .board-div-value{

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 55778dd..41c4793 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -24,6 +24,17 @@
           分类箱
         </div>
       </div>
+      <div v-show="area!==''">
+        <el-divider direction="vertical"/>
+      </div>
+      <div v-show="area" class="board-div">
+        <div class="board-div-value">
+          {{ area }} km²
+        </div>
+        <div class="board-div-title">
+          面积
+        </div>
+      </div>
     </div>
     <!--工具箱-->
     <tools-container>
@@ -58,7 +69,7 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './components/popwindow'
-import { getWastebinListPage } from '@/api/biz/wastebin'
+import { getWastebinList } from '@/api/biz/wastebin'
 import ToolsContainer from './components/toolsContainer'
 import DrawTool from './components/drawTool'
 import 'leaflet.pm'
@@ -87,7 +98,8 @@
       }), // 分类箱图标
       wastebinShow: true, // 垃圾桶是否显示
       classificationShow: true, // 分类箱是否显示
-      currentData: {} // 当前弹窗数据
+      currentData: {}, // 当前弹窗数据
+      area: '' // 选区面积
     }
   },
   created() {
@@ -111,60 +123,26 @@
         sort: '',
         order: 'desc'
       }
-      getWastebinListPage(params).then(response => {
+      getWastebinList(params).then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.filter(item => item.isClassification === 0)
+          this.wastebins = this.wastebins.map(item => {
             return {
               ...item,
-              collectCompany: '环卫所',
-              collectCar: '赣B3213',
-              collectFrequency: '1次/1日',
-              servicePeople: '12',
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
           this.wastebinCount = this.wastebins.length
+          this.classifications = response.data.filter(item => item.isClassification === 1)
+          this.classifications = this.classifications.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+          this.classificationCount = this.classifications.length
         }
       })
-      this.classifications = [
-        {
-          id: '12346',
-          code: 'c0001',
-          name: 'c0001',
-          latlng: [27.73252, 116.05321],
-          lng: 27.73252,
-          lat: 116.05321,
-          road: '活力大道',
-          position: '活力大道',
-          responsiblePerson: '张三',
-          responsiblePersonTel: '13382739123',
-          collectCompany: '环卫所',
-          collectCar: '赣B3213',
-          collectFrequency: '1次/1日',
-          servicePeople: '12',
-          responseArea: '崇仁县',
-          responseAreaName: '崇仁县'
-        },
-        {
-          id: '12347',
-          code: 'c0002',
-          name: 'c0001',
-          latlng: [27.72852, 116.03721],
-          lng: 27.72852,
-          lat: 116.03721,
-          road: '活力大道',
-          position: '活力大道',
-          responsiblePerson: '张三',
-          responsiblePersonTel: '13382739123',
-          collectCompany: '环卫所',
-          collectCar: '赣B3213',
-          collectFrequency: '1次/1日',
-          servicePeople: '12',
-          responseArea: '崇仁县',
-          responseAreaName: '崇仁县'
-        }
-      ]
-      this.classificationCount = this.classifications.length
     },
     // 获取垃圾桶详情
     fetchWastebinDetail(data) {
@@ -210,22 +188,77 @@
         // 绘制完成
         this.map.on('pm:create', e => {
           this.drawLayer = e
-          debugger
+          // debugger
           // 计算面积
           var area
           if (e.shape === 'Circle') {
+            // 计算面积
             const radius = e.layer.options.radius
+            const latlng = e.layer.getLatLng()
             area = 3.1415926 * radius * radius
+            this.area = (area / 1000000).toFixed(2)
+            const circle = turf.circle([latlng.lng, latlng.lat], radius / 1000)
+            // 依次判断点的存在
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
           } else {
             // 获取选区的geojson, 用turf计算面积
             const geojson = e.layer.toGeoJSON()
             area = turf.area(geojson)
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
           }
+          this.area = (area / 1000000).toFixed(2)
           console.log('面积' + area.toString())
           // 计算区域内的垃圾桶和分类箱个数
         })
       })
     },
+    judgePointInPolygon(p, geojson) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      // 2. 多边形
+      const polygon = geojson.geometry
+      const result = turf.booleanPointInPolygon(point, polygon)
+      if (result) {
+        console.log('is in polygon')
+      }
+      return result
+    },
+    // 判断点是否在圆里
+    judgePointInCircle(p, circle) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      const result = turf.booleanPointInPolygon(point, circle)
+      if (result) {
+        console.log('is in circle')
+      }
+      return result
+    },
     // 清除绘制
     clearDraw() {
       if (this.drawLayer) {
@@ -233,6 +266,9 @@
       } else {
         this.map.pm.toggleGlobalRemovalMode()
       }
+      this.area = ''
+      this.wastebinCount = this.wastebins.length
+      this.classificationCount = this.classifications.length
     }
   }
 }
@@ -245,7 +281,7 @@
   position: relative;
   .top-board{
     height: 100px;
-    width:300px;
+    min-width:250px;
     background-color: #ffffff;
     position: absolute;
     z-index:1001;
@@ -256,7 +292,7 @@
     align-items: center;
     padding:12px;
     .board-div{
-      width: 45%;
+      min-width: 80px;
       font-size:19px;
       text-align: center;
       .board-div-value{
diff --git a/src/views/wastebinClassificationManage/editWastebinC.vue b/src/views/wastebinClassificationManage/editWastebinC.vue
index 3bd263a..42bb247 100644
--- a/src/views/wastebinClassificationManage/editWastebinC.vue
+++ b/src/views/wastebinClassificationManage/editWastebinC.vue
@@ -48,7 +48,7 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="小区/路段" prop="road">
-                <el-input v-model.trim="wastebinForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+                <el-input v-model.trim="wastebinForm.road" :disabled="isDetailMode" type="text" placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -172,7 +172,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -290,7 +290,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -366,6 +366,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        }else{
+          this.canEdit = true
         }
       })
     },

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 55778dd..41c4793 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -24,6 +24,17 @@
           分类箱
         </div>
       </div>
+      <div v-show="area!==''">
+        <el-divider direction="vertical"/>
+      </div>
+      <div v-show="area" class="board-div">
+        <div class="board-div-value">
+          {{ area }} km²
+        </div>
+        <div class="board-div-title">
+          面积
+        </div>
+      </div>
     </div>
     <!--工具箱-->
     <tools-container>
@@ -58,7 +69,7 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './components/popwindow'
-import { getWastebinListPage } from '@/api/biz/wastebin'
+import { getWastebinList } from '@/api/biz/wastebin'
 import ToolsContainer from './components/toolsContainer'
 import DrawTool from './components/drawTool'
 import 'leaflet.pm'
@@ -87,7 +98,8 @@
       }), // 分类箱图标
       wastebinShow: true, // 垃圾桶是否显示
       classificationShow: true, // 分类箱是否显示
-      currentData: {} // 当前弹窗数据
+      currentData: {}, // 当前弹窗数据
+      area: '' // 选区面积
     }
   },
   created() {
@@ -111,60 +123,26 @@
         sort: '',
         order: 'desc'
       }
-      getWastebinListPage(params).then(response => {
+      getWastebinList(params).then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.filter(item => item.isClassification === 0)
+          this.wastebins = this.wastebins.map(item => {
             return {
               ...item,
-              collectCompany: '环卫所',
-              collectCar: '赣B3213',
-              collectFrequency: '1次/1日',
-              servicePeople: '12',
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
           this.wastebinCount = this.wastebins.length
+          this.classifications = response.data.filter(item => item.isClassification === 1)
+          this.classifications = this.classifications.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+          this.classificationCount = this.classifications.length
         }
       })
-      this.classifications = [
-        {
-          id: '12346',
-          code: 'c0001',
-          name: 'c0001',
-          latlng: [27.73252, 116.05321],
-          lng: 27.73252,
-          lat: 116.05321,
-          road: '活力大道',
-          position: '活力大道',
-          responsiblePerson: '张三',
-          responsiblePersonTel: '13382739123',
-          collectCompany: '环卫所',
-          collectCar: '赣B3213',
-          collectFrequency: '1次/1日',
-          servicePeople: '12',
-          responseArea: '崇仁县',
-          responseAreaName: '崇仁县'
-        },
-        {
-          id: '12347',
-          code: 'c0002',
-          name: 'c0001',
-          latlng: [27.72852, 116.03721],
-          lng: 27.72852,
-          lat: 116.03721,
-          road: '活力大道',
-          position: '活力大道',
-          responsiblePerson: '张三',
-          responsiblePersonTel: '13382739123',
-          collectCompany: '环卫所',
-          collectCar: '赣B3213',
-          collectFrequency: '1次/1日',
-          servicePeople: '12',
-          responseArea: '崇仁县',
-          responseAreaName: '崇仁县'
-        }
-      ]
-      this.classificationCount = this.classifications.length
     },
     // 获取垃圾桶详情
     fetchWastebinDetail(data) {
@@ -210,22 +188,77 @@
         // 绘制完成
         this.map.on('pm:create', e => {
           this.drawLayer = e
-          debugger
+          // debugger
           // 计算面积
           var area
           if (e.shape === 'Circle') {
+            // 计算面积
             const radius = e.layer.options.radius
+            const latlng = e.layer.getLatLng()
             area = 3.1415926 * radius * radius
+            this.area = (area / 1000000).toFixed(2)
+            const circle = turf.circle([latlng.lng, latlng.lat], radius / 1000)
+            // 依次判断点的存在
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
           } else {
             // 获取选区的geojson, 用turf计算面积
             const geojson = e.layer.toGeoJSON()
             area = turf.area(geojson)
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
           }
+          this.area = (area / 1000000).toFixed(2)
           console.log('面积' + area.toString())
           // 计算区域内的垃圾桶和分类箱个数
         })
       })
     },
+    judgePointInPolygon(p, geojson) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      // 2. 多边形
+      const polygon = geojson.geometry
+      const result = turf.booleanPointInPolygon(point, polygon)
+      if (result) {
+        console.log('is in polygon')
+      }
+      return result
+    },
+    // 判断点是否在圆里
+    judgePointInCircle(p, circle) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      const result = turf.booleanPointInPolygon(point, circle)
+      if (result) {
+        console.log('is in circle')
+      }
+      return result
+    },
     // 清除绘制
     clearDraw() {
       if (this.drawLayer) {
@@ -233,6 +266,9 @@
       } else {
         this.map.pm.toggleGlobalRemovalMode()
       }
+      this.area = ''
+      this.wastebinCount = this.wastebins.length
+      this.classificationCount = this.classifications.length
     }
   }
 }
@@ -245,7 +281,7 @@
   position: relative;
   .top-board{
     height: 100px;
-    width:300px;
+    min-width:250px;
     background-color: #ffffff;
     position: absolute;
     z-index:1001;
@@ -256,7 +292,7 @@
     align-items: center;
     padding:12px;
     .board-div{
-      width: 45%;
+      min-width: 80px;
       font-size:19px;
       text-align: center;
       .board-div-value{
diff --git a/src/views/wastebinClassificationManage/editWastebinC.vue b/src/views/wastebinClassificationManage/editWastebinC.vue
index 3bd263a..42bb247 100644
--- a/src/views/wastebinClassificationManage/editWastebinC.vue
+++ b/src/views/wastebinClassificationManage/editWastebinC.vue
@@ -48,7 +48,7 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="小区/路段" prop="road">
-                <el-input v-model.trim="wastebinForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+                <el-input v-model.trim="wastebinForm.road" :disabled="isDetailMode" type="text" placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -172,7 +172,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -290,7 +290,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -366,6 +366,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        }else{
+          this.canEdit = true
         }
       })
     },
diff --git a/src/views/wastebinManage/editWastebin.vue b/src/views/wastebinManage/editWastebin.vue
index 32be8b7..a52c4e4 100644
--- a/src/views/wastebinManage/editWastebin.vue
+++ b/src/views/wastebinManage/editWastebin.vue
@@ -48,7 +48,7 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="小区/路段" prop="road">
-                <el-input v-model.trim="wastebinForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+                <el-input v-model.trim="wastebinForm.road" :disabled="isDetailMode" type="text" placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -366,6 +366,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        } else {
+          this.canEdit = true
         }
       })
     },

diff --git a/src/api/biz/garbageBag.js b/src/api/biz/garbageBag.js
index 4891568..e538b3f 100644
--- a/src/api/biz/garbageBag.js
+++ b/src/api/biz/garbageBag.js
@@ -5,7 +5,7 @@
 // 入库出库记录查询
 export function getBoundList(params) {
   return request({
-    url: '/sanitation/wastebin/listPage',
+    url: '/gc/garbageBag/listPage',
     method: 'get',
     params
   })
@@ -14,7 +14,7 @@
 // 入库
 export function inbound(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/garbageBag/inbound',
     method: 'post',
     params
   })
@@ -22,7 +22,7 @@
 // 出库
 export function outbound(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/garbageBag/outbound',
     method: 'post',
     params
   })
diff --git a/src/api/biz/member.js b/src/api/biz/member.js
index 05b0576..1333c60 100644
--- a/src/api/biz/member.js
+++ b/src/api/biz/member.js
@@ -6,26 +6,24 @@
 // 会员查询
 export function getMemberListPage(params) {
   return request({
-    url: '/sanitation/staff/listPage',
+    url: '/gc/member/listPage',
     method: 'get',
     params
   })
 }
 // 会员查询
-export function getMemberList(pid) {
+export function getMemberScoreList(params) {
   return request({
-    url: '/sanitation/staff/list',
+    url: '/gc/member/scoreDetail',
     method: 'get',
-    params: {
-      pid: pid
-    }
+    params
   })
 }
 
 // 添加会员
 export function addMember(params) {
   return request({
-    url: '/sanitation/staff/add',
+    url: '/gc/member/add',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -36,7 +34,7 @@
 // 修改会员
 export function updateMember(params) {
   return request({
-    url: '/sanitation/staff/update',
+    url: '/gc/member/update',
     method: 'post',
     params,
     paramsSerializer: params => {
@@ -47,7 +45,7 @@
 // 删除会员
 export function delMember(ids) {
   return request({
-    url: '/sanitation/staff/delete',
+    url: '/gc/member/delete',
     method: 'post',
     params: {
       ids
@@ -57,23 +55,15 @@
     }
   })
 }
-// 会员出勤记录查询
-export function getAttendanceList(params) {
-  return request({
-    url: '/sanitation/staff/attendanceList',
-    method: 'get',
-    params
-  })
-}
 
-// 会员出勤记录查询
-export function exportAttendanceList(params, config) {
+// 新增积分
+export function addScore(params) {
   return request({
-    url: '/sanitation/staff/attendance/export',
-    method: 'get',
-    timeout: 120000,
+    url: '/gc/member/addScore',
+    method: 'post',
     params,
-    ...config,
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
   })
 }
diff --git a/src/api/biz/wastebin.js b/src/api/biz/wastebin.js
index c804587..95ab09f 100644
--- a/src/api/biz/wastebin.js
+++ b/src/api/biz/wastebin.js
@@ -25,7 +25,7 @@
 // 添加垃圾桶
 export function addWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/add',
+    url: '/gc/wastebin/add',
     method: 'post',
     params
   })
@@ -33,7 +33,7 @@
 // 修改垃圾桶机构
 export function updateWastebin(params) {
   return request({
-    url: '/sanitation/wastebin/update',
+    url: '/gc/wastebin/update',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 删除垃圾桶机构
 export function delWastebin(ids) {
   return request({
-    url: '/sanitation/wastebin/delete',
+    url: '/gc/wastebin/delete',
     method: 'post',
     params: {
       ids
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 62cc439..8fc8e50 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -79,7 +79,7 @@
       </el-table>
     </div>
     <!--分页-->
-    <div class="pagination-container">
+    <div v-show="pagination" class="pagination-container">
       <el-pagination
         :current-page="query.offset"
         :page-sizes="pageSizes"
@@ -136,6 +136,10 @@
         return []
       }
     }, // 列
+    pagination:{
+      type: Boolean,
+      default: true
+    },
     options: {
       type: Object,
       default: function() {
diff --git a/src/views/garbageBag/garbageBagList.vue b/src/views/garbageBag/garbageBagList.vue
index 59aeb23..319a88c 100644
--- a/src/views/garbageBag/garbageBagList.vue
+++ b/src/views/garbageBag/garbageBagList.vue
@@ -3,7 +3,7 @@
     <div class="garbage-blocks">
       <div class="garbage-block-div">
         <div class="block-title">当前库存</div>
-        <div class="block-value">{{currentBags}}<span>个</span></div>
+        <div class="block-value">{{ currentBags }}<span>个</span></div>
       </div>
       <div class="garbage-block-div block-button" @click="inbound">
         <div class="block-middle">入库</div>
@@ -140,26 +140,31 @@
     fetchData() {
       this.listLoading = true
       const that = this
-      this.list = [
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
-        { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
-      ]
-      this.currentBags = this.list[0].remain
-      this.list = this.list.map(item => {
-        return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
-      })
-      this.total = this.list.length
-      that.listLoading = false
-      // getBoundList(this.listQuery).then(response => {
-      //   that.list = response.data.rows
-      //   that.total = response.data.total
-      //   that.listLoading = false
+      // this.list = [
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '2', num: 200, remain: 2000, useTime: '2021-05-07', useType: '日常', useArea: '活力大道', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', num: 200, remain: 2000, useTime: '', useType: '', useArea: '', recyclable: '可回收', ts: '2021-05-07 12:00:00' }
+      // ]
+      // this.currentBags = this.list[0].remain
+      // this.list = this.list.map(item => {
+      //   return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
       // })
+      // this.total = this.list.length
+      that.listLoading = false
+      getBoundList(this.listQuery).then(response => {
+        that.list = response.data.rows
+        this.list = this.list.map(item => {
+          return { ...item, typeName: item.type === '1' ? '入库' : '出库' }
+        })
+        that.total = response.data.total
+        this.currentBags = this.list[0].remain
+        that.listLoading = false
+      })
     },
     // 点击编辑
     inbound() {
diff --git a/src/views/garbageBag/inbound.vue b/src/views/garbageBag/inbound.vue
index f1e2299..3451d0a 100644
--- a/src/views/garbageBag/inbound.vue
+++ b/src/views/garbageBag/inbound.vue
@@ -73,24 +73,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('入库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // inbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('入库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          inbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/garbageBag/outbound.vue b/src/views/garbageBag/outbound.vue
index 146e31a..86332da 100644
--- a/src/views/garbageBag/outbound.vue
+++ b/src/views/garbageBag/outbound.vue
@@ -91,24 +91,24 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          this.$message.success('出库成功')
-          this.resetForm()
-          this.$refs['dataForm'].clearValidate()
-          this.canEdit = true
-          this.dialogFormVisible = false
-          this.$emit('watchChild')
-          // outbound(this.dataForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('入库成功')
-          //     this.resetForm()
-          //     this.$refs['dataForm'].clearValidate()
-          //     this.canEdit = true
-          //     this.dialogFormVisible = false
-          //     this.$emit('watchChild')
-          //   }
-          // }).catch((e) => {
-          //   this.canEdit = true
-          // })
+          // this.$message.success('出库成功')
+          // this.resetForm()
+          // this.$refs['dataForm'].clearValidate()
+          // this.canEdit = true
+          // this.dialogFormVisible = false
+          // this.$emit('watchChild')
+          outbound(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('入库成功')
+              this.resetForm()
+              this.$refs['dataForm'].clearValidate()
+              this.canEdit = true
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
+            }
+          }).catch((e) => {
+            this.canEdit = true
+          })
         } else {
           this.canEdit = true
         }
diff --git a/src/views/memberManage/addScore.vue b/src/views/memberManage/addScore.vue
index 0f6e318..6226542 100644
--- a/src/views/memberManage/addScore.vue
+++ b/src/views/memberManage/addScore.vue
@@ -29,14 +29,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="积分数" prop="score">
-                <el-input v-model.trim="dataForm.score" type="text" placeholder="必填"/>
+                <el-input v-model.number="dataForm.score" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
               <el-form-item label="积分内容" prop="content">
-                <el-input v-model.trim="dataForm.tel" type="text" placeholder="必填"/>
+                <el-input v-model.trim="dataForm.content" type="text" placeholder="必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { addMember } from '@/api/biz/member'
+import { addScore } from '@/api/biz/member'
 
 export default {
   name: 'AddScore',
@@ -85,7 +85,8 @@
      * 初始化对话框
      * @param row 内容参数（编辑和详情需要）
      */
-    initDialog: function(row = null) {
+    initDialog: function(row) {
+      console.log(row)
       this.dialogFormVisible = true
       this.dataForm = {
         memberId: row.id, // id
@@ -115,23 +116,14 @@
       this.$refs['dataForm'].validate((valid) => {
         console.log(this.dataForm)
         if (valid) {
-          addMember(this.dataForm).then(response => {
+          addScore(this.dataForm).then(response => {
             if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                  this.canEdit = true
-                })
-              }).catch(() => {
-                this.$emit('watchChild')
-                this.dialogFormVisible = false
-                this.canEdit = true
-              })
+              this.$message.success('积分登记成功')
+              this.resetForm()
+              this.canEdit = true
+              this.$refs['dataForm'].clearValidate()
+              this.dialogFormVisible = false
+              this.$emit('watchChild')
             }
           }).catch((e) => {
             this.canEdit = true
diff --git a/src/views/memberManage/editMember.vue b/src/views/memberManage/editMember.vue
index 0fdcc49..b08f05e 100644
--- a/src/views/memberManage/editMember.vue
+++ b/src/views/memberManage/editMember.vue
@@ -42,7 +42,7 @@
       </div>
     </el-form>
     <div v-show="isDetailMode" class="score-div">
-      <normal-table :data="scoreList" :head="tableOption.head" :query="listQuery" :total="total" :list-loading="listLoading">
+      <normal-table :data="scoreList" :head="tableOption.head" :pagination="false" :query="listQuery" :total="total" :list-loading="listLoading">
         <template slot="columns">
           <el-table-column label="积分类型" prop="type" align="center">
             <template slot-scope="scope">
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { addMember, updateMember } from '@/api/biz/member'
+import { addMember, updateMember, getMemberScoreList } from '@/api/biz/member'
 import { getDictByType } from '@/api/common'
 
 export default {
@@ -115,12 +115,12 @@
         }
       }, // 表格属性
       listQuery: {
-        keywords: '', // 关键字
-        isClassification: '1',
-        position: '', // 位置
+        id: '',
+        beginTime: '',
+        endTime: '',
         offset: 1,
-        limit: 20,
-        sort: '',
+        limit: 520,
+        sort: 'ts',
         order: 'desc'
       }, // 筛选条件
       total: 0, // 数据总数
@@ -159,7 +159,7 @@
         this.canEdit = true
         this.isEditMode = true
         this.isDetailMode = false
-      } else {
+      } else { // 详情
         this.memberForm = {
           id: row.id, // id
           name: row.name, // 姓名
@@ -168,6 +168,7 @@
           birth: row.birth, // 生日
           notes: row.notes // 备注
         }
+        this.listQuery.id = row.id
         this.fetchScoreList()
         this.isEditMode = true
         this.isDetailMode = true
@@ -253,15 +254,21 @@
     // 获取积分记录
     fetchScoreList() {
       this.listLoading = true
-      this.scoreList = [
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
-        { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
-        { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
-        { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
-        { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
-      ]
-      this.listLoading = false
+      getMemberScoreList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.scoreList = res.data
+        this.total = res.data.length
+        this.listLoading = false
+      })
+      // this.scoreList = [
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 12:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 13:00:00' },
+      //   { type: '1', score: 100, remain: 300, content: '积分+100', ts: '2021-05-07 14:00:00' },
+      //   { type: '2', score: 300, remain: 0, content: '兑换-300', ts: '2021-05-07 15:00:00' },
+      //   { type: '1', score: 100, remain: 100, content: '积分+100', ts: '2021-05-07 16:00:00' },
+      //   { type: '1', score: 100, remain: 200, content: '积分+100', ts: '2021-05-07 17:00:00' }
+      // ]
+
     },
     // 取消
     cancel: function() {
diff --git a/src/views/memberManage/memberList.vue b/src/views/memberManage/memberList.vue
index bfbd0f0..1430a65 100644
--- a/src/views/memberManage/memberList.vue
+++ b/src/views/memberManage/memberList.vue
@@ -66,7 +66,7 @@
         },
         {
           text: '生日',
-          value: 'hireDate',
+          value: 'birth',
           align: 'center',
           width: 120
         },
@@ -77,7 +77,7 @@
         },
         {
           text: '创建时间',
-          value: 'hireDate',
+          value: 'createTime',
           align: 'center'
         },
         {
diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue
index 55778dd..41c4793 100644
--- a/src/views/overview/overview.vue
+++ b/src/views/overview/overview.vue
@@ -24,6 +24,17 @@
           分类箱
         </div>
       </div>
+      <div v-show="area!==''">
+        <el-divider direction="vertical"/>
+      </div>
+      <div v-show="area" class="board-div">
+        <div class="board-div-value">
+          {{ area }} km²
+        </div>
+        <div class="board-div-title">
+          面积
+        </div>
+      </div>
     </div>
     <!--工具箱-->
     <tools-container>
@@ -58,7 +69,7 @@
 import * as L from 'leaflet'
 import { LMarker, LIcon, LPopup } from 'vue2-leaflet'
 import Popwindow from './components/popwindow'
-import { getWastebinListPage } from '@/api/biz/wastebin'
+import { getWastebinList } from '@/api/biz/wastebin'
 import ToolsContainer from './components/toolsContainer'
 import DrawTool from './components/drawTool'
 import 'leaflet.pm'
@@ -87,7 +98,8 @@
       }), // 分类箱图标
       wastebinShow: true, // 垃圾桶是否显示
       classificationShow: true, // 分类箱是否显示
-      currentData: {} // 当前弹窗数据
+      currentData: {}, // 当前弹窗数据
+      area: '' // 选区面积
     }
   },
   created() {
@@ -111,60 +123,26 @@
         sort: '',
         order: 'desc'
       }
-      getWastebinListPage(params).then(response => {
+      getWastebinList(params).then(response => {
         if (response.code === 200) {
-          this.wastebins = response.data.rows.map(item => {
+          this.wastebins = response.data.filter(item => item.isClassification === 0)
+          this.wastebins = this.wastebins.map(item => {
             return {
               ...item,
-              collectCompany: '环卫所',
-              collectCar: '赣B3213',
-              collectFrequency: '1次/1日',
-              servicePeople: '12',
               latlng: [parseFloat(item.lat), parseFloat(item.lng)]
             }
           })
           this.wastebinCount = this.wastebins.length
+          this.classifications = response.data.filter(item => item.isClassification === 1)
+          this.classifications = this.classifications.map(item => {
+            return {
+              ...item,
+              latlng: [parseFloat(item.lat), parseFloat(item.lng)]
+            }
+          })
+          this.classificationCount = this.classifications.length
         }
       })
-      this.classifications = [
-        {
-          id: '12346',
-          code: 'c0001',
-          name: 'c0001',
-          latlng: [27.73252, 116.05321],
-          lng: 27.73252,
-          lat: 116.05321,
-          road: '活力大道',
-          position: '活力大道',
-          responsiblePerson: '张三',
-          responsiblePersonTel: '13382739123',
-          collectCompany: '环卫所',
-          collectCar: '赣B3213',
-          collectFrequency: '1次/1日',
-          servicePeople: '12',
-          responseArea: '崇仁县',
-          responseAreaName: '崇仁县'
-        },
-        {
-          id: '12347',
-          code: 'c0002',
-          name: 'c0001',
-          latlng: [27.72852, 116.03721],
-          lng: 27.72852,
-          lat: 116.03721,
-          road: '活力大道',
-          position: '活力大道',
-          responsiblePerson: '张三',
-          responsiblePersonTel: '13382739123',
-          collectCompany: '环卫所',
-          collectCar: '赣B3213',
-          collectFrequency: '1次/1日',
-          servicePeople: '12',
-          responseArea: '崇仁县',
-          responseAreaName: '崇仁县'
-        }
-      ]
-      this.classificationCount = this.classifications.length
     },
     // 获取垃圾桶详情
     fetchWastebinDetail(data) {
@@ -210,22 +188,77 @@
         // 绘制完成
         this.map.on('pm:create', e => {
           this.drawLayer = e
-          debugger
+          // debugger
           // 计算面积
           var area
           if (e.shape === 'Circle') {
+            // 计算面积
             const radius = e.layer.options.radius
+            const latlng = e.layer.getLatLng()
             area = 3.1415926 * radius * radius
+            this.area = (area / 1000000).toFixed(2)
+            const circle = turf.circle([latlng.lng, latlng.lat], radius / 1000)
+            // 依次判断点的存在
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInCircle(wastbin, circle)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
           } else {
             // 获取选区的geojson, 用turf计算面积
             const geojson = e.layer.toGeoJSON()
             area = turf.area(geojson)
+            let wastbinCount = 0
+            for (const wastbin of this.wastebins) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                wastbinCount++
+              }
+            }
+            let classificationCount = 0
+            for (const wastbin of this.classifications) {
+              if (this.judgePointInPolygon(wastbin, geojson)) {
+                classificationCount++
+              }
+            }
+            this.wastebinCount = wastbinCount
+            this.classificationCount = classificationCount
           }
+          this.area = (area / 1000000).toFixed(2)
           console.log('面积' + area.toString())
           // 计算区域内的垃圾桶和分类箱个数
         })
       })
     },
+    judgePointInPolygon(p, geojson) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      // 2. 多边形
+      const polygon = geojson.geometry
+      const result = turf.booleanPointInPolygon(point, polygon)
+      if (result) {
+        console.log('is in polygon')
+      }
+      return result
+    },
+    // 判断点是否在圆里
+    judgePointInCircle(p, circle) {
+      // 1. 点
+      const point = turf.point([p.latlng[1], p.latlng[0]])
+      const result = turf.booleanPointInPolygon(point, circle)
+      if (result) {
+        console.log('is in circle')
+      }
+      return result
+    },
     // 清除绘制
     clearDraw() {
       if (this.drawLayer) {
@@ -233,6 +266,9 @@
       } else {
         this.map.pm.toggleGlobalRemovalMode()
       }
+      this.area = ''
+      this.wastebinCount = this.wastebins.length
+      this.classificationCount = this.classifications.length
     }
   }
 }
@@ -245,7 +281,7 @@
   position: relative;
   .top-board{
     height: 100px;
-    width:300px;
+    min-width:250px;
     background-color: #ffffff;
     position: absolute;
     z-index:1001;
@@ -256,7 +292,7 @@
     align-items: center;
     padding:12px;
     .board-div{
-      width: 45%;
+      min-width: 80px;
       font-size:19px;
       text-align: center;
       .board-div-value{
diff --git a/src/views/wastebinClassificationManage/editWastebinC.vue b/src/views/wastebinClassificationManage/editWastebinC.vue
index 3bd263a..42bb247 100644
--- a/src/views/wastebinClassificationManage/editWastebinC.vue
+++ b/src/views/wastebinClassificationManage/editWastebinC.vue
@@ -48,7 +48,7 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="小区/路段" prop="road">
-                <el-input v-model.trim="wastebinForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+                <el-input v-model.trim="wastebinForm.road" :disabled="isDetailMode" type="text" placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -172,7 +172,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -290,7 +290,7 @@
         position: '', // 位置：社区/道路
         lng: '', // 经度
         lat: '', // 纬度
-        isClassification: '0', // 是否分类箱
+        isClassification: '1', // 是否分类箱
         servicePeople: '', // 服务人口
         collectCompany: '', // 收集单位
         collectCar: '', // 收集车辆
@@ -366,6 +366,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        }else{
+          this.canEdit = true
         }
       })
     },
diff --git a/src/views/wastebinManage/editWastebin.vue b/src/views/wastebinManage/editWastebin.vue
index 32be8b7..a52c4e4 100644
--- a/src/views/wastebinManage/editWastebin.vue
+++ b/src/views/wastebinManage/editWastebin.vue
@@ -48,7 +48,7 @@
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item label="小区/路段" prop="road">
-                <el-input v-model.trim="wastebinForm.area" :disabled="isDetailMode" type="text" placeholder=""/>
+                <el-input v-model.trim="wastebinForm.road" :disabled="isDetailMode" type="text" placeholder=""/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -366,6 +366,8 @@
           }).catch((e) => {
             this.canEdit = true
           })
+        } else {
+          this.canEdit = true
         }
       })
     },
diff --git a/src/views/wastebinManage/wastebinList.vue b/src/views/wastebinManage/wastebinList.vue
index a819534..b496b24 100644
--- a/src/views/wastebinManage/wastebinList.vue
+++ b/src/views/wastebinManage/wastebinList.vue
@@ -117,7 +117,7 @@
         },
         {
           text: '收集频率',
-          value: 'ts',
+          value: 'collectFrequency',
           align: 'center'
         },
         {