修复库存校验和概率校验

b-template/collectCard/client/components/dialog/card-prize-dialog/card-prize-dialog.js

@@ -458,7 +458,7 @@ Component({
       // 库存奖品的库存值判断
       let usePass = switchStock == 1 ? +stock >= (useStock || 0) : true;
       let stockPass = switchStock == 1 ? validateRangeNumber(stock, [0, 99999]) : true;
-      if (!stockPass || !usePass) {
+      if (!(stockPass && usePass)) {
         this.showItemTips(
           "prizeNumberTips",
           "error",
@@ -491,7 +491,7 @@ Component({
           name,
           ename,
           type,
-          probability,
+          probability: `${+probability}`,
           stock: +stock,
           credits: +credits,
           useStock: +useStock,

b-template/collectCard/client/components/dialog/prize-dialog/prize-dialog.js

@@ -455,7 +455,7 @@ Component({
       // 库存奖品的库存值判断
       let usePass = switchStock == 1 ? +stock >= (useStock || 0) : true;
       let stockPass = switchStock == 1 ? validateRangeNumber(stock, [0, 99999]) : true;
-      if (!stockPass || !usePass) {
+      if (!(stockPass && usePass)) {
         this.showItemTips(
           "prizeNumberTips",
           "error",
@@ -556,7 +556,7 @@ Component({
           name,
           ename,
           type,
-          probability,
+          probability: `${+probability}`,
           stock: +stock,
           credits: +credits,
           useStock: +useStock,

b-template/collectCard/client/utils/validate.js

@@ -35,7 +35,7 @@ export const validateRangeNumber = (number, [min, max] = [], fixed = 0) => {
     console.error('数字范围的最小值不能大于最大值');
     return;
   }
-  if (number != 0) {
+  if (number !== 0 || number !== '0') {
     if (!pattern.test(number) || number === '') return false;
   }