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

src/assets/svg/icon-joined-group-logo.svg

@@ -1,4 +1,4 @@
-<svg width="32" height="30" viewBox="0 0 32 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.9464 28.5523L16.0002 28.6076L16.0539 28.5523L31.0538 13.1124L31.0987 13.0661L31.0597 13.0147L23.4185 2.95464L23.396 2.925H23.3588H8.64124H8.60403L8.58152 2.95464L0.940275 13.0147L0.901262 13.0661L0.946206 13.1124L15.9464 28.5523ZM28.8923 12.9257L16.0002 26.1958L3.108 12.9257L9.40121 4.64043H22.5988L28.8923 12.9257Z" fill="#1D9BF0" stroke="#1D9BF0" stroke-width="0.15"/>
-<path d="M16.8074 12.7008C17.1973 12.3323 17.5094 11.8893 17.7252 11.398C17.941 10.9068 18.0561 10.3773 18.0639 9.84079C18.0721 9.30434 17.9728 8.77168 17.7716 8.2743C17.5705 7.77691 17.2716 7.32491 16.8928 6.94501C17.2274 6.8184 17.5823 6.75364 17.94 6.75391C19.6031 6.75391 20.9528 8.13541 20.9528 9.84079C20.9528 11.5459 19.6037 12.9277 17.94 12.9277C17.5516 12.9277 17.1661 12.8512 16.8074 12.7008ZM18.2377 13.9567H19.3212C21.4695 13.9567 23.2097 15.741 23.2097 17.9438V18.2019C23.2097 18.899 22.0842 19.0577 20.5271 19.0925C20.6015 18.9758 20.6399 18.841 20.6375 18.702V18.3677C20.6421 17.4897 20.4244 16.6249 20.0048 15.8536C19.5852 15.0824 18.9773 14.4299 18.2377 13.9567ZM13.8241 6.75391C15.4869 6.75391 16.8353 8.13541 16.8353 9.84079C16.8353 11.5459 15.4884 12.9277 13.8241 12.9277C12.1616 12.9277 10.8119 11.5459 10.8119 9.84079C10.8119 8.13541 12.1616 6.75391 13.8241 6.75391ZM12.6944 13.9567H15.2041C17.3527 13.9567 19.0938 15.741 19.0938 17.9438V18.2019C19.0938 19.0687 17.3512 19.1032 15.2041 19.1032H12.6944C10.5461 19.1032 8.80469 19.1014 8.80469 18.2019V17.9438C8.80469 15.7419 10.5458 13.9567 12.6944 13.9567Z" fill="#1D9BF0"/>
+<svg width="26" height="24" viewBox="0 0 26 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.9463 22.8527L13.0001 22.908L13.0539 22.8527L25.0538 10.5007L25.0987 10.4545L25.0597 10.4031L18.9467 2.35503L18.9242 2.32539H18.887H7.11299H7.07578L7.05327 2.35503L0.940275 10.4031L0.901262 10.4545L0.946206 10.5007L12.9463 22.8527ZM23.2941 10.3398L13.0001 20.9355L2.70615 10.3398L7.72841 3.72774H18.2716L23.2941 10.3398Z" fill="black" stroke="black" stroke-width="0.15"/>
+<path d="M13.6443 10.1594C13.9563 9.86454 14.2059 9.51014 14.3786 9.11715C14.5512 8.72417 14.6434 8.30056 14.6495 7.87136C14.6561 7.4422 14.5766 7.01607 14.4157 6.61817C14.2548 6.22026 14.0158 5.85866 13.7127 5.55474C13.9804 5.45345 14.2642 5.40165 14.5505 5.40186C15.8809 5.40186 16.9607 6.50706 16.9607 7.87136C16.9607 9.23543 15.8814 10.3409 14.5505 10.3409C14.2397 10.3409 13.9313 10.2797 13.6443 10.1594ZM14.7886 11.1641H15.6554C17.3741 11.1641 18.7662 12.5915 18.7662 14.3538V14.5602C18.7662 15.118 17.8658 15.2449 16.6201 15.2727C16.6797 15.1794 16.7104 15.0715 16.7085 14.9603V14.6929C16.7121 13.9905 16.5379 13.2986 16.2023 12.6816C15.8666 12.0647 15.3803 11.5426 14.7886 11.1641ZM11.2577 5.40186C12.5879 5.40186 13.6667 6.50706 13.6667 7.87136C13.6667 9.23543 12.5891 10.3409 11.2577 10.3409C9.92769 10.3409 8.84796 9.23543 8.84796 7.87136C8.84796 6.50706 9.92769 5.40186 11.2577 5.40186ZM10.354 11.1641H12.3617C14.0806 11.1641 15.4735 12.5915 15.4735 14.3538V14.5602C15.4735 15.2537 14.0794 15.2813 12.3617 15.2813H10.354C8.6353 15.2813 7.24219 15.2799 7.24219 14.5602V14.3538C7.24219 12.5922 8.63507 11.1641 10.354 11.1641Z" fill="black"/>
 </svg>

