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

learn/active/src/User.php

@@ -32,7 +32,7 @@ Class User extends Core
     	} else {
     		$where['active_id'] = $data['active_id'];
     		$where['buy_uid'] = $data['uid'];
-    		$where['join_uid'] = $uid;
+    		$where['join_uid'] = $this->uid;
     		$where['order_id'] = $order_id;
     		$where['act_status'] = $info['act_status'];
     		$code = Dever::db('active/code')->find($where);