edit

app/collection/database/info.php

@@ -619,6 +619,8 @@ $config = array
             'list5' => array('章节', '"page&search_option_info_id={id}&oper_table=info"' , '{audit} == 1'),
 
             'list6' => array('榜单', '"ranking&project=collection&search_option_info_id={id}&oper_table=info&oper_project=collection&where_id={id}"', '{audit} == 1'),
+
+            'list7' => array('反馈', '"feedback&project=user&search_option_info_id={id}&oper_table=info&oper_project=collection"'),
             
         ),
     ),

app/community/lib/Comment.php

@@ -34,10 +34,6 @@ class Comment
     # 发表信息
     public function submit($uid, $id, $type, $pic, $content, $playtime, $score_type = false, $score_type_id = false)
     {
-        # 如果是商品，要先验证是否购买
-        if ($type == 'content/product') {
-
-        }
         $where['uid'] = $uid;
         $where['type_id'] = $id;
         $where['type'] = $type;

app/user/database/feedback.php

@@ -0,0 +1,167 @@
+<?php
+$info = function()
+{
+    return Dever::db('collection/info')->state();
+};
+
+$type = array
+(
+	1 => '未回复',
+	2 => '已回复',
+);
+$info_id = Dever::input('search_option_info_id');
+return array
+(
+	# 表名
+	'name' => 'feedback',
+	# 显示给用户看的名称
+	'lang' => '反馈管理',
+	# 是否显示在后台菜单
+	'order' => 80,
+	'menu' => false,
+	# 数据结构
+	'struct' => array
+	(
+		'id' 		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> 'ID',
+			'default' 	=> '',
+			'desc' 		=> '',
+			'match' 	=> 'is_numeric',
+			'order'		=> 'desc',
+			//'list'		=> true,
+		),
+		
+		'uid'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '用户名',
+			'default' 	=> '0',
+			'desc' 		=> '请选择用户',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'text',
+			//'search'	=> 'select',
+			'search'    => array
+            (
+                'api' => 'passport/user-all',
+                'col' => 'username',
+                'result' => 'id',
+            ),
+			//'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#username", {uid}) : "匿名用户"',
+		),
+
+		'info_id'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => '合集信息',
+            'default'   => '',
+            'desc'      => '合集ID',
+            'match'     => 'is_numeric',
+            'update'    => 'select',
+            'option'    => $info,
+            'value'     => $info_id,
+            //'search'    => 'select',
+            'list'        => true,
+        ),
+
+		'pic'		=> array
+		(
+			'type' 		=> 'varchar-2000',
+			'name' 		=> '图片-图片尺寸不等，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
+			'default' 	=> '',
+			'desc' 		=> '图片',
+			'match' 	=> 'is_string',
+			'update'	=> 'images',
+			'key' 		=> '1',
+		),
+
+		'content'		=> array
+		(
+			'type' 		=> 'varchar-800',
+			'name' 		=> '内容',
+			'update' 	=> 'editor',
+			'key'		=> 1,
+			'default' 	=> '',
+			'desc' 		=> '请输入内容',
+			'match' 	=> 'is_string',
+			'search'	=> 'fulltext',
+			//'list'		=> true,
+			//'modal'		=> '查看详情',
+			'list'		=> 'Dever::load("user/lib/manage.feedback", {id})',
+		),
+
+		'type'		=> array
+		(
+			'type' 		=> 'tinyint-1',
+			'name' 		=> '是否回复',
+			'default' 	=> '1',
+			'desc' 		=> '是否回复',
+			'match' 	=> 'is_numeric',
+			'update'    => 'radio',
+            'option'    => $type,
+            'list'		=> true,
+            'edit'		=> true,
+		),
+		
+		'state'		=> array
+		(
+			'type' 		=> 'tinyint-1',
+			'name' 		=> '状态',
+			'default' 	=> '1',
+			'desc' 		=> '请选择状态',
+			'match' 	=> 'is_numeric',
+		),
+		
+		'cdate'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '时间',
+			'match' 	=> array('is_numeric', time()),
+			'desc' 		=> '',
+			# 只有insert时才生效
+			'insert'	=> true,
+			'search'	=> 'date',
+			'list'		=> 'date("Y-m-d H:i:s", {cdate})',
+		),
+	),
+
+	'manage' => array
+	(
+		'insert' => false,
+		'edit' => false,
+		'delete' => false,
+	),
+
+	# request 请求接口定义
+	'request' => array
+	(
+		'getAll' => array
+		(
+			# 匹配的正则或函数 选填项
+			'option' => array
+			(
+				'uid' => 'yes',
+				'state' => 1,
+			),
+			'type' => 'all',
+			'order' => array('id' => 'asc'),
+			'page' => array(1000, 'list'),
+			'col' => '*',
+		),
+
+		'getData' => array
+		(
+			# 匹配的正则或函数 选填项
+			'option' => array
+			(
+				'uid' => 'yes',
+				'state' => 1,
+			),
+			'type' => 'all',
+			'order' => array('id' => 'desc'),
+			'page' => array(10, 'list'),
+			'col' => '*',
+		),
+	)
+);

