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

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

@@ -31,6 +31,7 @@ td {
     /*position: relative;*/
     /*padding: 50px 15px;*/
     line-height: 20px;
+    margin-left: -20px;
 }
 .layui-input {
     /*position: relative;*/
@@ -78,6 +79,8 @@ td {
   <div class="layui-card-body">
 <{if(isset($write_code)):}>
     <table class="table layui-table layui-table-body" id="table">
+    <col width="100">
+    <col width="100">
       <thead>
     <tr>
       <th>参会人</th>

learn/active/lib/Active.php

@@ -153,11 +153,13 @@ class Active
         	
         	$code = Dever::db('active/code')->find(array('join_uid'=>$order['uid'],'active_id'=>$order['active_id']));
         	if (!$code) {
+        		$active = Dever::db('active/info')->find($order['active_id']);
         		$insert['join_uid'] = $order['uid'];
         		$insert['active_id'] = $order['active_id'];
         		$insert['buy_uid'] = $order['uid'];
         		$insert['order_id'] = $order['id'];
         		$insert['write_code'] = Dever::load('active/home')->getCode();
+        		$insert['act_status'] = $active['act_status'];
         		$ids = Dever::db('active/code')->insert($insert);
         		if ($ids) {
         			$update['code_num'] = 1;

learn/active/lib/Manage.php

@@ -335,7 +335,7 @@ Class Manage
                 $purl = Dever::url('active/lib/manage.refund&id='.$id);
                 $button[] = array
                 (
-                    'type' => 'edit',
+                    'type' => 'action',
                     'link' => $purl,
                     'name' => '全额退款',
                 );
@@ -513,7 +513,7 @@ Class Manage
                 }
                 $where['refund_num'] = $refund_num + $data['refund_num'];
 
-                if ($type == 1 || ($price == $data['price'])) {
+                if ($type == 1 || ($price == $data['price']) || ($data['num'] == $where['refund_num'])) {
                     Dever::db('active/order')->update($where);
                 } else {
                     $where['status'] = 2;

learn/active/src/Home.php

@@ -205,7 +205,7 @@ Class Home extends Core
 		$user = Dever::db('active/user')->find($uid);
        	
         $info = Dever::db('active/info')->find($active_id);
-        if ($info['status'] == 5 || time() >= $info['act_end']) {
+        if ($info['act_status'] == 5 || time() >= $info['act_end']) {
         	Dever::alert('活动已结束');
         }     
         if ($info['status'] == 2) {
@@ -214,10 +214,10 @@ 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) {
@@ -228,14 +228,14 @@ Class Home extends Core
         } else {
             $where['active_id'] = $active_id;
             $where['join_uid'] = $uid;
-            $where['act_status'] = $info['act_status'];
+            
             $code = Dever::db('active/code')->find($where);
             if ($code) {
                 Dever::alert('您已领取过了，不可重复领取');
             }
             $where['buy_uid'] = $data['info']['uid'];
             $where['order_id'] = $order_id;
-            
+            $where['act_status'] = $info['act_status'];
             $where['write_code'] = $this->getCode();
             
             // $code = Dever::db('active/code')->find(array('write_code'=>$where['write_code']));
@@ -274,7 +274,7 @@ Class Home extends Core
 			// if (time() < $active['act_start']){
 			// 	Dever::alert('活动未开始');
 			// }
-			if ($active['status'] == 5 || time() >= $active['act_end']) {
+			if ($active['act_status'] == 5 || time() >= $active['act_end']) {
 				Dever::alert('活动已结束');
 			}
 			if ($data['status'] == 2) {

learn/active/src/Off.php

@@ -110,7 +110,7 @@ Class Off extends Coreoff
 			// if (time() < $active['act_start']){
 			// 	Dever::alert('活动未开始');
 			// }
-			if ($active['status'] == 5 || time() >= $active['act_end']) {
+			if ($active['act_status'] == 5 || time() >= $active['act_end']) {
 				Dever::alert('活动已结束');
 			}
 			if ($data['status'] == 2) {