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

src/view/iframe/treasure-hunt/components/open-box.vue

@@ -3,7 +3,7 @@
         <div class="background"></div>
         <!-- 开奖页 -->
         <div class="content">
-            <img :src="require('@/assets/img/icon-silver-open-box.png')" alt="" class="popIn" />
+            <img :src="state.open_box.icon" alt="" class="popIn" />
             <div class="mark">
                 <p>You Win</p>
                 <div class="money">{{ state.open_box.data.usdAmountValue }}</div>

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

@@ -91,6 +91,8 @@ const handleCommon = (res, callback) => {
     }
     callback && 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')
 
 state.treasureOpen = () => {
     treasureOpen({
@@ -100,8 +102,20 @@ state.treasureOpen = () => {
         }
     }).then((res) => {
         if (res.code == 0) {
+            for (let i in state.open_box) {
+                if (state.boxs[i].id == state.treasureId) {
+                    if (i > 0) {
+                        state.open_box.icon = gold_open_box_big
+                    } else {
+                        state.open_box.icon = silver_open_box_big
+                    }
+                    break
+                }
+            }
             state.open_box.show = true
             state.open_box.data = res.data
+
+            // icon
             state.init(() => {
                 state.inviteInit()
             })

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

@@ -1,7 +1,7 @@
 <template>
     <!-- 邀请页 -->
     <div class="area-process">
-        <v-head :left-data="state.detail.postUserInfo || null" :rightData="state.detail.remainAmountValue"></v-head>
+        <v-head :left-data="state.detail.postUserInfo || null" :rightData="state.detail.remainAmountUsdValue"></v-head>
         <div class="box-process">
             <div class="item" v-for="item, i in state.boxs">
                 <hover-tip :txt="item.txt" v-show="item.show || item.openStatus" :icon="item.hover_icon"></hover-tip>
@@ -135,20 +135,20 @@ state.inviteInit = () => {
 
 }
 
-const setLineFull = (box_num = 0, needInviteCount = 0, successInviteCount = 0) => {
+const setLineFull = (box_num = 0, finishNeedInviteCount = 0, successInviteCount = 0) => {
     if (box_num == 0) {
-        line_full.value.style.width = (successInviteCount / needInviteCount) * 80 + 'px'
-    } else if (box_num = 1) {
-        line_full.value.style.width = ((successInviteCount / needInviteCount) * 100 + 80) + 'px'
-    } else if (box_num = 2) {
-        line_full.value.style.width = ((successInviteCount / needInviteCount) * 100 + 180) + 'px'
+        line_full.value.style.width = (successInviteCount / finishNeedInviteCount) * 80 + 'px'
+    } else if (box_num == 1) {
+        line_full.value.style.width = ((successInviteCount / finishNeedInviteCount) * 100 + 80) + 'px'
+    } else if (box_num == 2) {
+        line_full.value.style.width = ((successInviteCount / finishNeedInviteCount) * 100 + 180) + 'px'
     }
 }
 
 const btnStatus = () => {
     for (let i in state.boxs) {
         if (state.boxs[i].taskFinishStatus == 0) {
-            let num = state.boxs[i].needInviteCount - state.boxs[i].successInviteCount
+            let num = state.boxs[i].finishNeedInviteCount - state.boxs[i].successInviteCount
             if (num == 1) {
                 state.open_btn.txt = 'Invite a friend to open the chest'
             } else {
@@ -171,7 +171,7 @@ const btnStatus = () => {
             }
         }
         if (item.taskFinishStatus == 1) {
-            setLineFull(index, item.needInviteCount, item.successInviteCount)
+            setLineFull(index, item.finishNeedInviteCount, item.successInviteCount)
         }
         // 三个箱子全部打开了 
         if (item.openStatus == 1) {