app/user/database/ticket_order.php

@@ -367,6 +367,22 @@ return array
 
     'request' => array
     (
+        'getList' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'info_id' => 'yes',
+                'uid' => 'yes',
+                'status' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('cdate' => 'desc'),
+            'page' => array(5, 'list'),
+            'col' => '*',
+        ),
+
         'getAll' => array
         (
             # 匹配的正则或函数 选填项

app/user/lib/Feedback.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace User\Lib;
+
+use Dever;
+
+class Feedback
+{
+
+    # 发表信息
+    public function submit($uid, $pic, $content, $info_id, $type)
+    {
+        $where['uid'] = $uid;
+        $where['info_id'] = $info_id;
+        $where['content'] = $content;
+        if ($pic) {
+            $where['pic'] = $pic;
+        }
+        $table = 'user/feedback';
+        $info = false;
+        if (!$info) {
+            Dever::db($table)->insert($where);
+            Dever::score($uid, 'submit_feedback', '发布反馈', false, false, false, $type, $info_id);
+        }
+
+        return true;
+    }
+}

app/user/lib/Manage.php

@@ -6,9 +6,27 @@ use Dever;
 
 class Manage
 {
+    public function feedback($id)
+    {
+        $info = Dever::db('user/feedback')->one($id);
+        $user = Dever::load("passport/user-one", $info['uid']);
+
+        $table['用户名'] = $user['username'];
+        $table['手机号'] = $user['mobile'];
+
+        if ($info['pic']) {
+            $table['图片'] = '<a><img src="'.$info['pic'].'" style="width:150px" /></a>';
+        }
+
+        if ($info['content']) {
+            $table['内容'] = $info['content'];
+        }
+        return Dever::table($table);
+    }
+
 	public function showOrderUser($id)
     {
-        $info = Dever::db('act/order')->one($id);
+        $info = Dever::db('coll/order')->one($id);
 
         $table = array();
 

app/user/lib/Ticket.php

@@ -6,6 +6,28 @@ use Dever;
 
 class Ticket
 {
+    # 获取门票订单列表
+    public function getList($uid, $info_id)
+    {
+        $where['uid'] = $uid;
+        $where['info_id'] = $info_id;
+        $data = Dever::db('user/ticket_order')->getList($where);
+
+        $result = array();
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $result[$k]['title'] = $v['name'];
+                $result[$k]['total'] = -1;
+                $result[$k]['status'] = 1;
+                $result[$k]['num'] = $v['buy_num'];
+                $result[$k]['price'] = $v['cash'] . '元';
+                $result[$k]['cdate'] = date('Y-m-d H:i:s', $v['cdate']);
+            }
+        }
+
+        return $result;
+    }
+
     # 保存信息
     public function up($uid, $info_id, $num = 1)
     {

app/user/src/Api.php

@@ -64,11 +64,12 @@ class Api extends Core
         if ($type == 'score') {
             $score = Dever::load('score/lib/core')->getUserScoreList($this->uid, $info['score_id'], 'collection/info', $info['id']);
         } elseif ($type == 'ticket') {
-            $score = Dever::load('score/lib/core')->getUserScoreList($this->uid, $info['score_id'], 'collection/info', $info['id']);
+            $score = Dever::load('user/lib/ticket')->getList($this->uid, $info['id']);
         } else {
             $score = Dever::load('score/lib/core')->getUserScoreList($this->uid);
         }
         $data['score'] = $score;
+        $data['type'] = $type;
         return $data;
     }
 
@@ -252,4 +253,18 @@ class Api extends Core
         $data['store'] = Dever::load('goods/lib/info')->storeInfo($goods_id, $this->user['area_id']);
         return $data;
     }
+
+    # 发布反馈
+    public function addFeedback()
+    {
+        $pic = Dever::input('pic');
+        $content = Dever::input('content');
+        if (!$content) {
+            Dever::alert('请填写内容');
+        }
+        
+        Dever::load('user/lib/feedback')->submit($this->uid, $pic, $content, $this->id, 'collection/info');
+
+        return 'yes';
+    }
 }