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

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

@@ -1384,24 +1384,26 @@ const calcIptValue = (cb) => {
 
 /**
  * usd最小金额判断
- * luckdropPostConfig.usdLimitEnable 当前选中的token是否开启usd最小金额判断
+ * luckdropPostConfig是一个列表，需要根据当前的玩法选择对应的Limit信息比对
+ * luckdropPostConfig[i].usdLimitEnable 当前选中的token是否开启usd最小金额判断
  */
 const checkUsdMinNumber = (isInTemplate) => {
     let forbiddenText = '';
     const { usdPrice, luckdropPostConfig } = currentCurrencyInfo.value;
-    if (baseFormData.rewardType === RewardType.money && luckdropPostConfig?.usdLimitEnable === 1) {
+    let currentLuckDropConfig = luckdropPostConfig.find(item => item.luckdropType === selectModeInfo.type);
+    if (baseFormData.rewardType === RewardType.money && currentLuckDropConfig?.usdLimitEnable === 1) {
         const { amountValue, totalCount } = baseFormData;
-        if (luckdropPostConfig?.minTotalUsdAmount === 0 || luckdropPostConfig?.minAvgUsdAmount === 0) {
+        if (currentLuckDropConfig?.minTotalUsdAmount === 0 || currentLuckDropConfig?.minAvgUsdAmount === 0) {
             // 当前token允许的usd最小金额为0 或单个红包最小金额为0，则无限制
             return forbiddenText;
         } else {
-            const isAmountForbidden = luckdropPostConfig?.minTotalUsdAmount ? math.format(math.evaluate(amountValue * usdPrice)) < luckdropPostConfig.minTotalUsdAmount : false;
-            const isAvgForbidden = luckdropPostConfig?.minAvgUsdAmount ? math.format(math.evaluate(amountValue / totalCount * usdPrice)) < luckdropPostConfig.minAvgUsdAmount : false;
+            const isAmountForbidden = currentLuckDropConfig?.minTotalUsdAmount ? math.format(math.evaluate(amountValue * usdPrice)) < currentLuckDropConfig.minTotalUsdAmount : false;
+            const isAvgForbidden = currentLuckDropConfig?.minAvgUsdAmount ? math.format(math.evaluate(amountValue / totalCount * usdPrice)) < currentLuckDropConfig.minAvgUsdAmount : false;
             forbiddenText = isAmountForbidden && isAvgForbidden ? 
                             `The prize pool must be above 
-                            ${isInTemplate ? ('<span class="font-color-1D9BF0">$' + luckdropPostConfig.minTotalUsdAmount + '</span>') : ('$' + luckdropPostConfig.minTotalUsdAmount)} 
+                            ${isInTemplate ? ('<span class="font-color-1D9BF0">$' + currentLuckDropConfig.minTotalUsdAmount + '</span>') : ('$' + currentLuckDropConfig.minTotalUsdAmount)} 
                             or the average prize must be above
-                            ${isInTemplate ? ('<span class="font-color-1D9BF0">$' + luckdropPostConfig.minAvgUsdAmount +' per person.</span>' ): ('$' + luckdropPostConfig.minAvgUsdAmount + ' per person.') }`
+                            ${isInTemplate ? ('<span class="font-color-1D9BF0">$' + currentLuckDropConfig.minAvgUsdAmount +' per person.</span>' ): ('$' + currentLuckDropConfig.minAvgUsdAmount + ' per person.') }`
                             : '';
         }
     }