wenliming пре 2 година
родитељ
комит
652bd31269

+ 1 - 1
src/entry/background.js

@@ -33,7 +33,7 @@ chrome.runtime.onConnect.addListener(function (port) {
                 twitterShortUrl(res.url)
                 break
             case "CONTENT_SEND_DISCORD_AUTH_CODE":
-                discordLoginCode(res.code);
+                discordLoginCode(res);
                 break
         }
     });

+ 1 - 1
src/logic/background/twitter.js

@@ -60,7 +60,7 @@ export function twitterPinLoginCode(port,code) {
 
 }
 
-export function discordLoginCode(code) {
+export function discordLoginCode({code}) {
     chrome.tabs.query({}, (tab) => {
         for (let i in tab) {
             if (tab[i].url.indexOf('denetme.net/auth/discordCallback') > -1) {

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

@@ -32,7 +32,7 @@
         <div class="pay-btn">
             <div class="iframe-pay"
                 v-show="currentCurrencyInfo.currencyCode == 'USD'"
-                 @click="paypalPay">
+                @click="paypalPay">
                 <iframe
                     class="iframe-pay"
                     ref="iframe"
@@ -185,6 +185,7 @@ onMounted(() => {
             color: #1D9BF0;
             display: flex;
             align-items: center;
+            justify-content: end;
             margin-bottom: 6px;
             span {
                 display: inline-block;

+ 44 - 6
src/view/iframe/publish/give-dialog.vue

@@ -188,14 +188,17 @@
                                                 @delUser="delFollowUser"
                                             ></follow-input>
                                         </div>
+                                        <!-- join discord -->
                                         <div
                                             class="control"
                                             v-if="item.nodeType == 'input'"
                                         >
-                                            <!-- <div class="">
-                                                <img :src="discordInviteInfo.icon" />
-                                                <span>{{discordInviteInfo.name}}</span>
-                                            </div> -->
+                                            <div v-if="showDiscordInvitePop" 
+                                                class="discord-invite-info"
+                                                @click="showDiscordInvitePop = false">
+                                                <img class="icon" :src="discordInviteInfo.icon" />
+                                                <span class="name">{{discordInviteInfo.name}}</span>
+                                            </div>
                                             <input v-model="item.text" 
                                                 placeholder="Enter link address"
                                                 class="discord-address" 
@@ -350,7 +353,7 @@ let paypalHtml = ref("");
 let publishRes = reactive({});
 
 //弹窗是否展示
-let visible = ref(true);
+let visible = ref(false);
 
 //弹窗高度
 let dialogHeight = ref(680);
@@ -477,6 +480,7 @@ let formList = reactive([
 ]);
 
 const discordInviteInfo = ref({});
+let showDiscordInvitePop = ref(false);
 
 const props = defineProps({
     dialogVisible: {
@@ -1035,7 +1039,10 @@ const onIptDiscordDebounce = debounce(function({value, checked}) {
                 if(res.code != 0) {
                     // 错误提示
                 } else {
-                    // 预览 服务器 showDiscordInvitePop
+                    showDiscordInvitePop.value = true;
+                    setTimeout(() => {
+                        showDiscordInvitePop.value = false;
+                    }, 2000)
                 }
             });
         } else {
@@ -1554,6 +1561,7 @@ onMounted(() => {
                                 margin-left: 18px;
                                 box-sizing: border-box;
                                 border-left: 1px solid #ECECEC;
+                                position: relative;
 
                                 .discord-address {
                                     border: none;
@@ -1568,6 +1576,36 @@ onMounted(() => {
                                 .discord-address::placeholder {
                                     color: #c5c5c5;
                                 }
+
+                                .discord-invite-info {
+                                    position: absolute;
+                                    top: 40px;
+                                    left: 0;
+                                    box-shadow: 0px 4px 30px rgba(0, 0, 0, 0.3);
+                                    background: #fff;
+                                    border-radius: 16px;
+                                    padding: 16px;
+                                    box-sizing: border-box;
+                                    display: flex;
+                                    align-items: center;
+                                    .icon {
+                                        width: 40px;
+                                        height: 40px;
+                                        margin-right: 10px;
+                                        border-radius: 50%;
+                                    }
+                                    .name  {
+                                        font-weight: 600;
+                                        font-size: 16px;
+                                        color: #101419;
+                                        width: 193px;
+                                        height: 20px;
+                                        overflow: hidden;
+                                        white-space: nowrap;
+                                        text-overflow: ellipsis;
+                                        display: inline-block;
+                                    }
+                                }
                             }
                         }
                         .form-item:last-child {