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

src/project/fengdu/AppMine/AppMine.vue

@@ -44,6 +44,12 @@
             <span>{{ item.label }}</span>
           </button>
         </div>
+        <div class="item" hover-class="bg-hover" @click="scan">
+          <div class="block">
+            <img class="icon" src="https://cdn.cunwuyun.cn/wxmp/mine/saoyisao.png" alt="">
+          </div>
+          <span class="desc">扫一扫</span>
+        </div>
       </div>
     </div>
     <div class="logout" v-if="token">
@@ -90,6 +96,12 @@ export default {
             path: "./myIntegral",
             type: 'token'
           },
+          {
+            icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png",
+            label: "我的家庭",
+            path: "./myFamily",
+            type: 'token'
+          },
         ],
         // [
         //   {
@@ -179,6 +191,20 @@ export default {
         }
       })
     },
+    scan() {
+      wx.scanQRCode({
+        needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+        scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+        success: (res)=> { 
+          // var result = res.resultStr; // 当 needResult 为 1 时，扫码返回的结果
+          // var resultArr = result.split(','); // 扫描结果以逗号分割数组(一维码)
+          // var codeContent = resultArr[resultArr.length - 1]; // 获取数组最后一个元素，也就是最终的内容 
+        },
+        fail: (err) => {
+          console.log("调用wx.scanQRCode扫码失败");
+        },
+      });
+    }
   },
   onLoad() {
     this.getAuth();

src/project/fengdu/AppMine/integralRank.vue

@@ -0,0 +1,469 @@
+<template>
+  <div class="integralRank" v-if="pageShow">
+    <div class="credit-points">
+      <div class="fixed-top">
+        <div class="header-tab">
+          <div class="tab-item" :class="{ active: tabIndex == index }" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)">{{ item }}
+            <span class="active-line" v-if="tabIndex == index"></span>
+          </div>
+        </div>
+      </div>
+      <div class="rank">
+        <!-- <u-subsection :list="typeList" :current="typeCurrent" active-color="#4181FF" inactive-color="#666666" :bold="false" @change="typeChange"></u-subsection> -->
+        <div class="content-subsection">
+          <div class="type-subsection">
+            <div class="item" :class="index == typeCurrent ? 'item-active' : ''" v-for="(item, index) in typeList" :key="index" @click="typeChange(index)">{{ item }}</div>
+          </div>
+        </div>
+        <div class="faultage"></div>
+        <div class="header-content" v-if="userInfo.length">
+          <div class="item">
+            <span class="item-num">{{ inx + 1 }}</span>
+            <image :src="userInfo[0].avatar_url" alt="" class="user-img mar-b4" v-if="userInfo[0].avatar_url" />
+            <div class="user-name-bg mar-b4 mar-r24" v-else>{{ formatName(userInfo[0].name) }}</div>
+            <span class="item-name">{{ userInfo[0].name }}</span>
+            <span class="item-point">{{ userInfo[0].integral }}</span>
+          </div>
+        </div>
+        <div class="faultage"></div>
+        <div>
+          <div class="ranking-content" v-if="list && list.length">
+            <div class="item" v-if="list.length > 1">
+              <img src="https://cdn.cunwuyun.cn/dvcp/credit/2.png" alt="" class="top-img">
+              <img :src="list[1].avatar_url" alt="" class="user-img mar-b4" v-if="list[1].avatar_url">
+              <div class="user-name-bg mar-b4" v-else>{{ formatName(list[1].name) }}</div>
+              <p class="user-name mar-b8">{{ list[1].name }}</p>
+              <p class="item-num">{{ list[1].integral }}</p>
+            </div>
+            <div class="item-top item" v-if="list.length > 0">
+              <img src="https://cdn.cunwuyun.cn/dvcp/credit/1.png" alt="" class="top-img-one">
+              <img :src="list[0].avatar_url" alt="" class="user-img mar-b4" v-if="list[0].avatar_url">
+              <div class="user-name-bg mar-b4" v-else>{{ formatName(list[0].name) }}</div>
+              <p class="user-name mar-b8">{{ list[0].name }}</p>
+              <p class="item-num">{{ list[0].integral }}</p>
+            </div>
+            <div class="item" v-if="list.length > 2">
+              <img src="https://cdn.cunwuyun.cn/dvcp/credit/3.png" alt="" class="top-img">
+              <img :src="list[2].avatar_url" alt="" class="user-img mar-b4" v-if="list[2].avatar_url">
+              <div class="user-name-bg mar-b4" v-else>{{ formatName(list[2].name) }}</div>
+              <p class="user-name mar-b8">{{ list[2].name }}</p>
+              <p class="item-num">{{ list[2].integral }}</p>
+            </div>
+          </div>
+          <div class="ranking-list" v-if="list && list.length">
+            <div class="item" v-for="(item, index) in list" :key="index" v-if="index > 2">
+              <span class="item-num">{{ index+1 }}</span>
+              <img :src="item.avatar_url" alt="" class="user-img mar-b4" v-if="item.avatar_url">
+              <div class="user-name-bg mar-b4 mar-r24" v-else>{{ formatName(item.name) }}</div>
+              <span class="item-name">{{ item.name }}</span>
+              <span class="item-point">{{ item.integral }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: "integralRank",
+  appName: "积分排行",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  data() {
+    return {
+      // tabList: ['总榜','月榜','周榜'],
+      tabList: ['个人排行', '家庭排行'],
+      tabIndex: 0,
+      current: 1,
+      userInfo: {},
+      inx: 0,
+      pageShow: false,
+      list: [],
+      typeList: ['总榜', '月榜', '周榜'],
+      typeCurrent: 0
+    }
+  },
+  onLoad() {
+    this.getList()
+  },
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  methods: {
+    tabClick(index) {
+      this.tabIndex = index
+      this.getList()
+    },
+    getList() {// 积分排行
+      this.list = {}
+      var url = `/app/appintegraluser/integralSortFD?type=${this.tabIndex}&size=50&areaId=${this.user.areaId}`  //积分排行  
+      this.$instance.post(url).then(res => {
+        if (res.code === 0) {
+          this.list = res.data.map(e=> ({...e, index: e.index}))
+          this.userInfo = res.data.filter(e => e.open_id === this.user.openId)
+          this.inx = res.data.findIndex(e=> e.open_id == this.user.openId)
+          this.pageShow = true
+        }
+      })
+    },
+    formatName(name) {
+      if (name == undefined) {
+        return
+      }
+      return name.substr(name.length - 2, name.length > 2 ? (name.length - 1) : name.length)
+    },
+    typeChange(index) {
+      this.typeCurrent = index
+    }
+  },
+  onReachBottom() {
+    // if (this.list.length < 50) {
+    //   this.current++;
+    //   this.getList()
+    // }
+  },
+}
+</script>
+<style scoped lang="scss">
+@import "~dvcp-wui/common";
+
+.integralRank {
+  width: 100vw;
+  overflow-x: hidden;
+  background-color: #f3f6f9;
+
+  ::v-deep .header-tab {
+    background: #FFF;
+    height: 116px;
+    padding: 34px 0 42px 0;
+    border-bottom: 1px solid #eee;
+    .tab-item {
+      color: #222222;
+      font-size: 30px;
+      font-weight: 400;
+    }
+    .active {
+      font-size: 34px;
+      font-weight: 500;
+    }
+    .active-line {
+      background: #2D7DFF;
+      top: 82px;
+    }
+  }
+
+  .fixed-top {
+    z-index: 999;
+  }
+
+  .rank {
+    width: 100vw;
+    overflow-x: hidden;
+    height: calc(100% - 156px);
+    margin-top: 116px;
+    
+    .content-subsection {
+      width: 100%;
+      height: 116px;
+      padding: 22px 28px;
+      box-sizing: border-box;
+      background: #FFFF;
+      
+      .type-subsection {
+        width: 100%;
+        height: 100%;
+        padding: 4px;
+        box-sizing: border-box;
+        border-radius: 36px;
+        background-color: #f6f7f9;
+        display: flex;
+        .item {
+          flex: 1;
+          line-height: 64px;
+          text-align: center;
+          font-family: PingFangSC-Regular;
+          font-weight: 400;
+          font-size: 28px;
+          color: #666;
+        }
+        .item-active {
+          background: #FFF;
+          border-radius: 32px;
+          color: #4181FF;
+        }
+      }
+    }
+    
+
+    .header-content {
+      .item {
+        width: 100%;
+        height: 120px;
+        line-height: 120px;
+        background: #FFF;
+        padding: 0 64px;
+        box-sizing: border-box;
+        // border: 4px solid #2d7dffff;
+
+        .item-num {
+          display: inline-block;
+          width: 68px;
+          height: 112px;
+          line-height: 112px;
+          color: #858594;
+          font-size: 28px;
+          vertical-align: top;
+        }
+
+
+        .user-img {
+          margin-right: 24px;
+          vertical-align: middle;
+        }
+
+        .item-name {
+          color: #333;
+          font-size: 30px;
+          display: inline-block;
+          width: 240px;
+        }
+
+        .item-point {
+          display: inline-block;
+          width: calc(100% - 420px);
+          text-align: right;
+          font-size: 30px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+        }
+
+        .mar-r24 {
+          margin-right: 24px;
+        }
+      }
+    }
+
+    .faultage {
+      width: 100%;
+      height: 32px;
+      background: #f3f5f7;
+    }
+
+    .ranking-content {
+      padding: 94px 30px 0;
+      background: #fff;
+
+      .item {
+        display: inline-block;
+        width: 216px;
+        box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
+        border-radius: 12px;
+        padding: 40px 0 76px 0;
+        text-align: center;
+        box-sizing: border-box;
+        position: relative;
+
+        .user-name {
+          font-size: 30px;
+          font-family: PingFang-SC-Medium, PingFang-SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 42px;
+        }
+
+        .item-num {
+          font-size: 46px;
+          font-weight: 6000;
+          color: #2C51CE;
+          line-height: 54px;
+        }
+
+        .top-img {
+          width: 100%;
+          height: 34px;
+          position: absolute;
+          top: -11px;
+          left: 0;
+        }
+      }
+
+      .item-top {
+        margin: -46px 20px 0;
+        vertical-align: top;
+        height: 370px;
+
+        .user-img {
+          width: 104px;
+          height: 104px;
+        }
+
+        .user-name-bg {
+          width: 104px;
+          height: 104px;
+          border-radius: 50%;
+          background-color: #4E8EEE;
+          font-size: 28px;
+          line-height: 104px;
+          text-align: center;
+          color: #fff;
+        }
+
+        .top-img-one {
+          width: 100%;
+          position: absolute;
+          top: -22px;
+          left: 0;
+          height: 46px;
+        }
+      }
+    }
+
+    .ranking-list {
+      background-color: #fff;
+
+      .item {
+        width: 100%;
+        height: 120px;
+        line-height: 120px;
+        background: #FFF;
+        padding: 0 64px;
+        box-sizing: border-box;
+
+        .item-num {
+          display: inline-block;
+          width: 68px;
+          color: #858594;
+          font-size: 28px;
+          vertical-align: top;
+        }
+
+        .user-img {
+          margin-right: 24px;
+          vertical-align: middle;
+        }
+
+        .item-name {
+          color: #333;
+          font-size: 30px;
+          display: inline-block;
+          width: 240px;
+        }
+
+        .item-point {
+          display: inline-block;
+          width: 210px;
+          text-align: right;
+          font-size: 30px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+        }
+
+        .mar-r24 {
+          margin-right: 24px;
+        }
+      }
+    }
+
+
+    .user-img {
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+    }
+
+    .user-name-bg {
+      display: inline-block;
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+      background-color: #4E8EEE;
+      font-size: 28px;
+      line-height: 80px;
+      text-align: center;
+      color: #fff;
+    }
+
+    .mar-b4 {
+      margin-bottom: 8px;
+    }
+
+    .mar-b8 {
+      margin-bottom: 16px;
+    }
+
+    .detail-content {
+      width: 690px;
+      background: #FFF;
+      border-radius: 16px;
+      margin: 0 0 0 32px;
+      padding: 30px 30px 94px;
+      box-sizing: border-box;
+
+      .title {
+        font-size: 34px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 48px;
+        margin-bottom: 30px;
+      }
+
+      .item {
+        padding: 34px 0 32px 0;
+        border-bottom: 2px solid #ddd;
+        display: flex;
+
+        .item-info {
+          width: 500px;
+
+          p {
+            word-break: break-all;
+            font-size: 32px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #333;
+            line-height: 44px;
+          }
+
+          span {
+            display: inline-block;
+            margin-top: 8px;
+            font-size: 24px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #999;
+            line-height: 34px;
+          }
+        }
+
+        .item-num {
+          width: calc(100% - 500px);
+          text-align: right;
+          font-size: 36px;
+          font-family: PingFangSC-Semibold, PingFang SC;
+          font-weight: 600;
+          line-height: 50px;
+        }
+      }
+    }
+
+    .color-0 {
+      color: #2C51CE !important;
+    }
+
+    .color-1 {
+      color: #E6736E !important;
+    }
+
+    .fixed-top {
+      z-index: 999;
+    }
+}
+
+}
+</style>

