Browse Source

[edit][ui bug]

zhangwei 2 years ago
parent
commit
23dcae0bbd

+ 3 - 3
src/logic/content/ParseCard.js

@@ -263,9 +263,9 @@ class ParseCard {
             _iframe_url = _iframe_url + '&denet_debugger=1'
         }
         _iframe.src = _iframe_url
-        _iframe.style.cssText = 'border:medium none; width:375px; min-height:500px;'
+        _iframe.style.cssText = 'border:medium none; width:375px; min-height:500px; border: 1px solid #DCDCDC; border-radius: 20px;'
         if (if_center) {
-            _iframe.style.cssText = 'border:medium none; width:375px; min-height:500px; display:block; margin:auto;'
+            _iframe.style.cssText = 'border:medium none; width:375px; min-height:500px; display:block; margin:auto; border: 1px solid #DCDCDC; border-radius: 20px;'
         }
         return _iframe
     }
@@ -289,7 +289,7 @@ class ParseCard {
         let _iframe = document.createElement('iframe')
         _iframe.id = params.post_Id
         _iframe.src = chrome.runtime.getURL('/iframe/treasure-hunt.html') + `?params=${JSON.stringify(params)}`;
-        _iframe.style.cssText = 'border:medium none; width:375px; min-height:500px;'
+        _iframe.style.cssText = 'border:medium none; width:375px; min-height:500px; border: 1px solid #DCDCDC; border-radius: 20px;'
         return _iframe
     }
     isHasIframeByArticle(dom_card) {

+ 17 - 21
src/view/iframe/red-packet/luck-draw.vue

@@ -225,25 +225,23 @@
                 </div>
             </template> -->
             <!-- <template v-else> -->
-                <custom-card-cover 
-                    :data="{
-                        totalCount: state.detail.totalCount,
-                        amountValue: state.detail.amountValue,
-                        tokenSymbol: state.detail.currencySymbol,
-                        currencyCode: state.detail.amountCurrencyCode,
-                        currencyIconUrl: state.detail.currencyIconPath,
-                        type: PlayType.lottery,
-                        validityDuration: state.count_down_time,
-                        countDown: state.count_down_time,
-                        userInfo: {
-                            nickName: state.detail.postUserInfo.name,
-                            avatarUrl: state.detail.postUserInfo.avatarUrl
-                        },
-                        rewardType: state.detail.rewardType,
-                        customizedReward: state.detail.customizedReward,
-                        customPosterUrl: state.detail.customPosterInstalled
-                    }"
-                    @clickOpenRedPacket = "clickOpenRedPacket"></custom-card-cover>
+            <custom-card-cover :data="{
+                totalCount: state.detail.totalCount,
+                amountValue: state.detail.amountValue,
+                tokenSymbol: state.detail.currencySymbol,
+                currencyCode: state.detail.amountCurrencyCode,
+                currencyIconUrl: state.detail.currencyIconPath,
+                type: PlayType.lottery,
+                validityDuration: state.count_down_time,
+                countDown: state.count_down_time,
+                userInfo: {
+                    nickName: state.detail.postUserInfo.name,
+                    avatarUrl: state.detail.postUserInfo.avatarUrl
+                },
+                rewardType: state.detail.rewardType,
+                customizedReward: state.detail.customizedReward,
+                customPosterUrl: state.detail.customPosterInstalled
+            }" @clickOpenRedPacket="clickOpenRedPacket"></custom-card-cover>
             <!-- </template> -->
         </div>
 
