Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

learn/active/assets/pc/html/off_code.html

@@ -30,7 +30,7 @@ td {
 .layui-card-body {
     /*position: relative;*/
     /*padding: 50px 15px;*/
-    line-height: 24px;
+    line-height: 20px;
 }
 .layui-input {
     /*position: relative;*/
@@ -42,26 +42,6 @@ td {
             max-width: 1024px;
             margin: auto;
         }
-  .lefttitle{
-      /*background-color: pink;*/
-      width: 10%;
-      float: left;/* 可将此句改为position:absolute;left:0; */
-  }
-  .leftname{
-      /*background-color: pink;*/
-      width: 30%;
-      float: left;/* 可将此句改为position:absolute;left:0; */
-  }
-  .righttitle{
-      /*background-color: dodgerblue;*/
-      width: 50%;
-      float:left;/* 可将此句改为position:absolute;left:50%; */
-  }
-  .rightname{
-      /*background-color: dodgerblue;*/
-      width: 40%;
-      float:right;/* 可将此句改为position:absolute;left:50%; */
-  }
   .layui-span{
     color: blue;
     margin-left: 80px;
@@ -73,10 +53,6 @@ td {
     margin-top: 15px;
     font-size: 15px;
   }
-  .layui-col-xs3{
-    margin-top: 15px;
-    font-size: 15px;
-  }
 </style>
 
 </head>
@@ -99,30 +75,6 @@ td {
     </div>
   </div>
     <input type="text" value="<{$write_code}>" autocomplete="off" id="date" class="layui-input" style="width: auto;display: inline;" placeholder="输入核销码">
-    <!-- <a href="javascript:;" class="layui-btn" id="search">搜索</a> -->
-  <!-- </div> -->
-  <!-- <div class="layui-row">
-  <{if(isset($write_code)):}>
-    <div class="layui-col-xs3">
-    <h5>参会人</h5>
-      <div class="grid-demo grid-demo-bg1"><{$join_avatar}></div>
-    </div>
-    <div class="layui-col-xs2">
-      <div class="grid-demo">姓名:<{$join_name}></div>
-      <div class="grid-demo">电话：<{$join_mobile}></div>
-      <div class="grid-demo">核销码：<{$write_code}></div>
-    </div>
-    <div class="layui-col-xs3">
-    <h5>邀请人</h5>
-      <div class="grid-demo grid-demo-bg1"><{$buy_avatar}></div>
-    </div>
-    <div class="layui-col-xs3">
-      <div class="grid-demo"><{$buy_name}></div>
-      <div class="grid-demo"><{$buy_mobile}>></div>
-      <div class="grid-demo"><{$role_name}></div>
-      <div class="grid-demo"><{$title_name}></div>
-    </div>
-  </div> -->
   <div class="layui-card-body">
 <{if(isset($write_code)):}>
     <table class="table layui-table layui-table-body" id="table">
@@ -136,14 +88,10 @@ td {
     <tr>
       <td>姓名:<{$join_name}></td>
       <td><{$buy_name}></td>
-      
-      
     </tr>
     <tr>
       <td>电话：<{$join_mobile}></td>
       <td><{$buy_mobile}></td>
-     
-      
     </tr>
     <tr>
     <td>核销码：<{$write_code}></td>
@@ -199,7 +147,6 @@ $('#date').bind('keydown',function(event){
       },
       error: function(data){
         layer.alert('核销码不存在或已核销', function(){
-        // layer.alert(data.data.msg, function(){
         location.href = config.host + "lib/manage.code&id=<{$active_id}>";
         layer.close();
     });
@@ -239,8 +186,6 @@ function hexiao() {
      }
 
   });
-
-
 }
 
 </script>

learn/active/src/Home.php

@@ -214,10 +214,11 @@ Class Home extends Core
                 Dever::alert('仅限代理商领取');
             }
         }
-        $code = Dever::db('active/code')->find(array('order_id'=>$order_id,'active_id'=>$active_id,'join_uid'=>$uid));
-        if ($code) {
-        	Dever::alert('您已领取过了，不可重复领取');
-        }
+        // $code = Dever::db('active/code')->find(array('order_id'=>$order_id,'active_id'=>$active_id,'join_uid'=>$uid));
+        // if ($code) {
+        // 	Dever::alert('您已领取过了，不可重复领取');
+        // }
+        $code = Dever::db('active/code')->state(array('order_id'=>$order_id));
         $data['info'] = Dever::db('active/order')->find($order_id);
         if ($data['info']['status'] < 2) {
             Dever::alert('订单还没有支付');