src/project/fengdu/AppMine/myFamily.vue

@@ -1,29 +1,29 @@
 <template>
   <div class="page">
-    <div class="credit-points">
-      <div class="bg-blue"></div>
-      <div class="header-content">
-        <div class="title">家庭地址</div>
-        <div class="address">
-          <img src="https://cdn.cunwuyun.cn/img/location-blue.svg" alt="">
-          <p>{{ info.resident.currentAreaName || '' }}{{ info.resident.currentAddress || '' }}</p>
+    <div class="user-list">
+      <div class="item">
+        <div class="item-left">
+          <img src="https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png" alt="">
+          <div class="user-info">
+            <h3>代玲昌</h3>
+            <p>积玉桥社区</p>
+          </div>
+        </div>
+        <div class="item-right">
+          <div @click="toTransfer">转积分</div>
         </div>
       </div>
-      <div class="list-content">
-        <div class="title">家庭成员</div>
-        <div class="item" v-for="(item, index) in info.family" :key="index">
-          <img src="https://cdn.cunwuyun.cn/dvcp/myFamily/1.png" alt="" class="banner-top" v-if="item.sex == 1">
-          <img src="https://cdn.cunwuyun.cn/dvcp/myFamily/2.png" alt="" class="banner-top" v-else>
-          <div class="user-img">
-            <img v-if="item.photo" :src="item.photo" alt=""/>
-            <img v-else src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt=""/>
-          </div>
+      <div class="item">
+        <div class="item-left">
+          <img src="https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png" alt="">
           <div class="user-info">
