Merge remote-tracking branch 'origin/master'

addons/theme/stv1/admin_list.html

@@ -289,7 +289,7 @@
 		</volist> -->
 	</div>
 	<!-- END BOTTOMBAR -->
-	
+
 </div>
 <script>
 	function reset_search() {

addons/theme/stv1/ccuploader.html

@@ -97,6 +97,7 @@
     //说明：用户可以加入相应逻辑
     //-------------------
     function on_spark_upload_validated(status, videoid) {
+        console.log(status);
         if (status == "OK") {
             document.getElementById("videoid_cc").value = videoid;
             document.getElementById("videokey").value = videoid;

apps/classroom/Lib/Action/AdminVipAction.class.php

@@ -30,11 +30,11 @@ class AdminVipAction extends AdministratorAction
             'tabHash' => 'index',
             'url'     => U('classroom/AdminVip/index')
         );
-        $this->pageTab [] = array(
-            'title'   => '添加',
-            'tabHash' => 'addVip',
-            'url'     => U('classroom/AdminVip/addVip')
-        );
+//        $this->pageTab [] = array(
+//            'title'   => '添加',
+//            'tabHash' => 'addVip',
+//            'url'     => U('classroom/AdminVip/addVip')
+//        );
 
     }
 

apps/course/Lib/Action/AdminVideoAction.class.php

@@ -89,6 +89,8 @@ class AdminVideoAction extends AdministratorAction
         } else {
             $listData = $this->_getData(20, 0, 1, 1);
         }
+//        dump($this->pageKeyList);dump($listData);
+
         $this->displayList($listData);
     }
 
@@ -662,6 +664,8 @@ class AdminVideoAction extends AdministratorAction
     //添加视频
     public function addVideoLib()
     {
+        $aa = model('Xdata')->get('classroom_AdminConfig:ccyun');
+        dump(THEME);
         if ($_POST) {
             if (empty($_POST['video_levelhidden'])) {
                 exit(json_encode(array('status' => '0', 'info' => "请选择课程分类")));
@@ -1987,7 +1991,7 @@ class AdminVideoAction extends AdministratorAction
 
         foreach ($list['data'] as &$value) {
             $value['video_title'] = mStr($value['video_title'], 20);
-            $value['video_title'] = getQuickLink(U('course/Video/view', ['id' => $value['id'], 'is_look' => 1]), $value['video_title'], '未知课程');
+//            $value['video_title'] = getQuickLink(U('course/Video/view', ['id' => $value['id'], 'is_look' => 1]), $value['video_title'], '未知课程');
             $value['user_title']  = getUserSpace($value['uid'], null, '_blank');
             $value['activity']    = $value['is_activity'] == '1' ? '<span style="color:green">已审核</span>' : '<span style="color:red">未审核</span>';
             $value['best']        = $value['is_best'] == '1' ? '<span style="color:green">是</span>' : '<span style="color:red">否</span>';
@@ -2016,9 +2020,9 @@ class AdminVideoAction extends AdministratorAction
                 //$s_id               = reset(reset($video_section_data)['child'])['id'] ?: 0;
                 // $s_id = D('zy_video_section')->where(['vid' => $value['id'], 'pid' => ['gt', 0]])->order('sort asc')->getField('zy_video_section_id');
                 // $value['DOACTION'] .= '<a target="_blank" href=" ' . U('course/Video/watch', array('id' => $value['id'], 's_id' => $s_id)) . ' ">查看</a> | ';
-                $value['DOACTION'] .= '<a href="' . U('course/AdminVideo/askVideo', array('tabHash' => 'askVideo', 'id' => $value['id'])) . '">提问</a> | ';
-                $value['DOACTION'] .= '<a href="' . U('course/AdminVideo/noteVideo', array('tabHash' => 'noteVideo', 'id' => $value['id'])) . '">笔记</a> | ';
-                $value['DOACTION'] .= '<a href="' . U('course/AdminVideo/reviewVideo', array('tabHash' => 'reviewVideo', 'id' => $value['id'])) . '">评价</a> | ';
+//                $value['DOACTION'] .= '<a href="' . U('course/AdminVideo/askVideo', array('tabHash' => 'askVideo', 'id' => $value['id'])) . '">提问</a> | ';
+//                $value['DOACTION'] .= '<a href="' . U('course/AdminVideo/noteVideo', array('tabHash' => 'noteVideo', 'id' => $value['id'])) . '">笔记</a> | ';
+//                $value['DOACTION'] .= '<a href="' . U('course/AdminVideo/reviewVideo', array('tabHash' => 'reviewVideo', 'id' => $value['id'])) . '">评价</a> | ';
                 $value['DOACTION'] .= '<a href="' . U('course/AdminVideo/addVideo', array('id' => $value['id'], 'tabHash' => 'editVideo')) . '">编辑</a> | ';
                 $value['DOACTION'] .= '<a href="' . U('course/AdminCourseOrder/courseUser', array('id' => $value['id'], 'tabHash' => 'courseUser')) . '">学员</a> | ';
                 // $value['DOACTION'] .= '<a href="' . U('course/AdminCourseOrder/addCourseOrder', array('id' => $value['id'], 'tabHash' => 'editVideo')) . '">添加</a> | ';

apps/mall/Lib/Action/AdminGoodsAction.class.php

@@ -47,7 +47,7 @@ class AdminGoodsAction extends AdministratorAction
         // 数据的格式化
         $order = 'id desc';
         $list = $this->_getGoodsList('index', 20, $order);
-
+//        dump($list);
         $this->displayList($list);
     }
 
@@ -324,7 +324,7 @@ class AdminGoodsAction extends AdministratorAction
 
         foreach ($goods_info['data'] as $key => &$val) {
             $url = U('mall/Goods/view', array('id' => $val['id']));
-            $val['title']   = getQuickLink($url, mStr($val['title'], 20), "未知商品");
+//            $val['title']   = getQuickLink($url, mStr($val['title'], 20), "未知商品");
             $val['uname']   = getUserSpace($val['uid'], null, '_blank');
             $val['ctime']   = date('Y-m-d H:i:s', $val["ctime"]);
             $val['info']    = mStr($val['info'], 40) . "...";

apps/news/Lib/Action/AdminTopicAction.class.php

@@ -249,11 +249,11 @@ class AdminTopicAction extends AdministratorAction
             'url'     => U('news/AdminTopic/index'),
         );
         // is_admin($this->mid) && 
-        $this->pageTab[] = array(
-            'title'   => '分类',
-            'tabHash' => 'cate',
-            'url'     => U('news/AdminTopic/cate'),
-        );
+//        $this->pageTab[] = array(
+//            'title'   => '分类',
+//            'tabHash' => 'cate',
+//            'url'     => U('news/AdminTopic/cate'),
+//        );
     }
 
     // 删除资讯