Skip to content

C
Compass
Commit 4dc0d064 by biao
Options

1111

parent 2974db59
Showing with 65 additions and 38 deletions
doc/指南针测试.docx
No preview for this file type
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 organization_no is not null";
$sql_where =" where delete_flg=false and role=6";
if (isset($param["title"]) && !empty($param["title"])) {
$sql_where .= " and organization_title like '%" . $param["title"] . "%'";
}
......
src/manager/org_account_edit_result.php
......@@ -27,11 +27,11 @@ if (!checkAuthority("13")) {
$id = ParamUtil::getRequestString("id");
$action_type = ParamUtil::getRequestString("action_type");
if($action_type == "new"){
$account_mst = new AccountMst();
$accountMst = new AccountMst();
}
if($action_type == "edit"){
$account_mst = AccountMst::getById($id);
if ($account_mst == null) {
$accountMst = AccountMst::getById($id);
if ($accountMst == null) {
// エラー表示
$layout_pages = array();
$layout_pages["left"] = "menu.inc";
......@@ -51,8 +51,8 @@ $uid = ParamUtil::getRequestNumber("uid");
$param = array();
$param["delete_flg"] = false;
$param["login"] = $login;
$account_list = AccountMst::getList($param);
if (count($account_list) > 1) {
$accountList = AccountMst::getList($param);
if (count($accountList) > 1) {
$error_message = "登陆帐号已经被使用,请换一个。";
$_SCRIPT_FILE = array("scripts/validators.js");
// 页面表示
......@@ -65,17 +65,26 @@ if (count($account_list) > 1) {
}
// 数据库更新
$account_mst->login = $login;
$account_mst->password = $password;
$account_mst->name = $name;
$account_mst->contact = $contact;
$account_mst->comment = $comment;
$account_mst->user_id = $uid;
$account_mst->modules = "14";
$account_mst->role = 9;
$accountMst->login = $login;
$accountMst->password = $password;
$accountMst->name = $name;
$accountMst->contact = $contact;
$accountMst->comment = $comment;
$accountMst->user_id = $uid;
$accountMst->modules = "14";
$accountMst->role = 9;
$account_mst->save();
$accountMst->save();
//发送消息给前端用户
$userMst = UserMst::getById($accountMst->user_id);
$userMessageDat = new UserMessageDat();
$userMessageDat->user_id = $userMst->id;
$userMessageDat->title = "账号审核通过通知";
$userMessageDat->comment = "恭喜您账号审核通过。\n后台网址:\n" . MANAGER_PATH . "\n账号名称:" . $accountMst->login . "\n账号密码:" . $accountMst->password;
$userMessageDat->attach_dat_type = "ORGNAZATION";
$userMessageDat->save();
// 页面表示
$layout_pages = array();
$layout_pages["left"] = "menu.inc";
......
src/manager/org_accredited_list.php
......@@ -52,7 +52,7 @@ if ($search_flg) {
$page_num = $param["page_num"];
}
} else {
// 検索条件を作成してsessionに設定
// 把检索条件放入session
$param = array();
if (!empty($status)) {
$param["status"] = $status;
......
src/manager/templates/org_account_list.inc
......@@ -13,14 +13,21 @@
<div class="list_title">
机构账号管理
<div style="float: right;">
<!-机构只有一个账号->
<?
if($account_count < 1) {
?>
<el-button type="primary" style="margin-right: 10px;" @click="addAccount()">新建账号</el-button>
<?
}
?>
</div>
</div>
<br />
<div class="result_list">
<el-table :data="tableData" border>
<el-table-column prop="id" label="编号" ></el-table-column>
<el-table-column prop="id" label="ID" ></el-table-column>
<el-table-column prop="login" label="账号" width=""></el-table-column>
<el-table-column prop="password" label="原始密码" width=""></el-table-column>
<el-table-column prop="comment" label="账号备注" width=""></el-table-column>
......
src/manager/templates/org_accredited_list.inc
......@@ -35,7 +35,7 @@
<br />
<div class="result_list">
<el-table :data="tableData" border>
<el-table-column prop="organization_no" label="编号" width="150"></el-table-column>
<el-table-column prop="id" label="ID" width="150"></el-table-column>
<el-table-column prop="organization_title" label="机构名称" width="200"></el-table-column>
<el-table-column prop="legal_person" label="法人姓名" width="200"></el-table-column>
<el-table-column prop="organization_contact" label="联系方式" width="200"></el-table-column>
......
src/settings/settings.inc
......@@ -18,6 +18,7 @@ define("SERVICE_NAME", "指南针");
define("DOMAIN_NAME", "compass.koala-online.cn");
define("HOST_NAME", "compass.koala-online.cn");
define("SSL_PATH", "www.koala-online.cn/compass");
define("MANAGER_PATH", "http://compass.koala-online.cn/manager");
// 数据库配置
define("COMPASS_DB", "compass_develop_db");
......
src/user/if/ajax_attend_volunteer_event_circle.php
......@@ -92,6 +92,7 @@ if(!empty($tmpCircleMemberList)) {
$userMessageDat->attach_dat_type = "VOLUNTEER";
$userMessageDat->attach_dat_id = $circleDat->id;
$userMessageDat->attach_dat_path = "/pages/volunteersEventDetail/volunteersEventDetail?eventId={$volunteerDat->id}&circleId={$circleDat->id}";
$userMessageDat->save();
}
}
......
src/user/if/ajax_get_user_message_detail.php
......@@ -46,10 +46,8 @@ $userMessageDat = $userMessageList[0];
if($userMessageDat->attach_dat_type == "VOLUNTEER") {
$attachDat = VolunteerEventDat::getById($userMessageDat->attach_dat_id);
//数据加工
$status_title = "征集中";
if($attachDat->status == "FINISH") {
$status_title = "活动结束";
}
$status_title = EventStatus::getTitleByName($attachDat->status);
$status_title = $status_title;
$attachDat->status_title = $status_title;
$attachDat->scope = "校内";
if($attachDat->include_social_user) {
......
src/user/if/ajax_social_user_register1.php
......@@ -7,6 +7,7 @@ ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....Start.", 0);
//获取参数
$name = ParamUtil::getRequestString("name");//用户填写的用户名称
$mobile = ParamUtil::getRequestNumber("mobile");
$organizationTitle = ParamUtil::getRequestString("organizationTitle");
$legalPerson = ParamUtil::getRequestString("legalPerson");
$organizationContact = ParamUtil::getRequestString("organizationContact");
$headerImg = ParamUtil::getRequestString("headerImg");
......@@ -15,10 +16,7 @@ $unionId = ParamUtil::getRequestString("unionId");
$longitude = ParamUtil::getRequestString("longitude");//用户位置的经度
$latitude = ParamUtil::getRequestString("latitude");//用户位置的纬度
ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....name=" . $name, 0);
ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....mobile=" . $mobile, 0);
ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....openId=" . $openId, 0);
ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....unionId=" . $unionId, 0);
ErrorLogger::doOutput("Compass...ajax_social_user_register1.php....organizationTitle=" . $organizationTitle, 0);
//参数验证
......@@ -74,6 +72,7 @@ $userMst->unionid = $unionId;
$userMst->name = $name;
$userMst->mobile = $mobile;
$userMst->header_img = $headerImg;
$userMst->organization_title = $organizationTitle;
$userMst->legal_person = $legalPerson;
$userMst->organization_contact = $organizationContact;
$userMst->save();
......
src/user/if/ajax_user_join_circle.php
......@@ -60,6 +60,7 @@ if($circleDat->need_check) {
$userMessageDat->attach_dat_type = "CIRCLE";
$userMessageDat->attach_dat_id = $circleDat->id;
//$userMessageDat->attach_dat_path = "pages/checkJoinCircle/checkJoinCircle?userId={$userMst->id}&circleId={$circleDat->id}";
$userMessageDat->save();
$result["message"] = "申请成功，请等待圈主审核！";
responseOK($result);
......
src/wx/app.wxss
......@@ -152,7 +152,7 @@ video, live-player, live-pusher, open-data, web-view {
border-bottom: 1px solid #ccc;
font-size: 13px;
text-align: center;
color: #f0f0f0;
color: #4f4f4f;
}
.button button{
padding: 20px 90px;
......
src/wx/pages/index/index.js
......@@ -94,6 +94,7 @@ Page({
wx.redirectTo({
url: '../socialUserRegister/socialUserRegister',
});
return;
}
that.setData({
roleTitle: res.data.result.name,
......@@ -191,6 +192,12 @@ Page({
isvolunteerEventList: res.data.result.volunteerEventList.length>0?true:false,
ismediaList: res.data.result.mediaList.length>0?true:false
})
//是否显示志愿者活动
if (res.data.result.volunteerEventList && res.data.result.volunteerEventList.length>0) {
that.setData({
isvolunteerEventList: true,
})
}
console.log(res)
},
fail: function (res) { },
......
src/wx/pages/myNewsDetail/myNewsDetail.wxml
......@@ -2,7 +2,7 @@
<view class='myNewsDetail'>
<view class='firstpage' wx:if="{{attach_dat_type=='ORGNAZATION'}}">
<view class='title_firstpage'>{{messageDat.title}}</view>
<view class='content_firstpage'>{{messageDat.comment}}</view>
<text class='content_firstpage'>{{messageDat.comment}}</text>
<!-- <view class='btn_firstpage'>
<view>取消</view>
<view style='background:#698FBB'>确认</view>
......
src/wx/pages/myNewsDetail/myNewsDetail.wxss
......@@ -5,20 +5,21 @@
left: 0;
bottom: 0;
right: 0;
margin: auto;
width: 250px;
margin: 20px auto;
width: 90%;
height: 400px;
}
.title_firstpage{
width: 100%;
text-align: center;
font-size: 18px;
font-size: 16px;
height:40px;
font-weight: 600;
}
.content_firstpage{
width: 100%;
box-sizing: border-box;
padding: 10px;
text-align: left;
}
/* .btn_firstpage{
position: absolute;
......
src/wx/pages/newCircleEvent/newCircleEvent.js
......@@ -227,7 +227,7 @@ Page({
//活动时长
if (that.data.timeLength == null || that.data.timeLength.trim() == "") {
Notify('请输入活动时长')
Notify('请输入时长')
return
}
......
src/wx/pages/socialUserRegister/socialUserRegister.js
// pages/jigouRegistered/jigouRegistered.js
// pages/socialUserRegister/socialUserRegister.js
import Notify from '../../dist/notify/notify';
var app = getApp()
Page({
......@@ -224,6 +224,7 @@ Page({
openId: config.openId,
name: that.data.name,
mobile: that.data.mobile,
organizationTitle: that.data.organizationTitle,
legalPerson: that.data.legalPerson,
organizationContact: that.data.organizationContact,
headerImg: app.globalData.userInfo.avatarUrl,
......
src/wx/pages/socialUserRegister/socialUserRegister.json
{
"usingComponents": {}
"usingComponents": {},
"navigationBarTitleText": "注册"
}
\ No newline at end of file
src/wx/pages/socialUserRegister/socialUserRegister.wxml
<!--pages/jigouRegistered/jigouRegistered.wxml-->
<!--pages/socialUserRegister/socialUserRegister.wxml-->
<view class='jigouRegistered'>
<image src='../../img/2.jpg'></image>
<view class='formtable'>
......
src/wx/pages/socialUserRegister/socialUserRegister.wxss
/* pages/jigouRegistered/jigouRegistered.wxss */
/* pages/socialUserRegister/socialUserRegister.wxss */
.jigouRegistered{
width: 100%;
position: relative;
......@@ -94,7 +94,7 @@
.mainUpload>view>view>text{
display: block;
font-size: 14px;
color: #666;
color: #4F4F4F;
height: 120px;
}
.uploadPic>view{
......
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