Переглянути джерело

Merge branch 'dev_1.1.7.2' of https://git.yishihui.com/DeNet/de-net into dev_1.1.7.2

wenliming 2 роки тому
батько
коміт
b42b9fee77

+ 1 - 1
src/view/iframe/treasure-hunt/all-receive-list.vue

@@ -20,7 +20,7 @@
                             <div class="name" @click="clickItem(item)">{{ item.userInfo.nickName }}</div>
                             <div class="time">{{ getBeforeTimeFormat(item.timestamp) }}</div>
                         </div>
-                        <div class="money">${{ item.amountValue }}</div>
+                        <div class="money">${{ item.amountUsdValue }}</div>
                     </div>
                 </div>
             </div>

+ 41 - 2
src/view/iframe/treasure-hunt/components/invite-layer.vue

@@ -6,12 +6,12 @@
             </div>
             <div class="n2">Invite Friends to Open the Chest!</div>
         </div>
-        <div>
+        <!-- <div>
             <div class="n1">
                 You are not <span>Real New follower</span>
             </div>
             <div class="n2">Invite Friends to Open the Chest!</div>
-        </div>
+        </div> -->
     </div>
 </template>
 <script>
@@ -25,6 +25,13 @@
     height: 83px;
     text-align: center;
     z-index: 19;
+    position: fixed;
+    top: -83px;
+    color: #fff;
+
+
+
+
 
     .n1 {
         margin-top: 20px;
@@ -32,6 +39,7 @@
         font-weight: 800;
         font-size: 18px;
 
+
         span {
             color: #FCB936;
         }
@@ -43,4 +51,35 @@
         font-size: 14px;
     }
 }
+
+.up {
+    animation: frame_up 0.5s linear;
+    animation-fill-mode: forwards;
+}
+
+.down {
+    animation: frame_down 0.5s linear;
+    animation-fill-mode: forwards;
+}
+
+@keyframes frame_down {
+    0% {
+        top: -83px;
+    }
+
+    100% {
+        top: 0px
+    }
+}
+
+@keyframes frame_up {
+    0% {
+        top: 0px
+    }
+
+    100% {
+        top: -83px;
+
+    }
+}
 </style>

+ 2 - 0
src/view/iframe/treasure-hunt/invite.vue

@@ -1,6 +1,7 @@
 <template>
     <all-receive-list v-if="state.page_show == '总邀请者页'"></all-receive-list>
     <div v-show="state.page_show != '总邀请者页'">
+        <invite-layer></invite-layer>
         <!-- 邀请页 -->
         <div class="area-process" v-show-log="state.log_invite_show">
             <div class="area1">
@@ -29,6 +30,7 @@ import InviteFriends from '@/view/iframe/treasure-hunt/components/invite-friends
 import VDialog from '@/view/iframe/treasure-hunt/components/dialog.vue'
 import VBoxs from '@/view/iframe/treasure-hunt/components/boxs.vue'
 import VCarousel from '@/view/iframe/treasure-hunt/components/carousel.vue'
+import InviteLayer from '@/view/iframe/treasure-hunt/components/invite-layer.vue'
 
 import Report from "@/log-center/log"