瀏覽代碼

[fix] bug

wenliming 2 年之前
父節點
當前提交
0fbe84dc05

+ 0 - 1
src/view/components/currency-list.vue

@@ -356,7 +356,6 @@ defineExpose({
     .list-wrapper {
         height: calc(100% - 60px);
         overflow-y: auto;
-        padding-bottom: 50px;
 
         .list-item {
             .item-title {

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

@@ -75,7 +75,7 @@
             <div class="treasure-row-1">
                 <div class="left">Treasure</div>
                 <component-zoom :width="160" :txt="data.amountValue || 0">
-                    <div class="right">${{ data.amountValue || 0 }}</div>
+                    <div class="right">${{ data.usdEstimateOrderAmount || 0 }}</div>
                 </component-zoom>
             </div>
 

+ 41 - 3
src/view/iframe/publish/give-dialog.vue

@@ -44,7 +44,7 @@
                     <div class="currency-pop" v-show="showCurrencyPop">
                         <currency-list 
                             ref="currencyListDom"
-                            :showGeneralLottery="true"
+                            :showGeneralLottery="showGeneralLottery"
                             @selectCurrency="selectCurrency"
                             @setCurrencyList="setCurrentCurrencyInfo"
                             @addGeneralLottery="addCustomizedRewardHandle"></currency-list>
@@ -127,7 +127,7 @@
                                                             :src="currentArrowCpd"/>
                                                     </div>
                                                     <form-input class="margin-left-10"
-                                                        :suffix="baseFormData.rewardType === RewardType.custom || currentCurrencyInfo.currencyCode ? currentPrizeCpd : ''">
+                                                        :suffix="baseFormData.rewardType === RewardType.custom ? 'items' : currentCurrencyInfo.currencyCode ? currentPrizeCpd : ''">
                                                         <template v-slot:content>
                                                             <input style="width: 100px"
                                                                 v-model="baseFormData.amountValue"
@@ -138,6 +138,7 @@
                                                         </template>
                                                     </form-input>
                                                     <form-input class="margin-left-10"
+                                                        v-if="currentCurrencyInfo.currencyCode != 'USD' && baseFormData.rewardType != RewardType.custom"
                                                         prefix="=$"
                                                         suffix="USD">
                                                         <template v-slot:content>
@@ -327,11 +328,11 @@
                             </div> 
                             <div class="form-right-sheet">
                                 <!-- 自定义封面事件 -->
-                                <!-- @click="customCoverImg" -->
                                 <div style="width: 375px;height: 500px; zoom: .74;margin-left: 80px">
                                     <custom-card-cover :data="{
                                         ...baseFormData,
                                         ...currentCurrencyInfo,
+                                        usdEstimateOrderAmount: treasureFormData.usdEstimateOrderAmount,
                                         currencyIconUrl: currentCurrencyInfo.iconPath,
                                         customPosterUrl: customPosterInfo && customPosterInfo.after && customPosterInfo.after.imagePath || '',
                                         userInfo: {
@@ -340,6 +341,12 @@
                                         },
                                     }"></custom-card-cover>
                                 </div>
+                                <div class="custom-cover-btn" 
+                                    v-if="selectModeInfo.type != PlayType.treasure"
+                                    @click="customCoverImg">
+                                    <img :src="require('@/assets/svg/icon-custom-cover-btn.svg')" />
+                                    Custom
+                                </div>
                             </div>
                             <div class="submit-btn-wrapper">
                                 <div class="submit-btn"
@@ -608,6 +615,8 @@ let previewFontSize = ref(56);
 
 let postId = ref('');
 
+let showGeneralLottery = ref(false);
+
 let selectModeInfo = reactive({
     index: 0,
     type: PlayType.treasure
@@ -1495,6 +1504,10 @@ const onUsdEstimateOrderAmountInput = () => {
     treasureFormData.usdEstimateOrderAmount = val;
     calcTokenEstimate({type: 'ORDER_AMOUNT'});
     onIptSetErrorTxt();
+
+    if(val && treasureFormData.usdEstimateFansUnitAmount) {
+        treasureFormData.addFans = calcAddFans({totalAmount: val, unitPrice: treasureFormData.usdEstimateFansUnitAmount});
+    }
     return val;
 };
 
@@ -1575,6 +1588,9 @@ const onAmountInput = () => {
     calcUsdEstimate({type: 'ORDER_AMOUNT'});
     onIptSetErrorTxt();
 
+    if(val && baseFormData.fansUnitAmountValue) {
+        treasureFormData.addFans = calcAddFans({totalAmount: val, unitPrice: baseFormData.fansUnitAmountValue});
+    }
     return val;
 };
 
@@ -2066,6 +2082,7 @@ const setFrontConfig = () => {
 };
 
 const getUserName = (screenName) => {
+    if(!screenName) return;
     getUser({
         params:{
             screenName
@@ -2128,6 +2145,14 @@ const selectPublishMode = (params, index) => {
     selectModeInfo.type = params.type;
     baseFormData.type = params.type;
 
+    if(params.type == PlayType.treasure) {
+        baseFormData.rewardType = RewardType.money;
+        baseFormData.customizedReward = '';
+        showGeneralLottery.value = false;
+    } else {
+        showGeneralLottery.value = true;
+    }
+
     onIptSetErrorTxt();
 }
 
@@ -2474,6 +2499,19 @@ onMounted(() => {
                         width: 500px;
                     }
 
+                    .form-right-sheet {
+                        .custom-cover-btn {
+                            margin-top: 12px;
+                            display: flex;
+                            align-items: center;
+                            cursor: pointer;
+                            color: #494949;
+                            font-weight: 400;
+                            font-size: 12px;
+                            float: right;
+                        }
+                    }
+
                     .base-form-wrapper {
                         margin-right: 30px;
                         width: 100%;