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

src/view/content/message/index.vue

@@ -3,7 +3,7 @@
         <template v-for="item in state.list">
             <div class="denet-message-area" @click="clickItem(item)" v-if="item.bizType == 2">
                 <img :src="require('@/assets/img/icon-message-fail.png')" alt />
-                <span>You were not selected from jerryWang's giveaway... click to see more giveaway!</span>
+                <span>You were not selected from the giveaway events... Click to see more giveaways!</span>
                 <div class="denet-message-close" @click.stop="clickClose(item)">
                     <img :src="require('@/assets/img/icon-message-close.png')" alt />
                 </div>
@@ -11,8 +11,7 @@
             <div class="denet-message-area" @click="clickItem(item)" v-if="item.bizType == 1">
                 <img :src="require('@/assets/img/icon-message-win.png')" alt />
                 <span>Congratulations! You won <b class="denet-message-money">{{ item.bizData.lotteryMoney }}
-                        {{ item.bizData.lotteryTokenSymbol }}</b> from jerryWang's giveaway!
-                    🎉</span>
+                        {{ item.bizData.lotteryTokenSymbol }}</b> from the giveaway!🎉</span>
                 <div class="denet-message-close" @click.stop="clickClose(item)">
                     <img :src="require('@/assets/img/icon-message-close.png')" alt />
                 </div>
@@ -48,8 +47,12 @@ const clickClose = (item) => {
 }
 
 const clickItem = (item) => {
-    // 跳转详情页
-    window.open(`https://twitter.com/${item.bizData.twitterAccount}/status/${item.bizData.twitterId}`)
+    if (item.bizType == 1) {
+        // 跳转详情页
+        window.open(`https://twitter.com/${item.bizData.twitterAccount}/status/${item.bizData.twitterId}`)
+    } else {
+        window.open('https://twitter.com/search?q=%23DeNet&src=typed_query')
+    }
 }
 
 // 读取消息

src/view/iframe/red-packet/luck-draw.vue

@@ -207,7 +207,7 @@
                     <font-amount :amount="state.detail.amountValue" style="color:#fff;"></font-amount>
                 </div>
                 <!-- <div class="people">{{ state.detail.totalCount }} WINNERS TO SHARE</div> -->
-                <div class="mark-area">
+                <!-- <div class="mark-area">
                     <div class="time">
                         <img :src="require('@/assets/svg/icon-time.svg')" />
                         <span>{{ state.count_down_time }}</span>
@@ -216,7 +216,13 @@
                         <img :src="require('@/assets/svg/icon-win.svg')" />
                         <span>{{ state.detail.totalCount }} WINNERS</span>
                     </div>
+                </div> -->
+                <div class="time-area">
+                    <div></div>
+                    <img :src="require('@/assets/svg/icon-time.svg')" />
+                    <span>{{ state.count_down_time }}</span>
                 </div>
+
             </div>
         </div>
 
@@ -1474,6 +1480,7 @@ onMounted(() => {
     init()
     onRuntimeMsg();
     // state.loading_show = true
+    // state.status = 'not-open'
     // state.status = 'success'
     // state.status = 'close'
     // state.close_status = '已经过期了'
@@ -2941,6 +2948,39 @@ body {
             align-items: center;
             justify-content: center;
 
+            .time-area {
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                position: relative;
+                width: 100%;
+                height: 46px;
+
+                div {
+                    width: 100%;
+                    height: 100%;
+                    position: absolute;
+                    background: #000000;
+                    z-index: 0;
+                    opacity: 0.15;
+                }
+
+                img {
+                    z-index: 1;
+                    width: 26px;
+                    height: 26px;
+                    margin-right: 10px;
+                }
+
+                span {
+                    z-index: 1;
+                    color: #FFCC4D;
+                    font-weight: 900;
+                    font-size: 26px;
+
+                }
+            }
+
             .mark-area {
                 width: 100%;
                 display: flex;
@@ -2992,7 +3032,7 @@ body {
             .coin {
                 text-align: center;
                 margin-top: 6px;
-                margin-bottom: 7px;
+                /*margin-bottom: 7px;*/
                 display: flex;
                 justify-content: center;
                 align-items: center;