dever 7 years ago
parent
commit
f0cae81818
47 changed files with 199 additions and 199 deletions
  1. 1 1
      KIF/Core/PermissionController.class.php
  2. 17 17
      doc/onepage.sql
  3. 141 141
      doc/onepage_project.sql
  4. 3 20
      kissy/cfg-min.js
  5. 0 0
      kissy/op_dever/test-min.js
  6. 0 0
      kissy/op_dever/test.js
  7. 0 0
      kissy/op_dever/topic-page-2-min.css
  8. 1 1
      kissy/op_dever/topic-page-2-min.js
  9. 0 0
      kissy/op_dever/topic-page-2.css
  10. 0 0
      kissy/op_dever/topic-page-2.js
  11. 0 0
      kissy/op_dever/topic-page-min.css
  12. 1 1
      kissy/op_dever/topic-page-min.js
  13. 0 0
      kissy/op_dever/topic-page.css
  14. 1 1
      kissy/op_dever/topic-page.js
  15. 3 1
      kissy/public/static/css/admin_style.css
  16. BIN
      kissy/public/upload/image/2018/0418/094551_80972.jpg
  17. BIN
      kissy/public/upload/image/2018/0418/094552_82074.jpg
  18. BIN
      kissy/public/upload/image/2018/0418/094557_70073.jpg
  19. BIN
      kissy/public/upload/image/2018/0418/094559_49461.jpg
  20. BIN
      kissy/public/upload/image/2018/0418/101135_47035.jpg
  21. BIN
      kissy/public/upload/image/2018/0418/101147_89537.jpg
  22. BIN
      kissy/public/upload/image/2018/0418/101933_49133.jpg
  23. BIN
      kissy/public/upload/image/2018/0418/101953_70612.jpg
  24. BIN
      kissy/public/upload/image/2018/0418/102121_73498.jpg
  25. BIN
      kissy/public/upload/image/2018/0418/102126_62044.jpg
  26. BIN
      kissy/public/upload/image/2018/0418/115452_92610.jpg
  27. BIN
      kissy/public/upload/image/2018/0418/115459_80612.jpg
  28. BIN
      kissy/public/upload/image/2018/0418/115749_65165.jpg
  29. BIN
      kissy/public/upload/image/2018/0418/115850_26065.jpg
  30. BIN
      kissy/public/upload/image/2018/0418/115927_14079.jpg
  31. BIN
      kissy/public/upload/qrcode/5f50a5944785cb15.png
  32. BIN
      kissy/public/upload/qrcode/967ebc7ba88a0f8dd62a6dc0662810d7.png
  33. BIN
      kissy/public/upload/qrcode/c0adf5b6197d4f1a.png
  34. BIN
      kissy/public/upload/qrcode/c0c4c59fc0adf5b6197d4f1ac823fe6e.png
  35. BIN
      kissy/public/upload/qrcode/ccff4c32dd40217f.png
  36. BIN
      kissy/public/upload/qrcode/e161cfa8d6b32d387fa9531bb821c71a.png
  37. 1 1
      kissy/versions.js
  38. 1 1
      project/op_dever/config.inc.php
  39. 1 0
      project/op_dever/index.php
  40. 1 1
      tm/lib/Controller/Index.class.php
  41. 2 1
      tm/lib/Module/User.class.php
  42. 5 3
      tm/template_dir/admin/activity/setPage_article.html
  43. 2 1
      tm/template_dir/admin/backUser/login.html
  44. 6 2
      tm/template_dir/admin/header.html
  45. 2 1
      tm/template_dir/admin/login.html
  46. 2 2
      tm/template_dir/admin/platform/list.html
  47. 8 3
      tm/template_dir/header.html

+ 1 - 1
KIF/Core/PermissionController.class.php

