diff --git a/src/apps/AppCreditPoints/AppCreditPoints.vue b/src/apps/AppCreditPoints/AppCreditPoints.vue
index 4a9b8b94..2ed195af 100644
--- a/src/apps/AppCreditPoints/AppCreditPoints.vue
+++ b/src/apps/AppCreditPoints/AppCreditPoints.vue
@@ -1,462 +1,59 @@
 <template>
-  <div class="page">
-    <div class="credit-points column" flex>
-      <AiTopFixed>
-        <div class="header-tab">
-          <div
-            class="tab-item"
-            v-for="(item, index) in tabList"
-            :key="index"
-            @click="tabClick(index)"
-          >
-            {{ item }}<span class="active-line" v-if="tabIndex == index"></span>
-          </div>
-        </div>
-        <div class="area-content">
-          <AiAreaPicker :areaId="user.areaId" :value="areaId" @select="areaSelect" :name.sync="areaName" selectRoot>
-            <img src="./components/img/local-icon.png" alt="">
-            <span class="label" v-if="areaName">{{ areaName }}</span>
-            <span v-else>请选择</span>
-            <u-icon name="arrow-down" color="#666" size="24"/>
-          </AiAreaPicker>
-        </div>
-      </AiTopFixed>
-      <div class="line-bg"></div>
-      <div v-if="info['列表'] && info['列表'].length">
-        <div class="ranking-content" v-if="info['列表'] && info['列表'].length">
-          <div class="item" v-if="info['列表'].length > 1">
-            <img
-              src="https://cdn.cunwuyun.cn/dvcp/credit/2.png"
-              alt=""
-              class="top-img"
-            />
-            <img
-              :src="info['列表'][1].photo"
-              alt=""
-              class="user-img mar-b4"
-              v-if="info['列表'][1].photo"
-            />
-            <div class="user-name-bg mar-b4" v-else>
-              {{ formatName(info["列表"][1].name) }}
-            </div>
-            <p class="user-name mar-b8">
-              {{ info["列表"][1].name }}{{ tabIndex == 0 ? "家" : "" }}
-            </p>
-            <p class="item-num">{{ info["列表"][1].integral }}</p>
-          </div>
-          <div class="item-top item" v-if="info['列表'].length > 0">
-            <img
-              src="https://cdn.cunwuyun.cn/dvcp/credit/1.png"
-              alt=""
-              class="top-img-one"
-            />
-            <img
-              :src="info['列表'][0].photo"
-              alt=""
-              class="user-img mar-b4"
-              v-if="info['列表'][0].photo"
-            />
-            <div class="user-name-bg mar-b4" v-else>
-              {{ formatName(info["列表"][0].name) }}
-            </div>
-            <p class="user-name mar-b8">
-              {{ info["列表"][0].name }}{{ tabIndex == 0 ? "家" : "" }}
-            </p>
-            <p class="item-num">{{ info["列表"][0].integral }}</p>
-          </div>
-          <div class="item" v-if="info['列表'].length > 2">
-            <img
-              src="https://cdn.cunwuyun.cn/dvcp/credit/3.png"
-              alt=""
-              class="top-img"
-            />
-            <img
-              :src="info['列表'][2].photo"
-              alt=""
-              class="user-img mar-b4"
-              v-if="info['列表'][2].photo"
-            />
-            <div class="user-name-bg mar-b4" v-else>
-              {{ formatName(info["列表"][2].name) }}
-            </div>
-            <p class="user-name mar-b8">
-              {{ info["列表"][2].name }}{{ tabIndex == 0 ? "家" : "" }}
-            </p>
-            <p class="item-num">{{ info["列表"][2].integral }}</p>
-          </div>
-        </div>
-        <div class="ranking-list" v-if="info['列表'] && info['列表'].length">
-          <div
-            class="item"
-            v-for="(item, index) in info['列表']"
-            :key="index"
-            v-if="index > 2"
-          >
-            <span class="item-num">{{ index + 1 }}</span>
-            <img
-              :src="item.photo"
-              alt=""
-              class="user-img mar-b4"
-              v-if="item.photo"
-            />
-            <div class="user-name-bg mar-b4 mar-r24" v-else>
-              {{ formatName(item.name) }}
-            </div>
-            <span class="item-name"
-              >{{ item.name }}{{ tabIndex == 0 ? "家" : "" }}</span
-            >
-            <span class="item-point">{{ item.integral }}</span>
-          </div>
-        </div>
-      </div>
-      <AiEmpty v-else />
-    </div>
-  </div>
+  <section class="AppCreditPoints">
+    <AiTabPanes :tabs="tabList" v-model="tabIndex" background="#4181FF"/>
+    <family-rank v-if="tabIndex == 0" :showDetail="showDetail"/>
+    <user-rank v-if="tabIndex == 1" :showDetail="showDetail"/>
+    <sys-user-integral v-if="tabIndex==2"/>
+  </section>
 </template>
 <script>
