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

src/view/components/component-zoom.vue

@@ -5,7 +5,7 @@
     </span>
 </template>
 <script setup>
-import { ref, defineProps, onMounted, watch } from 'vue'
+import { ref, defineProps, onMounted, watch, defineExpose} from 'vue'
 
 let props = defineProps({
     width: {
@@ -44,6 +44,9 @@ onMounted(() => {
     setFontZoom()
 })
 
+defineExpose({
+  setFontZoom
+})
 </script>
 <style lang="scss" scoped>
 .zoom-wrap {

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

@@ -9,7 +9,7 @@
                 <span class="info">{{isLottaryCpd ? 'Left' : 'Instant Giveaway'}}</span>
             </div>
             <div class="winner-info">
-                <component-zoom width="320" fontSize="12">
+                <component-zoom width="320" fontSize="12" ref="zoomCom1">
                     <span class="count">{{data.totalCount}} Winners</span>
                     <span>to Share </span>
                     <span class="prize-name">{{isMoneyRewardCpd ? data.amountValue + ' ' + data.tokenSymbol : data.customizedReward}}</span>
@@ -57,11 +57,10 @@
                 &nbsp;GIVEAWAY
             </div>
             <div class="coin">
-                <component-zoom width="300" fontSize="56" :txt="data.amountValue || 0">
+                <component-zoom width="300" fontSize="56" :txt="data.amountValue || 0" ref="zoomCom">
                   <img v-if="data.currencyIconUrl" :src="data.currencyIconUrl || imgHeaderCover" />
                   <span id="preview-after-amount">{{ data.amountValue || 0 }}</span>
                 </component-zoom>
-
             </div>
             <div class="time-area" v-if="data.type == PlayType.lottery">
                 <img class="icon-clock" :src="require('@/assets/svg/icon-time.svg')" />
@@ -109,7 +108,7 @@
         <img class="cover" v-else :src="require('@/assets/subject/img-custom-common-bg.svg')"  />
         <img class="gift" :src="require('@/assets/subject/icon-gift.gif')" />
         <div class="prize">
-            <component-zoom width="300" fontSize="22">
+            <component-zoom width="300" fontSize="22" ref="zoomCom2">
                 <img class="icon" :src="require('@/assets/subject/icon-gift-inline.svg')"/>
                 <span class="name" id="custom-name" >
                     {{data.customizedReward}}
@@ -126,7 +125,7 @@
                 <span class="info">{{isLottaryCpd ? 'Left' : 'Instant Giveaway'}}</span>
             </div>
             <div class="winner-info">
-                <component-zoom width="300" fontSize="12">
+                <component-zoom width="300" fontSize="12" ref="zoomCom3">
                     <span class="count">{{data.totalCount}}Winners</span>
                     <span>to Share </span>
                     <span class="prize-name">{{isMoneyRewardCpd ? data.amountValue + ' ' + data.tokenSymbol : data.customizedReward}}</span>
@@ -140,12 +139,20 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits, ref, computed, onMounted } from "vue";
+import { defineProps, defineEmits, ref, computed, onMounted, watch } from "vue";
 import { formatSecondsAsDaysOrTime } from "@/uilts/help";
 import ComponentZoom from "./component-zoom.vue";
 import { RewardType, PlayType } from "@/types";
 
+let zoomCom = ref('');
+let zoomCom1 = ref('');
+let zoomCom2 = ref('');
+let zoomCom3 = ref('');
 const props = defineProps({
+    show: {
+      type: Boolean,
+      default: true
+    },
     data: {
         type: Object,
         default: () => {
@@ -170,6 +177,19 @@ const props = defineProps({
     },
 });
 
+watch(() => props.show, (newVal) => {
+      if(newVal) {
+        zoomCom.value && zoomCom.value.setFontZoom(0);
+        zoomCom1.value && zoomCom.value.setFontZoom(0);
+        zoomCom2.value && zoomCom.value.setFontZoom(0);
+        zoomCom3.value && zoomCom.value.setFontZoom(0);
+      }
+    },
+    {
+        deep: true
+    })
+
+
 
 let isMoneyRewardCpd =computed(() => {
     return props.data.rewardType === RewardType.money

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

@@ -163,7 +163,7 @@ let amountFontSize = ref(60);
 
 watch(() => props.data, () => {
     let lenstr = document.querySelector('#preview-before-amount')?.innerHTML?.length;
-    let num = parseInt(360/lenstr);
+    let num = parseInt(330/lenstr);
     amountFontSize.value = num < 56 ? num : 56;
 })
 </script>

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

@@ -195,9 +195,10 @@ const setIptWidth = (index) => {
     }  else {
         setTimeout(() => {
             let iptDom = document.getElementById('input'+index);
-            iptDom.style.width = document.getElementById('pre'+index).offsetWidth + 'px'
-                console.log('iptDom1',iptDom,document.getElementById('pre'+index).offsetWidth);
-        }, 500)
+            if(iptDom){
+              iptDom.style.width = document.getElementById('pre'+index).offsetWidth + 'px'
+            }
+        }, 600)
     }
 }
 

src/view/iframe/publish/components/preview-card.vue

@@ -35,7 +35,8 @@
                             rewardType: baseFormData.rewardType,
                             customizedReward: baseFormData.customizedReward,
                             upGainAmountUsdValue: upGainAmountUsdValue
-                        }"></custom-card-cover>
+                        }"
+                        :show="installStatus"></custom-card-cover>
                     </div>
                 </div>
             </div>