@@ -17,7 +17,7 @@ class PermissionController extends \KIF\Core\BKController {
 	 * 默认为true,设置为false 时,可以在需要有权限操作的方法里加上 $this->requireCompetence()方法,要求有操作权限
 	 * @var Boolean
 	 */
-	static private $useCompetence = true;
+	static private $useCompetence = KIF_CREATE;
 	
 	/**
 	 * 用户访问权限

+ 17 - 17
doc/onepage.sql

@@ -24,19 +24,19 @@ DROP TABLE IF EXISTS `back_user`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `back_user` (
   `uid` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `name` char(40) NOT NULL,
-  `password` char(16) NOT NULL,
-  `email` char(50) NOT NULL,
-  `project` char(50) NOT NULL COMMENT '用户所属项目',
-  `permission` char(10) NOT NULL,
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `name` char(40) NOT NULL DEFAULT '',
+  `password` char(16) NOT NULL DEFAULT '',
+  `email` char(50) NOT NULL DEFAULT '',
+  `project` char(50) NOT NULL DEFAULT '' COMMENT '用户所属项目',
+  `permission` char(10) NOT NULL DEFAULT '',
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`uid`),
   UNIQUE KEY `name_project` (`name`,`project`),
   KEY `project` (`project`)
-) ENGINE=MyISAM AUTO_INCREMENT=30 DEFAULT CHARSET=utf8 COMMENT='后台用户';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='后台用户';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -48,15 +48,15 @@ DROP TABLE IF EXISTS `platform_bulletin`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `platform_bulletin` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'bulletinID',
-  `title` varchar(100) NOT NULL COMMENT '标题',
-  `content` text NOT NULL COMMENT '内容',
+  `title` varchar(100) NOT NULL DEFAULT '' COMMENT '标题',
+  `content` text NOT NULL DEFAULT '' COMMENT '内容',
   `operator_uid` int(11) NOT NULL DEFAULT '0' COMMENT '操作ID',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COMMENT='平台公告';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='平台公告';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 

+ 141 - 141
doc/onepage_project.sql

@@ -24,11 +24,11 @@ DROP TABLE IF EXISTS `article_like`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `article_like` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `event_id` int(11) NOT NULL,
-  `uid` int(11) NOT NULL,
+  `event_id` int(11) NOT NULL DEFAULT 0,
+  `uid` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `event_id` (`event_id`,`uid`)
-) ENGINE=MyISAM AUTO_INCREMENT=44 DEFAULT CHARSET=utf8 COMMENT='文章点赞';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='文章点赞';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -39,8 +39,8 @@ DROP TABLE IF EXISTS `article_like_counter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `article_like_counter` (
-  `event_id` int(10) unsigned NOT NULL,
-  `likes` int(10) unsigned NOT NULL,
+  `event_id` int(10) unsigned NOT NULL DEFAULT 0,
+  `likes` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`event_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='文章点赞计数';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -54,18 +54,18 @@ DROP TABLE IF EXISTS `lottery_data`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_data` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `events_id` int(10) unsigned NOT NULL COMMENT '所属抽奖活动ID',
-  `prize_id` int(10) unsigned NOT NULL COMMENT '奖项ID',
+  `events_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '所属抽奖活动ID',
+  `prize_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '奖项ID',
   `uid` int(11) NOT NULL DEFAULT '0' COMMENT '获奖用户ID',
   `winning_time` int(10) unsigned NOT NULL COMMENT '用户获奖时间',
   `winners_time` int(10) unsigned NOT NULL COMMENT '程序到时发奖间',
   `scratch_receive` tinyint(2) NOT NULL DEFAULT '1' COMMENT '对刮挂卡领取奖品的特殊处理 1:用户已领取  2:用户未领取',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=660 DEFAULT CHARSET=utf8 COMMENT='抽奖数据表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='抽奖数据表';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -77,16 +77,16 @@ DROP TABLE IF EXISTS `lottery_delivery_channels`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_delivery_channels` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '渠道ID',
-  `str_name` varchar(100) NOT NULL COMMENT '渠道名称',
+  `str_name` varchar(100) NOT NULL DEFAULT '' COMMENT '渠道名称',
   `events_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '活动ID',
   `platform_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '平台ID',
   `pv_num` int(10) NOT NULL DEFAULT '0' COMMENT 'pv数',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=53 DEFAULT CHARSET=utf8 COMMENT='投放渠道';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='投放渠道';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -98,21 +98,21 @@ DROP TABLE IF EXISTS `lottery_events`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_events` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '抽奖活动ID',
-  `events_name` varchar(100) NOT NULL COMMENT '抽奖活动名称',
-  `begin_time` int(10) unsigned NOT NULL COMMENT '活动开始时间',
-  `end_time` int(10) unsigned NOT NULL COMMENT '活动结束时间',
+  `events_name` varchar(100) NOT NULL DEFAULT '' COMMENT '抽奖活动名称',
+  `begin_time` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '活动开始时间',
+  `end_time` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '活动结束时间',
   `type` tinyint(3) NOT NULL DEFAULT '0' COMMENT '活动类型 :转盘:刮挂卡',
   `display` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否显示 0 :不显示   1:显示',
   `del` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否被管理员删除',
   `list_display` tinyint(1) NOT NULL DEFAULT '0' COMMENT '列表中是否显示',
   `platform_ids` int(10) NOT NULL DEFAULT '0' COMMENT '所属列表',
   `operator_uid` int(10) NOT NULL DEFAULT '0' COMMENT '操作人UID',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=163 DEFAULT CHARSET=utf8 COMMENT='抽奖活动信息表';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='抽奖活动信息表';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -124,15 +124,15 @@ DROP TABLE IF EXISTS `lottery_events_code_data`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_events_code_data` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `events_id` int(10) unsigned NOT NULL COMMENT '所属活动ID',
+  `events_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '所属活动ID',
   `uid` int(11) NOT NULL DEFAULT '0' COMMENT '用户ID',
-  `data` text NOT NULL COMMENT '数据',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `data` text NOT NULL DEFAULT '' COMMENT '数据',
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=236 DEFAULT CHARSET=utf8 COMMENT='奖池数据表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='奖池数据表';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -144,14 +144,14 @@ DROP TABLE IF EXISTS `lottery_events_forms`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_events_forms` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `events_id` int(10) unsigned NOT NULL,
-  `uid` int(10) unsigned NOT NULL,
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `events_id` int(10) unsigned NOT NULL DEFAULT 0,
+  `uid` int(10) unsigned NOT NULL DEFAULT 0,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1220 DEFAULT CHARSET=utf8 COMMENT='活动表单';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='活动表单';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -163,16 +163,16 @@ DROP TABLE IF EXISTS `lottery_events_invitation`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_events_invitation` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `events_id` int(10) unsigned NOT NULL COMMENT '所属活动ID',
+  `events_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '所属活动ID',
   `uid` int(11) NOT NULL DEFAULT '0' COMMENT '用户ID',
-  `user_name` varchar(100) NOT NULL COMMENT '姓名',
-  `phone` varchar(100) NOT NULL COMMENT '电话',
-  `city` varchar(100) NOT NULL COMMENT '城市',
-  `mail` varchar(100) NOT NULL COMMENT 'Email',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `user_name` varchar(100) NOT NULL DEFAULT '' COMMENT '姓名',
+  `phone` varchar(100) NOT NULL DEFAULT '' COMMENT '电话',
+  `city` varchar(100) NOT NULL DEFAULT '' COMMENT '城市',
+  `mail` varchar(100) NOT NULL DEFAULT '' COMMENT 'Email',
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='活动[邀请函用户]';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -186,18 +186,18 @@ DROP TABLE IF EXISTS `lottery_events_letters`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_events_letters` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '字母-id',
-  `events_id` int(10) unsigned NOT NULL COMMENT '所属活动ID',
-  `ABC_name` varchar(100) NOT NULL COMMENT '字母名称',
+  `events_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '所属活动ID',
+  `ABC_name` varchar(100) NOT NULL DEFAULT '' COMMENT '字母名称',
   `img_1` varchar(100) NOT NULL DEFAULT 'null' COMMENT '字母名称图片1',
   `img_2` varchar(100) NOT NULL DEFAULT 'null' COMMENT '字母名称图片2',
   `num` int(10) NOT NULL DEFAULT '1' COMMENT '字母数量',
   `winning_num` int(10) NOT NULL DEFAULT '0' COMMENT '抽中字母数量',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=36 DEFAULT CHARSET=utf8 COMMENT='活动[收集字母信息]';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='活动[收集字母信息]';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -209,15 +209,15 @@ DROP TABLE IF EXISTS `lottery_events_log`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_events_log` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'LOGID',
-  `events_id` int(10) unsigned NOT NULL COMMENT '所属活动ID',
+  `events_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '所属活动ID',
   `type` tinyint(3) NOT NULL DEFAULT '0' COMMENT '1:访问 2:参与 3:获得',
   `uid` int(11) NOT NULL DEFAULT '0' COMMENT '获奖用户ID',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=4952 DEFAULT CHARSET=utf8 COMMENT='活动日志信息表';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='活动日志信息表';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -229,13 +229,13 @@ DROP TABLE IF EXISTS `lottery_events_try`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_events_try` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'LOGID',
-  `events_id` int(10) unsigned NOT NULL COMMENT '所属活动ID',
+  `events_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '所属活动ID',
   `uid` int(11) NOT NULL DEFAULT '0' COMMENT '获奖用户ID',
   `apply_txt` text NOT NULL COMMENT '用户申请信息',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='活动[试用申请信息]';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -249,14 +249,14 @@ DROP TABLE IF EXISTS `lottery_events_user_letters`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_events_user_letters` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `events_id` int(10) unsigned NOT NULL COMMENT '所属活动ID',
+  `events_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '所属活动ID',
   `uid` int(11) NOT NULL DEFAULT '0' COMMENT '用户ID',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COMMENT='活动[用户收集字母信息]';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='活动[用户收集字母信息]';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -269,16 +269,16 @@ DROP TABLE IF EXISTS `lottery_events_vote`;
 CREATE TABLE `lottery_events_vote` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
   `events_id` int(10) unsigned NOT NULL COMMENT '所属活动ID',
-  `title` varchar(100) NOT NULL COMMENT '投票标题',
-  `img_url` varchar(100) NOT NULL COMMENT '投票配图',
+  `title` varchar(100) NOT NULL DEFAULT '' COMMENT '投票标题',
+  `img_url` varchar(100) NOT NULL DEFAULT '' COMMENT '投票配图',
   `num` int(10) NOT NULL DEFAULT '0' COMMENT '投票数',
   `add_num` int(10) NOT NULL DEFAULT '0' COMMENT '作弊投票数',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=57 DEFAULT CHARSET=utf8 COMMENT='活动[投票项]';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='活动[投票项]';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -290,15 +290,15 @@ DROP TABLE IF EXISTS `lottery_events_vote_user_log`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_events_vote_user_log` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `events_id` int(10) unsigned NOT NULL COMMENT '所属活动ID',
-  `vote_id` varchar(100) NOT NULL COMMENT '投票项ID',
+  `events_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '所属活动ID',
+  `vote_id` varchar(100) NOT NULL DEFAULT '' COMMENT '投票项ID',
   `uid` int(11) NOT NULL DEFAULT '0' COMMENT '用户ID',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1106 DEFAULT CHARSET=utf8 COMMENT='活动[用户投票记录]';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='活动[用户投票记录]';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -310,18 +310,18 @@ DROP TABLE IF EXISTS `lottery_prize`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_prize` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '奖项ID',
-  `events_id` int(10) unsigned NOT NULL COMMENT '所属活动ID',
-  `prize_name` varchar(100) NOT NULL COMMENT '奖品名称',
-  `prize_num` int(10) unsigned NOT NULL COMMENT '奖品数量',
+  `events_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '所属活动ID',
+  `prize_name` varchar(100) NOT NULL DEFAULT '' COMMENT '奖品名称',
+  `prize_num` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '奖品数量',
   `prize_winning_num` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '已经抽中的数量',
   `type` tinyint(3) unsigned NOT NULL DEFAULT '1' COMMENT '状态 1:实物  2:虚拟',
   `display` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否显示 0 :不显示   1:显示',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=55 DEFAULT CHARSET=utf8 COMMENT='抽奖奖品表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='抽奖奖品表';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -333,15 +333,15 @@ DROP TABLE IF EXISTS `lottery_prize_virtual_data`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lottery_prize_virtual_data` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `prize_id` int(10) unsigned NOT NULL COMMENT '奖项ID',
-  `data` text NOT NULL COMMENT '奖池数据',
+  `prize_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '奖项ID',
+  `data` text NOT NULL DEFAULT '' COMMENT '奖池数据',
   `lottery_data_id` int(11) NOT NULL DEFAULT '0' COMMENT '获奖数据ID',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL  DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=231 DEFAULT CHARSET=utf8 COMMENT='奖池数据表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='奖池数据表';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -357,13 +357,13 @@ CREATE TABLE `lottery_pv_uv_log` (
   `pv_num` int(10) NOT NULL DEFAULT '0' COMMENT 'pv数',
   `uv_num` int(10) NOT NULL DEFAULT '0' COMMENT 'uv数',
   `date` int(10) unsigned NOT NULL COMMENT '统计日期时间戳',
-  `extend` text NOT NULL COMMENT '扩展字段',
-  `create_time` int(10) unsigned NOT NULL COMMENT '创建时间',
-  `update_time` int(10) unsigned NOT NULL COMMENT '更新时间',
-  `cas_token` int(10) unsigned NOT NULL COMMENT '乐观锁',
+  `extend` text NOT NULL  DEFAULT '' COMMENT '扩展字段',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '更新时间',
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '乐观锁',
   PRIMARY KEY (`id`),
   UNIQUE KEY `events_id` (`events_id`,`date`)
-) ENGINE=MyISAM AUTO_INCREMENT=914 DEFAULT CHARSET=utf8 COMMENT='活动PV&UV统计按日';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='活动PV&UV统计按日';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -376,17 +376,17 @@ DROP TABLE IF EXISTS `lottery_user_express`;
 CREATE TABLE `lottery_user_express` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
   `uid` int(11) NOT NULL DEFAULT '0' COMMENT '用户ID',
-  `phone` varchar(100) NOT NULL COMMENT '电话',
+  `phone` varchar(100) NOT NULL DEFAULT '' COMMENT '电话',
   `address` text NOT NULL COMMENT '地址',
-  `user_name` varchar(100) NOT NULL COMMENT '收货人姓名',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `user_name` varchar(100) NOT NULL DEFAULT '' COMMENT '收货人姓名',
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uid` (`uid`),
   UNIQUE KEY `uid_2` (`uid`)
-) ENGINE=MyISAM AUTO_INCREMENT=60 DEFAULT CHARSET=utf8 COMMENT='用户收货信息';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='用户收货信息';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -400,12 +400,12 @@ CREATE TABLE `lottery_user_participate_log` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'LOGID',
   `events_id` int(10) unsigned NOT NULL COMMENT '所属活动ID',
   `uid` int(11) NOT NULL DEFAULT '0' COMMENT '获奖用户ID',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=12549 DEFAULT CHARSET=utf8 COMMENT='活动用户参与表';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='活动用户参与表';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -417,14 +417,14 @@ DROP TABLE IF EXISTS `platform`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `platform` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'platformID',
-  `name` varchar(100) NOT NULL COMMENT '平台名称',
-  `css` varchar(100) NOT NULL COMMENT 'css文件名称',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `name` varchar(100) NOT NULL DEFAULT '' COMMENT '平台名称',
+  `css` varchar(100) NOT NULL DEFAULT '' COMMENT 'css文件名称',
+  `extend` text NOT NULL  DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COMMENT='平台';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='平台';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -436,15 +436,15 @@ DROP TABLE IF EXISTS `platform_bulletin`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `platform_bulletin` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'bulletinID',
-  `title` varchar(100) NOT NULL COMMENT '标题',
-  `content` text NOT NULL COMMENT '内容',
+  `title` varchar(100) NOT NULL DEFAULT '' COMMENT '标题',
+  `content` text NOT NULL DEFAULT '' COMMENT '内容',
   `operator_uid` int(11) NOT NULL DEFAULT '0' COMMENT '操作ID',
-  `extend` text NOT NULL,
-  `create_time` int(10) unsigned NOT NULL,
-  `update_time` int(10) unsigned NOT NULL,
-  `cas_token` int(10) unsigned NOT NULL,
+  `extend` text NOT NULL DEFAULT '',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0,
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COMMENT='平台公告';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='平台公告';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -456,17 +456,17 @@ DROP TABLE IF EXISTS `user_info`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `user_info` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id(本平台UID)',
-  `passport_uid` int(10) unsigned NOT NULL COMMENT '第三方用户ID',
-  `groupid` int(10) unsigned NOT NULL COMMENT '分组id',
+  `passport_uid` int(10) signed NOT NULL DEFAULT -1 COMMENT '第三方用户ID',
+  `groupid` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '分组id',
   `is_new` tinyint(1) unsigned NOT NULL COMMENT '是否新用户,0新用户(待获取用户信息) 1老用户',
-  `nickname` char(255) NOT NULL COMMENT '用户的昵称',
-  `localRemark` char(150) NOT NULL COMMENT '本地备注',
+  `nickname` char(255) NOT NULL DEFAULT '' COMMENT '用户的昵称',
+  `localRemark` char(150) NOT NULL DEFAULT '' COMMENT '本地备注',
   `extend` text NOT NULL COMMENT '扩展字段',
-  `create_time` int(10) unsigned NOT NULL COMMENT '创建时间',
-  `update_time` int(10) unsigned NOT NULL COMMENT '更新时间',
-  `cas_token` int(10) unsigned NOT NULL COMMENT '乐观锁',
+  `create_time` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `update_time` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '更新时间',
+  `cas_token` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '乐观锁',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=16504 DEFAULT CHARSET=utf8 COMMENT='用户基础数据';
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='用户基础数据';
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 

+ 3 - 20
kissy/cfg-min.js

@@ -3,27 +3,10 @@ KISSY.config({
 	debug: false
     , packages: {
         gallery: {
-            base: 'http://opcdn.sg.com.cn/k/kissy/1.4.0'
+            base: 'http://op_cdn.5dev.cn/kissy/1.4.0'
         }
-        , vogue: {
-            base: 'http://opcdn.sg.com.cn/k/vogue/'
-            , ignorePackageNameInUri: true
-        }
-
-        , sg: {
-            base: 'http://opcdn.sg.com.cn/project/sg/'
-            , ignorePackageNameInUri: true
-        }
-        , t: {
-            base: 'http://opcdn.sg.com.cn/project/t/'
-            , ignorePackageNameInUri: true
-        }
-        , ok: {
-            base: 'http://opcdn.sg.com.cn/project/ok/'
-            , ignorePackageNameInUri: true
-        }
-        , kinfolk: {
-            base: 'http://opcdn.sg.com.cn/project/kinfolk/'
+        , op_dever: {
+            base: 'http://op_cdn.5dev.cn/op_dever/'
             , ignorePackageNameInUri: true
         }
     }

+ 0 - 0
kissy/vogue/test-min.js → kissy/op_dever/test-min.js


+ 0 - 0
kissy/vogue/test.js → kissy/op_dever/test.js


+ 0 - 0
kissy/vogue/topic-page-2-min.css → kissy/op_dever/topic-page-2-min.css


+ 1 - 1
kissy/vogue/topic-page-2-min.js → kissy/op_dever/topic-page-2-min.js

@@ -1,4 +1,4 @@
-KISSY.add('vogue/topic-page-2',function (S, Node, DOM, Base, Event, IO) {
+KISSY.add('op_dever/topic-page-2',function (S, Node, DOM, Base, Event, IO) {
 	var $ = Node.all;
 	
 	var TopicPage = function (target, config) {

+ 0 - 0
kissy/vogue/topic-page-2.css → kissy/op_dever/topic-page-2.css


+ 0 - 0
kissy/vogue/topic-page-2.js → kissy/op_dever/topic-page-2.js


+ 0 - 0
kissy/vogue/topic-page-min.css → kissy/op_dever/topic-page-min.css


+ 1 - 1
kissy/vogue/topic-page-min.js → kissy/op_dever/topic-page-min.js

@@ -1,4 +1,4 @@
-KISSY.add('vogue/topic-page',function (S, Node, DOM, Base, Event, IO) {
+KISSY.add('op_dever/topic-page',function (S, Node, DOM, Base, Event, IO) {
 	var $ = Node.all;
 	
 	var TopicPage = function (target, config) {

+ 0 - 0
kissy/vogue/topic-page.css → kissy/op_dever/topic-page.css


+ 1 - 1
kissy/vogue/topic-page.js → kissy/op_dever/topic-page.js

@@ -1,4 +1,4 @@
-KISSY.add('vogue/topic-page',function (S, Node, DOM, Base, Event, IO) {
+KISSY.add('op_dever/topic-page',function (S, Node, DOM, Base, Event, IO) {
 	var $ = Node.all;
 	
 	var TopicPage = function (target, config) {

+ 3 - 1
kissy/public/static/css/admin_style.css

@@ -4,7 +4,9 @@ Author: ThemeBucket
 -------------------------------------------*/
 
 /*@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);*/
-@import url('/public/??bootstrap/css/bootstrap.min.css,static/css/bootstrap-reset.css,static/css/jquery-ui-1.10.3.css');
+@import url('/public/bootstrap/css/bootstrap.min.css');
+@import url('/public/static/css/bootstrap-reset.css');
+@import url('/public/static/css/jquery-ui-1.10.3.css');
 @import url('/public/bootstrap/font-awesome-4.3.0/css/font-awesome.css');
 
 html {

BIN
kissy/public/upload/image/2018/0418/094551_80972.jpg


BIN
kissy/public/upload/image/2018/0418/094552_82074.jpg


BIN
kissy/public/upload/image/2018/0418/094557_70073.jpg


BIN
kissy/public/upload/image/2018/0418/094559_49461.jpg


BIN
kissy/public/upload/image/2018/0418/101135_47035.jpg


BIN
kissy/public/upload/image/2018/0418/101147_89537.jpg


BIN
kissy/public/upload/image/2018/0418/101933_49133.jpg


BIN
kissy/public/upload/image/2018/0418/101953_70612.jpg


BIN
kissy/public/upload/image/2018/0418/102121_73498.jpg


BIN
kissy/public/upload/image/2018/0418/102126_62044.jpg


BIN
kissy/public/upload/image/2018/0418/115452_92610.jpg


BIN
kissy/public/upload/image/2018/0418/115459_80612.jpg


BIN
kissy/public/upload/image/2018/0418/115749_65165.jpg


BIN
kissy/public/upload/image/2018/0418/115850_26065.jpg


BIN
kissy/public/upload/image/2018/0418/115927_14079.jpg


BIN
kissy/public/upload/qrcode/5f50a5944785cb15.png


BIN
kissy/public/upload/qrcode/967ebc7ba88a0f8dd62a6dc0662810d7.png


BIN
kissy/public/upload/qrcode/c0adf5b6197d4f1a.png


BIN
kissy/public/upload/qrcode/c0c4c59fc0adf5b6197d4f1ac823fe6e.png


BIN
kissy/public/upload/qrcode/ccff4c32dd40217f.png


BIN
kissy/public/upload/qrcode/e161cfa8d6b32d387fa9531bb821c71a.png


+ 1 - 1
kissy/versions.js

@@ -1,7 +1,7 @@
 // 管理模块文件的版本号
 KISSY.config({
 	modules: {
-		"vogue/test": {
+		"op_dever/test": {
 			tag: "1407574879"
 		},
 		"gallery/datalazyload/2.0/index": {

+ 1 - 1
project/op_dever/config.inc.php

@@ -56,5 +56,5 @@ return array(
 	),
 	// passport签名key
 	'passport_sign_key'	=> 'rD5carfCGbHAhF',
-	'passport_url' => 'http://passport.sg.com.cn/auth.info?' ,
+	'passport_url' => 'http://passport.5dev.cn/auth.info?' ,
 );

+ 1 - 0
project/op_dever/index.php

@@ -4,6 +4,7 @@ use KIF\Core\Request;
 use KIF\Core\Config;
 
 define ( 'KIF_PATH', '/www/onepage/KIF' );
+define ( 'KIF_CREATE', true );
 
 require_once KIF_PATH . '/init.php';
 

+ 1 - 1
tm/lib/Controller/Index.class.php

@@ -18,7 +18,7 @@ class Index extends EventsController {
 		
 		# 检查是否移动端
 		$title = '精彩活动';
-		$this->checkIsFromMobile($title);
+		//$this->checkIsFromMobile($title);
 		
 		$plat_form_id = $this->getPlatFormId();
 		

+ 2 - 1
tm/lib/Module/User.class.php

@@ -64,7 +64,8 @@ class User {
 	 */
 	public function initUser() {
 		$info = array (
-				'is_new' => UserInfo::NEW_USER 
+				'is_new' => UserInfo::NEW_USER ,
+				'passport_uid' => '-1',
 		);
 		return $this->objDUserInfo->add ( $info );
 	}

+ 5 - 3
tm/template_dir/admin/activity/setPage_article.html

@@ -4,8 +4,10 @@
 <{include file="get_kindeditor.html"}>
 
 <script type="text/javascript" src="<{$web_cfg.cdn}>/public/static/js/jquery-1.7.2.min.js"></script>
-<link rel="stylesheet" type="text/css" href="<{$web_cfg.cdn}>/public/static/css/??swiper.min.css,swiper.animate.min.css" />
-<script src="<{$web_cfg.cdn}>/public/static/js/??swiper.jquery.min.js,swiper.animate.min.js"></script>
+<link rel="stylesheet" type="text/css" href="<{$web_cfg.cdn}>/public/static/css/swiper.min.css" />
+<link rel="stylesheet" type="text/css" href="<{$web_cfg.cdn}>/public/static/css/swiper.animate.min.css" />
+<script src="<{$web_cfg.cdn}>/public/static/js/swiper.jquery.min.js"></script>
+<script src="<{$web_cfg.cdn}>/public/static/js/swiper.animate.min.js"></script>
 
 <style>
 .set-nav {
@@ -354,7 +356,7 @@
 
 <script>
 var tmpPG, tmpPageData = {'layers': {}}, modify_ks_screen;
-KISSY.use('node, io, vogue/topic-page-2, json, event, dom, dd, dd/plugin/scroll, dd/plugin/proxy, xtemplate', function (S, Node, IO, TopicPage, JSON, Event, DOM, DD, Scroll, Proxy, XTemplate) {
+KISSY.use('node, io, op_dever/topic-page-2, json, event, dom, dd, dd/plugin/scroll, dd/plugin/proxy, xtemplate', function (S, Node, IO, TopicPage, JSON, Event, DOM, DD, Scroll, Proxy, XTemplate) {
 	var $ = S.all;
 	var K = KindEditor;
 	

+ 2 - 1
tm/template_dir/admin/backUser/login.html

@@ -4,7 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title><{if $title}><{$title}><{/if}></title>
 <link rel="stylesheet" href="<{$web_cfg.cdn}>/public/static/css/admin_style.css">
-<script src="<{$web_cfg.cdn}>/k/??kissy/1.4.0/seed-min.js,cfg-min.js?t=1408326831" data-config="{combine:true}" charset="utf-8"></script>
+<script src="<{$web_cfg.cdn}>/kissy/1.4.0/seed.js?t=1408326831" data-config="{combine:false}" charset="utf-8"></script>
+<script src="<{$web_cfg.cdn}>/cfg-min.js?t=1408326831" data-config="{combine:false}" charset="utf-8"></script>
 <script src="<{$web_cfg.domain}>/kissy-versions.php" charset="utf-8"></script>
 </head>
 <style>

+ 6 - 2
tm/template_dir/admin/header.html

@@ -3,10 +3,14 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title><{if $title}><{$title}> - <{/if}>OnePage</title>
-<script src="<{$web_cfg.cdn}>/k/??kissy/1.4.0/seed-min.js,cfg-min.js?t=1408326831" data-config="{combine:true}" charset="utf-8"></script>
+<script src="<{$web_cfg.cdn}>/kissy/1.4.0/seed.js?t=1408326831" data-config="{combine:false}" charset="utf-8"></script>
+<script src="<{$web_cfg.cdn}>/cfg-min.js?t=1408326831" data-config="{combine:false}" charset="utf-8"></script>
 <script type="text/javascript" src="<{$web_cfg.cdn}>/public/static/js/jquery-1.10.2.min.js"></script>
 <script src="<{$web_cfg.domain}>/kissy-versions.php" charset="utf-8"></script>
-<link rel="stylesheet" href="<{$web_cfg.cdn}>/public/static/css/??admin_style.css,buttons.css,tabs.css">
+<link rel="stylesheet" href="<{$web_cfg.cdn}>/public/static/css/admin_style.css">
+<link rel="stylesheet" href="<{$web_cfg.cdn}>/public/static/css/buttons.css">
+<link rel="stylesheet" href="<{$web_cfg.cdn}>/public/static/css/tabs.css">
+
 <style>
 hr {
     border-color: #ddd;

+ 2 - 1
tm/template_dir/admin/login.html

@@ -4,7 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title><{if $title}><{$title}><{/if}></title>
 <link rel="stylesheet" href="<{$web_cfg.cdn}>/public/static/css/admin_style.css">
-<script src="<{$web_cfg.cdn}>/k/??kissy/1.4.0/seed-min.js,cfg-min.js?t=1408326831" data-config="{combine:true}" charset="utf-8"></script>
+<script src="<{$web_cfg.cdn}>/kissy/1.4.0/seed.js?t=1408326831" data-config="{combine:false}" charset="utf-8"></script>
+<script src="<{$web_cfg.cdn}>/cfg-min.js?t=1408326831" data-config="{combine:false}" charset="utf-8"></script>
 <script src="<{$web_cfg.domain}>/kissy-versions.php" charset="utf-8"></script>
 </head>
 <style>

+ 2 - 2
tm/template_dir/admin/platform/list.html

@@ -208,12 +208,12 @@ KISSY.use('node, io', function (S, Node, IO) {
 		
 		var home_img_url = $("input[name=home_img_url]").val();
 		if (!home_img_url) {
-			alert('请选择“首页”按钮图片');
+			alert('请选择“活动”按钮图片');
 			return false;
 		}
 		var gift_img_url = $("input[name=gift_img_url]").val();
 		if (!gift_img_url) {
-			alert('请选择“品”按钮图片');
+			alert('请选择“品”按钮图片');
 			return false;
 		}
 		

+ 8 - 3
tm/template_dir/header.html

@@ -10,10 +10,15 @@
 <meta http-equiv="Cache-Control" CONTENT="no-cache">
 <meta http-equiv="Pragma" CONTENT="no-cache">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<script src="<{$web_cfg.cdn}>/k/??kissy/1.4.0/seed-min.js,cfg-min.js?t=1408326831" data-config="{combine:true}" charset="utf-8"></script>
+<script src="<{$web_cfg.cdn}>/kissy/1.4.0/seed.js?t=1408326831" data-config="{combine:false}" charset="utf-8"></script>
+<script src="<{$web_cfg.cdn}>/cfg-min.js?t=1408326831" data-config="{combine:false}" charset="utf-8"></script>
 <script src="<{$web_cfg.domain}>/kissy-versions.php" charset="utf-8"></script>
-<script src="<{$web_cfg.cdn}>/public/static/js/??jquery-1.8.3.min.js,sidebar.js?v=0.2" charset="utf-8"></script>
-<link rel="stylesheet" type="text/css" href="<{$web_cfg.cdn}>/public/static/css/??base.css,style.css" />
+
+<script src="<{$web_cfg.cdn}>/public/static/js/jquery-1.8.3.min.js?v=0.2" charset="utf-8"></script>
+<script src="<{$web_cfg.cdn}>/public/static/js/sidebar.js?v=0.2" charset="utf-8"></script>
+
+<link rel="stylesheet" type="text/css" href="<{$web_cfg.cdn}>/public/static/css/base.css" />
+<link rel="stylesheet" type="text/css" href="<{$web_cfg.cdn}>/public/static/css/style.css" />
 <link rel="stylesheet" type="text/css" href="<{$web_cfg.cdn}>/public/bootstrap/font-awesome-4.3.0/css/font-awesome.css" />
 <style>
 .submit_btn_style,.bg_color,.v_close_btn{background-color:<{$platform.color}>;}