update shop

shop/control/card_key.php

@@ -96,14 +96,14 @@ class card_keycontrol extends BaseSellerControl
             $card_no = $_POST['card_no'];
             $card_key = $_POST['card_key'];
             $card_state = $_POST['card_state'];
-            if($card_state != 0) {
+            if($card['card_state'] != 0) {
                 showDialog('此卡密已被绑定', 'reload', 'error');
             }
             [$state , $msg] = $this->checkCardKey($card_no , $card_key, $card_type);
             if($state == false) {
                 showDialog($msg, 'reload', 'error');
             }
-            $check_card = $mod_card->getCards(['card_no' => $card_no , 'card_key' => $card_key]);
+            $check_card = $mod_card->getCards(['card_no' => $card_no , 'card_key' => $card_key , 'card_id' => ['neq' , $card_id]]);
             if(!empty($check_card)) {
                 showDialog('此卡号和卡密已存在', 'reload', 'error');
             }

shop/templates/default/seller/card_key.form.php

@@ -290,7 +290,7 @@
     let cardArr
     let cardPassword
     let regSplitArr
-    let isTrue
+    let isTrue = true
     let open
     if (typeVal == 4) {
       // 移动
@@ -301,7 +301,6 @@
           isTrue = false
           return 
         } else {
-          isTrue = true
           return item
         }
       })
@@ -325,7 +324,6 @@
           isTrue = false
           return isTrue
         } else {
-          isTrue = true
           return item
         }
       })
@@ -349,7 +347,6 @@
           isTrue = false
           return
         } else {
-          isTrue = true
           return item
         }
       })
@@ -377,12 +374,12 @@
       }
       return false 
     }
-    if (isRepeat(cardArr)) {
+    if (isTrue && isRepeat(cardArr)) {
       layer.msg('卡号重复');
       // return false
       isTrue = false
       return isTrue
-    } else if (isRepeat(cardPassword)) {
+    } else if (isTrue && isRepeat(cardPassword)) {
       layer.msg('卡密重复');
       // return false
       isTrue = false
@@ -410,7 +407,7 @@
     let cardArr
     let cardPassword
     let regSplitArr
-    let isTrue
+    let isTrue = true
     let open
     if (typeVal == 4) {
       // 移动
@@ -421,7 +418,7 @@
           isTrue = false
           return 
         } else {
-          isTrue = true
+          // isTrue = true
           return item
         }
       })
@@ -445,7 +442,7 @@
           isTrue = false
           return
         } else {
-          isTrue = true
+          // isTrue = true
           return item
         }
       })
@@ -469,7 +466,6 @@
           isTrue = false
           return
         } else {
-          isTrue = true
           return item
         }
       })
@@ -497,27 +493,30 @@
       }
       return false 
     }
-    if (isRepeat(cardArr)) {
+    if (isTrue && isRepeat(cardArr)) {
       layer.msg('卡号重复');
       return false
-    } else if (isRepeat(cardPassword)) {
+    } else if (isTrue && isRepeat(cardPassword)) {
       layer.msg('卡密重复');
       return false
     }
     let title = $(".card_type_span input[name='card_type']:checked")[0].title
     let amount = faceVal + '元'
     let cardKeyLen = cardPassword.length + '张'
+    // console.log('isTrue', isTrue);
     // 弹层
-    layer.open({
-      type: 0,
-      area: ['600px', '360px'],
-      shadeClose: true, //点击遮罩关闭
-      title: '卡密确认',
-      btn: ['确认提交'],
-      content: `<div style="padding:20px;"><form>提交卡种：${title}</br></br>选择面值：${amount}</br></br>提交卡密数量：${cardKeyLen}</form></div>`,
-      yes: function(index, layero){
-        $('#btn').click()
-      }
-    });
+    if (isTrue) {
+      layer.open({
+        type: 0,
+        area: ['600px', '360px'],
+        shadeClose: true, //点击遮罩关闭
+        title: '卡密确认',
+        btn: ['确认提交'],
+        content: `<div style="padding:20px;"><form>提交卡种：${title}</br></br>选择面值：${amount}</br></br>提交卡密数量：${cardKeyLen}</form></div>`,
+        yes: function(index, layero){
+          $('#btn').click()
+        }
+      });
+    }
   })
 </script>