-import { mapState } from "vuex";
+import {mapState} from 'vuex'
+import userRank from './components/userRank.vue'
+import familyRank from './components/familyRank.vue'
+import SysUserIntegral from "./components/sysUserIntegral";
 
 export default {
   name: "AppCreditPoints",
-  appName: '积分排行',
+  appName: "我的积分",
   computed: {
-    ...mapState(["user"]),
+    ...mapState(['user', 'token'])
   },
+  components: {SysUserIntegral, userRank, familyRank},
   data() {
     return {
-      tabList: ["家庭积分", "个人积分"],
+      tabList: ['家庭积分', '个人积分', "员工积分"],
       tabIndex: 0,
-      info: {},
-      areaId: '',
-      areaName: '',
-      list: []
-    };
+      showDetail: true
+    }
   },
-  onLoad() {
-    this.areaId = this.user.areaId
-    this.areaName = this.user.areaName || ''
-    this.getInfo();
+  onLoad(options) {
+    if (options.type == 'detail') {
+      this.showDetail = true
+    }
+    uni.setNavigationBarTitle({
+      title: options.title
+    })
   },
-  onShow() {
-    document.title = '积分排行'
+  onReachBottom() {
+    uni.$emit("reachBottom")
+  },
+  onShow(){
+    let index = JSON.parse(JSON.stringify(this.tabIndex))
+    this.tabIndex = null
+    this.$nextTick(()=>this.tabIndex = index)
   },
   methods: {
-    areaSelect(e) {
-      this.areaId = e
-      this.getInfo()
-    },
     tabClick(index) {
-      this.tabIndex = index;
-      this.getInfo();
-    },
-    // 积分排行
-    getInfo() {
-      this.info = {};
-      this.$http.post(`/app/appresident/rank-qw?type=${this.tabIndex}&areaId=${this.areaId}`).then((res) => {
-        if (res.code === 0) {
-          this.info = res.data;
-        }
-      });
-    },
-    formatName(name) {
-      if (name == undefined) {
-        return
-      }
-      return name.substr(name.length - 2, name.length > 2 ? (name.length - 1) : name.length)
-    },
+      this.tabIndex = index
+    }
   },
-};
+}
 </script>
 <style scoped lang="scss">
