Skip to content

C
Compass
Commit dfd5e29c by biao
Options

111

parent 95d72f74
Showing with 401 additions and 87 deletions
src/manager/collection_media_edit_input.php
...@@ -53,7 +53,7 @@ $teacher_name = $course_mst->teacher_name; ...@@ -53,7 +53,7 @@ $teacher_name = $course_mst->teacher_name;
$teacher_profile = $course_mst->teacher_profile; $teacher_profile = $course_mst->teacher_profile;
$new_sub_category_list = []; $new_sub_category_list = [];
foreach ($sub_category_list as $tmp){ foreach ($sub_category_list as $tmp){
if($tmp->parent_id == $sub_category_id){ if($tmp->parent_id == $parent_category_id){
array_push($new_sub_category_list, $tmp); array_push($new_sub_category_list, $tmp);
} }
} }
......
src/manager/media_edit_input.php
...@@ -54,7 +54,24 @@ if( $course_id != 0){ ...@@ -54,7 +54,24 @@ if( $course_id != 0){
$course_name = CourseMst::getById($course_id)->title; $course_name = CourseMst::getById($course_id)->title;
} }
error_log("parent_category_id-->" . $course_media_dat->parent_category_id);
error_log("sub_category_id-->" . $course_media_dat->sub_category_id);
$comment = $course_media_dat->comment;
$parent_category_id = $course_media_dat->parent_category_id;
$sub_category_id = $course_media_dat->sub_category_id;
$teacher_profile = $course_media_dat->teacher_profile;
$parent_category_list = CourseParentCategory::getList();
$param["delete_flg"] = false;
$sub_category_list = CourseCategoryDat::getList($param,"id");
$new_sub_category_list = [];
foreach ($sub_category_list as $tmp){
if($tmp->parent_id == $parent_category_id){
array_push($new_sub_category_list, $tmp);
}
}
// JavaScriptページ // JavaScriptページ
$_SCRIPT_FILE = array("scripts/validators.js", "scripts/media_upload.js","scripts/form_checkbox_common.js","scripts/form_radio_common.js"); $_SCRIPT_FILE = array("scripts/validators.js", "scripts/media_upload.js","scripts/form_checkbox_common.js","scripts/form_radio_common.js");
// ページ // ページ
......
src/manager/media_edit_result.php
...@@ -32,6 +32,10 @@ $media_type = ParamUtil::getRequestNumber("media_type"); ...@@ -32,6 +32,10 @@ $media_type = ParamUtil::getRequestNumber("media_type");
$media_kind = ParamUtil::getRequestString("media_kind"); $media_kind = ParamUtil::getRequestString("media_kind");
$price = ParamUtil::getRequestString("price"); $price = ParamUtil::getRequestString("price");
$course_id = ParamUtil::getRequestNumber("course_id"); $course_id = ParamUtil::getRequestNumber("course_id");
$comment = ParamUtil::getRequestString("comment");
$teacher_profile = ParamUtil::getRequestString("teacher_profile");
$parent_category_id = ParamUtil::getRequestNumber("parent_category_id");
$sub_category_id = ParamUtil::getRequestNumber("sub_category_id");
// error_log("title-->" . $title); // error_log("title-->" . $title);
// error_log("tags-->" . $tags); // error_log("tags-->" . $tags);
...@@ -66,6 +70,9 @@ if(!empty($_FILES['front_image']['tmp_name'])){ ...@@ -66,6 +70,9 @@ if(!empty($_FILES['front_image']['tmp_name'])){
$course_media_dat->title = $title; $course_media_dat->title = $title;
$course_media_dat->tags = implode("|", explode(",", $tags)); $course_media_dat->tags = implode("|", explode(",", $tags));
$course_media_dat->teacher = $teacher; $course_media_dat->teacher = $teacher;
$course_media_dat->comment = $comment;
$course_media_dat->teacher_profile = $teacher_profile;
if($media_kind == 'true'){ if($media_kind == 'true'){
$course_media_dat->price = $price; $course_media_dat->price = $price;
$course_media_dat->is_free = false; $course_media_dat->is_free = false;
...@@ -74,8 +81,13 @@ if($media_kind == 'true'){ ...@@ -74,8 +81,13 @@ if($media_kind == 'true'){
} }
if($media_type == 1){ if($media_type == 1){
$course_media_dat->course_id = $course_id; $course_media_dat->course_id = $course_id;
$course_mst = CourseMst::getById($course_id);
$course_media_dat->parent_category_id = $course_mst->parent_category_id;
$course_media_dat->sub_category_id = $course_mst->sub_category_id;
}else{ }else{
$course_media_dat->course_id = 0; $course_media_dat->course_id = 0;
$course_media_dat->parent_category_id = $parent_category_id;
$course_media_dat->sub_category_id = $sub_category_id;
} }
$course_media_dat->save(); $course_media_dat->save();
......
src/manager/media_upload.php
...@@ -28,6 +28,12 @@ $media_tag_list = MediaTagDat::getList($param); ...@@ -28,6 +28,12 @@ $media_tag_list = MediaTagDat::getList($param);
$course_list = CourseMst::getList($param); $course_list = CourseMst::getList($param);
$parent_category_list = CourseParentCategory::getList();
$param = array();
$param["delete_flg"] = false;
$sub_category_list = CourseCategoryDat::getList($param,"id");
$new_sub_category_list = [];
// JavaScriptページ // JavaScriptページ
$_SCRIPT_FILE = array("scripts/validators.js", "scripts/media_upload.js","scripts/form_checkbox_common.js","scripts/form_radio_common.js"); $_SCRIPT_FILE = array("scripts/validators.js", "scripts/media_upload.js","scripts/form_checkbox_common.js","scripts/form_radio_common.js");
// ページ // ページ
......
src/manager/media_upload_result.php
...@@ -31,6 +31,11 @@ $media_type = ParamUtil::getRequestNumber("media_type"); ...@@ -31,6 +31,11 @@ $media_type = ParamUtil::getRequestNumber("media_type");
$media_kind = ParamUtil::getRequestString("media_kind"); $media_kind = ParamUtil::getRequestString("media_kind");
$price = ParamUtil::getRequestString("price"); $price = ParamUtil::getRequestString("price");
$course_id = ParamUtil::getRequestNumber("course_id"); $course_id = ParamUtil::getRequestNumber("course_id");
$comment = ParamUtil::getRequestString("comment");
$teacher_profile = ParamUtil::getRequestString("teacher_profile");
$parent_category_id = ParamUtil::getRequestNumber("parent_category_id");
$sub_category_id = ParamUtil::getRequestNumber("sub_category_id");
// error_log("size-->" . filesize($upload_file->tmp_name)); // error_log("size-->" . filesize($upload_file->tmp_name));
// error_log("title-->" . $title); // error_log("title-->" . $title);
...@@ -38,8 +43,8 @@ $course_id = ParamUtil::getRequestNumber("course_id"); ...@@ -38,8 +43,8 @@ $course_id = ParamUtil::getRequestNumber("course_id");
// error_log("teacher-->" . $teacher); // error_log("teacher-->" . $teacher);
// error_log("media_type-->" . $media_type); // error_log("media_type-->" . $media_type);
// error_log("media_kind-->" . $media_kind); // error_log("media_kind-->" . $media_kind);
// error_log("price-->" . $price); // error_log("sub_category_id-->" . $sub_category_id);
// error_log("course_id-->" . $course_id); // error_log("parent_category_id-->" . $parent_category_id);
$course_media_dat = new CourseMediaDat(); $course_media_dat = new CourseMediaDat();
$aliHandler = new AliUploadHandler(); $aliHandler = new AliUploadHandler();
...@@ -61,6 +66,9 @@ ErrorLogger::doOutput($url); ...@@ -61,6 +66,9 @@ ErrorLogger::doOutput($url);
$course_media_dat->title = $title; $course_media_dat->title = $title;
$course_media_dat->tags = implode("|", explode(",", $tags)); $course_media_dat->tags = implode("|", explode(",", $tags));
$course_media_dat->teacher = $teacher; $course_media_dat->teacher = $teacher;
$course_media_dat->comment = $comment;
$course_media_dat->teacher_profile = $teacher_profile;
if($media_kind == 'true'){ if($media_kind == 'true'){
$course_media_dat->price = $price; $course_media_dat->price = $price;
$course_media_dat->is_free = false; $course_media_dat->is_free = false;
...@@ -72,7 +80,14 @@ if($media_type == 1){ ...@@ -72,7 +80,14 @@ if($media_type == 1){
$course_mst = CourseMst::getById($course_id); $course_mst = CourseMst::getById($course_id);
$course_mst->media_count += 1; $course_mst->media_count += 1;
$course_mst->save(); $course_mst->save();
$course_media_dat->parent_category_id = $course_mst->parent_category_id;
$course_media_dat->sub_category_id = $course_mst->sub_category_id;
}else{
$course_media_dat->parent_category_id = $parent_category_id;
$course_media_dat->sub_category_id = $sub_category_id;
} }
$course_media_dat->save(); $course_media_dat->save();
// 页面表示 // 页面表示
......
src/manager/templates/account_edit_input.inc
...@@ -70,8 +70,8 @@ global $modules; ...@@ -70,8 +70,8 @@ global $modules;
<p>备注</p> <p>备注</p>
<el-input v-model="comment" name="comment" class="input_300"></el-input><br /> <el-input v-model="comment" name="comment" class="input_300"></el-input><br />
<br/><br/> <br/><br/>
<el-button type="danger" class="edit_btn" @click="submitForm()">编辑</el-button> <el-button type="primary" class="edit_btn" @click="submitForm()">编辑</el-button>
<el-button type="danger" class="edit_btn" @Click="window.location='./account_list.php'" />返回</el-button> <el-button type="primary" class="edit_btn" @Click="window.location='./account_list.php'" />返回</el-button>
<br/><br/> <br/><br/>
</form> </form>
</div> </div>
......
src/manager/templates/account_new_input.inc
...@@ -61,8 +61,8 @@ global $account_role; ...@@ -61,8 +61,8 @@ global $account_role;
<p>备注</p> <p>备注</p>
<el-input v-model="comment" name="comment" class="input_300"></el-input><br /> <el-input v-model="comment" name="comment" class="input_300"></el-input><br />
<br/><br/> <br/><br/>
<el-button type="danger" class="edit_btn" @click="submitForm()">新增</el-button> <el-button type="primary" class="edit_btn" @click="submitForm()">新增</el-button>
<el-button type="danger" class="edit_btn" @Click="window.location='./account_list.php'" />返回</el-button> <el-button type="primary" class="edit_btn" @Click="window.location='./account_list.php'" />返回</el-button>
<br/><br/> <br/><br/>
</form> </form>
</div> </div>
......
src/manager/templates/certificate_apply_edit_input.inc
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
</el-option> </el-option>
</el-select><br/> </el-select><br/>
<br/> <br/>
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</form> </form>
......
src/manager/templates/certificate_apply_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/certificate_edit_input.inc
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<img id="imgshow" height="150px" alt="学校封面图" /> <img id="imgshow" height="150px" alt="学校封面图" />
</div> </div>
<br/> <br/>
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
</form> </form>
</div> </div>
......
src/manager/templates/certificate_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/class_edit_input.inc
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<p class="begin_blank"><?=htmlspecialchars($class_mst->title) ?>&nbsp;</p> <p class="begin_blank"><?=htmlspecialchars($class_mst->title) ?>&nbsp;</p>
<p>班级人数</p> <p>班级人数</p>
<el-input v-model="member_count" name="member_count" type='number' class="input_200"></el-input><br /> <el-input v-model="member_count" name="member_count" type='number' class="input_200"></el-input><br />
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
</form> </form>
</div> </div>
......
src/manager/templates/class_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/collection_media_edit_input.inc
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<textarea v-model="teacher_profile" name="teacher_profile" rows="5"></textarea><br /> <textarea v-model="teacher_profile" name="teacher_profile" rows="5"></textarea><br />
<br/> <br/>
<br/> <br/>
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</form> </form>
......
src/manager/templates/collection_media_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/course_category_edit_input.inc
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
<el-input v-model="title" name="title" class="input_200"></el-input> <el-input v-model="title" name="title" class="input_200"></el-input>
<br/> <br/>
<br/> <br/>
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</form> </form>
......
src/manager/templates/course_category_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/donations_dat_detail.inc
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<p>审核者</p> <p>审核者</p>
<p class="begin_blank"><?=$donations_dat->auditor_name?></p> <p class="begin_blank"><?=$donations_dat->auditor_name?></p>
<br/><br/> <br/><br/>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</div> </div>
......
src/manager/templates/donations_edit_input.inc
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
<p>活动发布人</p> <p>活动发布人</p>
<el-input v-model="author" name="author" class="input_200"></el-input><br /> <el-input v-model="author" name="author" class="input_200"></el-input><br />
<br/><br/> <br/><br/>
<el-button type="danger" @click="submit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="submit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</form> </form>
......
src/manager/templates/donations_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="tolist()" class="edit_btn">返回</el-button> <el-button type="primary" @click="tolist()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/donations_examine_input.inc
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
</el-select> </el-select>
<br/><br/> <br/><br/>
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</form> </form>
......
src/manager/templates/donations_examine_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/event_dat_detail.inc
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<p>审核者</p> <p>审核者</p>
<p class="begin_blank"><?=$volunteer_event_dat->auditor_name?></p> <p class="begin_blank"><?=$volunteer_event_dat->auditor_name?></p>
<br/><br/> <br/><br/>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</div> </div>
......
src/manager/templates/event_edit_input.inc
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
<p>活动发布人</p> <p>活动发布人</p>
<el-input v-model="author" name="author" class="input_200"></el-input><br /> <el-input v-model="author" name="author" class="input_200"></el-input><br />
<br/><br/> <br/><br/>
<el-button type="danger" @click="submit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="submit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</form> </form>
......
src/manager/templates/event_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="tolist()" class="edit_btn">返回</el-button> <el-button type="primary" @click="tolist()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/event_examine_input.inc
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
</el-select> </el-select>
<br/><br/> <br/><br/>
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</form> </form>
......
src/manager/templates/event_examine_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/event_input_time.inc
...@@ -27,8 +27,8 @@ global $thumbnail_error_msg; ...@@ -27,8 +27,8 @@ global $thumbnail_error_msg;
<span id="zhl_admin_imgs"></span><img src="images/btn_add.png" id="zhl_admin_img" onclick="zhl_admin_file.click()" /> <span id="zhl_admin_imgs"></span><img src="images/btn_add.png" id="zhl_admin_img" onclick="zhl_admin_file.click()" />
</div> </div>
<br/><br/> <br/><br/>
<el-button type="danger" @click="edit()" class="edit_btn">完成</el-button> <el-button type="primary" @click="edit()" class="edit_btn">完成</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
</form> </form>
<br/><br/> <br/><br/>
......
src/manager/templates/event_input_time_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/event_member_detail.inc
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<img class="member_img" alt="" src="<?=$img?>"><br/> <img class="member_img" alt="" src="<?=$img?>"><br/>
<?}?> <?}?>
<br /><br /> <br /><br />
<el-button type="danger" @click="window.history.go(-1);" class="edit_btn">返回</el-button> <el-button type="primary" @click="window.history.go(-1);" class="edit_btn">返回</el-button>
<br /><br /> <br /><br />
<script type="text/javascript"> <script type="text/javascript">
......
src/manager/templates/event_publishing.inc
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<p>活动发布人</p> <p>活动发布人</p>
<el-input v-model="author" name="author" class="input_200"></el-input><br /> <el-input v-model="author" name="author" class="input_200"></el-input><br />
<br/><br/> <br/><br/>
<el-button type="danger" @click="submit()" class="edit_btn">创建</el-button><br/><br/> <el-button type="primary" @click="submit()" class="edit_btn">创建</el-button><br/><br/>
</div> </div>
</form> </form>
</div> </div>
......
src/manager/templates/event_publishing_result.inc
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="goon()" class="edit_btn">继续发布</el-button> <el-button type="primary" @click="goon()" class="edit_btn">继续发布</el-button>
<el-button type="danger" @click="tolist()" class="edit_btn">活动列表</el-button> <el-button type="primary" @click="tolist()" class="edit_btn">活动列表</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/government_edit_input.inc
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<p class="begin_blank"><?=htmlspecialchars($government_mst->district) ?>&nbsp;</p> <p class="begin_blank"><?=htmlspecialchars($government_mst->district) ?>&nbsp;</p>
<p>教育管局名称</p> <p>教育管局名称</p>
<el-input v-model="name" class="input_200"></el-input><br /> <el-input v-model="name" class="input_200"></el-input><br />
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
}); });
return; return;
} }
$('#title').val(this.name) $('#title').val(this.name);
$('#form').submit(); $('#form').submit();
}, },
back:function(){ back:function(){
......
src/manager/templates/government_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/government_new.inc
...@@ -16,8 +16,8 @@ global $csv_error_msg; ...@@ -16,8 +16,8 @@ global $csv_error_msg;
<form id="form" method="post" action="government_new_result.php" enctype="multipart/form-data"> <form id="form" method="post" action="government_new_result.php" enctype="multipart/form-data">
<p>CSV文件</p> <p>CSV文件</p>
<input type="file" name="csv_file" class="input_200" @change="getFile($event)" accept=".csv"/><br /> <input type="file" name="csv_file" class="input_200" @change="getFile($event)" accept=".csv"/><br />
<el-button type="danger" class="edit_btn" @click="submitForm()">新增</el-button> <el-button type="primary" class="edit_btn" @click="submitForm()">新增</el-button>
<el-button type="danger" class="edit_btn" @Click="window.location='./government_list.php'" />返回</el-button> <el-button type="primary" class="edit_btn" @Click="window.location='./government_list.php'" />返回</el-button>
</form> </form>
</div> </div>
</div> </div>
......
src/manager/templates/government_new_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/government_qr_edit_input.inc
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
<img v-if="qr_image != ''" src="<?=$qr_image?>"/> <img v-if="qr_image != ''" src="<?=$qr_image?>"/>
<br/> <br/>
<br/> <br/>
<el-button v-if="!qr_image"type="danger" @click="edit()" class="edit_btn">编辑并生成二维码</el-button> <el-button v-if="!qr_image"type="primary" @click="edit()" class="edit_btn">编辑并生成二维码</el-button>
<el-button v-if="qr_image"type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button v-if="qr_image"type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</form> </form>
......
src/manager/templates/government_qr_edit_result.inc
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<?}?> <?}?>
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/grade_edit_input.inc
...@@ -40,7 +40,7 @@ global $school_id; ...@@ -40,7 +40,7 @@ global $school_id;
<div class="edit_content"> <div class="edit_content">
<p>年级名称</p> <p>年级名称</p>
<el-input v-model="name" class="input_100"></el-input><br /> <el-input v-model="name" class="input_100"></el-input><br />
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
</div> </div>
</div> </div>
......
src/manager/templates/media_edit_input.inc
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
<input name="post_max" type="hidden" value="<?=ini_get('post_max_size')?>"> <input name="post_max" type="hidden" value="<?=ini_get('post_max_size')?>">
<input name="id" type="hidden" value="<?=$id?>"> <input name="id" type="hidden" value="<?=$id?>">
<input name="upload_max" type="hidden" value="<?=ini_get('upload_max_filesize')?>"> <input name="upload_max" type="hidden" value="<?=ini_get('upload_max_filesize')?>">
<input type="hidden" name="parent_category_id" value="<?=$parent_category_id?>"/>
<input type="hidden" name="sub_category_id" value="<?=$sub_category_id?>"/>
<div class="edit_content"> <div class="edit_content">
<p>视频名称</p> <p>视频名称</p>
<el-input v-model="title" name="title" class="input_200"></el-input><br /> <el-input v-model="title" name="title" class="input_200"></el-input><br />
...@@ -24,6 +26,8 @@ ...@@ -24,6 +26,8 @@
<br /> <br />
<p>讲师姓名</p> <p>讲师姓名</p>
<el-input v-model="teacher" name="teacher" class="input_200"></el-input><br /> <el-input v-model="teacher" name="teacher" class="input_200"></el-input><br />
<p>讲师介绍</p>
<textarea v-model="teacher_profile" name="teacher_profile" rows="5"></textarea><br />
<p>视频封面图</p> <p>视频封面图</p>
<a href='javascript:void(0);' class="el-button el-button--primary blueButton">选择文件</a> <a href='javascript:void(0);' class="el-button el-button--primary blueButton">选择文件</a>
<input id="image_file" class="myFileUpload" name="front_image" type="file" accept="image/*"/> <input id="image_file" class="myFileUpload" name="front_image" type="file" accept="image/*"/>
...@@ -35,6 +39,26 @@ ...@@ -35,6 +39,26 @@
<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> </template>
<div v-if="is_category_show">
<p>一级分类名称</p>
<el-select v-model="parent_category_id" size="small">
<el-option
v-for="item in parent_category_list"
:key="item.id"
:label="item.title"
:value="item.id">
</el-option>
</el-select>
<p>二级分类名称</p>
<el-select v-model="sub_category_id" size="small">
<el-option
v-for="item in new_sub_category_list"
:key="item.id"
:label="item.title"
:value="item.id">
</el-option>
</el-select>
</div>
<div v-if="is_course_show"> <div v-if="is_course_show">
<p>选择合集</p> <p>选择合集</p>
<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> <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>
...@@ -53,11 +77,12 @@ ...@@ -53,11 +77,12 @@
<el-input v-model="price" name="price" type="number" class="input_200"></el-input><br /> <el-input v-model="price" name="price" type="number" class="input_200"></el-input><br />
<br /> <br />
</div> </div>
<p>课程简介</p>
<textarea v-model="comment" name="comment" rows="5"></textarea><br />
<br/><br/> <br/><br/>
<el-button type="danger" @click="submit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="submit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button><br/><br/> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button><br/><br/>
</div> </div>
</form> </form>
</div> </div>
...@@ -70,12 +95,20 @@ ...@@ -70,12 +95,20 @@
media_tags:'<?=$tags?>', media_tags:'<?=$tags?>',
media_type:'<?=$media_type?>', media_type:'<?=$media_type?>',
teacher:'<?=$teacher?>', teacher:'<?=$teacher?>',
parent_category_id:<?=$parent_category_id?>,
sub_category_id:'<?=$sub_category_id?>',
teacher_profile:'<?=$teacher_profile?>',
comment:'<?=$comment?>',
media_kind:'<?=$media_kind?>', media_kind:'<?=$media_kind?>',
price:'<?=$price?>', price:'<?=$price?>',
course_name:'<?=$course_name?>', course_name:'<?=$course_name?>',
is_category_show:<?=$media_type == '1'?'false':'true'?>,
is_course_show:<?=$media_type == '0'?'false':'true'?>, is_course_show:<?=$media_type == '0'?'false':'true'?>,
is_price_show:<?=$media_kind == 'true'?'true':'false'?>, is_price_show:<?=$media_kind == 'true'?'true':'false'?>,
front_image:'<?=$front_image?>' front_image:'<?=$front_image?>',
sub_category_list:<?=json_encode($sub_category_list)?>,
new_sub_category_list:<?=json_encode($new_sub_category_list)?>,
parent_category_list:<?=json_encode($parent_category_list)?>,
}, },
watch:{ watch:{
media_type(val,oldval){ media_type(val,oldval){
...@@ -91,7 +124,17 @@ ...@@ -91,7 +124,17 @@
}else{ }else{
this.is_price_show = true; this.is_price_show = true;
} }
} },
parent_category_id(val,oldval){
var new_list = [];
this.sub_category_list.map(function(item) {
if (item.parent_id == val) {
new_list.push(item);
}
});
this.new_sub_category_list = new_list;
this.sub_category_id = this.new_sub_category_list[0]["id"];
}
}, },
methods:{ methods:{
back:function(){ back:function(){
...@@ -112,6 +155,20 @@ ...@@ -112,6 +155,20 @@
}); });
return; return;
} }
if(this.media_type == '0' && !this.parent_category_id){
this.$message({
type: 'error',
message: '请选择视频一级分类名称!'
});
return;
}
if(this.media_type == '0' && !this.sub_category_id){
this.$message({
type: 'error',
message: '请选择视频二级分类名称!'
});
return;
}
if(this.media_type == '1' && $("input[name='course_id']").val() == '0'){ if(this.media_type == '1' && $("input[name='course_id']").val() == '0'){
this.$message({ this.$message({
type: 'error', type: 'error',
...@@ -133,7 +190,8 @@ ...@@ -133,7 +190,8 @@
}); });
return; return;
} }
$("input[name='parent_category_id']").val(this.parent_category_id);
$("input[name='sub_category_id']").val(this.sub_category_id);
$('#form').submit(); $('#form').submit();
}, },
......
src/manager/templates/media_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="tolist()" class="edit_btn">返回</el-button> <el-button type="primary" @click="tolist()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/media_upload.inc
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<form id="form" name="media_upload" action="media_upload_result.php" method="post" enctype="multipart/form-data"> <form id="form" name="media_upload" action="media_upload_result.php" method="post" enctype="multipart/form-data">
<input name="post_max" type="hidden" value="<?=ini_get('post_max_size')?>"> <input name="post_max" type="hidden" value="<?=ini_get('post_max_size')?>">
<input name="upload_max" type="hidden" value="<?=ini_get('upload_max_filesize')?>"> <input name="upload_max" type="hidden" value="<?=ini_get('upload_max_filesize')?>">
<input type="hidden" name="parent_category_id" value="<?=$parent_category_id?>"/>
<input type="hidden" name="sub_category_id" value="<?=$sub_category_id?>"/>
<div class="edit_content"> <div class="edit_content">
<p>视频名称</p> <p>视频名称</p>
<el-input v-model="title" name="title" class="input_200"></el-input><br /> <el-input v-model="title" name="title" class="input_200"></el-input><br />
...@@ -23,6 +25,8 @@ ...@@ -23,6 +25,8 @@
<br /> <br />
<p>讲师姓名</p> <p>讲师姓名</p>
<el-input v-model="teacher" name="teacher" class="input_200"></el-input><br /> <el-input v-model="teacher" name="teacher" class="input_200"></el-input><br />
<p>讲师介绍</p>
<textarea v-model="teacher_profile" name="teacher_profile" rows="5"></textarea><br />
<p>视频封面图</p> <p>视频封面图</p>
<a href='javascript:void(0);' class="el-button el-button--primary blueButton">选择文件</a> <a href='javascript:void(0);' class="el-button el-button--primary blueButton">选择文件</a>
<input id="image_file" class="myFileUpload" name="front_image" type="file" accept="image/*"/> <input id="image_file" class="myFileUpload" name="front_image" type="file" accept="image/*"/>
...@@ -34,6 +38,26 @@ ...@@ -34,6 +38,26 @@
<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> </template>
<div v-if="is_category_show">
<p>一级分类名称</p>
<el-select v-model="parent_category_id" size="small">
<el-option
v-for="item in parent_category_list"
:key="item.id"
:label="item.title"
:value="item.id">
</el-option>
</el-select>
<p>二级分类名称</p>
<el-select v-model="sub_category_id" size="small">
<el-option
v-for="item in new_sub_category_list"
:key="item.id"
:label="item.title"
:value="item.id">
</el-option>
</el-select>
</div>
<div v-if="is_course_show"> <div v-if="is_course_show">
<p>选择合集</p> <p>选择合集</p>
<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> <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>
...@@ -52,6 +76,8 @@ ...@@ -52,6 +76,8 @@
<el-input v-model="price" name="price" type="number" class="input_200"></el-input><br /> <el-input v-model="price" name="price" type="number" class="input_200"></el-input><br />
<br /> <br />
</div> </div>
<p>课程简介</p>
<textarea v-model="comment" name="comment" rows="5"></textarea><br />
<p>上传视频</p> <p>上传视频</p>
<a href='javascript:void(0);' class="el-button el-button--primary blueButton">选择文件</a> <a href='javascript:void(0);' class="el-button el-button--primary blueButton">选择文件</a>
<input id="media_file" class="myFileUpload" name="media" type="file" accept="audio/mp4,video/mp4"/><br/><br/> <input id="media_file" class="myFileUpload" name="media" type="file" accept="audio/mp4,video/mp4"/><br/><br/>
...@@ -59,7 +85,7 @@ ...@@ -59,7 +85,7 @@
<span id="media_thumbnail" style="height: 20px;"> <span id="media_thumbnail" style="height: 20px;">
</span> </span>
<br/><br/> <br/><br/>
<el-button type="primary" @click="submit()" class="edit_btn">上传发布</el-button><br/><br/> <el-button type="primary" @click="submit()" class="edit_btn">上传发布</el-button><br/><br/><br/>
</div> </div>
</form> </form>
</div> </div>
...@@ -75,16 +101,25 @@ ...@@ -75,16 +101,25 @@
media_kind:'true', media_kind:'true',
price:'', price:'',
course_name:'', course_name:'',
is_category_show:true,
is_course_show:false, is_course_show:false,
is_price_show:true, is_price_show:true,
teacher_profile:'', teacher_profile:'',
comment:'',
parent_category_id:'',
sub_category_id:'',
sub_category_list:<?=json_encode($sub_category_list)?>,
new_sub_category_list:<?=json_encode($new_sub_category_list)?>,
parent_category_list:<?=json_encode($parent_category_list)?>
}, },
watch:{ watch:{
media_type(val,oldval){ media_type(val,oldval){
if(val == "0"){ if(val == "0"){
this.is_course_show = false; this.is_course_show = false;
this.is_category_show = true;
}else{ }else{
this.is_course_show = true; this.is_course_show = true;
this.is_category_show = false;
} }
}, },
media_kind(val,oldval){ media_kind(val,oldval){
...@@ -93,7 +128,17 @@ ...@@ -93,7 +128,17 @@
}else{ }else{
this.is_price_show = true; this.is_price_show = true;
} }
} },
parent_category_id(val,oldval){
var new_list = [];
this.sub_category_list.map(function(item) {
if (item.parent_id == val) {
new_list.push(item);
}
});
this.new_sub_category_list = new_list;
this.sub_category_id = this.new_sub_category_list[0]["id"];
}
}, },
methods:{ methods:{
submit:function(){ submit:function(){
...@@ -118,6 +163,20 @@ ...@@ -118,6 +163,20 @@
}); });
return; return;
} }
if(this.media_type == '0' && !this.parent_category_id){
this.$message({
type: 'error',
message: '请选择视频一级分类名称!'
});
return;
}
if(this.media_type == '0' && !this.sub_category_id){
this.$message({
type: 'error',
message: '请选择视频二级分类名称!'
});
return;
}
if(this.media_type == '1' && $("input[name='course_id']").val() == '0'){ if(this.media_type == '1' && $("input[name='course_id']").val() == '0'){
this.$message({ this.$message({
type: 'error', type: 'error',
...@@ -147,7 +206,9 @@ ...@@ -147,7 +206,9 @@
}); });
return; return;
} }
$("input[name='parent_category_id']").val(this.parent_category_id);
$("input[name='sub_category_id']").val(this.sub_category_id);
$('#form').submit(); $('#form').submit();
}, },
......
src/manager/templates/media_upload_result.inc
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="goon()" class="edit_btn">继续上传</el-button> <el-button type="primary" @click="goon()" class="edit_btn">继续上传</el-button>
<el-button type="danger" @click="tolist()" class="edit_btn">视频列表</el-button> <el-button type="primary" @click="tolist()" class="edit_btn">视频列表</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/menu.inc
...@@ -19,6 +19,10 @@ html,body{ ...@@ -19,6 +19,10 @@ html,body{
.el-menu{ .el-menu{
border-right: none!important; border-right: none!important;
} }
.el-menu-item{
height: 45px !important;
line-height: 45px !important;
}
/*a{ /*a{
color: #000; color: #000;
text-decoration: none; text-decoration: none;
...@@ -110,6 +114,7 @@ a:hover{ ...@@ -110,6 +114,7 @@ a:hover{
<el-menu-item index="4-3" v-if="checkAuthority11" @click="fn43()">视频上传</el-menu-item> <el-menu-item index="4-3" v-if="checkAuthority11" @click="fn43()">视频上传</el-menu-item>
<el-menu-item index="4-4" v-if="checkAuthority11" @click="fn44()">公益收益</el-menu-item> <el-menu-item index="4-4" v-if="checkAuthority11" @click="fn44()">公益收益</el-menu-item>
<el-menu-item index="4-5" v-if="checkAuthority11" @click="fn45()">课程分类</el-menu-item> <el-menu-item index="4-5" v-if="checkAuthority11" @click="fn45()">课程分类</el-menu-item>
<el-menu-item index="4-6" v-if="checkAuthority" @click="fn46()">会员缴费</el-menu-item>
</el-menu-item-group> </el-menu-item-group>
</el-submenu> </el-submenu>
<el-submenu index="5"> <el-submenu index="5">
...@@ -133,6 +138,7 @@ a:hover{ ...@@ -133,6 +138,7 @@ a:hover{
el:'#leftMenu', el:'#leftMenu',
data:{ data:{
default_active:'1-1', default_active:'1-1',
checkAuthority:<?=($_account->role == 10 || $_account->role == 99)?'true':'false'?>,
checkAuthority1:<?=checkAuthority("1")?'true':'false'?>, checkAuthority1:<?=checkAuthority("1")?'true':'false'?>,
checkAuthority2:<?=checkAuthority("2")?'true':'false'?>, checkAuthority2:<?=checkAuthority("2")?'true':'false'?>,
checkAuthority3:<?=checkAuthority("3")?'true':'false'?>, checkAuthority3:<?=checkAuthority("3")?'true':'false'?>,
...@@ -203,6 +209,9 @@ a:hover{ ...@@ -203,6 +209,9 @@ a:hover{
fn45(){ fn45(){
window.location.href='course_category_list.php' window.location.href='course_category_list.php'
}, },
fn46(){
window.location.href='user_pay_list.php'
},
fn51(){ fn51(){
window.location.href='account_list.php' window.location.href='account_list.php'
}, },
......
src/manager/templates/org_account_edit_input.inc
...@@ -32,8 +32,8 @@ global $error_message; ...@@ -32,8 +32,8 @@ global $error_message;
<p>备注</p> <p>备注</p>
<textarea v-model="comment" name="comment" rows="5" class="input_200"></textarea> <textarea v-model="comment" name="comment" rows="5" class="input_200"></textarea>
<br/><br/> <br/><br/>
<el-button type="danger" class="edit_btn" @click="submitForm()">编辑</el-button> <el-button type="primary" class="edit_btn" @click="submitForm()">编辑</el-button>
<el-button type="danger" class="edit_btn" @Click="window.location='./org_account_list.php?id=<?=$uid?>'" />返回</el-button> <el-button type="primary" class="edit_btn" @Click="window.location='./org_account_list.php?id=<?=$uid?>'" />返回</el-button>
<br/><br/> <br/><br/>
</form> </form>
</div> </div>
......
src/manager/templates/org_account_edit_result.inc
...@@ -15,7 +15,7 @@ global $uid; ...@@ -15,7 +15,7 @@ global $uid;
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/org_accredited_input.inc
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
</el-select> </el-select>
<br/><br/> <br/><br/>
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<br/><br/> <br/><br/>
</div> </div>
</form> </form>
......
src/manager/templates/org_accredited_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/school_edit_input.inc
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
<input name="latitude" type="hidden" value="<?=$school_mst->latitude?>"> <input name="latitude" type="hidden" value="<?=$school_mst->latitude?>">
<input name="id" type="hidden" value="<?=$school_mst->id?>"> <input name="id" type="hidden" value="<?=$school_mst->id?>">
<br/><br/> <br/><br/>
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<?if($can_back){?> <?if($can_back){?>
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
<?}?> <?}?>
<br/><br/> <br/><br/>
</div> </div>
......
src/manager/templates/school_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/system_const_edit_input.inc
...@@ -23,8 +23,8 @@ global $error_message; ...@@ -23,8 +23,8 @@ global $error_message;
<el-input v-model="title" name="title" class="input_200"></el-input><br /> <el-input v-model="title" name="title" class="input_200"></el-input><br />
<p>值</p> <p>值</p>
<textarea v-model="constant_value" name="constant_value" rows="10"></textarea><br /> <textarea v-model="constant_value" name="constant_value" rows="10"></textarea><br />
<el-button type="danger" @click="edit()" class="edit_btn">编辑</el-button> <el-button type="primary" @click="edit()" class="edit_btn">编辑</el-button>
<el-button type="danger" class="edit_btn" @Click="window.location='./system_const_list.php'" />返回</el-button> <el-button type="primary" class="edit_btn" @Click="window.location='./system_const_list.php'" />返回</el-button>
</div> </div>
</form> </form>
</div> </div>
......
src/manager/templates/system_const_edit_result.inc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<br /> <br />
<br /> <br />
<div id="result"> <div id="result">
<el-button type="danger" @click="back()" class="edit_btn">返回</el-button> <el-button type="primary" @click="back()" class="edit_btn">返回</el-button>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
......
src/manager/templates/user_pay_list.inc 0 → 100644
<?php
/**
* 会员缴费
* $Id: user_pay_list.inc,v 1.1 2020/01/03 11:18:46 Exp $
* @author lixq
* @access public
* @package manager.templates
*/
?>
<div id="classSetting">
<div class="list_title">
会员缴费
</div>
<br />
<p>会员总人数: <?=$user_pay_total["total"]?></p>
<p>缴费总额: <?=floatval($user_pay_total["money"])?>元</p>
<div class="result_list">
<el-table :data="tableData" border>
<el-table-column prop="user_name" label="用户姓名" width=""></el-table-column>
<el-table-column prop="money" label="支付金额" width=""></el-table-column>
<el-table-column prop="registration_date" label="支付时间" width=""></el-table-column>
</el-table>
</div>
</div>
<?
if ($user_pay_count > 0) {
?>
<!--page begin-->
<?
require_once("page_common.inc");
?>
<!--page end-->
<?
}
?>
<script type="text/javascript">
var list=[];
<?
foreach ($user_pay_list as $tmp) {
?>
var data={
user_name:'<?=$tmp->user_name?>',
money:'<?=floatval($tmp->money)?>',
registration_date:'<?=$tmp->registration_date?>',
};
list.push(data);
<?
}
?>
new Vue({
el:'#classSetting',
data:{
tableData: list,
}
})
</script>
\ No newline at end of file
src/manager/user_pay_list.php 0 → 100644
<?php
/**
* 会员缴费一览
* $Id: user_pay_list.php,v 1.1 2020/01/03 11:18:46 Exp $
* @author lixq
* @package manager.public_html
*/
// 底层包含
require_once("manager_include.inc");
// 登录检查
require_once("check_login.inc");
// 权限检查
if (!checkAuthority("11")) {
// エラー表示
$layout_pages = array();
$layout_pages["left"] = "menu.inc";
$layout_pages["right"] = "error.inc";
$message = "权限不足，请联系系统管理员。";
require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/leftmenu_layout.inc");
exit;
}
$page_num = ParamUtil::getRequestNumber("page_num", 1);
$page_row = MANAGER_DEFAULT_ROW_COUNT;
$paging_url_link = "./user_pay_list.php";
$user_pay_list = [];
//总件数
$user_pay_total = CompassHandler::getMemberUserCount();
$param = array();
$param["delete_flg"] = false;
$param["action_type"] = "MEMBER";
$user_pay_count = UserPayLog::getListCount($param);
// // 一览取得
if ($user_pay_count > 0) {
$offset = ($page_num - 1) * $page_row;
$user_pay_list = UserPayLog::getList($param, "id", "ASC", $offset, $page_row);
$page_count = ceil($user_pay_count / $page_row);
$show_page_num = MANAGER_PAGING_SHOW_PAGE_COUNT;
$page_range = PagingHandler::getPageRange($page_num, $page_count, $show_page_num);
$page_first = $page_range[0];
$page_end = $page_range[1];
}
// ページ
$layout_pages = array();
$layout_pages["left"] = "menu.inc";
$layout_pages["right"] = "user_pay_list.inc";
$layout_pages["menu_clicked"] = "4-6";
require_once(MANAGER_TEMPLATE_DIR_PATH . "/layout/leftmenu_layout.inc");
exit;
\ No newline at end of file
src/wx/app.js
...@@ -46,12 +46,25 @@ App({ ...@@ -46,12 +46,25 @@ App({
unionId: res.data.result.unionId, unionId: res.data.result.unionId,
registed: res.data.result.registed registed: res.data.result.registed
}; };
wx.showToast({
title: "unionId=" + res.data.result.unionId,
icon: 'success',
duration: 2000
});
wx.setStorage({ wx.setStorage({
key: 'config', key: 'config',
data: config, data: config,
}); });
},
} fail: function (res) {
wx.showToast({
title: "失败",
icon: 'success',
duration: 2000
});
},
complete: function (res) {
},
}) })
}, },
globalData: { globalData: {
......
src/wx/app.wxss
...@@ -51,6 +51,14 @@ video, live-player, live-pusher, open-data, web-view { ...@@ -51,6 +51,14 @@ video, live-player, live-pusher, open-data, web-view {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
flex-wrap: wrap;
}
.activeLine{
display: block;
width: 80%;
height: 1px;
background: #ccc;
margin: 0 auto;
} }
.left_listVolunteers{ .left_listVolunteers{
width: 30%; width: 30%;
......
src/wx/pages/familyEvent/familyEvent.wxml
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
</view> </view>
<text>{{item.author}}</text> <text>{{item.author}}</text>
</view> </view>
<text class='activeLine'></text>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
......
src/wx/pages/register/register.js
...@@ -49,8 +49,8 @@ Page({ ...@@ -49,8 +49,8 @@ Page({
//家校/家园用户注册 //家校/家园用户注册
regist(e){ regist(e){
var that = this;
var that = this;
// 获取用户信息 // 获取用户信息
wx.getUserInfo({ wx.getUserInfo({
success: res => { success: res => {
...@@ -82,11 +82,6 @@ Page({ ...@@ -82,11 +82,6 @@ Page({
method: 'GET', method: 'GET',
dataType: 'json', dataType: 'json',
success: function (res) { success: function (res) {
wx.showToast({
title: res.data.result.message,
icon: 'success',
duration: 2000
});
//跳转到首页 //跳转到首页
wx.switchTab({ wx.switchTab({
url: '../index/index', url: '../index/index',
......
src/wx/pages/socialEvent/socialEvent.wxml
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<text>发布时间：{{item.publish_time}}\n</text> <text>发布时间：{{item.publish_time}}\n</text>
</view> </view>
</view> </view>
<text class='activeLine'></text>
</view> </view>
</scroll-view> </scroll-view>
</view> </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