shop/templates/default/seller/card_key.oil.form.php

@@ -262,7 +262,7 @@
     let cardArr
     let cardPassword
     let regSplitArr
-    let isTrue
+    let isTrue = true
     if (typeVal == 2) {
       // 石化
       regSplitArr = textSplitArr.map(function(item,idx) {
@@ -272,7 +272,6 @@
           isTrue = false
           return
         } else {
-          isTrue = true
           return item
         }
       })
@@ -300,10 +299,10 @@
       }
       return false 
     }
-    if (isRepeat(cardArr)) {
+    if (isTrue && isRepeat(cardArr)) {
       layer.msg('卡号重复');
       return false
-    } else if (isRepeat(cardPassword)) {
+    } else if (isTrue && isRepeat(cardPassword)) {
       layer.msg('卡密重复');
       return false
     }
@@ -329,7 +328,7 @@
     let cardArr
     let cardPassword
     let regSplitArr
-    let isTrue
+    let isTrue = true
     let open
     if (typeVal == 2) {
       // 石化
@@ -340,7 +339,6 @@
           isTrue = false
           return
         } else {
-          isTrue = true
           return item
         }
       })
@@ -368,10 +366,10 @@
       }
       return false 
     }
-    if (isRepeat(cardArr)) {
+    if (isTrue && isRepeat(cardArr)) {
       layer.msg('卡号重复');
       return false
-    } else if (isRepeat(cardPassword)) {
+    } else if (isTrue && isRepeat(cardPassword)) {
       layer.msg('卡密重复');
       return false
     }
@@ -379,16 +377,18 @@
     let amount = faceVal + '元'
     let cardKeyLen = cardPassword.length + '张'
     // 弹层
-    layer.open({
-      type: 0,
-      area: ['600px', '360px'],
-      shadeClose: true, //点击遮罩关闭
-      title: '卡密确认',
-      btn: ['确认提交'],
-      content: `<div style="padding:20px;"><form>提交卡种：${title}</br></br>选择面值：${amount}</br></br>提交卡密数量：${cardKeyLen}</form></div>`,
-      yes: function(index, layero){
-        $('#btn').click()
-      }
-    });
+    if (isTrue) {
+      layer.open({
+        type: 0,
+        area: ['600px', '360px'],
+        shadeClose: true, //点击遮罩关闭
+        title: '卡密确认',
+        btn: ['确认提交'],
+        content: `<div style="padding:20px;"><form>提交卡种：${title}</br></br>选择面值：${amount}</br></br>提交卡密数量：${cardKeyLen}</form></div>`,
+        yes: function(index, layero){
+          $('#btn').click()
+        }
+      });
+    }
   })
 </script>

test/TestRefill.php

@@ -752,43 +752,6 @@ class TestRefill extends TestCase
                 Log::record("data phone:{$phone} , 不支持的号段" , Log::DEBUG);
             }
         };
-
-        $phone_data = [18257939501,
-            13972748464,
-            18804840184,
-            13502425355,
-            13556439026,
-            13886396292,
-            13423847565,
-            15027241848,
-            13720147356,
-            19847641519,
-            13566127267,
-            13566127267,
-            13566127267,
-            13566127267,
-            13725375875,
-            15802795200,
-            15908618099,
-            13597965447,
-            13667173026,
-            13409875787,
-            13517990683,
-            13972431922,
-            15902769986,
-            13796242526,
-            15245806675,
-            15846255524,
-            18333061403,
-            15931693241,
-            15146725715,
-            13945133691,
-            15046744787,
-            18745128978,
-            15711015722];
-        foreach ($phone_data as $phone) {
-//            $check($phone);
-        }
         $check(17801048874);
     }