From 01beff42b01a9295911e1ab71d0dbb77f7c7d34d Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 31 Mar 2023 14:51:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B5=8C=E5=A5=97=E4=B8=80=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fengdu/AppNewFarmerBank/integralAdd.vue   | 29 +++++-
 .../fengdu/AppNewFarmerBank/integralApply.vue | 63 +++++++++++-
 .../fengdu/AppNewFarmerBank/taskDetail.vue    | 95 ++++++++++---------
 3 files changed, 134 insertions(+), 53 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/integralAdd.vue b/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
index 5aef722..8980b91 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralAdd.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="integralAdd">
-
+    <div class="item">
+      <div class="left">事件类型</div>
+      <!-- <div class="right"> -->
+        <AiSelect class="right" dict="clapEventStatus" v-model="form.type"></AiSelect>
+      <!-- </div> -->
+    </div>
   </div>
 </template>
 
@@ -10,14 +15,32 @@ export default {
   appName: '积分申请',
   data() {
     return {
-
+      form: {
+        type: 0,
+      }
     }
   },
+  onLoad(o) {
+    this.$dict.load(['clapEventStatus'])
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .integralAdd {
-  
+  .item {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    background: #FFF;
+    padding: 24px 32px;
+    .left {
+      width: 250px;;
+    }
+    .right {
+      width: calc(100% - 200px);
+      text-align: right;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/project/fengdu/AppNewFarmerBank/integralApply.vue b/src/project/fengdu/AppNewFarmerBank/integralApply.vue
index bd2cfd4..ce0e175 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralApply.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralApply.vue
@@ -2,12 +2,19 @@
   <div class="integralApply">
     <div class="card-list">
       <div class="card">
-        
+        <div class="left">
+          <div class="title">房钱午后卫生</div>
+          <div class="time">2020-12-11 10:10</div>
+        </div>
+        <div class="right">
+          <div class="integral">+5</div>
+          <div class="status">待审核</div>
+        </div>
       </div>
     </div>
     <AiEmpty :description="`暂无数据`" class="emptyWrap"/>
     <div class="btn-wrapper">
-      <div class="btn" hover-class="text-hover">积分申请</div>
+      <div class="btn" hover-class="text-hover" @click="toAdd">积分申请</div>
     </div>
   </div>
 </template>
@@ -22,7 +29,9 @@ export default {
     }
   },
   methods: {
-
+    toAdd() {
+      this.$linkTo('./integralAdd')
+    }
   },
   onShow() {
 
@@ -35,6 +44,54 @@ export default {
   padding-bottom: 120px;
   box-sizing: border-box;
 
+  .card-list {
+    margin-top: 24px;
+    background: #FFF;
+    .card {
+      padding: 32px 40px;
+      box-sizing: border-box;
+      border-bottom: 1px solid #EEEEEE;
+      display: flex;
+      align-items: center;
+      .left {
+        width: calc(100% - 200px);
+        .title {
+          font-size: 32px;
+          font-weight: 600;
+        }
+        .time {
+          font-size: 28px;
+          font-weight: 400;
+          color: #666666;
+          margin-top: 8px;
+        }
+      }
+      .right {
+        width: 200px;
+        text-align: right;
+        .integral {
+          font-size: 38px;
+          font-weight: 600;
+        }
+        .status {
+          font-size: 28px;
+          font-weight: 400;
+          margin-top: 8px;
+        }
+
+        .status0 {
+          color: #FF9A40;
+        }
+        .status0 {
+          color: #5AAD6A;
+        }
+        .status0 {
+          color: #CD413A;
+        }
+      }
+    }
+  }
+
   ::v-deep .btn-wrapper {
     background: #FFF;
   }
diff --git a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
index 0df3a0f..f310431 100644
--- a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
+++ b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
@@ -1,58 +1,60 @@
 <template>
-  <div class="taskDetail" v-if="showPages">
-    <div class="task">
-      <h4>{{ info.title }}</h4>
-      <p>{{ info.detail }}</p>
-      <div class="imgs" v-if="info.files">
-        <image :src="item.url" v-for="(item, index) in info.files" :key="index" mode="aspectFill" @click="preview(item.url)" />
+  <div class="page">
+    <div class="taskDetail" v-if="showPages">
+      <div class="task">
+        <h4>{{ info.title }}</h4>
+        <p>{{ info.detail }}</p>
+        <div class="imgs" v-if="info.files">
+          <image :src="item.url" v-for="(item, index) in info.files" :key="index" mode="aspectFill" @click="preview(item.url)" />
+        </div>
       </div>
-    </div>
 
-    <div class="info">
-      <div class="title">基础信息</div>
-      <div class="items">
-        <img src="https://cdn.cunwuyun.cn/fengdu/ic-dizhi.png" alt="">
-        <div class="items-info">
-          <label>活动地点：</label>
-          <div class="value">{{ info.address }}</div>
+      <div class="info">
+        <div class="title">基础信息</div>
+        <div class="items">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-dizhi.png" alt="">
+          <div class="items-info">
+            <label>活动地点：</label>
+            <div class="value">{{ info.address }}</div>
+          </div>
+          <div class="address" @click="toAddress">
+            <img src="https://cdn.cunwuyun.cn/fengdu/ic-daohang.png" alt="">
+            <i>导航</i>
+          </div>
         </div>
-        <div class="address" @click="toAddress">
-          <img src="https://cdn.cunwuyun.cn/fengdu/ic-daohang.png" alt="">
-          <i>导航</i>
+        <div class="item">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-renwuleixing.png" alt="">
+          <div class="item-info">
+            <label>任务类型：</label>
+            <div class="value">{{ $dict.getLabel('fdIntegralTaskType', info.type) }}</div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-jinchangshijian.png" alt="">
+          <div class="item-info" v-if="info.intoBegintime && info.intoEndtime">
+            <label>{{ info.type == 0 ? '进场时间：' : '报名时间：' }}</label>
+            <div class="value">{{ info.intoBegintime.substring(0, 16) }} 至 {{ info.intoEndtime.substring(0, 16) }}</div>
+          </div>
+        </div>
+        <div class="item" v-if="info.type == 0">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-lichangshijian.png" alt="">
+          <div class="item-info" v-if="info.exitBegintime && info.exitEndtime">
+            <label>离场时间：</label>
+            <div class="value">{{ info.exitBegintime.substring(0, 16) }} 至 {{ info.exitEndtime.substring(0, 16) }}</div>
+          </div>
         </div>
       </div>
-      <div class="item">
-        <img src="https://cdn.cunwuyun.cn/fengdu/ic-renwuleixing.png" alt="">
-        <div class="item-info">
-          <label>任务类型：</label>
-          <div class="value">{{ $dict.getLabel('fdIntegralTaskType', info.type) }}</div>
+      <div class="btn-wrapper" v-if="info.type == 1">
+        <div class="btn" @click="signUp" hover-class="text-hover" :class="baoming == 1 ? 'opacity' : baoming == 0 ? 'gray' : ''">
+          <span v-if="baoming == 2 || baoming == 0">报名得积分<span v-if="baoming == 2">/积分+{{ info.enrollIntegral }}</span></span>
+          <span v-if="baoming == 1">已报名</span>
         </div>
       </div>
-      <div class="item">
-        <img src="https://cdn.cunwuyun.cn/fengdu/ic-jinchangshijian.png" alt="">
-        <div class="item-info" v-if="info.intoBegintime && info.intoEndtime">
-          <label>{{ info.type == 0 ? '进场时间：' : '报名时间：' }}</label>
-          <div class="value">{{ info.intoBegintime.substring(0, 16) }} 至 {{ info.intoEndtime.substring(0, 16) }}</div>
+      <div class="btn-wrapper" v-if="info.type == 0">
+        <div class="btn" @click="clockIn" hover-class="text-hover" :class="isClock == 0 ? 'gray' : isClock == 3 ? 'gray' : isClock == 2 ? 'opacity' : isClock == 4 ? 'opacity' : ''">
+          <div class="daka">{{ dkqd }}<span v-if="isClock == 1">/积分+{{ intoIntegral }}</span></div>
         </div>
       </div>
-      <div class="item" v-if="info.type == 0">
-        <img src="https://cdn.cunwuyun.cn/fengdu/ic-lichangshijian.png" alt="">
-        <div class="item-info" v-if="info.exitBegintime && info.exitEndtime">
-          <label>离场时间：</label>
-          <div class="value">{{ info.exitBegintime.substring(0, 16) }} 至 {{ info.exitEndtime.substring(0, 16) }}</div>
-        </div>
-      </div>
-    </div>
-    <div class="btn-wrapper" v-if="info.type==1">
-      <div class="btn" @click="signUp" hover-class="text-hover" :class="baoming==1? 'opacity': baoming == 0? 'gray':''">
-        <span v-if="baoming==2 || baoming == 0">报名得积分<span v-if="baoming==2">/积分+{{ info.enrollIntegral }}</span></span>
-        <span v-if="baoming==1">已报名</span>
-      </div>
-    </div>
-    <div class="btn-wrapper" v-if="info.type == 0">
-      <div class="btn" @click="clockIn" hover-class="text-hover" :class="isClock== 0? 'gray': isClock==3? 'gray': isClock== 2? 'opacity': isClock == 4? 'opacity':''">
-        <div class="daka">{{ dkqd }}<span v-if="isClock==1">/积分+{{ intoIntegral }}</span></div>
-      </div>
     </div>
     <AiLogin ref="login" @success="getAuth()"/>
   </div>
@@ -343,10 +345,9 @@ export default {
         this.token && this.getUserInfo('qujing')
       })
     }
-
   },
   onLoad(o) {
-    this.id = o.id
+    this.id = o?.id
     if (decodeURIComponent(o.scene) != 'undefined') {
       this.id = decodeURIComponent(o.scene)
     }