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

src/view/iframe/treasure-hunt/components/boxs.vue

@@ -33,7 +33,7 @@
             <div class="item" v-for="item, i in state.boxs"
                 :style="{ 'margin-left': item.icon_margin_left, 'width': item.icon_width }">
                 <img :src="require('@/assets/svg/icon-user1.svg')" alt="" />
-                <span>{{ item.successInviteCount }}/{{ item.finishNeedInviteCount }}</span>
+                <span>{{ item.inviteProgress }}</span>
             </div>
 
         </div>
@@ -118,8 +118,8 @@ state.boxs = [{
     flash_width: '90px',
     icon_margin_left: '31px',
     flash_margin_top: `-${90 / 2}px`,
-    line_width: '55px',
-    line_left: `-${55 - 15}px`,
+    line_width: '60px',
+    line_left: `-${60 - 15}px`,
     money_color: '#FCB936', money_top: '-15px'
 
 }, {
@@ -131,8 +131,8 @@ state.boxs = [{
     flash_width: '108px',
     icon_margin_left: '23px',
     flash_margin_top: `-${108 / 2}px`,
-    line_width: '58px',
-    line_left: `-${58 - 20}px`,
+    line_width: '60px',
+    line_left: `-${60 - 20}px`,
     money_color: '#FCB936', money_top: '-10px'
 }]
 

src/view/iframe/treasure-hunt/components/carousel.vue

@@ -25,7 +25,7 @@
 </template>
 <script setup>
 import { inject, ref, onMounted, watch } from 'vue'
-import { receiveList } from '@/http/treasure.js'
+import { receiveListV2 } from '@/http/treasure.js'
 let content_success_message = ref(null)
 let state = inject('state')
 let global_refresh = inject('global_refresh')
@@ -43,7 +43,7 @@ onMounted(() => {
 })
 
 const init = () => {
-    receiveList({
+    receiveListV2({
         params: {
             postId: state.postId,
             pageNum: 1,

src/view/iframe/treasure-hunt/components/head.vue

@@ -48,7 +48,8 @@ const clickItem = () => {
         }
 
         span {
-            color: #B69882;
+            color: #FFFFFF;
+            opacity: 0.6;
             font-weight: 400;
             margin-left: 5px;
             font-size: 11px;
@@ -65,7 +66,7 @@ const clickItem = () => {
 
         span:first-child {
             color: #FFFFFF;
-            opacity: 0.7;
+            opacity: 0.6;
         }
 
         span:last-child {

src/view/iframe/treasure-hunt/cover.vue

@@ -156,8 +156,8 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
             }
             break
         case 'CONTENT_API_GET_TWEET_USER_INFO_RES':
-            if(state.iframeId != req.iframeId) {
-              return;
+            if (state.iframeId != req.iframeId) {
+                return;
             }
             let twitterFans = 0;
             let { user } = req.data || {};
@@ -454,7 +454,7 @@ const getUsersFollowStatus = () => {
     }
 
     .invite {
-        background: rgba(255, 255, 255, 0.1);
+        /* background: rgba(255, 255, 255, 0.1); */
         height: 28px;
         display: flex;
         align-items: center;
@@ -475,7 +475,8 @@ const getUsersFollowStatus = () => {
         }
 
         span {
-            color: #BE9F89;
+            color: #FFFFFF;
+            opacity: 0.6;
         }
     }
 
@@ -551,7 +552,7 @@ const getUsersFollowStatus = () => {
             line-height: 15px;
             color: #FFFFFF;
 
-            opacity: 0.7;
+            opacity: 0.6;
         }
     }
 

src/view/iframe/treasure-hunt/index.vue

@@ -190,6 +190,7 @@ const handleCommon = (res, callback) => {
 }
 let silver_open_box_big = require('@/assets/img/icon-silver-open-box-big.png')
 let gold_open_box_big = require('@/assets/img/icon-gold-open-box-big.png')
+let purple_open_box_big = require('@/assets/img/icon-purple-open-big.png')
 
 state.refreshInit = () => {
     state.init(() => {
@@ -212,10 +213,12 @@ state.treasureOpen = () => {
             // icon
             for (let i in state.boxs) {
                 if (state.boxs[i].id == state.treasureId) {
-                    if (i > 0) {
-                        state.open_box.icon = gold_open_box_big
-                    } else {
+                    if (i == 0) {
                         state.open_box.icon = silver_open_box_big
+                    } else if (i == 1 || i == 2) {
+                        state.open_box.icon = gold_open_box_big
+                    } else if (i == 3) {
+                        state.open_box.icon = purple_open_box_big
                     }
                     break
                 }
@@ -324,8 +327,8 @@ function onRuntimeMsg() {
                 }
                 break
             case 'CONTENT_API_GET_TWEET_USER_INFO_RES':
-                if(state.iframeId != req.iframeId) {
-                  return;
+                if (state.iframeId != req.iframeId) {
+                    return;
                 }
                 let twitterFans = 0;
                 let { user } = req.data || {};

src/view/iframe/treasure-hunt/invite.vue

@@ -9,7 +9,7 @@
                 </v-head>
                 <v-carousel></v-carousel>
             </div>
-            <v-boxs style="margin-top: 30px;"></v-boxs>
+            <v-boxs style="margin-top: 40px;"></v-boxs>
             <invite-list></invite-list>
         </div>