From f44191578c54e4978b9eefa7e64bfbf3d7a17ab3 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 4 Apr 2023 14:56:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppNewFarmerBank/AppNewFarmerBank.vue     | 21 +++++++++++++++----
 .../fengdu/AppNewFarmerBank/integralAdd.vue   |  1 -
 .../fengdu/AppNewFarmerBank/signIn.vue        | 17 ++++++++++-----
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index b1a1389..f8921b2 100644
--- a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -10,7 +10,7 @@
         <span v-else>欢迎进入{{ user.areaName }}！</span>
         
       </div>
-      <div class="signin" @click="toPages('./signIn')">签到</div>
+      <div class="signin" @click="toPages('./signIn',status)">{{ status==1? '已签到':'签到' }}</div>
     </div>
     <div class="card-list">
       <div class="jfsq" @click="toPages('./integralApply')">
@@ -62,7 +62,7 @@ export default {
   appName: "功德银行",
   data() { 
     return {
-
+      status: null,
     }
   },
   computed: {
@@ -79,7 +79,7 @@ export default {
     handleBannerClick() {
 
     },
-    toPages(url) {
+    toPages(url,status) {
       if(!this.user.idNumber) {
         this.$dialog.confirm({
           content: '您只有完成信息认证后，才可进行相关操作。',
@@ -89,8 +89,20 @@ export default {
         }).catch(() => {
         })
       } else {
-        this.$linkTo(url)
+        if(!status) {
+          this.$linkTo(url)
+        } else {
+          // 停留
+        }
+        
       }
+    },
+    getStatus() {
+      this.$instance.post(`/app/appwechatsigninfo/checkSign`).then(res=> {
+        if(res?.data !== null) {
+          this.status = 1
+        }
+      })
     }
   },
   onShow() {
@@ -98,6 +110,7 @@ export default {
       title: '功德银行'
     });
     // this.getList()
+    this.getStatus()
   },
 }
 </script>
diff --git a/src/project/fengdu/AppNewFarmerBank/integralAdd.vue b/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
index 4d0813f..924335c 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
@@ -98,7 +98,6 @@ export default {
       this.$instance.post(`/app/appintegraluserapply/addOrUpdate`,{
         ...this.form
       }).then(res=> {
-        this.flag = false
         if(res?.data) {
           this.$u.toast('提交成功')
           uni.$emit('edit')
diff --git a/src/project/fengdu/AppNewFarmerBank/signIn.vue b/src/project/fengdu/AppNewFarmerBank/signIn.vue
index 32656ba..8e0d6c9 100644
--- a/src/project/fengdu/AppNewFarmerBank/signIn.vue
+++ b/src/project/fengdu/AppNewFarmerBank/signIn.vue
@@ -5,10 +5,10 @@
         <img src="https://cdn.cunwuyun.cn/fengdu/img-qiandaochenggong.png" alt="">
       </div>
       <p class="status">今日已完成签到</p>
-      <h4>积分<span>+5</span></h4>
+      <h4>积分<span>+{{ data.changeIntegral || 0}}</span></h4>
       <div class="times">
         <div>时间</div>
-        <div class="value">2020-12-11 10:10</div>
+        <div class="value">{{ data.createTime.slice(0,16) }}</div>
       </div>
     </div>
   </div>
@@ -20,14 +20,21 @@ export default {
   appName: '签到',
   data() {
     return {
-
+      showPage: false,
+      data: {},
     }
   },
   methods: {
-
+    sign() {
+      this.$instance.post(`/app/appwechatsigninfo/sign`,{}).then(res=> {
+        if(res?.data) {
+          this.data = res.data
+        }
+      })
+    }
   },
   onShow() {
-
+    this.sign()
   }
 }
 </script>

From 8a896f2289019927f07394964e9a8307900d589e Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 4 Apr 2023 16:31:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppNewFarmerBank/AppNewFarmerBank.vue     | 55 ++++++++++++-------
 .../fengdu/AppNewFarmerBank/integralAdd.vue   |  4 ++
 .../fengdu/AppNewFarmerBank/signIn.vue        |  2 +-
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index f8921b2..c554af9 100644
--- a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -30,27 +30,31 @@
         <h4>兑换得好物</h4>
       </div>
     </div>
-    <div class="handpick">
+    <div class="handpick" v-if="list.length">
       <div class="title">
         <h1>精选动态</h1>
-        <div class="more" @click="toPages('./handpick')">
+        <div class="more" v-if="list.length > 3" @click="toPages('./handpick')">
           <span>更多</span>
           <u-icon name="arrow-right" color="#687DA6" size="28"></u-icon>
         </div>
       </div>
-      <div class="list" @click="toPages('内容建设中...')">
-        <div class="top">
-          <div class="left">百年征和波澜壮阔，百年初心历争议弥坚。7月1日上午，庆祝中国共产党成立100周年…</div>
-          <div class="right">
-            <img src="https://cdn.cunwuyun.cn/wxmp/fengdu/zan-active.png" alt="">
-            <!-- https://cdn.cunwuyun.cn/wxmp/fengdu/zan.png -->
-            <span>99+</span>
+      <div class="list" @click="toPages('内容建设中...')" v-if="list.length">
+        <div v-for="(item,index) in list" :key="index">
+          <div class="top">
+            <div class="left">百年征和波澜壮阔，百年初心历争议弥坚。7月1日上午，庆祝中国共产党成立100周年…</div>
+            <div class="right">
+              <img src="https://cdn.cunwuyun.cn/wxmp/fengdu/zan-active.png" alt="">
+              <!-- https://cdn.cunwuyun.cn/wxmp/fengdu/zan.png -->
+              <span>99+</span>
+            </div>
+          </div>
+          <div class="bottom">
+            <img src="https://cdn.cunwuyun.cn/fengdu/img-jifenlist.png" alt="">
           </div>
         </div>
-        <div class="bottom">
-          <img src="https://cdn.cunwuyun.cn/fengdu/img-jifenlist.png" alt="">
-        </div>
+        
       </div>
+      <!-- <AiEmpty :description="`暂无数据`" class="emptyWrap" v-else/> -->
     </div>
   </div>
 </template>
@@ -63,16 +67,24 @@ export default {
   data() { 
     return {
       status: null,
+      current: 1,
+      list: [],
     }
   },
   computed: {
     ...mapState(['user'])
   },
   methods: {
-    getList() {
-      this.$instance.post(``).then(res=> {
+    getList(moduleId) {
+      this.$instance.post(`/app/appcontentinfo/list-web`,null,{
+        params: {
+          moduleId: moduleId,
+          current: this.current,
+          // areaId: this.user.areaId
+        }
+      }).then(res=> {
         if(res?.data) {
-          console.log(res);
+          this.list = res.data.records.length > 3 ? res.data.records.slice(2) : res.data.records
         }
       })
     },
@@ -103,14 +115,19 @@ export default {
           this.status = 1
         }
       })
+    },
+    getModule() {
+      this.$instance.post(`/app/appintegraluserapply/queryModuleByName`).then(res=> {
+        if(res?.data) {
+          this.getList(res.data)
+        }
+      })
     }
+    
   },
   onShow() {
-    uni.setNavigationBarTitle({
-      title: '功德银行'
-    });
-    // this.getList()
     this.getStatus()
+    this.getModule()
   },
 }
 </script>
diff --git a/src/project/fengdu/AppNewFarmerBank/integralAdd.vue b/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
index 924335c..93abfbf 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
@@ -84,6 +84,10 @@ export default {
         return this.$u.toast('请选择事件类型')
       }
 
+      if (!this.form.content) {
+        return this.$u.toast('请输入详细描述')
+      }
+
       if ((this.form.images.length + this.form.videos.length) > 9) {
         return this.$u.toast('图片和视频不得超过9个')
       } else {
diff --git a/src/project/fengdu/AppNewFarmerBank/signIn.vue b/src/project/fengdu/AppNewFarmerBank/signIn.vue
index 8e0d6c9..5dbac65 100644
--- a/src/project/fengdu/AppNewFarmerBank/signIn.vue
+++ b/src/project/fengdu/AppNewFarmerBank/signIn.vue
@@ -5,7 +5,7 @@
         <img src="https://cdn.cunwuyun.cn/fengdu/img-qiandaochenggong.png" alt="">
       </div>
       <p class="status">今日已完成签到</p>
-      <h4>积分<span>+{{ data.changeIntegral || 0}}</span></h4>
+      <h4>积分<span v-if="data.changeIntegral">+{{ data.changeIntegral || 0}}</span></h4>
       <div class="times">
         <div>时间</div>
         <div class="value">{{ data.createTime.slice(0,16) }}</div>

From 1fbc5e2448af9ab4a11981b12b1c33cc019f9773 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 4 Apr 2023 18:00:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=B2=BE=E9=80=89=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppNewFarmerBank/AppNewFarmerBank.vue     | 74 ++++++++++---------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index c554af9..800eaac 100644
--- a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -38,8 +38,8 @@
           <u-icon name="arrow-right" color="#687DA6" size="28"></u-icon>
         </div>
       </div>
-      <div class="list" @click="toPages('内容建设中...')" v-if="list.length">
-        <div v-for="(item,index) in list" :key="index">
+      <div class="list" v-if="list.length">
+        <div class="card" v-for="(item,index) in list" :key="index" @click="toPages(`./handpick?id=${item.id}`)">
           <div class="top">
             <div class="left">百年征和波澜壮阔，百年初心历争议弥坚。7月1日上午，庆祝中国共产党成立100周年…</div>
             <div class="right">
@@ -52,7 +52,6 @@
             <img src="https://cdn.cunwuyun.cn/fengdu/img-jifenlist.png" alt="">
           </div>
         </div>
-        
       </div>
       <!-- <AiEmpty :description="`暂无数据`" class="emptyWrap" v-else/> -->
     </div>
@@ -89,7 +88,7 @@ export default {
       })
     },
     handleBannerClick() {
-
+      
     },
     toPages(url,status) {
       if(!this.user.idNumber) {
@@ -134,7 +133,8 @@ export default {
 
 <style lang="scss" scoped>
 .AppNewFarmerBank {
-  
+  padding-bottom: 20px;
+  box-sizing: border-box;
   .swiper-content {
     width: 100%;
     height: 332px;
@@ -251,40 +251,42 @@ export default {
     }
 
     .list {
-      padding: 32px 24px;
-      box-sizing: border-box;
-      background: #FFF;
-      border-radius: 12px;
-      // margin-bottom: 24px;
-      .top {
-        display: flex;
-        justify-content: space-between;
-        .left {
-          width: 562px;
-          overflow:hidden; 
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
+      .card {
+        margin-bottom: 24px;
+        padding: 32px 24px;
+        box-sizing: border-box;
+        background: #FFF;
+        border-radius: 12px;
+        .top {
+          display: flex;
+          justify-content: space-between;
+          .left {
+            width: 562px;
+            overflow:hidden; 
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+          }
+          .right {
+            width: 52px;
+            text-align: center;
+            img {
+              width: 40px;
+              height: 40px;
+            }
+            span {
+              font-size: 28px;
+              font-weight: 400;
+              color: #687DA6;
+            }
+          }
         }
-        .right {
-          width: 52px;
-          text-align: center;
+        .bottom {
           img {
-            width: 40px;
-            height: 40px;
+            width: 100%;
+            height: 202px;
           }
-          span {
-            font-size: 28px;
-            font-weight: 400;
-            color: #687DA6;
-          }
-        }
-      }
-      .bottom {
-        img {
-          width: 100%;
-          height: 202px;
         }
       }
     }