1、更新内核

2、修复模型bug
3、修复后台部分操作的bug
4、清除多余文件

application/common/controller/User.php

@@ -34,6 +34,9 @@ class User extends Base{
 			array('title'=>'密码修改', 'url'=>'user/profile/editpw', 'icon'=>'key'),
 			array('title'=>'更换头像', 'url'=>'user/profile/avatar', 'icon'=>'male'),
 		);
+		$menu['订单管理'] = array(
+			array('title'=>'我的订单', 'url'=>'user/order/index', 'icon'=>'shopping-bag'),
+		);
 		$contetnmenu = $this->getContentMenu();
 		if (!empty($contetnmenu)) {
 			$menu['内容管理'] = $contetnmenu;

application/common/model/Addons.php

@@ -82,11 +82,16 @@ class Addons extends \app\common\model\Base {
 
     public function install($data){
         if ($data) {
-            $result = $this->save($data);
-            if ($result) {
-                model('Hooks')->addHooks($data['name']);
-                return true;
+            $info = $this->where('name', $data['name'])->find();
+            if (null == $info) {
+                $result = $this->save($data);
+                if ($result) {
+                    return model('Hooks')->addHooks($data['name']);
+                }else{
+                    return false;
+                }
             }else{
+                $this->error = "已安装！";
                 return false;
             }
         }else{

application/common/model/Content.php

@@ -24,6 +24,10 @@ class Content extends Base{
 		'cover_id'  => 'integer',
 	);
 
+	protected function setUidAttr(){
+		return session('user_auth.uid');
+	}
+
 	protected function setCreateTimeAttr($value){
 		return $value ? strtotime($value) : time();
 	}
@@ -41,7 +45,7 @@ class Content extends Base{
 		return date('Y-m-d H:i:s',$value);
 	}
 
-	public function setInfo($name){
+	public function extend($name){
 		$this->name = $name;
 		return $this;
 	}

application/common/model/Hooks.php

@@ -33,8 +33,10 @@ class Hooks extends Base {
 	}
 
 	protected function setAddonsAttr($value){
-		$string = implode(",", $value[1]);
-		return $string;
+		if ($value[1]) {
+			$string = implode(",", $value[1]);
+			return $string;
+		}
 	}
 
 	protected function getTypeTextAttr($value, $data){
@@ -71,7 +73,30 @@ class Hooks extends Base {
 			return false;
 		}
 		$methods = get_class_methods($addons_class);
-		dump($methods);
+		foreach ($methods as $item) {
+			if ('Addon' === substr($item, -5, 5)) {
+				$info = $this->where('name', substr($item, 0, -5))->find();
+				if (null == $info) {
+					$save = array(
+						'name'   => $addons_name,
+						'description'  => '',
+						'type'         => 1,
+						'addons'       => array($addons_name),
+						'update_time'  => time(),
+						'status'       => 1
+					);
+					$this->save($save);
+				}else{
+					if ($info['addons']) {
+						# code...
+					}else{
+						$addons = substr($item, 0, -5);
+					}
+					$this->where('name', $addons_name)->setField('addons', $addons);
+				}
+			}
+		}
+		return true;
 	}
 
 	public function removeHooks($addons_name){

application/common/model/Model.php

@@ -55,11 +55,13 @@ class Model extends Base{
 					if($data['extend'] == 1){
 						//默认文档前缀
 						$tablename = 'document_'.$data['name'];
+						$is_auto_increment = false;
 					}else{
 						$tablename = $data['name'];
+						$is_auto_increment = true;
 					}
 					$sql = $db->start_table($tablename)
-						->create_id('id', 11 , '主键' , false);
+						->create_id('id', 11 , '主键' , $is_auto_increment);
 					if ($data['extend'] != 1) {
 						$sql = $sql->create_uid();
 					}

application/common/view/default/ad/sider.html

@@ -1,24 +1,14 @@
 <div class="banner">
-	<div class="warp">
-		<div class="banner-side">
-			<ul>
-				{volist name="ad" id="item"}
-				<li>
-					<a href="{$item['url']}" target="_blank">
-					<img src="{:get_cover($item['cover_id'],'path')}">
-					<div class="title"><span>{$item['title']}</span></div>
-					</a>
-				</li>
-				{/volist}
-			</ul>
-			<ol class="dots">
-				{volist name="ad" id="item"}
-				<li class="dot">{$item['title']}</li>
-				{/volist}
-			</ol>
-		</div>
-	</div>
+	<ul>
+		{volist name="ad" id="item"}
+		<li style="background:{$item['bgcolor']|default='#95FCBD'};" title="{$item['title']}">{$item['content']}</li>
+		{/volist}
+	</ul>
 </div>
 <script type="text/javascript">
-$(".banner-side").slide({mainCell:"ul",titCell:".dots .dot",autoPlay:true});
+$(function() {
+    $('.banner').unslider({
+    	dots: true,               //  Display dot navigation
+    });
+});
 </script>