Merge pull request #936 from Matataki-io/testing

early release

api/API.js

@@ -1153,6 +1153,12 @@ minetokenGetResources(tokenId) {
       timeout: 60 * 1000
     })
   },
+  renewBscWithdrawPermit(permitId) {
+    return request({
+      method: 'GET',
+      url: `/minetoken/crosschain-permit/renew/${permitId}/`,
+    })
+  },
   listMyCrossChainDeposit() {
     return request({
       method: 'GET',

components/bilibili_card/bilibili_anime.vue

@@ -0,0 +1,156 @@
+<template>
+  <a class="linkbox" :href="'https://www.bilibili.com/bangumi/play/ep' + card.episode_id" target="_blank">
+    <div class="videocard">
+      <div class="videocard-l">
+        <el-image
+          :src="card.cover"
+          alt="image"
+          fit="cover"
+          lazy
+        />
+        <div class="videocard-l-type">
+          {{ card.apiSeasonInfo.type_name }}
+        </div>
+      </div>
+      <div class="videocard-r">
+        <h4>
+          {{ card.new_desc }}
+        </h4>
+        <p />
+        <div class="videocard-r-heat">
+          <div class="videocard-r-heat-views">
+            <svg-icon icon-class="bilibili_views" />
+            {{ card.play_count }}
+          </div>
+          <div class="videocard-r-heat-barrage">
+            <svg-icon icon-class="bilibili_barrage" />
+            {{ card.bullet_count }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </a>
+</template>
+
+<script>
+
+export default {
+  props: {
+    // 卡片数据
+    card: {
+      type: Object,
+      required: true
+    }
+  },
+  computed: {
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+.linkbox {
+  text-decoration: none;
+  display: block;
+}
+
+.word-limit {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  word-break: break-all;
+}
+
+.videocard {
+  border: 1px solid #E6E9EE;
+  background: white;
+  border-radius: 5px;
+  overflow: hidden;
+  box-sizing: border-box;
+  height: 127px;
+  display: flex;
+  max-width: 520px;
+  transition: all 0.2s;
+
+  &:hover {
+    box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.1);
+  }
+
+  &-l {
+    width: 203px;
+    height: 100%;
+    min-width: 203px;
+    position: relative;
+    border-radius: 5px;
+    overflow: hidden;
+    .el-image {
+      width: 100%;
+      height: 100%;
+    }
+    &-type {
+      position: absolute;
+      top: 8px;
+      right: 8px;
+      background: #fb7299;
+      text-align: center;
+      font-size: 12px;
+      height: 18px;
+      color: white;
+      padding: 0 4px;
+      border-radius: 5px;
+      overflow: hidden;
+    }
+  }
+
+  &-r {
+    margin: 0 12px 0 16px;
+    h4 {
+      font-size: 14px;
+      font-weight: 500;
+      line-height: 19px;
+      color: #212121;
+      height: 38px;
+      margin: 9px 0 0;
+      padding: 0;
+      .word-limit();
+    }
+
+    p {
+      height: 38px;
+      margin:  8px 0 0;
+      font-size: 12px;
+      font-weight: 400;
+      line-height: 19px;
+      color: #666;
+      padding: 0;
+      .word-limit();
+    }
+
+    &-heat {
+      display: flex;
+      margin-top: 8px;
+      &-views {
+        margin: 0 10px 0 0;
+        color: #999;
+        font-size: 12px;
+        line-height: 18px;
+        svg {
+          font-size: 14px;
+        }
+      }
+
+      &-barrage {
+        margin: 0;
+        color: #999;
+        font-size: 12px;
+        line-height: 18px;
+        svg {
+          font-size: 14px;
+        }
+      }
+    }
+  }
+
+}
+</style>

components/bilibili_card/bilibili_origin.vue

@@ -28,7 +28,7 @@
     </div>
     <!-- 视频 -->
     <bilibiliVideo
-      v-if="stype === 2"
+      v-if="type === 8"
       class="cardtop10"
       :card="card"
     />
@@ -38,12 +38,18 @@
       class="cardtop10"
       :card="card"
     />
-    <!-- 专栏 -->
+    <!-- 音乐 -->
     <bilibiliMusic
       v-if="type === 256"
       class="cardtop10"
       :card="card"
     />
+    <!-- 番剧 -->
+    <bilibiliAnime
+      v-if="type === 512"
+      class="cardtop10"
+      :card="card"
+    />
     <!-- 特殊卡片 -->
     <bilibiliSpecial v-if="sketch" :sketch="sketch" />
   </div>
@@ -54,6 +60,7 @@ import bilibiliPhotoAlbum from './bilibili_photo_album'
 import bilibiliVideo from './bilibili_video'
 import bilibiliColumn from './bilibili_column'
 import bilibiliMusic from './bilibili_music'
+import bilibiliAnime from './bilibili_anime'
 import bilibiliSpecial from './bilibili_special'
 import bilibiliContent from './bilibili_content'
 
@@ -63,6 +70,7 @@ export default {
     bilibiliVideo,
     bilibiliColumn,
     bilibiliMusic,
+    bilibiliAnime,
     bilibiliSpecial,
     bilibiliContent
   },
@@ -92,14 +100,20 @@ export default {
     },
     avatarImg () {
       if (!this.user) return ''
+      if (this.type === 512 && this.card && this.card.apiSeasonInfo && this.card.apiSeasonInfo.cover) {
+        return this.card.apiSeasonInfo.cover
+      }
       return this.user.info.face
     },
     nickname () {
       if (!this.user) return ''
+      if (this.type === 512 && this.card && this.card.apiSeasonInfo && this.card.apiSeasonInfo.title) {
+        return this.card.apiSeasonInfo.title
+      }
       return this.user.info.uname
     },
     media () {
-      if (!this.card || this.stype !== 1 || !this.card.item.pictures) return []
+      if (!this.card || this.type !== 2 || !this.card.item.pictures) return []
       return this.card.item.pictures
     },
     sketch () {

components/bilibili_card/index.vue

@@ -1,7 +1,14 @@
 <template>
   <div class="cardunit">
     <div class="cardunit-l">
+      <foreignUserPopover v-if="fromUser" :card="fromUser">
+        <c-avatar
+          class="cardunit-l-avatar"
+          :src="avatarImg"
+        />
+      </foreignUserPopover>
       <c-avatar
+        v-else
         class="cardunit-l-avatar"
         :src="avatarImg"
       />
@@ -35,7 +42,7 @@
       </div>
       <!-- 视频 -->
       <bilibiliVideo
-        v-if="stype === 2"
+        v-if="type === 8"
         class="cardtop10"
         :card="card"
       />
@@ -92,6 +99,7 @@ import bilibiliMusic from './bilibili_music'
 import bilibiliSpecial from './bilibili_special'
 import bilibiliContent from './bilibili_content'
 import bilibiliOrigin from './bilibili_origin'
+import foreignUserPopover from '@/components/user/foreign_user_popover'
 
 export default {
   components: {
@@ -101,13 +109,18 @@ export default {
     bilibiliMusic,
     bilibiliSpecial,
     bilibiliContent,
-    bilibiliOrigin
+    bilibiliOrigin,
+    foreignUserPopover
   },
   props: {
     // 卡片数据
     data: {
       type: Object,
       required: true
+    },
+    fromUser: {
+      type: Object,
+      default: null
     }
   },
   computed: {
@@ -161,7 +174,7 @@ export default {
       return res
     },
     media () {
-      if (!this.card || this.stype !== 1 || !this.card.item.pictures) return []
+      if (!this.card || this.type !== 2 || !this.card.item.pictures) return []
       return this.card.item.pictures
     },
     sketch () {

components/token_in_and_out/bsc.vue

@@ -4,15 +4,17 @@
       <BscDeposit :selection.sync="selection" />
     </div>
     <div v-if="isWithdrawSelected" class="withdraw">
-      <el-radio v-model="selection" label="apply">
-        申请提现许可
-      </el-radio>
-      <el-radio v-model="selection" label="my">
-        查看我的提现许可
-      </el-radio>
-      <el-radio v-model="selection" label="upload">
-        替别人提现许可
-      </el-radio>
+      <div class="withdraw-switch">
+        <el-radio v-model="selection" label="apply">
+          申请提现许可
+        </el-radio>
+        <el-radio v-model="selection" label="my">
+          查看我的提现许可
+        </el-radio>
+        <el-radio v-model="selection" label="upload">
+          替别人提现许可
+        </el-radio>
+      </div>
       <wbAlertWarning />
       <MyBscPermit v-if="selection === 'my'" :selection.sync="selection" />
       <BscWithdraw v-if="selection === 'apply'" :selection.sync="selection" />
@@ -55,4 +57,9 @@ export default {
     },
   },
 }
-</script>
+</script>
+<style lang="less" scoped>
+.withdraw-switch {
+  margin: 10px 0;
+}
+</style>