diff --git "a/doc/\346\214\207\345\215\227\351\222\210\346\265\213\350\257\225\346\212\245\345\221\2122.docx" "b/doc/\346\214\207\345\215\227\351\222\210\346\265\213\350\257\225\346\212\245\345\221\2122.docx"
new file mode 100644
index 0000000..d33efc7
Binary files /dev/null and "b/doc/\346\214\207\345\215\227\351\222\210\346\265\213\350\257\225\346\212\245\345\221\2122.docx" differ
diff --git a/src/cn/compass/entity/CourseMediaDat.inc b/src/cn/compass/entity/CourseMediaDat.inc
index cee2023..2fd3878 100644
--- a/src/cn/compass/entity/CourseMediaDat.inc
+++ b/src/cn/compass/entity/CourseMediaDat.inc
@@ -40,6 +40,8 @@ class CourseMediaDat extends CompassDynamicData
parent::constructor($record);
$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->comment = $record["comment"];
$this->tags = $record["tags"];
diff --git a/src/cn/compass/entity/definition/AcountModule.inc b/src/cn/compass/entity/definition/AcountModule.inc
index 0feb8ee..53b5937 100644
--- a/src/cn/compass/entity/definition/AcountModule.inc
+++ b/src/cn/compass/entity/definition/AcountModule.inc
@@ -3,7 +3,7 @@
* 管理员权限分配用静态类
* $Id$
* @author zongbiao
- * @package cn.compass.entity.definition
+ * @package jp.fishow.entity.definition
*/
class AcountModule
{
diff --git a/src/cn/compass/entity/definition/AuthorityLevel.inc b/src/cn/compass/entity/definition/AuthorityLevel.inc
index 033b6e8..47e97be 100644
--- a/src/cn/compass/entity/definition/AuthorityLevel.inc
+++ b/src/cn/compass/entity/definition/AuthorityLevel.inc
@@ -3,7 +3,7 @@
* 管理员权限分配用静态类
* $Id$
* @author zongbiao
- * @package cn.compass.entity.definition
+ * @package jp.fishow.entity.definition
*/
class AuthorityLevel
{
diff --git a/src/cn/compass/entity/definition/ImageType.inc b/src/cn/compass/entity/definition/ImageType.inc
index 1873898..0795d82 100644
--- a/src/cn/compass/entity/definition/ImageType.inc
+++ b/src/cn/compass/entity/definition/ImageType.inc
@@ -1,11 +1,12 @@
<?php
/**
* ImageType
- * 图片类型
+ * イメージ画像のタイプ定義
+ * mobieのmedia_type_defとcontent-typeの一部をstaticに定義したもの。
* $Id: ImageType.inc 90242 2015-09-29 11:27:35Z wulk $
* @author iimuro
* @access public
- * @package cn.compass.entity.definition
+ * @package jp.aimsweb.entity.definition
*/
class ImageType{
diff --git a/src/cn/compass/entity/definition/OrderStatus.inc b/src/cn/compass/entity/definition/OrderStatus.inc
index ba43e6f..ceaadb8 100644
--- a/src/cn/compass/entity/definition/OrderStatus.inc
+++ b/src/cn/compass/entity/definition/OrderStatus.inc
@@ -3,7 +3,7 @@
* 用户订单状态表
* $Id$
* @author zongbiao
- * @package cn.compass.entity.definition
+ * @package jp.fishow.entity.definition
*/
class OrderStatus
{
diff --git a/src/cn/compass/entity/definition/OrganizationStatus.inc b/src/cn/compass/entity/definition/OrganizationStatus.inc
index d27e039..4efa64d 100644
--- a/src/cn/compass/entity/definition/OrganizationStatus.inc
+++ b/src/cn/compass/entity/definition/OrganizationStatus.inc
@@ -3,7 +3,7 @@
* 管理员权限分配用静态类
* $Id$
* @author zongbiao
- * @package cn.compass.entity.definition
+ * @package jp.fishow.entity.definition
*/
class OrganizationStatus
{
diff --git a/src/cn/compass/entity/definition/PointActionType.inc b/src/cn/compass/entity/definition/PointActionType.inc
index f549ed9..cc236e6 100644
--- a/src/cn/compass/entity/definition/PointActionType.inc
+++ b/src/cn/compass/entity/definition/PointActionType.inc
@@ -4,7 +4,7 @@
* $Id: PointActionType.inc 81583 2015-04-02 08:59:46Z wanggb $
* @author wanggb
* @access public
- * @package cn.compass.entity.definition
+ * @package jp.fishow.entity.definition
*/
diff --git a/src/cn/compass/entity/definition/SystemFunction.inc b/src/cn/compass/entity/definition/SystemFunction.inc
index e17b6d9..ffb2161 100644
--- a/src/cn/compass/entity/definition/SystemFunction.inc
+++ b/src/cn/compass/entity/definition/SystemFunction.inc
@@ -3,7 +3,7 @@
* 管理员权限分配用静态类
* $Id$
* @author zongbiao
- * @package cn.compass.entity.definition
+ * @package jp.fishow.entity.definition
*/
class SystemFunction
{
diff --git a/src/cn/compass/handler/AliUploadHandler.inc b/src/cn/compass/handler/AliUploadHandler.inc
index 734e71b..3af956f 100644
--- a/src/cn/compass/handler/AliUploadHandler.inc
+++ b/src/cn/compass/handler/AliUploadHandler.inc
@@ -37,7 +37,7 @@ Class AliUploadHandler{
$auth = new OssClient($this->Access_Key,$this->Secret_Key,$this->endpoint);
try {
//上传图片
- $result = $auth->uploadFile($this->bucket,$dst,$src);
+ $result = $auth->uploadFile($this->bucket,$this->strToUtf8($dst),$src);
return $result['info']['url'];
} catch (OssException $e) {
ErrorLogger::doOutput(__FUNCTION__ . "uploadImg: FAILED\n");
@@ -55,7 +55,7 @@ Class AliUploadHandler{
public function uploadVideo($dst,$src){
$ossClient = new OssClient($this->Access_Key,$this->Secret_Key,$this->endpoint);
try{
- $result = $ossClient->multiuploadFile($this->bucket,$dst,$src);
+ $result = $ossClient->multiuploadFile($this->bucket,$this->strToUtf8($dst),$src);
return $result['info']['url'];
} catch(OssException $e) {
ErrorLogger::doOutput(__FUNCTION__ . "uploadVideo: FAILED\n");
@@ -85,5 +85,17 @@ Class AliUploadHandler{
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
diff --git a/src/cn/compass/handler/CompassHandler.inc b/src/cn/compass/handler/CompassHandler.inc
index 075a23d..cff133f 100644
--- a/src/cn/compass/handler/CompassHandler.inc
+++ b/src/cn/compass/handler/CompassHandler.inc
@@ -743,7 +743,7 @@ class CompassHandler{
*/
public static function getOrgAccreditedListCount($param) {
$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"])) {
$sql_where .= " and organization_title like '%" . $param["title"] . "%'";
}
@@ -934,6 +934,18 @@ class CompassHandler{
$result = $db->executeQuery($from.$sql_where);
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
diff --git a/src/manager/proceeds_list.php b/src/manager/proceeds_list.php
index 8a7163c..dae2ddc 100644
--- a/src/manager/proceeds_list.php
+++ b/src/manager/proceeds_list.php
@@ -52,5 +52,7 @@ $layout_pages = array();
$layout_pages["left"] = "menu.inc";
$layout_pages["right"] = "proceeds_list.inc";
$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;
\ No newline at end of file
diff --git a/src/manager/templates/donations_event_list.inc b/src/manager/templates/donations_event_list.inc
index 0ad0436..0c644e5 100644
--- a/src/manager/templates/donations_event_list.inc
+++ b/src/manager/templates/donations_event_list.inc
@@ -28,15 +28,15 @@
</tr>
<tr>
<td>
- <span>募捐时间: </span>{{tmp.start_time}} — {{tmp.finish_time}}
- <el-button type="primary"size="mini" @click="editChange(tmp)" style="margin-left: 50px;">修改</el-button>
- <el-button type="primary"size="mini" @click="deleteRow(tmp)">删除</el-button>
- <el-button type="primary"size="mini" @click="handleDetail(tmp)">查看数据</el-button>
+ <span>活动时间: </span>{{tmp.start_time}} — {{tmp.finish_time}}
+ <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)" style="margin-left:10px;">删除</el-button>
+ <el-button type="primary"size="mini" @click="handleDetail(tmp)" style="margin-left:10px;">查看数据</el-button>
</td>
</tr>
<tr>
<td>
- <span>拟募捐金额: </span>{{tmp.max_money}}元 <span>已募捐金额: </span>{{tmp.money}}元 <span>
+ <span>最大募捐金额: </span>{{tmp.max_money}}元 <span>已募捐金额: </span>{{tmp.money}}元 <span>
</td>
</tr>
</table>
@@ -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":"")?>',
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_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);
<?
diff --git a/src/manager/templates/event_edit_input.inc b/src/manager/templates/event_edit_input.inc
index 3a853fa..2827e3c 100644
--- a/src/manager/templates/event_edit_input.inc
+++ b/src/manager/templates/event_edit_input.inc
@@ -116,7 +116,7 @@
max_member_flg:'<?=$volunteer_event_dat->max_member > 0?"2":"1"?>',
title:'<?=$volunteer_event_dat->title?>',
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?>',
finish_time:'<?=$volunteer_event_dat->finish_time?>',
time_length:'<?=$volunteer_event_dat->time_length?>',
diff --git a/src/manager/templates/event_list.inc b/src/manager/templates/event_list.inc
index 06b0be1..687875e 100644
--- a/src/manager/templates/event_list.inc
+++ b/src/manager/templates/event_list.inc
@@ -29,9 +29,9 @@
<tr>
<td>
<span>活动时间: </span>{{tmp.start_time}} — {{tmp.finish_time}}
- <el-button type="primary"size="mini" @click="editChange(tmp)" style="margin-left: 50px;">修改</el-button>
- <el-button type="primary"size="mini" @click="deleteRow(tmp)">删除</el-button>
- <el-button type="primary"size="mini" @click="handleDetail(tmp)">查看数据</el-button>
+ <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)"style="margin-left:10px;">删除</el-button>
+ <el-button type="primary" size="mini" @click="handleDetail(tmp)"style="margin-left:10px;">查看数据</el-button>
</td>
</tr>
<tr>
@@ -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":"")?>',
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_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);
<?
diff --git a/src/manager/templates/layout/content_iframe.inc b/src/manager/templates/layout/content_iframe.inc
index 87f8db0..ac54cbe 100644
--- a/src/manager/templates/layout/content_iframe.inc
+++ b/src/manager/templates/layout/content_iframe.inc
@@ -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/datepicker_addon.js"></script>
</head>
-
<? require(MANAGER_TEMPLATE_DIR_PATH . "/" . $layout_pages["right"]); ?>
diff --git a/src/manager/templates/media_edit_input.inc b/src/manager/templates/media_edit_input.inc
index 846b013..b4baaf1 100644
--- a/src/manager/templates/media_edit_input.inc
+++ b/src/manager/templates/media_edit_input.inc
@@ -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="1">合集</el-radio>
</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">
<p><b>一级分类名称：</b><el-select v-model="parent_category_id" size="small">
<el-option
@@ -57,16 +62,8 @@
:value="item.id">
</el-option>
</el-select></p>
-
- </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>
<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>