src/view/iframe/publish/components/follow-input.vue

@@ -167,11 +167,11 @@ const onblur = (params, index) => {
     console.log(params, index)
 }
 
-const onInput = debounce(function(params, index) {
+const onInput = (params, index) => {
     currentIptIndex.value = index;
     emits("setUser", {index: index, name: params.name})
     getTwitterUsers(params.name)
-}, 500) 
+}
 
 const onKeydown = (params, index) => {
     // setIptWidth(index);
@@ -219,10 +219,8 @@ const rectClick = (event) => {
     }
 }
 
-const getTwitterUsers = (query, cb) => {
-    if(query.indexOf('@') > -1) {
-        return;
-    }
+const getTwitterUsers =  debounce(function(query, cb) {
+    query = query.replace("@", "");
     searchTwitterUser({
         params: {
             name : query
@@ -234,7 +232,7 @@ const getTwitterUsers = (query, cb) => {
         cb && cb(res);
         console.log('searchTwitterUser',res)
     })
-}
+}, 500)
 
 const selectedUser = (params, index) => {
     emits("setUser", {index: currentIptIndex.value, name: params.screenName});

src/view/iframe/publish/components/top-up.vue

@@ -180,7 +180,7 @@ onMounted(() => {
             justify-content: space-between;
 
             .item {
-                width: 48%;
+                width: 49%;
 
                 .label {
                     color: #A0A0A0;

src/view/iframe/publish/give-dialog.vue

@@ -2,11 +2,13 @@
     <div class="overlay" v-if="visible">
         <div class="content"
             :style="{
-                height: dialogStyle.dialogHeight + 'px',
-                width: showComType == 'default' ?  dialogStyle.dialogContentWidth + 'px' : '880px'}">   
-            <div class="pop-mask"  
-                v-show="showCurrencyPop || showCurrencySelect" 
-                @click.stop="showCurrencyPop = false; showCurrencySelect=false"></div>
+                height: showComType === 'preview' ? 'calc(100vh - 40px)' : dialogStyle.dialogHeight + 'px',
+                width: dialogStyle.dialogContentWidth + 'px',
+            }">
+            <div class="pop-mask"
+                v-show="showCurrencyPop || showCurrencySelect"
+                @click.stop="showCurrencyPop = false; showCurrencySelect=false">
+            </div>
 
             <!-- 头部 -->
             <div class="head">
@@ -416,8 +418,8 @@ let visible = ref(false);
 
 //弹窗高度
 let dialogStyle = reactive({
-    dialogHeight: 680,
-    dialogContentWidth: 1080
+    dialogHeight: 670,
+    dialogContentWidth: 1100
 })
 
 // 当前展示组件内容 default(表单)  preview(预览)  topUp(充值)
@@ -1642,6 +1644,7 @@ onMounted(() => {
         transform: translate(-50%, -50%);
         box-sizing: border-box;
         z-index: 2000;
+        max-height: 825px;
 
         .pop-mask {
             width: 100%;
@@ -2156,10 +2159,11 @@ onMounted(() => {
     overflow-y: auto;
     .card {
         float: left;
+        width: 480px;
         position: relative;
         .flash {
             overflow: hidden;
-            height: 460px;
+            height: 600px;
             border-radius: 26px;
             border: solid 1px #ECECEC;
         }
@@ -2187,7 +2191,7 @@ onMounted(() => {
     }
     .card-content {
         float: right;
-        width: 430px;
+        width: 500px;
     }
     .card-amount {
         overflow: hidden;

src/view/iframe/tab-group/tab-group.vue

@@ -15,13 +15,14 @@
                             <div class="icon-nft-wrapper">
                                 <el-popover
                                     :width="340"
-                                    placement="right"
+                                    placement="right-start"
                                     trigger="hover"
                                     popper-style="background: #FFFFFF;
                                         box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.2);
                                         border-radius: 20px;
                                         padding: 20px;
-                                        box-sizing: border-box;">
+                                        box-sizing: border-box;
+                                        margin-top: -1px">
                                     <template #reference>
                                         <img v-if="item.nftItem" :src="item.nftItem.imagePath" class="icon-nft" @click.stop="">
                                     </template>
@@ -44,7 +45,7 @@
                                 {{item.nickName}}
                             </div>
                             <div class="screen-name">
-                                {{item.screenName}}
+                                @{{item.screenName}}
                             </div>
                         </div>
                         <div class="post-content" v-html="item.textContent"></div>
@@ -377,11 +378,11 @@ html, body, #app {
                     }
 
                     .nick-name, .screen-name {
-                        font-weight: 600;
                         font-size: 15px;
                     }
 
                     .nick-name {
+                        font-weight: 600;
                         color: #000;
                         margin-right: 8px;
                     }

src/view/popup/components/tabbar.vue

@@ -204,7 +204,6 @@ const getUserInfo = (cb) => {
 onMounted(() => {
     onMessage();
     init();
-    onPageVisbile()
 });
 
 onBeforeUnmount(() => {