-.page {
-  width: 100%;
-  // background-color: #f3f6f9;
-  .credit-points {
-
-    .bg-blue {
-      width: 100%;
-      height: 176rpx;
-      background-color: #3975C6;
-    }
-    .header-content {
-      width: 690rpx;
-      height: 256rpx;
-      background: #fff;
-      border-radius: 16rpx;
-      margin: -130rpx 0 40rpx 30rpx;
-      padding: 100rpx 60rpx 40rpx 60rpx;
-      box-sizing: border-box;
-      display: flex;
-      justify-content: space-between;
-      position: relative;
-      .item {
-        text-align: center;
-        z-index: 99;
-        .num {
-          font-family: DIN;
-          font-size: 52rpx;
-          font-weight: bold;
-          line-height: 60rpx;
-        }
-        .label {
-          font-size: 28rpx;
-          font-family: PingFangSC-Regular, PingFang SC;
-          color: #999;
-          line-height: 40rpx;
-          margin-top: 10rpx;
-        }
-        .color-5AAD6A {
-          color: #5aad6a;
-        }
-        .color-4185F5 {
-          color: #4185f5;
-        }
-        .color-CD413A {
-          color: #cd413a;
-        }
-      }
-      img {
-        position: absolute;
-        width: 360rpx;
-        height: 250rpx;
-        top: -40rpx;
-        right: 0;
-      }
-    }
-    .ranking-content {
-      padding: 94rpx 30rpx 0;
-      background-color: #fff;
-      .item {
-        display: inline-block;
-        width: 216rpx;
-        height: 320px;
-        box-shadow: 0 4rpx 20rpx 0 rgba(0, 0, 0, 0.12);
-        border-radius: 12rpx;
-        padding: 40rpx 0 0 0;
-        text-align: center;
-        box-sizing: border-box;
-        position: relative;
-        vertical-align: top;
-        .user-name {
-          font-size: 30rpx;
-          font-family: PingFang-SC-Medium, PingFang-SC;
-          font-weight: 500;
-          color: #333;
-          line-height: 42rpx;
-          word-break: break-all;
-        }
-        .item-num {
-          font-size: 46rpx;
-          font-weight: 6000;
-          color: #2c51ce;
-          line-height: 54rpx;
-        }
-        .top-img {
-          width: 100%;
-          height: 34rpx;
-          position: absolute;
-          top: -11rpx;
-          left: 0;
-        }
-      }
-      .item-top {
-        margin: -46rpx 20rpx 0;
-        height: 366px;
-        .user-img {
-          width: 104rpx;
-          height: 104rpx;
-        }
-        .user-name-bg {
-          width: 104rpx;
-          height: 104rpx;
-          border-radius: 50%;
-          background-color: #4e8eee;
-          font-size: 28rpx;
-          line-height: 104rpx;
-          text-align: center;
-          color: #fff;
-        }
-        .top-img-one {
-          width: 100%;
-          position: absolute;
-          top: -22rpx;
-          left: 0;
-          height: 46rpx;
-        }
-      }
-    }
-    .ranking-list {
-      background-color: #fff;
-      .item {
-        width: 100%;
-        height: 120rpx;
-        line-height: 120rpx;
-        background: #fff;
-        padding: 0 64rpx;
-        box-sizing: border-box;
-        .item-num {
-          display: inline-block;
-          width: 68rpx;
-          color: #858594;
-          font-size: 28rpx;
-        }
-        .user-img {
-          margin-right: 24rpx;
-          vertical-align: middle;
-        }
-        .item-name {
-          color: #333;
-          font-size: 30rpx;
-          display: inline-block;
-          width: 240rpx;
-        }
-        .item-point {
-          display: inline-block;
-          width: 210rpx;
-          text-align: right;
-          font-size: 30rpx;
-          font-family: PingFangSC-Medium, PingFang SC;
-          font-weight: 500;
-          color: #333;
-        }
-        .mar-r24 {
-          margin-right: 24rpx;
-        }
-      }
-    }
-    .user-img {
-      width: 80rpx;
-      height: 80rpx;
-      border-radius: 50%;
-    }
-    .user-name-bg {
-      display: inline-block;
-      width: 80rpx;
-      height: 80rpx;
-      border-radius: 50%;
-      background-color: #4e8eee;
-      font-size: 28rpx;
-      line-height: 80rpx;
-      text-align: center;
-      color: #fff;
-    }
-    .mar-b4 {
-      margin-bottom: 8rpx;
-    }
-    .mar-b8 {
-      margin-bottom: 16rpx;
-    }
-    .detail-content {
-      width: 690rpx;
-      background: #fff;
-      border-radius: 16rpx;
-      margin: 432rpx 0 0 32rpx;
-      padding: 30rpx 30rpx 94rpx;
-      box-sizing: border-box;
-      .title {
-        font-size: 34rpx;
-        font-family: PingFangSC-Medium, PingFang SC;
-        font-weight: 500;
-        color: #333;
-        line-height: 48rpx;
-        margin-bottom: 30rpx;
-      }
-      .item {
-        padding: 34rpx 0 32rpx 0;
-        border-bottom: 2rpx solid #ddd;
-        display: flex;
-        .item-info {
-          width: 500rpx;
-          p {
-            word-break: break-all;
-            font-size: 32rpx;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #333;
-            line-height: 44px;
-          }
-          span {
-            display: inline-block;
-            margin-top: 8rpx;
-            font-size: 24px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #999;
-            line-height: 34rpx;
-          }
-        }
-        .item-num {
-          width: calc(100% - 500rpx);
-          text-align: right;
-          font-size: 36rpx;
-          font-family: PingFangSC-Semibold, PingFang SC;
-          font-weight: 600;
-          line-height: 50rpx;
-        }
-      }
-    }
-  }
-  .color-0 {
-    color: #2c51ce !important;
-  }
-  .color-1 {
-    color: #e6736e !important;
-  }
-  .fixed-top {
-    z-index: 999;
-  }
-  .header-tab {
-    height: 96rpx;
-    background-color: #3975C6;
-    padding: 20rpx 0;
-    display: flex;
-    align-items: center;
-    box-sizing: border-box;
-  }
-
-  .header-tab .tab-item {
-    flex: 1;
-    text-align: center;
-    position: relative;
-    color: #fff;
-    font-size: 28rpx;
-  }
-
-  .header-tab .tab-active {
-    font-weight: 500;
-  }
-
-  .header-tab .active-line {
-    position: absolute;
-    width: 40rpx;
-    height: 4rpx;
-    background: #FFF;
-    top: 48rpx;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
-
-  .area-content {
-    padding: 32px;
-    background-color: #fff;
-
-    img {
-      width: 42px;
-      vertical-align: middle;
-      margin-right: 16px;
-    }
-
-    .u-icon {
-      margin-left: 6px;
-    }
-  }
-  .line-bg{
-    width: 100%;
-    height: 6px;
-    background-color: #f3f6f9;
-  }
-  ::v-deep .content{
-    padding: 0;
-  }
+.AppCreditPoints {
+  width: 100vw;
+  overflow-x: hidden;
+  background-color: #f3f6f9;
+  min-height: 100vh;
 }
 </style>
diff --git a/src/apps/AppCreditPoints/components/familyRank.vue b/src/apps/AppCreditPoints/components/familyRank.vue
new file mode 100644
index 00000000..3c58af07
--- /dev/null
+++ b/src/apps/AppCreditPoints/components/familyRank.vue
@@ -0,0 +1,390 @@
+<template>
+  <div class="familyRank">
+    <div class="bg-blue"></div>
+    <div class="header-content">
+      <div class="item">
+        <div class="num color-5AAD6A">{{ info['家庭积分'] || '0' }}</div>
+        <div class="label">家庭总分</div>
+      </div>
+      <div class="item">
+        <div class="num color-4185F5">{{ info['剩余总分'] || '0' }}</div>
+        <div class="label">剩余总分</div>
+      </div>
+      <div class="item">
+        <div class="num color-CD413A">{{ info['家庭排行'] || '0' }}</div>
+        <div class="label">家庭排名</div>
+      </div>
+      <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+    </div>
+    <div v-if="!showDetail">
+      <div class="ranking-content" v-if="info['列表'] && info['列表'].length">
+        <div class="item" v-if="info['列表'].length > 1">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/2.png" alt="" class="top-img">
+          <img :src="info['列表'][1].photo" alt="" class="user-img mar-b4" v-if="info['列表'][1].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][1].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][1].name }}</p>
+          <p class="item-num">{{ info['列表'][1].integral }}</p>
+        </div>
+        <div class="item-top item" v-if="info['列表'].length > 0">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/1.png" alt="" class="top-img-one">
+          <img :src="info['列表'][0].photo" alt="" class="user-img mar-b4" v-if="info['列表'][0].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][0].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][0].name }}</p>
+          <p class="item-num">{{ info['列表'][0].integral }}</p>
+        </div>
+        <div class="item" v-if="info['列表'].length > 2">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/3.png" alt="" class="top-img">
+          <img :src="info['列表'][2].photo" alt="" class="user-img mar-b4" v-if="info['列表'][2].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][2].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][2].name }}</p>
+          <p class="item-num">{{ info['列表'][2].integral }}</p>
+        </div>
+      </div>
+      <div class="ranking-list" v-if="info['列表'] &&  info['列表'].length">
+        <div class="item" v-for="(item, index) in info['列表']" :key="index" v-if="index > 2">
+          <span class="item-num">{{ index + 1 }}</span>
+          <img :src="item.photo" alt="" class="user-img mar-b4" v-if="item.photo">
+          <div class="user-name-bg mar-b4 mar-r24" v-else>{{ $formatName(item.name) }}</div>
+          <span class="item-name">{{ item.name }}</span>
+          <span class="item-point">{{ item.integral }}</span>
+        </div>
+      </div>
+    </div>
+    <div class="detail-content" v-if="showDetail && list.length">
+      <div class="title">积分明细</div>
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="item-info">
+          <p>{{ item.residentName + ':' }}{{ item.eventDesc }}</p>
+          <span>&nbsp;&nbsp;&nbsp;{{ item.doTime }}</span>
+        </div>
+        <div class="item-num" :class="'color-'+ (item.changeIntegral >= 0 ? 0 : 1)">
+          {{ item.changeIntegral > 0 ? '+' + item.changeIntegral : item.changeIntegral }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "familyRank",
+  appName: "家庭积分",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  props: {
+    showDetail: {  //true 积分明细 false积分排行
+      type: Boolean
+    }
+  },
+  data() {
+    return {
+      info: {},
+      current: 1,
+      list: [],
+    }
+  },
+  mounted() {
+    this.getInfo()
+    if (this.showDetail) {
+      this.getList()
+    }
+  },
+  methods: {
+    getInfo() {// 积分排行
+      this.info = {}
+      var url = `/app/appresident/rank?id=${this.user.residentId}&type=0&areaId=${this.user?.areaId}`  //积分排行
+      this.$http.post(url).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+        }
+      })
+    },
+    getList() {// 积分明细列表
+      let url = `/app/appvillagerintegraldetail/IntegralList?residentId=${this.user.residentId}&queryType=0&current=${this.current}&size=10`  //积分明细
+      this.$http.post(url).then(res => {
+        if (res?.data) {
+          if (this.current > res.data.pages) {
+            return
+          }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+  },
+}
+</script>
+<style scoped lang="scss">
+.familyRank {
+  width: 100vw;
+  overflow-x: hidden;
+  background-color: #f3f6f9;
+
+  .bg-blue {
+    width: 100vw;
+    height: 176px;
+    background-color: #4181FF;
+  }
+
+  .header-content {
+    width: 690px;
+    height: 256px;
+    background: #FFF;
+    border-radius: 16px;
+    margin: -130px 0 40px 30px;
+    padding: 100px 60px 40px 60px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+
+    .item {
+      text-align: center;
+      z-index: 99;
+
+      .num {
+        font-family: DIN;
+        font-size: 52px;
+        font-weight: bold;
+        line-height: 60px;
+      }
+
+      .label {
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        line-height: 40px;
+        margin-top: 10px;
+      }
+
+      .color-5AAD6A {
+        color: #5AAD6A;
+      }
+
+      .color-4185F5 {
+        color: #4185F5;
+      }
+
+      .color-CD413A {
+        color: #CD413A;
+      }
+    }
+
+    img {
+      position: absolute;
+      width: 360px;
+      height: 250px;
+      top: -40px;
+      right: 0;
+    }
+  }
+
+  .ranking-content {
+    padding: 94px 30px 0;
+    background-color: #fff;
+
+    .item {
+      display: inline-block;
+      width: 216px;
+      box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
+      border-radius: 12px;
+      padding: 40px 0 76px 0;
+      text-align: center;
+      box-sizing: border-box;
+      position: relative;
+
+      .user-name {
+        font-size: 30px;
+        font-family: PingFang-SC-Medium, PingFang-SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 42px;
+      }
+
+      .item-num {
+        font-size: 46px;
+        font-weight: 6000;
+        color: #2C51CE;
+        line-height: 54px;
+      }
+
+      .top-img {
+        width: 100%;
+        height: 34px;
+        position: absolute;
+        top: -11px;
+        left: 0;
+      }
+    }
+
+    .item-top {
+      margin: -46px 20px 0;
+
+      .user-img {
+        width: 104px;
+        height: 104px;
+      }
+
+      .user-name-bg {
+        width: 104px;
+        height: 104px;
+        border-radius: 50%;
+        background-color: #4E8EEE;
+        font-size: 28px;
+        line-height: 104px;
+        text-align: center;
+        color: #fff;
+      }
+
+      .top-img-one {
+        width: 100%;
+        position: absolute;
+        top: -22px;
+        left: 0;
+        height: 46px;
+      }
+    }
+  }
+
+  .ranking-list {
+    background-color: #fff;
+
+    .item {
+      width: 100%;
+      height: 120px;
+      line-height: 120px;
+      background: #FFF;
+      padding: 0 64px;
+      box-sizing: border-box;
+
+      .item-num {
+        display: inline-block;
+        width: 68px;
+        color: #858594;
+        font-size: 28px;
+      }
+
+      .user-img {
+        margin-right: 24px;
+        vertical-align: middle;
+      }
+
+      .item-name {
+        color: #333;
+        font-size: 30px;
+        display: inline-block;
+        width: 240px;
+      }
+
+      .item-point {
+        display: inline-block;
+        width: 210px;
+        text-align: right;
+        font-size: 30px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+      }
+
+      .mar-r24 {
+        margin-right: 24px;
+      }
+    }
+  }
+
+  .user-img {
+    width: 80px;
+    height: 80px;
+    border-radius: 50%;
+  }
+
+  .user-name-bg {
+    display: inline-block;
+    width: 80px;
+    height: 80px;
+    border-radius: 50%;
+    background-color: #4E8EEE;
+    font-size: 28px;
+    line-height: 80px;
+    text-align: center;
+    color: #fff;
+  }
+
+  .mar-b4 {
+    margin-bottom: 8px;
+  }
+
+  .mar-b8 {
+    margin-bottom: 16px;
+  }
+
+  .detail-content {
+    width: 690px;
+    background: #FFF;
+    border-radius: 16px;
+    margin: 0 0 0 32px;
+    padding: 30px 30px 94px;
+    box-sizing: border-box;
+
+    .title {
+      font-size: 34px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 48px;
+      margin-bottom: 30px;
+    }
+
+    .item {
+      padding: 34px 0 32px 0;
+      border-bottom: 2px solid #ddd;
+      display: flex;
+
+      .item-info {
+        width: 500px;
+
+        p {
+          word-break: break-all;
+          font-size: 32px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #333;
+          line-height: 44px;
+        }
+
+        span {
+          display: inline-block;
+          margin-top: 8px;
+          font-size: 24px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #999;
+          line-height: 34px;
+        }
+      }
+
+      .item-num {
+        width: calc(100% - 500px);
+        text-align: right;
+        font-size: 36px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        line-height: 50px;
+      }
+    }
+  }
+
+  .color-0 {
+    color: #2C51CE !important;
+  }
+
+  .color-1 {
+    color: #E6736E !important;
+  }
+
+  .fixed-top {
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/apps/AppCreditPoints/components/img/line.png b/src/apps/AppCreditPoints/components/img/line.png
deleted file mode 100644
index bde78ee8..00000000
Binary files a/src/apps/AppCreditPoints/components/img/line.png and /dev/null differ
diff --git a/src/apps/AppCreditPoints/components/img/local-icon.png b/src/apps/AppCreditPoints/components/img/local-icon.png
deleted file mode 100644
index 3e23aff6..00000000
Binary files a/src/apps/AppCreditPoints/components/img/local-icon.png and /dev/null differ
diff --git a/src/apps/AppCreditPoints/components/sysUserIntegral.vue b/src/apps/AppCreditPoints/components/sysUserIntegral.vue
new file mode 100644
index 00000000..a469de8e
--- /dev/null
+++ b/src/apps/AppCreditPoints/components/sysUserIntegral.vue
@@ -0,0 +1,216 @@
+<template>
+  <div class="page">
+    <div class="bg-blue"></div>
+    <div class="header-content">
+      <div class="left-content" flex>
+        <div class="fill">
+          <span>总积分：</span>
+          <div class="info num" v-text="info.sysUserIntegral"/>
+        </div>
+        <div class="btn" @click="gotoGive">积分赠送</div>
+      </div>
+      <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+    </div>
+    <div class="detail-content" v-if="list.length">
+      <div class="title">积分明细</div>
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="item-info">
+          <p v-text="item.eventDesc"/>
+          <span v-text="item.doTime"/>
+        </div>
+        <div class="item-num" :class="'color-'+ item.integralCalcType">
+          {{ (item.integralCalcType == 1 ? '+' : '-') + item.changeIntegral }}
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-else/>
+  </div>
+</template>
+<script>
+import {mapActions, mapState} from 'vuex'
+
+export default {
+  name: "sysUserIntegral",
+  appName: "员工积分",
+  computed: {
+    ...mapState(['user', 'token']),
+    ...mapActions(['selectEnterpriseContact'])
+  },
+  data() {
+    return {
+      info: {},
+      list: [],
+      current: 1,
+      pages: 0
+    }
+  },
+  created() {
+    this.getInfo()
+    uni.$on("reachBottom", onShow => {
+      !onShow && this.current++;
+      this.getInfo()
+    })
+  },
+  methods: {
+    // 积分排行
+    getInfo() {
+      let {current, user: {id: userId}, info: {details}} = this
+      if (!details?.pages || current <= details.pages) {
+        this.$http.post('/app/appvillagerintegraldetail/sysUserIntegralList', null, {
+          params: {userId, current, size: 10}
+        }).then(res => {
+          if (res?.data) {
+            this.info = res.data
+            this.list = [this.list, res.data.details?.records || []].flat()
+          }
+        })
+      }
+    },
+    gotoGive() {
+      uni.navigateTo({url: "./giveIntegral"})
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+.page {
+  width: 100vw;
+  background-color: #f3f6f9;
+
+  .bg-blue {
+    width: 100%;
+    height: 176px;
+    background-color: #4181FF;
+  }
+
+  .header-content {
+    width: 690px;
+    height: 184px;
+    background: #FFF;
+    border-radius: 16px;
+    margin: -130px 0 40px 30px;
+    padding: 32px;
+    box-sizing: border-box;
+    position: relative;
+
+    .left-content {
+      position: absolute;
+      left: 32px;
+      right: 32px;
+      z-index: 99;
+      align-items: flex-end;
+
+      .btn {
+        border-radius: 28px;
+        border: 2px solid #4181FF;
+        padding: 0 28px;
+        line-height: 56px;
+        color: #4181FF;
+      }
+    }
+
+    span {
+      width: 140px;
+      color: #999;
+    }
+
+    .info {
+      height: 40px;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #333;
+      line-height: 40px;
+    }
+
+    .num {
+      margin-top: 20px;
+      font-size: 40px;
+      font-family: DINAlternate-Bold, DINAlternate;
+      font-weight: bold;
+      color: #5AAD6A;
+      line-height: 48px;
+      margin-bottom: 10px;
+    }
+
+    img {
+      position: absolute;
+      width: 360px;
+      height: 250px;
+      top: -40px;
+      right: 0;
+    }
+  }
+
+  .mar-b4 {
+    margin-bottom: 8px;
+  }
+
+  .mar-b8 {
+    margin-bottom: 16px;
+  }
+
+  .detail-content {
+    width: 690px;
+    background: #FFF;
+    border-radius: 16px;
+    margin: 0 0 0 32px;
+    padding: 30px 30px 94px;
+    box-sizing: border-box;
+
+    .title {
+      font-size: 34px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 48px;
+      margin-bottom: 30px;
+    }
+
+    .item {
+      padding: 34px 0 32px 0;
+      border-bottom: 2px solid #ddd;
+      display: flex;
+
+      .item-info {
+        width: 500px;
+
+        p {
+          word-break: break-all;
+          font-size: 32px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #333;
+          line-height: 44px;
+        }
+
+        span {
+          display: inline-block;
+          margin-top: 8px;
+          font-size: 24px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #999;
+          line-height: 34px;
+        }
+      }
+
+      .item-num {
+        width: calc(100% - 500px);
+        text-align: right;
+        font-size: 36px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        line-height: 50px;
+      }
+    }
+  }
+
+  .color-1 {
+    color: #2C51CE !important;
+  }
+
+  .color-0 {
+    color: #E6736E !important;
+  }
+}
+</style>
diff --git a/src/apps/AppCreditPoints/components/userRank.vue b/src/apps/AppCreditPoints/components/userRank.vue
new file mode 100644
index 00000000..2ac54549
--- /dev/null
+++ b/src/apps/AppCreditPoints/components/userRank.vue
@@ -0,0 +1,395 @@
+<template>
+  <section class="userRank">
+    <div class="bg-blue"/>
+    <div class="header-content">
+      <div class="item">
+        <div class="num color-5AAD6A">{{ Number(info['个人积分']) || '0' }}</div>
+        <div class="label">个人总分</div>
+      </div>
+      <div class="item">
+        <div class="num color-CD413A">{{ info['个人排行'] || '0' }}</div>
+        <div class="label">个人排名</div>
+      </div>
+      <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+    </div>
+    <div v-if="!showDetail">
+      <div class="ranking-content" v-if="info['列表'] && info['列表'].length">
+        <div class="item" v-if="info['列表'].length > 1">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/2.png" alt="" class="top-img">
+          <img :src="info['列表'][1].photo" alt="" class="user-img mar-b4" v-if="info['列表'][1].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][1].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][1].name }}</p>
+          <p class="item-num">{{ info['列表'][1].integral }}</p>
+        </div>
+        <div class="item-top item" v-if="info['列表'].length > 0">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/1.png" alt="" class="top-img-one">
+          <img :src="info['列表'][0].photo" alt="" class="user-img mar-b4" v-if="info['列表'][0].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][0].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][0].name }}</p>
+          <p class="item-num">{{ info['列表'][0].integral }}</p>
+        </div>
+        <div class="item" v-if="info['列表'].length > 2">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/3.png" alt="" class="top-img">
+          <img :src="info['列表'][2].photo" alt="" class="user-img mar-b4" v-if="info['列表'][2].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][2].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][2].name }}</p>
+          <p class="item-num">{{ info['列表'][2].integral }}</p>
+        </div>
+      </div>
+      <div class="ranking-list" v-if="info['列表'] &&  info['列表'].length">
+        <div class="item" v-for="(item, index) in info['列表']" :key="index" v-if="index > 2">
+          <span class="item-num">{{ index + 1 }}</span>
+          <img :src="item.photo" alt="" class="user-img mar-b4" v-if="item.photo">
+          <div class="user-name-bg mar-b4 mar-r24" v-else>{{ $formatName(item.name) }}</div>
+          <span class="item-name">{{ item.name }}</span>
+          <span class="item-point">{{ item.integral }}</span>
+        </div>
+      </div>
+    </div>
+    <div class="detail-content" v-if="showDetail && list.length">
+      <div class="title">积分明细</div>
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="item-info">
+          <p>{{ item.residentName + ':' }}{{ item.eventDesc }}</p>
+          <span>&nbsp;&nbsp;&nbsp;{{ item.doTime }}</span>
+        </div>
+        <div class="item-num" :class="'color-'+ (item.changeIntegral >= 0 ? 0 : 1)">
+          {{ item.changeIntegral > 0 ? '+' + item.changeIntegral : item.changeIntegral }}
+        </div>
+      </div>
+    </div>
+  </section>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "userRank",
+  appName: "个人积分",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  props: {
+    showDetail: {  //true 积分明细 false积分排行
+      type: Boolean
+    }
+  },
+  data() {
+    return {
+      info: {},
+      current: 1,
+      list: [],
+    }
+  },
+  mounted() {
+    this.getInfo()
+    if (this.showDetail) {
+      this.getList()
+    }
+  },
+  methods: {
+    getInfo() {// 积分排行
+      this.info = {}
+      // var url = `/app/appresident/rank?id=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}`  //积分排行
+      var url = `/app/appresident/rank?id=${this.user.residentId}&type=1&areaId=${this.user?.areaId}`  //积分排行
+      this.$http.post(url).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+        }
+      })
+    },
+
+    getList() {// 积分明细列表
+      // var url = `/app/appvillagerintegraldetail/IntegralList?residentId=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}&current=${this.current}&size=10`  //积分明细
+      let url = `/app/appvillagerintegraldetail/IntegralList?residentId=${this.user.residentId}&queryType=1&current=${this.current}&size=10`  //积分明细
+      this.$http.post(url).then(res => {
+        if (res?.data) {
+          if (this.current > res.data.pages) {
+            return
+          }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+  },
+  onReachBottom() {
+    if (this.list.length < 50) {
+      this.current++;
+      this.getList()
+    }
+  },
+}
+</script>
+<style scoped lang="scss">
+.userRank {
+  width: 100vw;
+  overflow-x: hidden;
+  background-color: #f3f6f9;
+
+  .bg-blue {
+    width: 100%;
+    height: 176px;
+    background-color: #4181FF;
+  }
+
+  .header-content {
+    width: 690px;
+    height: 256px;
+    background: #FFF;
+    border-radius: 16px;
+    margin: -130px 0 40px 30px;
+    padding: 100px 60px 40px 60px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+
+    .item {
+      text-align: center;
+      z-index: 99;
+
+      .num {
+        font-family: DIN;
+        font-size: 52px;
+        font-weight: bold;
+        line-height: 60px;
+      }
+
+      .label {
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        line-height: 40px;
+        margin-top: 10px;
+      }
+
+      .color-5AAD6A {
+        color: #5AAD6A;
+      }
+
+      .color-4185F5 {
+        color: #4185F5;
+      }
+
+      .color-CD413A {
+        color: #CD413A;
+      }
+    }
+
+    img {
+      position: absolute;
+      width: 360px;
+      height: 250px;
+      top: -40px;
+      right: 0;
+    }
+  }
+
+  .ranking-content {
+    padding: 94px 30px 0;
+    background-color: #fff;
+
+    .item {
+      display: inline-block;
+      width: 216px;
+      box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
+      border-radius: 12px;
+      padding: 40px 0 76px 0;
+      text-align: center;
+      box-sizing: border-box;
+      position: relative;
+
+      .user-name {
+        font-size: 30px;
+        font-family: PingFang-SC-Medium, PingFang-SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 42px;
+      }
+
+      .item-num {
+        font-size: 46px;
+        font-weight: 6000;
+        color: #2C51CE;
+        line-height: 54px;
+      }
+
+      .top-img {
+        width: 100%;
+        height: 34px;
+        position: absolute;
+        top: -11px;
+        left: 0;
+      }
+    }
+
+    .item-top {
+      margin: -46px 20px 0;
+
+      .user-img {
+        width: 104px;
+        height: 104px;
+      }
+
+      .user-name-bg {
+        width: 104px;
+        height: 104px;
+        border-radius: 50%;
+        background-color: #4E8EEE;
+        font-size: 28px;
+        line-height: 104px;
+        text-align: center;
+        color: #fff;
+      }
+
+      .top-img-one {
+        width: 100%;
+        position: absolute;
+        top: -22px;
+        left: 0;
+        height: 46px;
+      }
+    }
+  }
+
+  .ranking-list {
+    background-color: #fff;
+
+    .item {
+      width: 100%;
+      height: 120px;
+      line-height: 120px;
+      background: #FFF;
+      padding: 0 64px;
+      box-sizing: border-box;
+
+      .item-num {
+        display: inline-block;
+        width: 68px;
+        color: #858594;
+        font-size: 28px;
+      }
+
+      .user-img {
+        margin-right: 24px;
+        vertical-align: middle;
+      }
+
+      .item-name {
+        color: #333;
+        font-size: 30px;
+        display: inline-block;
+        width: 240px;
+      }
+
+      .item-point {
+        display: inline-block;
+        width: 210px;
+        text-align: right;
+        font-size: 30px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+      }
+
+      .mar-r24 {
+        margin-right: 24px;
+      }
+    }
+  }
+
+  .user-img {
+    width: 80px;
+    height: 80px;
+    border-radius: 50%;
+  }
+
+  .user-name-bg {
+    display: inline-block;
+    width: 80px;
+    height: 80px;
+    border-radius: 50%;
+    background-color: #4E8EEE;
+    font-size: 28px;
+    line-height: 80px;
+    text-align: center;
+    color: #fff;
+  }
+
+  .mar-b4 {
+    margin-bottom: 8px;
+  }
+
+  .mar-b8 {
+    margin-bottom: 16px;
+  }
+
+  .detail-content {
+    width: 690px;
+    background: #FFF;
+    border-radius: 16px;
+    margin: 0 0 0 32px;
+    padding: 30px 30px 94px;
+    box-sizing: border-box;
+
+    .title {
+      font-size: 34px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 48px;
+      margin-bottom: 30px;
+    }
+
+    .item {
+      padding: 34px 0 32px 0;
+      border-bottom: 2px solid #ddd;
+      display: flex;
+
+      .item-info {
+        width: 500px;
+
+        p {
+          word-break: break-all;
+          font-size: 32px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #333;
+          line-height: 44px;
+        }
+
+        span {
+          display: inline-block;
+          margin-top: 8px;
+          font-size: 24px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #999;
+          line-height: 34px;
+        }
+      }
+
+      .item-num {
+        width: calc(100% - 500px);
+        text-align: right;
+        font-size: 36px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        line-height: 50px;
+      }
+    }
+  }
+
+  .color-0 {
+    color: #2C51CE !important;
+  }
+
+  .color-1 {
+    color: #E6736E !important;
+  }
+
+  .fixed-top {
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/apps/AppCreditPoints/giveIntegral.vue b/src/apps/AppCreditPoints/giveIntegral.vue
new file mode 100644
index 00000000..deaef0ed
--- /dev/null
+++ b/src/apps/AppCreditPoints/giveIntegral.vue
@@ -0,0 +1,96 @@
+<template>
+  <section class="giveIntegral">
+    <AiGroup>
+      <AiItem label="选择对象" required>
+        <AiSelect v-model="form.objectType" dict="integralGiveObjType"/>
+      </AiItem>
+      <AiItem label="选择人员" required v-if="form.objectType">
+        <AiPagePicker v-if="form.objectType==0" single @select="handleSelectUser">
+          <AiMore v-model="form.userName"/>
+        </AiPagePicker>
+        <AiPagePicker v-if="form.objectType==1" single @select="handleSelectUser" type="sysUser">
+          <AiMore v-model="form.userName"/>
+        </AiPagePicker>
+      </AiItem>
+    </AiGroup>
+    <AiGroup>
+      <AiItem label="赠送分值" required topLabel>
+        <div slot="sub" class="color-999">(积分总额{{ info.sysUserIntegral || 0 }}分)</div>
+        <input v-model.number="form.integral"/>
+      </AiItem>
+    </AiGroup>
+    <AiBottomBtn text="确认赠送" @click="submit"/>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "giveIntegral",
+  appName: "积分赠送",
+  computed: {
+    ...mapState(['user'])
+  },
+  data() {
+    return {
+      info: {},
+      form: {userName: ""}
+    }
+  },
+  methods: {
+    getInfo() {
+      let {user: {id: userId}} = this
+      this.$http.post('/app/appvillagerintegraldetail/sysUserIntegralList', null, {
+        params: {userId, current: 1, size: 10}
+      }).then(res => {
+        if (res?.data) {
+          this.info = res.data
+        }
+      })
+    },
+    submit() {
+      let {objectType, userId, integral} = this.form
+      if (!objectType) {
+        return this.$u.toast("请选择对象")
+      }
+      if (!userId) {
+        return this.$u.toast("请选择人员")
+      }
+      if (!integral) {
+        return this.$u.toast("请输入赠送分值")
+      }
+      this.$http.post("/admin/user/giveIntegral", null, {
+        params: {...this.form}
+      }).then(res => {
+        if (res?.code == 0) {
+          this.$u.toast("提交成功!")
+          uni.navigateBack({
+            success: () => uni.$emit('reachBottom', true)
+          })
+        }
+      })
+    },
+    handleSelectUser(v) {
+      console.log(v)
+      this.form.userId = v?.[0]?.id || ""
+      this.form.userName = v?.[0]?.name || ""
+    }
+  },
+  created() {
+    this.getInfo()
+    this.$dict.load("integralGiveObjType")
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.giveIntegral {
+  width: 100vw;
+  min-height: 100vh;
+
+  .color-999 {
+    color: #999;
+  }
+}
+</style>