Merge branch 'test' into feature_220523_at_task

src/assets/css/reset.css

@@ -0,0 +1,3 @@
+body {
+    background-color: unset;
+}

src/iframe/red-packet.js

@@ -4,6 +4,7 @@ const app = createApp(App)
 
 // 引入路由对象实例
 import "ant-design-vue/dist/antd.css"; // or 'ant-design-vue/dist/antd.less'
+import "@/assets/css/reset.css";
 
 import { message, Tooltip } from "ant-design-vue";
 message.config({

src/logic/content/twitter.js

@@ -107,6 +107,7 @@ function addPinedPop() {
 
     let img = document.createElement('img');
     img.src = require("@/assets/img/img-pined-guide.png");
+    img.width = 253;
 
     let contentDom = document.createElement('div');
     contentDom.innerHTML = "<div style='font-weight: 500;font-size: 18px;margin-top: 20px;margin-bottom: 20px'>📌 Pin an Extension is more convenient to open😄</div><div style='display: flex; align-items: center; justify-content: space-between;'><div style='display: flex; align-items: center; font-size: 14px; color: #899099; cursor: pointer;' id='de-remind'><input id='de-check' type='checkbox'/> Don't remind</div><div class='de-pin-skip' style='font-weight: 500; font-size: 16px; color: #1D9BF0;cursor: pointer;'>Skip</div></div>"

src/view/components/popup-transactions.vue

@@ -341,7 +341,7 @@ const listScroll = (e) => {
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
-                border-bottom: 1px solid #d1d1d1;
+                border-bottom: 1px solid #ECECEC;
                 box-sizing: border-box;
                 padding: 10px 12px 10px 0;
 
@@ -356,7 +356,7 @@ const listScroll = (e) => {
 
                     .time {
                         font-size: 12px;
-                        color: #b6b6b6;
+                        color: #B0B0B0;
                     }
                 }
 

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

@@ -178,8 +178,7 @@
           <div class="luck-content">
             <div class="luck-title" v-if="item.simpleUserInfoVO.nickName">{{ item.simpleUserInfoVO.nickName }}</div>
             <div class="luck-title" v-else>Twitter User</div>
-
-            <div class="luck-time">{{ moment(item.receiveTimestamp).format('MM-DD HH:mm:ss') }}</div>
+            <div class="luck-time">{{ moment(item.receiveTimestamp).format('MM-DD HH:mm') }}</div>
           </div>
           <div class="luck-money">
             <img :src="state.detail.currencyIconPath" alt />
@@ -1811,6 +1810,8 @@ body {
           width: 40px;
           height: 40px;
           margin-right: 9px;
+          border-radius: 50%;
+          border: solid 2px #fff;
         }
 
         .big {
@@ -1847,6 +1848,7 @@ body {
       display: flex;
       justify-content: space-between;
       color: #B0B0B0;
+      font-weight: 500;
       border-bottom: 1px solid #F2F2F2;
 
       div:last-child {
@@ -1872,7 +1874,7 @@ body {
         text-align: center;
 
         img {
-          margin-top: 90px;
+          margin-top: 70px;
           width: 100px;
           height: 100px;
         }
@@ -1923,18 +1925,18 @@ body {
           flex: auto;
 
           .luck-title {
+            color: #444444;
             font-weight: 500;
             font-size: 16px;
             letter-spacing: 0.3px;
-            color: #444444;
+            margin-bottom: 5px;
           }
 
           .luck-time {
             font-weight: 400;
             font-size: 12px;
             line-height: 14px;
-
-            color: #9b9b9b;
+            color: #B0B0B0;
           }
         }
 
@@ -1973,8 +1975,7 @@ body {
   .success {
     .luck-list-title {
       margin-top: 17px;
-      margin-bottom: 11px;
-      border-bottom: 1px solid #D1D1D1;
+      border-bottom: 1px solid #ECECEC;
     }
   }
 

src/view/popup/popup.vue

@@ -834,7 +834,7 @@ body {
                     height: 100%;
                     display: flex;
                     justify-content: space-between;
-                    border-bottom: 1px solid #d1d1d1;
+                    border-bottom: 1px solid #ECECEC;
                     box-sizing: border-box;
                     padding: 10px 14px 10px 0;
 
@@ -849,7 +849,7 @@ body {
 
                         .time {
                             font-size: 12px;
-                            color: #b6b6b6;
+                            color: #B0B0B0;
                         }
                     }
 
@@ -981,6 +981,9 @@ body {
                     .left {
                         font-weight: 500;
                         font-size: 16px;
+                        .time {
+                            color: #B0B0B0;
+                        }
                     }
 
                     .right {