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] =?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>