@@ -2270,10 +2268,8 @@ body {
     width: 375px;
     height: 500px;
     background: #fafafa;
-    border-radius: 11px;
     overflow: hidden;
     box-sizing: border-box;
-    border: 1px solid #DCDCDC;
     font-family: "SF Pro Display";
     font-style: normal;
 

+ 16 - 20
src/view/iframe/red-packet/red-packet.vue

@@ -233,24 +233,22 @@
         </div>
       </template>
       <template v-else> -->
-        <custom-card-cover 
-          :data="{
-              totalCount: state.detail.totalCount,
-              amountValue: state.detail.amountValue,
-              tokenSymbol: state.detail.currencySymbol,
-              currencyCode: state.detail.amountCurrencyCode,
-              currencyIconUrl: state.detail.currencyIconPath,
-              type: PlayType.common,
-              validityDuration: state.detail.validityDuration,
-              userInfo: {
-                  nickName: state.detail.postUserInfo.name,
-                  avatarUrl: state.detail.postUserInfo.avatarUrl
-              },
-              rewardType: state.detail.rewardType,
-              customizedReward: state.detail.customizedReward,
-              customPosterUrl: state.detail.customPosterInstalled
-          }"
-          @clickOpenRedPacket = "clickOpenRedPacket"></custom-card-cover>
+      <custom-card-cover :data="{
+        totalCount: state.detail.totalCount,
+        amountValue: state.detail.amountValue,
+        tokenSymbol: state.detail.currencySymbol,
+        currencyCode: state.detail.amountCurrencyCode,
+        currencyIconUrl: state.detail.currencyIconPath,
+        type: PlayType.common,
+        validityDuration: state.detail.validityDuration,
+        userInfo: {
+          nickName: state.detail.postUserInfo.name,
+          avatarUrl: state.detail.postUserInfo.avatarUrl
+        },
+        rewardType: state.detail.rewardType,
+        customizedReward: state.detail.customizedReward,
+        customPosterUrl: state.detail.customPosterInstalled
+      }" @clickOpenRedPacket="clickOpenRedPacket"></custom-card-cover>
       <!-- </template> -->
     </div>
 
@@ -2039,10 +2037,8 @@ body {
   width: 375px;
   height: 500px;
   background: #fafafa;
-  border-radius: 11px;
   overflow: hidden;
   box-sizing: border-box;
-  border: 1px solid #DCDCDC;
   font-family: "SF Pro Display";
   font-style: normal;
 

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

@@ -3,13 +3,13 @@
         <div class="left" v-if="leftData">
             <img :src="leftData.avatarUrl" alt="" />
             <span>from</span>
-            <span>{{ leftData.nickName || '' }}</span>
+            <span>@{{ leftData.nickName || '' }}</span>
         </div>
         <div class="right" v-if="rightData">
             <span>
                 Remaining
             </span>
-            <span>{{ rightData }}</span>
+            <span>${{ rightData }}</span>
         </div>
 
     </div>

+ 4 - 2
src/view/iframe/treasure-hunt/cover.vue

@@ -28,7 +28,9 @@
             </div>
             <div class="coin">
                 <img :src="state.detail.currencyIconPath" alt="" />
-                <span>{{ state.detail.currencySymbol }}</span>
+                <span> {{ state.detail.currencySymbol }}
+                    <template v-if="state.detail.currencySymbol != 'USD'">equivalent (Crypto)</template>
+                </span>
             </div>
         </template>
 
@@ -57,7 +59,7 @@ import { getChromeCookie, removeChromeCookie } from '@/uilts/chromeExtension.js'
 chrome.storage.onChanged.addListener(changes => {
     if (changes.userInfo) {
         // let item = JSON.parse(changes.userInfo.newValue)
-        state.loading_show = false
+        state.btn_loading = false
         state.init()
     }
 })

+ 14 - 6
src/view/iframe/treasure-hunt/result.vue

@@ -3,14 +3,15 @@
     <div class="content">
         <img :src="require('@/assets/img/icon-silver-open-box.png')" alt="" />
         <div class="mark">
-            <p>You already followed
-                <template v-for="item, i in state.follows">
-                    <span v-if="i == 0">@{{ item.name }}</span>
-                    <span v-else>, @{{ item.name }}</span>
-                </template>
-            </p>
+
             <!-- 新粉 -->
             <template v-if="Number(state.start_task.amountValue) > 0">
+                <p>You are now fillowing
+                    <template v-for="item, i in state.follows">
+                        <span v-if="i == 0">@{{ item.name }}</span>
+                        <span v-else>, @{{ item.name }}</span>
+                    </template>
+                </p>
                 <p>You Win</p>
                 <component-zoom width="335" fontSize="34" style="margin:0 auto;">
                     <div class="money">${{ state.start_task.usdAmountValue }}</div>
@@ -23,6 +24,12 @@
             </template>
             <!-- 老粉不给钱 -->
             <template v-else>
+                <p>You already followed
+                    <template v-for="item, i in state.follows">
+                        <span v-if="i == 0">@{{ item.name }}</span>
+                        <span v-else>, @{{ item.name }}</span>
+                    </template>
+                </p>
                 <p>Only new followers open silver chest</p>
                 <p class="txt">Invite people to</p>
                 <p class="txt">open golden chest!</p>
@@ -108,6 +115,7 @@ JSON.parse('[{\"type\":2},{\"type\":10},{\"relatedUsers\":[{\"name\":\"Ice176197
             img {
                 width: 17px;
                 height: 17px;
+                margin: 0;
                 margin-right: 5px;
             }