Merge branch 'feature_220704_custom_redbag' into dev_1.1.3

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

@@ -9,7 +9,7 @@
                 <span class="info">{{isLottaryCpd ? 'Left' : 'Instant Giveaway'}}</span>
             </div>
             <div class="winner-info">
-                <span class="count">{{data.totalCount}}Winners</span>
+                <span class="count">{{data.totalCount}} Winners</span>
                 <span>to Share </span>
                 <span class="prize-name">{{isMoneyRewardCpd ? data.amountValue + ' ' + data.tokenSymbol : data.customizedReward}}</span>
             </div>

src/view/components/custom-card-horizontal-cover.vue

@@ -1,15 +1,46 @@
 <!-- 自定义卡片红包封面 -->
 <template>
-    <div class="card-wrapper" v-if="data.customPosterUrl">
-        <img class="customImg" :src="data.customPosterUrl" />
-    </div>
-    <div class="card-wrapper" v-else>
-        <img :src="require('@/assets/img/img-preview-draw-after-bg.png')"
-            v-if="data.type == 2"
-            class="card-cover">
-        <img :src="require('@/assets/subject/img-card-cover-blue.png')"
-            v-else
-            class="card-cover"/>
+    <div class="card-wrapper">
+        <template v-if="data.customPosterUrl">
+            <img class="customImg" :src="data.customPosterUrl" />
+        </template>
+        <template v-else>
+            <img :src="require('@/assets/img/img-preview-draw-after-bg.png')"
+                v-if="data.type == 2"
+                class="card-cover">
+            <img :src="require('@/assets/subject/img-card-cover-blue.png')"
+                v-else
+                class="card-cover"/>
+            <div class="user-info">
+                <img :src="data.userInfo.avatarUrl" 
+                class="avatar"/> {{data.userInfo.name}}
+            </div>
+            <div class="content-text">
+                <div class="title">
+                    {{data.tokenSymbol}} GIVEAWAY
+                </div>
+                <div class="center"
+                    :style="{
+                        fontSize: amountFontSize + 'px'
+                    }">
+                    <img :src="data.currencyIconUrl || imgHeaderCover" class="icon">
+                    <span id="preview-before-amount">
+                        {{data.amountValue}}
+                    </span>
+                </div>
+                <div class="desc">
+                    <template  v-if="data.type == 2">
+                        <img class="icon-clock" 
+                        :src="require('@/assets/svg/icon-preview-clock.svg')" />  {{data.validityDuration}} H
+                        <img class="icon-trophy" 
+                        :src="require('@/assets/svg/icon-preview-trophy.svg')" /> <span class="trophy-count">{{data.totalCount}} WINNERS</span>
+                    </template>
+                    <template v-else>
+                        {{data.totalCount}} WINNERS TO SHARE
+                    </template>
+                </div>
+            </div>
+        </template>
         <div class="bottom-bar" v-if="showBottom">
             <div class="title">
                 DeNet.me
@@ -18,35 +49,6 @@
                 🎁 <template v-if="data.tokenSymbol=='USD'">$</template>{{data.amountValue}} GIVEAWAY
             </div>
         </div>
-        <div class="user-info">
-            <img :src="data.userInfo.avatarUrl" 
-            class="avatar"/> {{data.userInfo.name}}
-        </div>
-        <div class="content-text">
-            <div class="title">
-                {{data.tokenSymbol}} GIVEAWAY
-            </div>
-            <div class="center"
-                :style="{
-                    fontSize: amountFontSize + 'px'
-                }">
-                <img :src="data.currencyIconUrl || imgHeaderCover" class="icon">
-                <span id="preview-before-amount">
-                    {{data.amountValue}}
-                </span>
-            </div>
-            <div class="desc">
-                <template  v-if="data.type == 2">
-                    <img class="icon-clock" 
-                    :src="require('@/assets/svg/icon-preview-clock.svg')" />  {{data.validityDuration}} H
-                    <img class="icon-trophy" 
-                    :src="require('@/assets/svg/icon-preview-trophy.svg')" /> <span class="trophy-count">{{data.totalCount}} WINNERS</span>
-                </template>
-                <template v-else>
-                    {{data.totalCount}} WINNERS TO SHARE
-                </template>
-            </div>
-        </div>
     </div>
 </template>
 

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

@@ -200,7 +200,7 @@
                                         </div>
                                         <div class="show-font">
                                             <span>Giveaway Poster</span>
-                                            <img class="new" :src=" require('@/assets/svg/img-new.svg') " />
+                                            <img class="new" v-if="customShowNewImage" :src=" require('@/assets/svg/img-new.svg') " />
                                         </div>
                                         <div class="show-placeholder">Replace</div>
                                         <div class="arrow">
@@ -522,6 +522,7 @@ let cropperLoading = ref(false)
 let cropperType = ref('before')
 let customPosterInfo = ref({})
 let customPosterData = ref({})
+let customShowNewImage = ref(false)
 
 // 当前展示组件内容 default(表单)  preview(预览)  topUp(充值)
 let showComType = ref("default"); 
@@ -947,6 +948,8 @@ const goTopUp = () => {
 const customCoverImg = () => {
     customPosterInfo.value = {}
     showComType.value = 'poster';
+    customShowNewImage.value = false;
+    setChromeStorage({ custom_poster_guide: Date.now() });
 }
 
 /**
@@ -1132,6 +1135,8 @@ const initParams = () => {
     setDiscordIptTxt({text: ''});
 
     discordInviteInfo.value = {};
+    customPosterInfo.value = {};
+    customPosterData.value = {};
 };
 
 const setDiscordIptTxt = ({text}) => {
@@ -1791,6 +1796,12 @@ onMounted(() => {
     window.addEventListener('resize', function () {
         setDialogStyle(true);
     })
+    // showNewImage
+    getChromeStorage('custom_poster_guide', (info) => {
+        if (!info) {
+            customShowNewImage.value = true
+        }
+    })
 });
 </script>
 

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

@@ -201,7 +201,7 @@
                         <span class="info">Left</span>
                     </div>
                     <div class="winner-info">
-                        <span class="count">{{state.detail.totalCount}}Winners</span>
+                        <span class="count">{{state.detail.totalCount}} Winners</span>
                         <span>to Share </span>
                         <span class="prize-name">{{state.detail.amountValue + ' ' + state.detail.currencySymbol}}</span>
                     </div>

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

@@ -210,7 +210,7 @@
                 <span class="info">Instant Giveaway</span>
             </div>
             <div class="winner-info">
-                <span class="count">{{state.detail.totalCount}}Winners</span>
+                <span class="count">{{state.detail.totalCount}} Winners</span>
                 <span>to Share </span>
                 <span class="prize-name">{{state.detail.amountValue + ' ' + state.detail.currencySymbol}}</span>
             </div>