diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index e5578b5..2c433a8 100644
--- a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -10,10 +10,10 @@
         <span v-else>欢迎进入{{ user.areaName }}！</span>
         
       </div>
-      <div class="signin" @click="$u.toast('内容建设中...')">签到</div>
+      <div class="signin" @click="toPages('./signIn')">签到</div>
     </div>
     <div class="card-list">
-      <div class="jfsq" @click="$u.toast('内容建设中...')">
+      <div class="jfsq" @click="toPages('./integralApply')">
         <p>积分申请</p>
         <h4>好事自荐得积分</h4>
       </div>
diff --git a/src/project/fengdu/AppNewFarmerBank/integralAdd.vue b/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
index 1a50013..aa4e587 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
@@ -2,13 +2,38 @@
   <div class="integralAdd">
     <div class="item">
       <div class="left">事件类型</div>
-      <AiSelect class="right" dict="clapEventStatus" v-model="form.type"></AiSelect>
+      <AiSelect class="right" :list="dictList" v-model="form.applyItemId"></AiSelect>
     </div>
     <div class="items">
       <p>详情描述</p>
       <textarea v-model="form.content" :maxlength="300" placeholder="请输入详细描述..."></textarea>
       <div class="tips">{{ form.content.length }}/300</div>
     </div>
+    <div class="items">
+      <p>上传图片</p>
+      <div class="upload">
+        <AiUploader v-model="form.files" placeholder="上传图片" type="image" :limit="9" multiple></AiUploader>
+      </div>
+      <div class="tips left">可上传图片，最多上传9张。</div>
+    </div>
+    <div class="items">
+      <p>上传视频</p>
+      <div class="upload">
+        <AiUploader v-model="form.files" placeholder="上传视频" type="video" :limit="9" multiple :size="30 * 1024 * 1024"></AiUploader>
+      </div>
+      <div class="tips left">可上传视频，最大30M。</div>
+    </div>
+
+    <div class="item">
+      <div class="left">所属网格</div>
+      <AiPagePicker type="gird" v-model="form.girdId" :params="{ formType: 2 }" @select="handleSelectGrid" nodeKey="id">
+        <AiMore v-model="form.girdName"/>
+      </AiPagePicker>
+    </div>
+
+    <div class="btn-wrapper">
+      <div class="btn" hover-class="text-hover" @click="submit">提交申请</div>
+    </div>
   </div>
 </template>
 
@@ -19,19 +44,66 @@ export default {
   data() {
     return {
       form: {
-        type: 0,
+        applyItemId: 0,
+        applyIntegral: '',
+        applyItemName: '',
         content: '',
-      }
+        files: [],
+        girdId: '',
+        girdName: '',
+      },
+      list: [],
+      dictList: [],
     }
   },
   onLoad(o) {
     this.$dict.load(['clapEventStatus'])
+    this.getType()
+  },
+  watch: {
+    'form.applyItemId'(v) {
+      if(v) {
+        this.form.applyItemName = this.list.filter(e=> (e.id==v))[0].ruleName
+        this.form.applyIntegral = this.list.filter(e => (e.id == v))[0].integral
+      }
+    }
+  },
+  methods: {
+    submit() {
+      this.$instance.post(`/app/appintegraluserapply/addOrUpdate`,{
+        ...this.form
+      }).then(res=> {
+        if(res?.data) {
+          console.log(res);
+        }
+      })
+    },
+    // 事件类型
+    getType() {
+      this.$instance.post(`/app/appintegralrule/listByFD`).then(res=> {
+        if(res?.data) {
+          this.list = res.data
+          this.dictList = res.data.map(v => {
+            return {
+              value: v.id,
+              label: v.ruleName
+            }
+          })
+        }
+      })
+    },
+    handleSelectGrid(v) {
+      this.form.girdName = v.girdName
+      this.form.girdId = v.girdId
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
 .integralAdd {
+  padding-bottom: 140px;
+  box-sizing: border-box;
   .item {
     width: 100%;
     display: flex;
@@ -73,6 +145,40 @@ export default {
       font-size: 24px;
       font-weight: 400;
     }
+    .left {
+      text-align: left;
+    }
+    .upload {
+      padding: 24px 32px;
+      box-sizing: border-box;
+
+      // .fodder_alls {
+      //   display: flex;
+      //   margin-top: 16px;
+      //   align-items: center;
+      //   .fodder_add {
+      //     border: 2px solid #DBDCDF;
+      //     padding: 20px 24px;
+      //     box-sizing: border-box;
+      //     border-radius: 8px;
+      //   }
+      //   .fodder_title {
+      //     color: #8E8F91;
+      //     margin-left: 20px;
+      //   }
+      // }
+    }
   }
+
+  ::v-deep .btn-wrapper {
+    background: #FFF;
+  }
+
+  ::v-deep .btn-wrapper .btn {
+    height: 80px;
+    line-height: 80px;
+    border-radius: 40px;
+  }
+
 }
 </style>
\ No newline at end of file
diff --git a/src/project/fengdu/AppNewFarmerBank/integralApply.vue b/src/project/fengdu/AppNewFarmerBank/integralApply.vue
index ce0e175..a43f866 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralApply.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralApply.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="integralApply">
-    <div class="card-list">
-      <div class="card">
+    <div class="card-list" v-if="list.length">
+      <div class="card" v-for="(item,index) in list" :key="index" @click="$linkTo(`./integralDetail?id=${item.id}`)">
         <div class="left">
-          <div class="title">房钱午后卫生</div>
-          <div class="time">2020-12-11 10:10</div>
+          <div class="title">{{ item.applyItemName }}</div>
+          <div class="time">{{ item.createTime }}</div>
         </div>
         <div class="right">
-          <div class="integral">+5</div>
+          <div class="integral">+{{ item.applyIntegral }}</div>
           <div class="status">待审核</div>
         </div>
       </div>
     </div>
-    <AiEmpty :description="`暂无数据`" class="emptyWrap"/>
+    <AiEmpty :description="`暂无数据`" class="emptyWrap" v-else/>
     <div class="btn-wrapper">
       <div class="btn" hover-class="text-hover" @click="toAdd">积分申请</div>
     </div>
@@ -25,17 +25,34 @@ export default {
   appName: "积分申请",
   data() {
     return {
-
+      current: 1,
+      list: [],
     }
   },
   methods: {
     toAdd() {
       this.$linkTo('./integralAdd')
+    },
+    getList() {
+      this.$instance.post(`/app/appintegraluserapply/listByAppletUser`,null,{
+        params: {
+          current: this.current,
+          size: 10
+        }
+      }).then(res => {
+        if (res?.data) {
+          this.list = res.data.records
+        }
+      })
     }
   },
   onShow() {
-
+    this.getList()
   },
+  onReachBottom() {
+    this.current++ 
+    this.getList()
+  }
 }
 </script>