Browse Source

Merge branch 'feature_220622_publish' into dev_1.1.2

wenliming 2 years ago
parent
commit
4482381ec7

+ 1 - 1
src/entry/content_help.js

@@ -4,7 +4,7 @@ import {
 } from "@/logic/content/twitter.js";
 
 window.onload = () => {
-    appendPopupPage();
+    // appendPopupPage();
     chrome.runtime.sendMessage({ 
         actionType: "CONTENT_WINDOW_LOADED_SET_POPUP_PAGE", 
         data: { } 

+ 2 - 2
src/view/components/custom-card-cover.vue

@@ -12,7 +12,7 @@
         <div class="title" v-if="data.userInfo">
             <img :src="data.userInfo.avatarUrl" />
             <span>{{
-                data.userInfo.nickName || "FutureDoctor"
+                data.userInfo.nickName || ""
             }}</span>
         </div>
         <div class="money-area">
@@ -71,9 +71,9 @@ const open = () => {
 .not-open {
     width: 100%;
     height: 100%;
-    filter: drop-shadow(0px 2px 20px rgba(0, 0, 0, 0.1));
     position: relative;
     border-radius: 16px;
+    filter: drop-shadow(0px 2px 20px rgba(0, 0, 0, 0.1));
 
     .money-area {
         width: 100%;

+ 1 - 1
src/view/components/message-box.vue

@@ -60,7 +60,7 @@ const confirm = () => {
         left: 50%;
         top: 50%;
         width: 375px;
-        height: 220px;
+        min-height: 220px;
         background: #FFFFFF;
         border-radius: 20px;
         padding: 20px;

+ 2 - 1
src/view/iframe/publish/components/paypal-button.vue

@@ -159,8 +159,9 @@ onMounted(() => {
             color: #1D9BF0;
             display: flex;
             align-items: center;
-            justify-content: end;
+            justify-content: flex-end;
             margin-bottom: 6px;
+            
             span {
                 display: inline-block;
                 color: #000000;

+ 7 - 3
src/view/iframe/publish/components/preview-card.vue

@@ -33,8 +33,11 @@
             </div> 
 
             <!-- 安装之前的卡片样式 -->
-            <div v-show="!installStatus" class="content-before" :style="{'width': reviewCanvasParams.width+ 'px'}">
-                <div class="head" :style="{'zoom': reviewCanvasParams.zoom}">
+            <div class="content-before"
+                v-show="!installStatus" 
+                :style="{'width': reviewCanvasParams.width+ 'px'}">
+                <div class="head" 
+                    :style="{'zoom': reviewCanvasParams.zoom}">
                     <img :src="userInfo.avatarUrl"
                         class="avatar"/>
                     <div class="article-wrapper">
@@ -46,7 +49,8 @@
                         </div>
                     </div>
                 </div>
-                <div class="card-wrapper" :style="{'zoom': reviewCanvasParams.zoom}">
+                <div class="card-wrapper" 
+                    :style="{'zoom': reviewCanvasParams.zoom}">
                     <img :src="require('@/assets/subject/img-card-cover-blue.png')"
                         class="card-cover"/>
                     <div class="bottom-bar">

File diff suppressed because it is too large
+ 434 - 434
src/view/iframe/publish/give-dialog.vue


+ 2 - 2
src/view/popup/tabbar-page/message/index.vue

@@ -550,7 +550,7 @@ onBeforeUnmount(() => {
 
               .msg {
                 display: flex;
-                align-items: end;
+                align-items: flex-end;
                 flex-direction: column;
                 .bold {
                   font-weight: 500;
@@ -605,7 +605,7 @@ onBeforeUnmount(() => {
                   .desc-bottom-bar {
                     display: flex;
                     align-items: center;
-                    justify-content: end;
+                    justify-content: flex-end;
                     margin-top: 10px;
 
                     .btn {

+ 1 - 1
src/view/popup/tabbar-page/nft/detail.vue

@@ -217,7 +217,7 @@ onMounted(() => {
 
             .img {
                 width: 280px;
-                border-radius: 26px;
+                border-radius: 10px;
             }
         }
 

Some files were not shown because too many files changed in this diff