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

learn/active/lib/Manage.php

@@ -155,7 +155,7 @@ Class Manage
             $aduit = Dever::load('manage/admin-find',$info['audit_admin']);
             $html['admin_name'] = $aduit['username'];
         } elseif ($info && $info['top_admin']) {
-            $off = Dever::db('active/off')->find($info['top_admin']);
+            $off = Dever::db('active/info_off')->find($info['top_admin']);
             $html['admin_name'] = $off['name'];
         }
         return $html;

learn/active/src/User.php

@@ -66,6 +66,8 @@ Class User extends Core
     		$ids = Dever::db('active/code')->update($where);
     		$data = Dever::db('active/code')->find($ids);
     		return $data;
+    	} else {
+    		Dever::alert('您还没有生成核销码');
     	}
     }
     #我的核销码