Merge remote-tracking branch 'origin/dev' into dev

src/project/fengdu/AppNewFarmerBank/integralAdd.vue

@@ -0,0 +1,23 @@
+<template>
+  <div class="integralAdd">
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: "integralAdd",
+  appName: '积分申请',
+  data() {
+    return {
+
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.integralAdd {
+  
+}
+</style>

src/project/fengdu/AppNewFarmerBank/integralApply.vue

@@ -0,0 +1,29 @@
+<template>
+  <div class="integralApply">
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: "integralApply",
+  appName: "积分申请",
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+
+  },
+  onShow() {
+
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.integralApply {
+  
+}
+</style>

src/project/fengdu/AppNewFarmerBank/integralDetail.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="integralDetail"></div>
+</template>
+
+<script>
+export default {
+  name: "integralDetail",
+  appName: "积分申请详情",
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+
+  },
+  onLoad(o) {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.integralDetail {
+  
+}
+</style>

src/project/fengdu/AppNewFarmerBank/signIn.vue

@@ -2,13 +2,13 @@
   <div class="signIn">
     <div class="card">
       <div class="imgs">
-        <img src="https://cdn.cunwuyun.cn/fengdu/ic-renwuleixing.png" alt="">
+        <img src="https://cdn.cunwuyun.cn/fengdu/img-qiandaochenggong.png" alt="">
       </div>
       <p class="status">今日已完成签到</p>
       <h4>积分<span>+5</span></h4>
       <div class="times">
         <div>时间</div>
-        <div>2020-12-11 10:10</div>
+        <div class="value">2020-12-11 10:10</div>
       </div>
     </div>
   </div>
@@ -44,6 +44,7 @@ export default {
     background: #FFFFFF;
     border-radius: 16px;
     padding-top: 120px;
+    box-sizing: border-box;
 
     .imgs {
       margin: 0 auto;
@@ -55,14 +56,34 @@ export default {
       }
     }
     .status {
+      margin-top: 72px;
       text-align: center;
+      font-size: 36px;
+      font-weight: 500;
     }
     h4 {
       text-align: center;
+      margin-top: 24px;
+      color: #666666;
+      font-size: 28px;
+      font-weight: 400;
+      span {
+        font-size: 52rpx;
+        font-weight: 600;
+        color: #5AAD6A;
+      }
     }
     .times {
+      width: 70%;
+      border-top: 2px solid #f5f5f5;
+      margin: 70px auto 0;
+      padding-top: 72px;
+      box-sizing: border-box;
       display: flex;
-      justify-content: space-around;
+      justify-content: space-between;
+      .value {
+        color: #666666;
+      }
     }
   }
 }