Skip to content

C
Compass
Commit 3723bf53 by biao
Options

111

parent 9e9ab4f4
Showing with 64 additions and 34 deletions
src/cn/compass/entity/CourseMediaDat.inc
...@@ -40,6 +40,8 @@ class CourseMediaDat extends CompassDynamicData ...@@ -40,6 +40,8 @@ class CourseMediaDat extends CompassDynamicData
parent::constructor($record); parent::constructor($record);
$this->course_id = $record["course_id"]; $this->course_id = $record["course_id"];
$this->parent_category_id = $record["parent_category_id"];
$this->sub_category_id = $record["sub_category_id"];
$this->title = $record["title"]; $this->title = $record["title"];
$this->comment = $record["comment"]; $this->comment = $record["comment"];
$this->tags = $record["tags"]; $this->tags = $record["tags"];
......
src/cn/compass/entity/definition/AcountModule.inc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* 管理员权限分配用静态类 * 管理员权限分配用静态类
* $Id$ * $Id$
* @author zongbiao * @author zongbiao
* @package cn.compass.entity.definition * @package jp.fishow.entity.definition
*/ */
class AcountModule class AcountModule
{ {
......
src/cn/compass/entity/definition/AuthorityLevel.inc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* 管理员权限分配用静态类 * 管理员权限分配用静态类
* $Id$ * $Id$
* @author zongbiao * @author zongbiao
* @package cn.compass.entity.definition * @package jp.fishow.entity.definition
*/ */
class AuthorityLevel class AuthorityLevel
{ {
......
src/cn/compass/entity/definition/ImageType.inc
<?php <?php
/** /**
* ImageType * ImageType
* 图片类型 * イメージ画像のタイプ定義
* mobieのmedia_type_defとcontent-typeの一部をstaticに定義したもの。
* $Id: ImageType.inc 90242 2015-09-29 11:27:35Z wulk $ * $Id: ImageType.inc 90242 2015-09-29 11:27:35Z wulk $
* @author iimuro * @author iimuro
* @access public * @access public
* @package cn.compass.entity.definition * @package jp.aimsweb.entity.definition
*/ */
class ImageType{ class ImageType{
......
src/cn/compass/entity/definition/OrderStatus.inc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* 用户订单状态表 * 用户订单状态表
* $Id$ * $Id$
* @author zongbiao * @author zongbiao
* @package cn.compass.entity.definition * @package jp.fishow.entity.definition
*/ */
class OrderStatus class OrderStatus
{ {
......
src/cn/compass/entity/definition/OrganizationStatus.inc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* 管理员权限分配用静态类 * 管理员权限分配用静态类
* $Id$ * $Id$
* @author zongbiao * @author zongbiao
* @package cn.compass.entity.definition * @package jp.fishow.entity.definition
*/ */
class OrganizationStatus class OrganizationStatus
{ {
......
src/cn/compass/entity/definition/PointActionType.inc
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* $Id: PointActionType.inc 81583 2015-04-02 08:59:46Z wanggb $ * $Id: PointActionType.inc 81583 2015-04-02 08:59:46Z wanggb $
* @author wanggb * @author wanggb
* @access public * @access public
* @package cn.compass.entity.definition * @package jp.fishow.entity.definition
*/ */
......
src/cn/compass/entity/definition/SystemFunction.inc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* 管理员权限分配用静态类 * 管理员权限分配用静态类
* $Id$ * $Id$
* @author zongbiao * @author zongbiao
* @package cn.compass.entity.definition * @package jp.fishow.entity.definition
*/ */
class SystemFunction class SystemFunction
{ {
......
src/cn/compass/handler/AliUploadHandler.inc
...@@ -37,7 +37,7 @@ Class AliUploadHandler{ ...@@ -37,7 +37,7 @@ Class AliUploadHandler{
$auth = new OssClient($this->Access_Key,$this->Secret_Key,$this->endpoint); $auth = new OssClient($this->Access_Key,$this->Secret_Key,$this->endpoint);
try { try {
//上传图片 //上传图片
$result = $auth->uploadFile($this->bucket,$dst,$src); $result = $auth->uploadFile($this->bucket,$this->strToUtf8($dst),$src);
return $result['info']['url']; return $result['info']['url'];
} catch (OssException $e) { } catch (OssException $e) {
ErrorLogger::doOutput(__FUNCTION__ . "uploadImg: FAILED\n"); ErrorLogger::doOutput(__FUNCTION__ . "uploadImg: FAILED\n");
...@@ -55,7 +55,7 @@ Class AliUploadHandler{ ...@@ -55,7 +55,7 @@ Class AliUploadHandler{
public function uploadVideo($dst,$src){ public function uploadVideo($dst,$src){
$ossClient = new OssClient($this->Access_Key,$this->Secret_Key,$this->endpoint); $ossClient = new OssClient($this->Access_Key,$this->Secret_Key,$this->endpoint);
try{ try{
$result = $ossClient->multiuploadFile($this->bucket,$dst,$src); $result = $ossClient->multiuploadFile($this->bucket,$this->strToUtf8($dst),$src);
return $result['info']['url']; return $result['info']['url'];
} catch(OssException $e) { } catch(OssException $e) {
ErrorLogger::doOutput(__FUNCTION__ . "uploadVideo: FAILED\n"); ErrorLogger::doOutput(__FUNCTION__ . "uploadVideo: FAILED\n");
...@@ -85,5 +85,17 @@ Class AliUploadHandler{ ...@@ -85,5 +85,17 @@ Class AliUploadHandler{
ErrorLogger::doOutput(__FUNCTION__ . "delete: OK" . "\n"); ErrorLogger::doOutput(__FUNCTION__ . "delete: OK" . "\n");
} }
/**
* 转换字符编码为utf-8
* @param unknown $str
* @return unknown|string
*/
function strToUtf8($str){
$encode = mb_detect_encoding($str, array("ASCII",'UTF-8',"GB2312","GBK",'BIG5'));
if($encode == 'UTF-8'){
return $str;
}else{
return mb_convert_encoding($str, 'UTF-8', $encode);
}
}
} }
\ No newline at end of file
src/cn/compass/handler/CompassHandler.inc
...@@ -743,7 +743,7 @@ class CompassHandler{ ...@@ -743,7 +743,7 @@ class CompassHandler{
*/ */
public static function getOrgAccreditedListCount($param) { public static function getOrgAccreditedListCount($param) {
$from = "select count(*) count from user_mst"; $from = "select count(*) count from user_mst";
$sql_where =" where delete_flg=false and role=6"; $sql_where =" where delete_flg=false and organization_no is not null";
if (isset($param["title"]) && !empty($param["title"])) { if (isset($param["title"]) && !empty($param["title"])) {
$sql_where .= " and organization_title like '%" . $param["title"] . "%'"; $sql_where .= " and organization_title like '%" . $param["title"] . "%'";
} }
...@@ -934,6 +934,18 @@ class CompassHandler{ ...@@ -934,6 +934,18 @@ class CompassHandler{
$result = $db->executeQuery($from.$sql_where); $result = $db->executeQuery($from.$sql_where);
return $result; return $result;
} }
/**
* 获取会员缴费count
*/
public static function getMemberUserCount() {
$from = "select count(id) as total,sum(money) as money from user_pay_log ";
$sql_where =" where delete_flg=false";
// 検索を行う
$db = &CompassDBManager::getInstance();
$result = $db->executeQuery($from.$sql_where);
return $result[0];
}
} }
?> ?>
\ No newline at end of file
src/manager/proceeds_list.php
...@@ -52,5 +52,7 @@ $layout_pages = array(); ...@@ -52,5 +52,7 @@ $layout_pages = array();
$layout_pages["left"] = "menu.inc"; $layout_pages["left"] = "menu.inc";
$layout_pages["right"] = "proceeds_list.inc"; $layout_pages["right"] = "proceeds_list.inc";
$layout_pages["menu_clicked"] = "4-4"; $layout_pages["menu_clicked"] = "4-4";
require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/leftmenu_layout.inc");
//require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/leftmenu_layout.inc");
require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/content_iframe.inc");
exit; exit;
\ No newline at end of file
src/manager/templates/donations_event_list.inc
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<span>募捐时间: </span>{{tmp.start_time}} — {{tmp.finish_time}} <span>活动时间: </span>{{tmp.start_time}} — {{tmp.finish_time}}
<el-button type="primary"size="mini" @click="editChange(tmp)" style="margin-left: 50px;">修改</el-button>&nbsp;&nbsp;&nbsp; <el-button v-if="tmp.event_status=='NEW' || tmp.event_status=='NG'" type="primary"size="mini" @click="editChange(tmp)" style="margin-left:10px;">修改</el-button>
<el-button type="primary"size="mini" @click="deleteRow(tmp)">删除</el-button>&nbsp;&nbsp;&nbsp; <el-button type="primary"size="mini" @click="deleteRow(tmp)" style="margin-left:10px;">删除</el-button>
<el-button type="primary"size="mini" @click="handleDetail(tmp)">查看数据</el-button> <el-button type="primary"size="mini" @click="handleDetail(tmp)" style="margin-left:10px;">查看数据</el-button>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<span>拟募捐金额: </span>{{tmp.max_money}}元 <span>已募捐金额: </span>{{tmp.money}}元 <span> <span>最大募捐金额: </span>{{tmp.max_money}}元 <span>已募捐金额: </span>{{tmp.money}}元 <span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -73,7 +73,8 @@ if ($donations_event_count > 0) { ...@@ -73,7 +73,8 @@ if ($donations_event_count > 0) {
time_status:'<?=date("Y-m-d H:i:s") > $tmp->finish_time?"info":(date("Y-m-d H:i:s") < $tmp->start_time?"success":"")?>', time_status:'<?=date("Y-m-d H:i:s") > $tmp->finish_time?"info":(date("Y-m-d H:i:s") < $tmp->start_time?"success":"")?>',
event_status:'<?=date("Y-m-d H:i:s") > $tmp->finish_time?"已结束":(date("Y-m-d H:i:s") < $tmp->start_time?"未开始":"进行中")?>', event_status:'<?=date("Y-m-d H:i:s") > $tmp->finish_time?"已结束":(date("Y-m-d H:i:s") < $tmp->start_time?"未开始":"进行中")?>',
status:'<?=$tmp->status=="NEW"?"未审核":($tmp->status=="NG"?"审核未通过":($tmp->status=="FINISH"?"活动结束":""))?>', status:'<?=$tmp->status=="NEW"?"未审核":($tmp->status=="NG"?"审核未通过":($tmp->status=="FINISH"?"活动结束":""))?>',
status_type:'<?=$tmp->status=="NEW"?"warning":($tmp->status=="NG"?"danger":($tmp->status=="FINISH"?"info":""))?>' status_type:'<?=$tmp->status=="NEW"?"warning":($tmp->status=="NG"?"danger":($tmp->status=="FINISH"?"info":""))?>',
event_status:'<?=$tmp->status?>'
}; };
list.push(data); list.push(data);
<? <?
......
src/manager/templates/event_edit_input.inc
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
max_member_flg:'<?=$volunteer_event_dat->max_member > 0?"2":"1"?>', max_member_flg:'<?=$volunteer_event_dat->max_member > 0?"2":"1"?>',
title:'<?=$volunteer_event_dat->title?>', title:'<?=$volunteer_event_dat->title?>',
comment:'<?=$volunteer_event_dat->comment?>', comment:'<?=$volunteer_event_dat->comment?>',
position:'<?=$volunteer_event_dat->position?>', position:'<?=preg_replace("/\'/", "\u0027",$volunteer_event_dat->position)?>',
start_time:'<?=$volunteer_event_dat->start_time?>', start_time:'<?=$volunteer_event_dat->start_time?>',
finish_time:'<?=$volunteer_event_dat->finish_time?>', finish_time:'<?=$volunteer_event_dat->finish_time?>',
time_length:'<?=$volunteer_event_dat->time_length?>', time_length:'<?=$volunteer_event_dat->time_length?>',
......
src/manager/templates/event_list.inc
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
<tr> <tr>
<td> <td>
<span>活动时间: </span>{{tmp.start_time}} — {{tmp.finish_time}} <span>活动时间: </span>{{tmp.start_time}} — {{tmp.finish_time}}
<el-button type="primary"size="mini" @click="editChange(tmp)" style="margin-left: 50px;">修改</el-button>&nbsp;&nbsp;&nbsp; <el-button v-if="tmp.event_status=='NEW' || tmp.event_status=='NG'" type="primary" size="mini" @click="editChange(tmp)" style="margin-left:10px;">修改</el-button>
<el-button type="primary"size="mini" @click="deleteRow(tmp)">删除</el-button>&nbsp;&nbsp;&nbsp; <el-button type="primary" size="mini" @click="deleteRow(tmp)"style="margin-left:10px;">删除</el-button>
<el-button type="primary"size="mini" @click="handleDetail(tmp)">查看数据</el-button> <el-button type="primary" size="mini" @click="handleDetail(tmp)"style="margin-left:10px;">查看数据</el-button>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -74,7 +74,8 @@ foreach ( $event_list as $tmp ) { ...@@ -74,7 +74,8 @@ foreach ( $event_list as $tmp ) {
time_status:'<?=date("Y-m-d H:i:s") > $tmp["finish_time"]?"info":(date("Y-m-d H:i:s") < $tmp["start_time"]?"success":"")?>', time_status:'<?=date("Y-m-d H:i:s") > $tmp["finish_time"]?"info":(date("Y-m-d H:i:s") < $tmp["start_time"]?"success":"")?>',
event_status:'<?=date("Y-m-d H:i:s") > $tmp["finish_time"]?"已结束":(date("Y-m-d H:i:s") < $tmp["start_time"]?"未开始":"进行中")?>', event_status:'<?=date("Y-m-d H:i:s") > $tmp["finish_time"]?"已结束":(date("Y-m-d H:i:s") < $tmp["start_time"]?"未开始":"进行中")?>',
status:'<?=$tmp["status"]=="NEW"?"未审核":($tmp["status"]=="NG"?"审核未通过":($tmp["status"]=="FINISH"?"活动结束":""))?>', status:'<?=$tmp["status"]=="NEW"?"未审核":($tmp["status"]=="NG"?"审核未通过":($tmp["status"]=="FINISH"?"活动结束":""))?>',
status_type:'<?=$tmp["status"]=="NEW"?"warning":($tmp["status"]=="NG"?"danger":($tmp["status"]=="FINISH"?"info":""))?>' status_type:'<?=$tmp["status"]=="NEW"?"warning":($tmp["status"]=="NG"?"danger":($tmp["status"]=="FINISH"?"info":""))?>',
event_status:'<?=$tmp["status"]?>'
}; };
list.push(data); list.push(data);
<? <?
......
src/manager/templates/layout/content_iframe.inc
...@@ -90,6 +90,5 @@ if (isset($_SCRIPT_FILE)) { ...@@ -90,6 +90,5 @@ if (isset($_SCRIPT_FILE)) {
<script src="scripts/jquery-ui-1.10.3/ui/jquery.ui.tabs.min.js"></script> <script src="scripts/jquery-ui-1.10.3/ui/jquery.ui.tabs.min.js"></script>
<script src="scripts/jquery-ui-1.10.3/ui/datepicker_addon.js"></script> <script src="scripts/jquery-ui-1.10.3/ui/datepicker_addon.js"></script>
</head> </head>
<? require(MANAGER_TEMPLATE_DIR_PATH . "/" . $layout_pages["right"]); ?> <? require(MANAGER_TEMPLATE_DIR_PATH . "/" . $layout_pages["right"]); ?>
src/manager/templates/media_edit_input.inc
...@@ -38,7 +38,12 @@ ...@@ -38,7 +38,12 @@
<el-radio v-model="media_type" name="media_type" label="0">单个</el-radio> <el-radio v-model="media_type" name="media_type" label="0">单个</el-radio>
<el-radio v-model="media_type" name="media_type" label="1">合集</el-radio> <el-radio v-model="media_type" name="media_type" label="1">合集</el-radio>
</template></p> </template></p>
<div v-if="is_course_show">
<p><b>选择合集：</b><el-input v-model="course_name" name="course_name" class="input_200 popselect" readonly onfocus="doRadioPopup('media_upload','course_name','course_id','pop_media_list.php');"></el-input>
<input type="hidden" name="course_id" value="<?=$course_id?>" />
<el-button type="primary" class="height_30" @click="selectClear('media_upload', 'course_name', 'course_id');">清空</el-button>
<el-button type="primary" class="height_30" @click="popAddCourse()">创建合集</el-button></p>
</div>
<div v-if="is_category_show"> <div v-if="is_category_show">
<p><b>一级分类名称：</b><el-select v-model="parent_category_id" size="small"> <p><b>一级分类名称：</b><el-select v-model="parent_category_id" size="small">
<el-option <el-option
...@@ -57,16 +62,8 @@ ...@@ -57,16 +62,8 @@
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select></p> </el-select></p>
</div> </div>
<div v-if="is_course_show">
<p><b>选择合集：</b><el-input v-model="course_name" name="course_name" class="input_200 popselect" readonly onfocus="doRadioPopup('media_upload','course_name','course_id','pop_media_list.php');"></el-input>
<input type="hidden" name="course_id" value="<?=$course_id?>" />
<el-button type="primary" class="height_30" @click="selectClear('media_upload', 'course_name', 'course_id');">清空</el-button>
<el-button type="primary" class="height_30" @click="popAddCourse()">创建合集</el-button></p>
</div>
<p><b>视频种类：</b><template> <p><b>视频种类：</b><template>
<el-radio v-model="media_kind" name="media_kind" label="false">志愿免费</el-radio> <el-radio v-model="media_kind" name="media_kind" label="false">志愿免费</el-radio>
<el-radio v-model="media_kind" name="media_kind" label="true">公益收费</el-radio> <el-radio v-model="media_kind" name="media_kind" label="true">公益收费</el-radio>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment