Merge branch 'dev_lqs' into 'master'

Dev lqs

See merge request !128

H5/src/views/airDropPool.vue

@@ -15,11 +15,8 @@
           <img src="@/assets/images/icon-notice.png" alt="" />
           <div class="notice-bar-show" id="scroll-box">
             <div class="user-id-list">
-              <p v-for="(item, index) in userPoolVos" :key="index">
-                {{ item.userId }}
-              </p>
-              <p v-for="(item, index) in userPoolVos" :key="index + 'us'">
-                {{ item.userId }}
+              <p v-for="(item, index) in userPoolVos" :key="index" @click="openUserInfo(item)">
+                用户{{ item.userId }}进入空投池
               </p>
             </div>
           </div>
@@ -34,15 +31,29 @@
         </p>
       </div>
     </div>
+    <base-dialog class="user-dialog" :base-dialog-show="userInfoDialog" @onClick="onCloseUser">
+      <div slot="content" class="user-dialog-content">
+        <img :src="currentUser.avatar" alt="头像">
+        <span class="normal">账号</span>
+        <span class="user-id">{{ currentUser.userId }}</span>
+        <span class="normal">进入空投池时间</span>
+        <span class="time">{{ currentUser.intoTime }}</span>
+      </div>
+    </base-dialog>
   </div>
 </template>
 
 <script>
+
 import { queryAerialDelivery } from "@/api/airDropPool";
+import BaseDialog from '../components/BaseDialog.vue';
 export default {
+  components: { BaseDialog },
   name: "AirDrop",
   data() {
     return {
+      currentUser: {},
+      userInfoDialog: false,
       total: 0,
       userPoolVos: [],
       timer: null
@@ -52,6 +63,15 @@ export default {
     this.queryData();
   },
   methods: {
+    onCloseUser() {
+      this.userInfoDialog = false;
+      this.currentUser = {}
+    },
+    openUserInfo(item) {
+      this.userInfoDialog = true;
+      this.currentUser = item;
+      this.currentUser.avatar = process.env.VUE_APP_BASE_URL + item.headImage
+    },
     handlerBack() {
       try {
         this.$bridgeToAppFun.navigateBack();
@@ -66,7 +86,11 @@ export default {
         console.log("空投池", res);
         if (res.code === 0) {
           _this.total = res.data.total;
-          _this.userPoolVos = res.data.userPoolVos;
+          _this.userPoolVos = res.data.userPoolVos.map(item => {
+            const temp = item
+            temp.userId = item.userId.substring(0, 3) + "****" + item.userId.substring(8, 11);
+            return temp;
+          });
           _this.$nextTick(() => {
             _this.scroll();
           });
@@ -92,7 +116,7 @@ export default {
           clearInterval(_this.timer);
           box.scrollTop = 0;
           setTimeout(() => {
-            _this.timer = setInterval(_this.autoScrollLine, 100);
+            _this.timer = setInterval(_this.autoScrollLine, 500);
           }, 0);
         }
       }
@@ -226,5 +250,37 @@ $white: #ffffff;
       }
     }
   }
+  .user-dialog-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-around;
+    margin-top: 20px;
+
+    img {
+      width: 67px;
+      height: 67px;
+      margin-bottom: 5px;
+    }
+
+    .normal {
+      font-size: 14px;
+      color: #999999;
+    }
+    .user-id,
+    .time {
+      font-size: 16px;
+    }
+
+    .user-id {
+      margin-bottom: 20px;
+    }
+  }
+  .user-dialog {
+    ::v-deep .van-button {
+      color: #666666;
+      background-color: #ffffff;
+    }
+  }
 }
 </style>

H5/src/views/cashOut/cash-out-record.vue

@@ -113,7 +113,9 @@ export default {
     }
   }
   ::v-deep .van-picker__frame {
-    border: 1px solid;
+    left: 0;
+    width: 100%;
+    background-color: #dddddd6e;
   }
 }
 .record-list {

H5/src/views/modefyAvatar.vue

@@ -7,8 +7,6 @@
         :max-count="1"
         :before-delete="onDeleteAvatar"
         :after-read="onRead"
-        :max-size="2 * 1024 * 1024"
-        @oversize="onOversize"
       >
         <van-button type="primary">上传新头像</van-button>
       </van-uploader>

H5/src/views/settings.vue

@@ -97,15 +97,8 @@ export default {
         });
     },
     logout() {
-      logout()
-        .then(res => {
-          if (res.code == 0) {
       localStorage.clear();
-          }
-        })
-        .catch(err => {
-          console.log(err);
-        });
+      logout().then();
       this.$bridgeToAppFun.logoutToApp();
     },
     jumpToInstructions() {