-            <p>{{ item.name }}</p>
-            <div v-if="item.householdName == 1" class="color-5AAD6A">户主</div>
-            <div v-else>{{ $dict.getLabel('householdRelation', item.householdRelation) }}</div>
+            <h3>代玲昌</h3>
+            <p>积玉桥社区</p>
           </div>
         </div>
+        <div class="item-right">
+          <div>转积分</div>
+        </div>
       </div>
     </div>
   </div>
@@ -50,11 +50,14 @@ export default {
   },
   methods: {
     getUser() {
-      this.$instance.post(`/app/appresident/detailForWx?id=${this.user.residentId}`).then(res => {
-        if (res.code === 0) {
-          this.info = res.data
-        }
-      })
+      // this.$instance.post(`/app/appresident/detailForWx?id=${this.user.residentId}`).then(res => {
+      //   if (res.code === 0) {
+      //     this.info = res.data
+      //   }
+      // })
+    },
+    toTransfer() {
+      uni.navigateTo({url: `./transferIntrgral`})
     }
   }
 }
@@ -66,112 +69,52 @@ export default {
   width: 100%;
   background-color: #f3f6f9;
 
-  .credit-points {
-    .bg-blue {
-      width: 100%;
-      height: 112px;
-      background-color: #197DF0;
-    }
-
-    .header-content {
-      width: 690px;
-      background: #FFF;
-      border-radius: 16px;
-      margin: -80px 0 32px 30px;
-      padding: 0 30px 80px;
-      box-sizing: border-box;
-      box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
-
-      .address {
-        font-size: 32px;
-        color: #666;
-        overflow: hidden;
-
+  .user-list {
+    padding: 32px 32px 0;
+    .item {
+      padding: 26px;
+      background-color: #fff;
+      display: flex;
+      margin-bottom: 24px;
+      .item-left {
+        width: calc(100% - 150px);
+        display: flex;
         img {
-          width: 34px;
-          height: 38px;
-          margin-right: 14px;
-          vertical-align: middle;
+          width: 108px;
+          height: 108px;
+          border-radius: 54px;
         }
-
-        p {
-          line-height: 44px;
-          width: 580px;
-          word-break: break-all;
-          float: right;
+        .user-info {
+          margin-left: 20px;
+          h3 {
+            line-height: 42px;
+            font-family: PingFangSC-Regular;
+            font-weight: 400;
+            font-size: 32px;
+            color: #333;
+            margin-bottom: 10px;
+          }
+          p {
+            font-family: PingFangSC-Regular;
+            font-size: 24px;
+            color: #999;
+            line-height: 40px;
+          }
         }
       }
-    }
-
-    .title {
-      font-size: 32px;
-      font-weight: 500;
-      color: #333;
-      line-height: 120px;
-    }
-
-    .list-content {
-      width: 690px;
-      background: #FFF;
-      border-radius: 16px;
-      padding: 0 30px 110px;
-      box-sizing: border-box;
-      margin-left: 30px;
-      box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
-
-      .item {
-        width: 630px;
-        height: 192px;
-        background: #FFF;
-        box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.08);
-        border-radius: 16px;
-        padding-left: 30px;
-        box-sizing: border-box;
-        margin-bottom: 32px;
-        overflow: hidden;
-
-        .banner-top {
-          width: 100%;
-          height: 72px;
-        }
-
-        .user-img {
-          width: 104px;
-          height: 104px;
-          margin: -16px 34px 0 0;
-          border-radius: 50%;
-          float: left;
-
-          img {
-            width: 100%;
-            height: 100%;
-            border-radius: 50%;
-          }
-        }
-
-        .user-info {
-          margin-top: -16px;
-          width: calc(100% - 138px);
-          float: right;
-
-          p {
-            font-size: 32px;
-            font-weight: 600;
-            color: #333;
-            line-height: 44px;
-            margin-bottom: 8px;
-          }
-
-          div {
-            font-size: 26px;
-            font-weight: 400;
-            color: #666;
-            line-height: 36px;
-          }
-
-          .color-5AAD6A {
-            color: #5AAD6A;
-          }
+      .item-right {
+        width: 150px;
+        div {
+          width: 126px;
+          height: 56px;
+          line-height: 56px;
+          text-align: center;
+          background: #2D7DFF;
+          border-radius: 30px;
+          font-family: PingFangSC-Regular;
+          font-size: 26px;
+          color: #FFF;
+          margin-top: 26px;
         }
       }
     }

src/project/fengdu/AppMine/myIntegral.vue

@@ -6,9 +6,13 @@
           <h1>{{info.integral || '0'}}</h1>
           <p>积分余额</p>
         </div>
+        <div class="total right-total">
+          <h1>{{info.integral || '0'}}</h1>
+          <p>家庭积分</p>
+        </div>
       </div>
       <div class="bottom">
-        <div class="item">
+        <div class="item" @click="toRank">
           <div class="num">{{ info.serialNo || '0'}}</div>
           <div class="label">积分排行</div>
         </div>
@@ -73,6 +77,9 @@ export default {
         }
       })
     },
+    toRank() {
+      uni.navigateTo({url: `./integralRank`})
+    }
   },
   onReachBottom() {
     this.current++
@@ -99,6 +106,7 @@ export default {
       width: 100%;
       height: 213px;
       z-index: 99;
+      position: relative;
       .total {
         width: 50%;
         padding-top: 48px;
@@ -114,6 +122,14 @@ export default {
           color: #999999;
         }
       }
+      .right-total {
+        position: absolute;
+        top: 0;
+        right: 0;
+        h1 {
+          color: #4083E9;
+        }
+      }
     }
     .bottom {
       display: flex;

src/project/fengdu/AppMine/transferIntrgral.vue

@@ -0,0 +1,108 @@
+<template>
+  <div class="page">
+    <div class="content">
+      <p class="text">积分收入方</p>
+      <img src="https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png" alt="">
+      <p class="user-name">代玲昌</p>
+      <u-input v-model="num" type="number" placeholder="请输入积分数量" :maxlength="11" :border="true" input-align="center" border-color="#ddd" height="76" class="input-num" />
+      <p class="num-text">剩余积分余额：567</p>
+      <div class="btn">确认转出</div>
+    </div>
+  </div>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  appName: "我的家庭",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  data() {
+    return {
+      num: ''
+    }
+  },
+  onLoad() {
+    this.$dict.load('householdRelation').then(() => {
+      this.$nextTick(() => {
+        this.getUser()
+      })
+    })
+  },
+  methods: {
+    getUser() {
+      // this.$instance.post(`/app/appresident/detailForWx?id=${this.user.residentId}`).then(res => {
+      //   if (res.code === 0) {
+      //     this.info = res.data
+      //   }
+      // })
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+@import "~dvcp-wui/common";
+.page {
+  width: 100%;
+  height: 100%;
+  height: 100vh;
+  padding: 32px 32px 96px 32px;
+  box-sizing: border-box;
+  background-color: #f3f6f9;
+  .content {
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+    border-radius: 8px;
+    text-align: center;
+    .text {
+      padding-top: 96px;
+      line-height: 40px;
+      font-family: PingFangSC-Regular;
+      font-size: 28px;
+      color: #999;
+      margin-bottom: 26px;
+    }
+    img {
+      width: 176px;
+      height: 176px;
+      border-radius: 88px;
+      margin: 0 auto 24px auto;
+    }
+    .user-name {
+      margin-bottom: 100px;
+      line-height: 42px;
+      font-family: PingFangSC-Regular;
+      font-weight: 400;
+      font-size: 36px;
+      color: #333;
+    }
+    .input-num {
+      width: calc(100% - 144px);
+      margin: 0 0 16px 72px;
+    }
+    .num-text {
+      color: #222;
+      font-size: 28px;
+      font-family: PingFangSC;
+      font-weight: 400;
+      line-height: 40px;
+      margin-bottom: 82px;
+    }
+    .btn {
+      width: 400px;
+      height: 80px;
+      text-align: center;
+      line-height: 80px;
+      background: #4181FF;
+      border-radius: 44px;
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 34px;
+      color: #FFF;
+      margin: 0 auto;
+    }
+  }
+}
+</style>

src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue

@@ -83,7 +83,7 @@ export default {
   appName: '积分兑换',
   data() {
     return {
-      tabList: [{name: '全部'}, {name: '积分兑换'}, {name: '京东低价商品'}],
+      tabList: [{name: '全部'}, {name: '积分兑换'}, {name: '低价商品'}],
       currentTabs: 0,
       barStyle: {
         'width': '20px',

src/project/szpc/AppNewFarmerBank/taskDetail.vue

@@ -204,7 +204,7 @@ export default {
     },
     // 打卡积分
     clockIn() {
-      if(!this.user.idNumber) {
+      if(!this.user.areaId) {
         return this.$dialog.confirm({
           content: '您只有完成信息认证后，才可进行相关操作。',
           confirmText: '去认证'
@@ -349,7 +349,7 @@ export default {
       })
     },
     toAuth() {
-      if (!this.user.idNumber) {
+      if (!this.user.areaId) {
         this.$dialog.confirm({
           content: '您只有完成信息认证后，才可进行相关操作。',
           confirmText: '去认证'