+
+
+
+{/block}
+{block name='script'}
+
+{/block}
diff --git a/application/admin/view/institution/priselecturer/index.php b/application/admin/view/institution/priselecturer/index.php
new file mode 100755
index 00000000..597ff71f
--- /dev/null
+++ b/application/admin/view/institution/priselecturer/index.php
@@ -0,0 +1,413 @@
+{extend name="public/container"}
+{block name="content"}
+
+
+
+
+
+{/block}
+{block name="script"}
+
+{/block}
diff --git a/application/admin/view/institution/priselecturer/lecturer_order.php b/application/admin/view/institution/priselecturer/lecturer_order.php
new file mode 100755
index 00000000..8b6ebf1a
--- /dev/null
+++ b/application/admin/view/institution/priselecturer/lecturer_order.php
@@ -0,0 +1,133 @@
+{extend name="public/container"}
+{block name="content"}
+
+
+机构列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{/block}
diff --git a/application/admin/view/institution/priselecturer/mercreate.php b/application/admin/view/institution/priselecturer/mercreate.php
new file mode 100755
index 00000000..d5c63d2a
--- /dev/null
+++ b/application/admin/view/institution/priselecturer/mercreate.php
@@ -0,0 +1,206 @@
+
+
+
+ {include file="public/head"}
+
+
+
+
+
+
+
+
+ 搜索条件
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.field}}
+
+
+
+ {{item.count}}
++ {{item.content}} + {{item.sum}} +
+
+
+
+
+ 课程订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 入驻
+ 平台
+
+
+
+
+ 开启
+ 关闭
+
+
+
+
+ 开启
+ 关闭
+
+
+
+
+
+ 提交
+
+
+
+
+
+
diff --git a/application/admin/view/special/lecturer/create.php b/application/admin/view/special/lecturer/create.php
index 138dc2de..b65037a8 100755
--- a/application/admin/view/special/lecturer/create.php
+++ b/application/admin/view/special/lecturer/create.php
@@ -113,7 +113,7 @@
{block name='script'}
+
+
+{/block}
+{block name='script'}
+
+{/block}
diff --git a/application/admin/view/store/store_entity_category/index.php b/application/admin/view/store/store_entity_category/index.php
new file mode 100755
index 00000000..53516ef7
--- /dev/null
+++ b/application/admin/view/store/store_entity_category/index.php
@@ -0,0 +1,224 @@
+{extend name="public/container"}
+{block name="head"}
+
+{/block}
+{block name="content"}
+
+
+
+{/block}
+{block name="script"}
+
+{/block}
diff --git a/application/common.php b/application/common.php
index 94fe1ab2..30379ff0 100755
--- a/application/common.php
+++ b/application/common.php
@@ -242,3 +242,23 @@ function getversion()
}
return $version_arr;
}
+
+/**
+ * 数据多层级
+ * @param array $data
+ * @param int $pid
+ * @return array
+ */
+function subTree(array $data, int $pid = 0) {
+ // 返回的结果
+ $arr = [];
+ foreach ($data as $val) {
+ // 给定的PID是当前记录的上级ID
+ if ($pid == $val['pid']) {
+ // 递归
+ $val['children'] = subTree($data,$val['id']);
+ $arr[] = $val;
+ }
+ }
+ return $arr;
+}
diff --git a/application/wap/controller/Clearance.php b/application/wap/controller/Clearance.php
new file mode 100644
index 00000000..2dcf9317
--- /dev/null
+++ b/application/wap/controller/Clearance.php
@@ -0,0 +1,269 @@
+where('status',1)->order('sort DESC,id desc')->select();
+ //刷题
+ $brush_questions = ClearanceModel::where('type',2)->where('status',1)->order('sort DESC,id desc')->select();
+ $activity = EventRegistration::eventRegistrationList(1, 4, $city, $subject_id, 0);
+ $uid = $this->uid;
+ $where = [
+ 'grade_id' => 1,
+ 'subject_id' => $subject_id,
+ 'search' => '',
+ 'page' => 1,
+ 'limit' => 4,
+ 'type' => 0,
+ 'special_type' => 3,
+ 'is_member' => 0,
+ 'uid' => $uid,
+ ];
+ $video = SpecialModel::getSpecialList($where);
+ $where['special_type'] = 4;
+ $live = SpecialModel::getSpecialList($where);
+
+
+
+ $sql = "SELECT rank,days FROM (SELECT @rank:=@rank+1 as rank, user_id, days,cate_id FROM tc_user_clearance, (SELECT @rank:=0) r ORDER BY days DESC ) t WHERE user_id = ".$uid ." and cate_id = ".$subject_id;
+ $userClearance = Db::query($sql);
+
+ $sql = "SELECT rank,recite_num FROM (SELECT @rank:=@rank+1 as rank, user_id, recite_num,cate_id FROM tc_user_clearance, (SELECT @rank:=0) r ORDER BY recite_num DESC ) t WHERE user_id = ".$uid ." and cate_id = ".$subject_id;
+ $userClearance1 = Db::query($sql);
+
+ $sql = "SELECT rank,accuracy FROM (SELECT @rank:=@rank+1 as rank, user_id, accuracy,cate_id FROM tc_user_clearance, (SELECT @rank:=0) r ORDER BY accuracy DESC ) t WHERE user_id = ".$uid ." and cate_id = ".$subject_id;
+ $userClearance2 = Db::query($sql);
+
+ //用户进入学习中心展示哪个科目问题处理
+ if (!$subject_id) {
+ $userStudy = UserStudy::where('user_id', $this->uid)->find();
+ if ($userStudy) {
+ $subject_id = $userStudy['cate_id'];
+ } else {
+ $specialSubject = SpecialSubject::where('is_show', 1)->where('is_del', 0)->find();
+ $subject_id = $specialSubject['id'];
+ }
+ }
+ $specialSubject = SpecialSubject::where('id', $subject_id)->find();
+ $test_paper = TestPaper::where('id',$specialSubject['exam_id'])->field('id,title as name')->select();
+ // var_dump($res);
+ // var_dump($userClearance);
+ // exit();
+ $date = date("Y-m-d");
+ $recite_num = UserClearanceDetail::where('user_id', $this->uid)->where('type', 1)->group('section_id')->count();
+ $brush_question_num = UserClearanceDetail::where('user_id', $this->uid)->where('type', 2)->group('item_id')->count();
+
+ $total_num = $specialSubject['recite_num'] + $specialSubject['brush_question_num'];
+ return JsonService::successful('ok', [
+ 'exam' => [
+ 'grade_id' => $specialSubject['grade_id'],
+ 'subject_id' => $subject_id,
+ 'name' => $specialSubject['name'],
+ 'date' => date("Y-m-d", $specialSubject['exam_time'] ?? 0),
+ 'distance_exam_day' => ceil((($specialSubject['exam_time'] ?? 0) - time()) / 86400),
+ ],
+ 'user_study' => [
+ 'days' => $userClearance[0]['days'] ?? 0,
+ 'rank' => $userClearance[0]['rank'] ?? 0,
+ ],
+ 'user_recite' => [
+ 'points' => $userClearance1[0]['recite_num'] ?? 0,
+ 'rank' => $userClearance1[0]['rank'] ?? 0,
+ ],
+ 'user_brush_questions' => [
+ 'accuracy' => ($userClearance2[0]['accuracy'] ?? 0)."%",
+ 'rank' => $userClearance2[0]['rank'] ?? 0,
+ ],
+ 'user_clock_in' => [
+ 'progress' => $total_num ? round(($recite_num + $brush_question_num) / $total_num ) : 0,
+ 'list' => $this->dealClockInRecord("", 1, 2),
+ ],
+ 'exam_list' => $test_paper,
+ 'banner' => GroupDataService::getData('mxtk_banner') ?: [],
+ 'recite' => $recite,
+ 'brush_questions' => $brush_questions,
+ 'video' => $video,
+ 'live' => $live,
+ 'offline_courses' => $activity,
+ ]);
+ }
+ /**
+ * 背诵过关
+ * [clearanceSubject description]
+ * @return [type] [description]
+ */
+ public function clearanceSubject($recite_id = 0){
+ $recite_subject_list = ClearanceSubject::where('status',1)->where('recite_id',$recite_id)->order('sort DESC,id desc')->select();
+ return JsonService::successful('ok', $recite_subject_list);
+ }
+ /**
+ * 背诵章节
+ * [clearanceSubjectChapter description]
+ * @param integer $recite_subject_id [description]
+ * @return [type] [description]
+ */
+ public function clearanceSubjectChapter($recite_subject_id = 0){
+ $chapters = ClearanceSubjectChapter::where('status',1)->where('recite_subject_id',$recite_subject_id)->order('sort DESC,id desc')->select();
+ $chapters = subTree($chapters->toArray());
+ return JsonService::successful('ok', $chapters);
+ }
+ /**
+ * 背诵接口
+ * [recite description]
+ * @param integer $chapter_id [description]
+ * @param integer $section_id [description]
+ * @return [type] [description]
+ */
+ public function recite($chapter_id = 0, $section_id = 0){
+ //var_dump($this->uid);exit();
+ $info = ClearanceSubjectChapter::where('id', $section_id)->where('pid', $chapter_id)->find();
+ if (!$info) {
+ return JsonService::fail('背诵内容不存在');
+ }
+ $recite_subject = ClearanceSubject::where('id', $info['recite_subject_id'])->find();
+ if (!$recite_subject) {
+ return JsonService::fail('背诵内容不存在');
+ }
+ $recite = ClearanceModel::where('id', $recite_subject['recite_id'])->find();
+ if (!$recite) {
+ return JsonService::fail('背诵内容不存在');
+ }
+
+ ClearanceService::clockIn($this->uid, $recite['subject_id'], 1, $recite['id'], $recite_subject['id'], $chapter_id, $section_id);
+
+ return JsonService::successful('ok');
+ }
+
+
+ protected function dealClockInRecord($date = "", $page = 1, $limit = 10){
+ $date = $date ? $date : date("Y-m-d");
+ $list = UserClearanceDetail::where('user_id', $this->uid)->where('date', $date)->order("id desc")->page($page, $limit)->select();
+ foreach ($list as &$value) {
+ if ($value['type'] == 1) {
+ $chapter = ClearanceSubjectChapter::where('id',$value['chapter_id'])->find();
+ $section = ClearanceSubjectChapter::where('id',$value['section_id'])->find();
+ $value['name'] = ($chapter['name'] ?? "")." ".($section['name'] ?? "");
+ } else {
+ $test_paper = TestPaper::where('id',$value['item_id'])->field('id,title as name')->find();
+ $value['name'] = $test_paper['name'] ?? "";
+ $hour = round($value['use_time'] / 3600);
+ $result = $value['use_time'] % 3600;
+ $minute = round($result / 60);
+ $value['use_time'] = $hour."小时".$minute."分";
+ }
+ }
+ return $list;
+ }
+
+ public function getMonthRecord($month){
+ $start_time = strtotime("{$month}-01"); // 月份的开始时间
+ $end_time = strtotime("+1 month", $start_time) - 1; // 月份的结束时间
+
+ $list = UserClearanceDetail::where('user_id', $this->uid)->where('add_time', ">=", $start_time)->where('add_time', "<=", $end_time)->field('date')->group('date')->select();
+ return JsonService::successful('ok', $list);
+ }
+ /**
+ * 用户打卡记录
+ * [clockInRecord description]
+ * @return [type] [description]
+ */
+ public function clockInRecord($date = "", $page = 1, $limit = 10){
+
+
+ $list = $this->dealClockInRecord($date, $page, $limit);
+ return JsonService::successful('ok', $list);
+ }
+ /**
+ * 学习项目切换
+ * [study description]
+ * @param integer $cate_id [description]
+ * @return [type] [description]
+ */
+ public function study($subject_id = 0){
+
+ $info = UserStudy::where('user_id', $this->uid)->find();
+ if ($info) {
+ UserStudy::where('id', $info['id'])->update(['cate_id' => $subject_id, 'update_time' => time()]);
+ return JsonService::successful('ok');
+ }
+ UserStudy::create(['user_id' => $this->uid, 'cate_id' => $subject_id, 'add_time' => time(), 'update_time' => time()]);
+ return JsonService::successful('ok');
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/application/wap/controller/Index.php b/application/wap/controller/Index.php
index b1056e1b..ab7810aa 100755
--- a/application/wap/controller/Index.php
+++ b/application/wap/controller/Index.php
@@ -22,6 +22,7 @@ use app\wap\model\special\SpecialSubject;
use app\wap\model\user\PhoneUser;
use app\wap\model\user\User;
use app\wap\model\wap\Search;
+use app\wap\model\wap\City;
use service\GroupDataService;
use service\JsonService;
use service\SystemConfigService;
@@ -34,7 +35,6 @@ use think\Cookie;
use think\Url;
use think\Db;
use service\JwtService;
-
/**首页控制器
* Class Index
* @package app\wap\controller
@@ -65,10 +65,32 @@ class Index extends AuthController
'qcode_login',
'get_search_history',
'agreeMa',
- 'index_data'
+ 'index_data',
+ 'city_list',
];
}
-
+ /**
+ * @return mixed
+ */
+ public function city_list($search = "")
+ {
+
+ $model = City::where('status', 1);
+ if ($search) {
+ $model = $model->where('name|first_letter', 'like', "%$search%");
+ }
+ $city_list = $model->select();
+ $hotList = [];
+ $list = [];
+ foreach ($city_list as $seq => &$item) {
+ if ($item['is_hot'] == 1) {
+ $hotList[] = $item;
+ }
+ $list[$item['first_letter']][] = $item;
+ }
+ $result = ['hotList'=>$hotList, "cityList"=>$list];
+ return JsonService::successful($result);
+ }
/**
* @return mixed
*/
@@ -136,14 +158,14 @@ class Index extends AuthController
//获取推荐列表
$exists_recommend_reids = false;
$this->redisModel->HEXISTS($this->subjectUrl . "wap_index_has", "recommend_list");
- if (!$exists_recommend_reids) {
+ //if (!$exists_recommend_reids) {
$is_member = isset($this->userInfo['level']) ? $this->userInfo['level'] : 0;
$recommend_list = json_encode(Recommend::getContentRecommend($this->uid, $is_member));
$this->redisModel->hset($this->subjectUrl . "wap_index_has", "recommend_list", $recommend_list);
$this->redisModel->expire($this->subjectUrl . "wap_index_has", 120);
- } else {
- $recommend_list = $this->redisModel->hget($this->subjectUrl . "wap_index_has", "recommend_list");
- }
+ // } else {
+ // $recommend_list = $this->redisModel->hget($this->subjectUrl . "wap_index_has", "recommend_list");
+ // }
} catch (\Exception $e) {
}
diff --git a/application/wap/controller/My.php b/application/wap/controller/My.php
index 571d5afb..c7bfe687 100755
--- a/application/wap/controller/My.php
+++ b/application/wap/controller/My.php
@@ -32,6 +32,8 @@ use app\wap\model\user\UserBill;
use app\wap\model\user\UserExtract;
use app\wap\model\user\UserAddress;
use app\wap\model\user\UserSign;
+use app\wap\model\user\Message;
+use app\wap\model\user\MessageType;
use service\CacheService;
use service\GroupDataService;
use service\JsonService;
@@ -44,7 +46,8 @@ use think\Url;
use app\wap\model\recommend\Recommend;
use app\wap\model\merchant\Merchant as MerchantModel;
use app\wap\model\institution\Institution as InstitutionModel;
-
+use app\wap\model\wap\Feedback;
+use app\wap\model\wap\Helpcenter;
/**my 控制器
* Class My
* @package app\wap\controller
@@ -62,10 +65,43 @@ class My extends AuthController
'about_us',
'getPersonalCenterMenu',
'questionModule',
- 'base_data_api'
+ 'base_data_api',
+ 'helpcenter',
];
}
-
+ /**
+ * 未读消息总数
+ * [unReadMsgNum description]
+ * @return [type] [description]
+ */
+ public function unReadMsgNum(){
+ $unReadMsgNum = Message::where('user_id', $this->uid)->where('is_read', 0)->count();
+ return JsonService::successful(['unReadMsgNum' => $unReadMsgNum]);
+ }
+ /**
+ * 消息列表
+ * [messageList description]
+ * @param integer $page [description]
+ * @param integer $limit [description]
+ * @return [type] [description]
+ */
+ public function messageList($page = 1, $limit = 10){
+ $list = Message::where('user_id', $this->uid)->page($page, $limit)->select()->toArray();
+ if (!$list) {
+ return JsonService::successful($list);
+ }
+ $message_types = array_column($list, "message_type");
+ $types = MessageType::whereIn('id', $message_types)->select()->toArray();
+ $types = array_column($types, null, "id");
+ foreach ($list as &$value) {
+ $value['message_types'] = $types[$value['message_type']] ?? [];
+ }
+ return JsonService::successful($list);
+ }
+ public function setReaded($id = 0){
+ Message::where('id', $id)->update(['is_read' => 1,'update_time' => time()]);
+ return JsonService::successful("ok");
+ }
/**
* 退出手机号码登录
*/
@@ -572,7 +608,37 @@ class My extends AuthController
'content' => get_config_content('about_us'),
]);
}
-
+ /**
+ * 帮助中心
+ * [helpcenter description]
+ * @return [type] [description]
+ */
+ public function helpcenter(){
+ $list = Helpcenter::where('status', 1)->order('sort DESC,add_time DESC')->select();
+ return JsonService::successful([
+ 'helpcenter' => $list
+ ]);
+ }
+ /**
+ * 提交反馈
+ * [addfeedback description]
+ * @return [type] [description]
+ */
+ public function addfeedback(){
+ $data = UtilService::postMore([
+ ['content', ''],
+ ], $this->request);
+ $inData = [
+ 'content' => $data['content'],
+ 'user_id' => $this->uid,
+ 'add_time' => time(),
+ ];
+ if (Feedback::create($inData)){
+ return JsonService::successful('提交成功');
+ } else {
+ return JsonService::fail('提交失败');
+ }
+ }
public function getUserGoldBill()
{
$user_info = $this->userInfo;
diff --git a/application/wap/controller/Special.php b/application/wap/controller/Special.php
index 8840a2cc..f53a974f 100755
--- a/application/wap/controller/Special.php
+++ b/application/wap/controller/Special.php
@@ -121,10 +121,25 @@ class Special extends AuthController
'data_details',
'exchange',
'question_index',
+ 'getSpecialSubject',
'special_validity'
];
}
+ /**获取分类 new
+ * @throws \think\exception\DbException
+ */
+ public function getSpecialSubject()
+ {
+ $category = SpecialSubject::with('children')->where(['is_show' => 1, 'is_del' => 0])->order('sort desc,id desc')->where('grade_id', 0)->select();
+
+ $recommend = SpecialSubject::where(['is_show' => 1, 'is_del' => 0, 'is_recommend' => 1])->where('grade_id', 'neq', 0)->order('sort desc,id desc')->select();
+ return JsonService::successful([
+ 'category_list' => $category,
+ 'recommend' => $recommend
+ ]);
+ }
+
/**获取视频上传地址和凭证
* @param string $videoId
* @param int $type
@@ -177,6 +192,7 @@ class Special extends AuthController
if ($order->total_num == $order->gift_count) return JsonService::fail('礼物已被领取完');
}
$special = SpecialModel::getOneSpecial($this->uid, $id);
+
if ($special === false) return JsonService::fail(SpecialModel::getErrorInfo('无法访问'));
$is_member = isset($this->userInfo['level']) ? $this->userInfo['level'] : 0;
if (!isset($special['special'])) $this->failed('专题信息未获得', Url::build('index/index'));
@@ -1833,10 +1849,11 @@ class Special extends AuthController
*/
public function grade_index()
{
- $category = SpecialSubject::where(['is_show' => 1, 'is_del' => 0])->order('sort desc,id desc')->where('grade_id', 1)->limit(7)->select();
+ $category = SpecialSubject::where(['is_show' => 1, 'is_del' => 0])->order('sort desc,id desc')->where('is_recommend', 1)->limit(7)->select();
$is_member = isset($this->userInfo['level']) ? $this->userInfo['level'] : 0;
$my = SpecialModel::getMyGradeList(1, 4, $this->uid, $is_member, 0);
- $offlineCourse = (new \app\wap\model\special\OfflineCourse)->order('id desc')->limit(4)->select();
+ //$offlineCourse = (new \app\wap\model\special\OfflineCourse)->order('id desc')->limit(4)->select();
+ $activity = EventRegistration::eventRegistrationList(1, 4, "", 0 ,0);
$uid = $this->uid;
$hot = SpecialModel::getSpecialList(['grade_id' => 0, 'subject_id' => 0, 'search' => '', 'page' => 1, 'limit' => 4, 'type' => 0, 'uid' => $uid, 'is_hot' => 1]);
@@ -1846,7 +1863,7 @@ class Special extends AuthController
'category_list' => $category->toArray(),
'my_course' => $my['list'],
'hot_course' => $hot,
- 'offline_courses' => $offlineCourse,
+ 'offline_courses' => $activity,
]);
}
@@ -2330,8 +2347,12 @@ class Special extends AuthController
*/
public function getOrderPrice($cartId = '', $cateNum = 1)
{
- $res = StoreCart::changeUserCartNum($cartId, $cateNum, $this->uid);
- if (!$res) return JsonService::fail('商品数量修改失败!');
+ $cartIds = explode(",", $cartId);
+ $cateNums = explode(",", $cateNum);
+ foreach ($cartIds as $seq => $value) {
+ $res = StoreCart::changeUserCartNum($value, $cateNums[$seq] ?? 1, $this->uid);
+ if (!$res) return JsonService::fail('商品数量修改失败!');
+ }
$user = $this->userInfo;
$cartGroup = StoreCart::getUserProductCartList($this->uid, $cartId, 1, $user['level']);
$vip_price_subtract = bcmul($cartGroup['valid'][0]['productInfo']['vip_price'], $cateNum, 2);
diff --git a/application/wap/controller/Topic.php b/application/wap/controller/Topic.php
index 2fa33b90..01532f6e 100755
--- a/application/wap/controller/Topic.php
+++ b/application/wap/controller/Topic.php
@@ -523,21 +523,26 @@ class Topic extends AuthController
*/
public function specialTestPaper()
{
- list($special_id, $type) = UtilService::PostMore([
+ list($special_id, $type, $relationship) = UtilService::PostMore([
['special_id', 0],
- ['type', 1],
+ ['type', 1],//试卷类型 1练习2考试
+ ['relationship', 1],
], $this->request, true);
if (!$special_id) return JsonService::fail('缺少参数,无法访问');
$data = [];
switch ($type) {
case 1:
- $relationship = 1;
+ $relationship1 = 1;
break;
case 2:
- $relationship = 2;
+ $relationship1 = 2;
break;
}
- $test_ids = Relation::setWhere($relationship, $special_id)->column('relation_id');
+ //兼容刷题过关的试卷
+ if ($relationship > 2) {
+ $relationship1 = $relationship;
+ }
+ $test_ids = Relation::setWhere($relationship1, $special_id)->column('relation_id');
if (count($test_ids)) {
$data = TestPaper::PreExercisesWhere()->where('type', $type)->where('id', 'in', $test_ids)->order('sort desc,id desc')->select();
$data = count($data) > 0 ? $data->toArray() : [];
diff --git a/application/wap/model/activity/EventRegistration.php b/application/wap/model/activity/EventRegistration.php
index 91ab5c90..6a4c2d1a 100755
--- a/application/wap/model/activity/EventRegistration.php
+++ b/application/wap/model/activity/EventRegistration.php
@@ -28,15 +28,36 @@ class EventRegistration extends ModelBasic
* @param int $limit
* @return array
*/
- public static function eventRegistrationList($page = 1, $limit = 10)
+ public static function eventRegistrationList($page = 1, $limit = 10, $city = "", $subject_id = 0, $type = "")
{
- $list = self::PreWhere()->order('sort DESC,add_time DESC')->page((int)$page, (int)$limit)->select();
+ $where = [];
+ if ($city) {
+ $where['city'] = ['like',"%".$city."%"];
+ }
+ if ($subject_id) {
+ $where['subject_id'] = $subject_id;
+ }
+ if ($type !== "") {
+ $where['type'] = $type;
+ }
+ $list = self::PreWhere()->where($where)->order('sort DESC,add_time DESC')->page((int)$page, (int)$limit)->select();
$list = count($list) > 0 ? $list->toArray() : [];
foreach ($list as &$v) {
$v = self::singleActivity($v);
$start_time = date('y/m/d H:i', $v['start_time']);
$end_time = date('y/m/d H:i', $v['end_time']);
$v['time'] = $start_time . '~' . $end_time;
+ $v['baoming'] = $start_time . '~' . $end_time;
+ $v['start'] = date('y/m/d H:i', $v['signup_start_time']) . '~' . date('y/m/d H:i', $v['signup_end_time']);
+ $activity_status = 0;
+ if ($v['start_time'] < time()) {
+ $activity_status = 0;
+ } elseif ($v['start_time'] > time() && $v['end_time'] > time()) {
+ $activity_status = 1;
+ } elseif ($v['end_time'] < time()) {
+ $activity_status = 2;
+ }
+ $v['activity_status'] = $activity_status;
$v['count'] = EventSignUp::signUpCount($v['id']);
}
return $list;
diff --git a/application/wap/model/institution/InstitutionFollow.php b/application/wap/model/institution/InstitutionFollow.php
index 88fdadbc..b9c34d15 100755
--- a/application/wap/model/institution/InstitutionFollow.php
+++ b/application/wap/model/institution/InstitutionFollow.php
@@ -53,7 +53,7 @@ class InstitutionFollow extends ModelBasic
$data = self::alias('f')->where(['f.uid' => $uid, 'f.is_follow' => 1,'l.is_show' => 1, 'l.is_del' => 0])
->join('Lecturer l', 'f.mer_id=l.mer_id')
->where('l.mer_id','>',0)->page((int)$page, (int)$limit)
- ->order('f.follow_time desc')->field('f.uid,f.mer_id,f.is_follow,l.id,l.mer_id,l.is_show,l.is_del,l.lecturer_name,l.lecturer_head,l.label,l.introduction,l.study,l.curriculum')
+ ->order('f.follow_time desc')->field('f.uid,f.mer_id,f.is_follow,l.id,l.mer_id,l.is_show,l.is_del,l.lecturer_name,l.lecturer_head,l.label,l.introduction,l.study,l.curriculum,l.explain')
->select();
$data = count($data) > 0 ? $data->toArray() : [];
return $data;
diff --git a/application/wap/model/merchant/MerchantFollow.php b/application/wap/model/merchant/MerchantFollow.php
index 7d9ae82e..883069a0 100755
--- a/application/wap/model/merchant/MerchantFollow.php
+++ b/application/wap/model/merchant/MerchantFollow.php
@@ -53,7 +53,7 @@ class MerchantFollow extends ModelBasic
$data = self::alias('f')->where(['f.uid' => $uid, 'f.is_follow' => 1,'l.is_show' => 1, 'l.is_del' => 0])
->join('Lecturer l', 'f.mer_id=l.mer_id')
->where('l.mer_id','>',0)->page((int)$page, (int)$limit)
- ->order('f.follow_time desc')->field('f.uid,f.mer_id,f.is_follow,l.id,l.mer_id,l.is_show,l.is_del,l.lecturer_name,l.lecturer_head,l.label,l.introduction,l.study,l.curriculum')
+ ->order('f.follow_time desc')->field('f.uid,f.mer_id,f.is_follow,l.id,l.mer_id,l.is_show,l.is_del,l.lecturer_name,l.lecturer_head,l.label,l.introduction,l.study,l.curriculum,l.explain')
->select();
$data = count($data) > 0 ? $data->toArray() : [];
return $data;
diff --git a/application/wap/model/store/StoreCart.php b/application/wap/model/store/StoreCart.php
index 849e45d0..fea33845 100755
--- a/application/wap/model/store/StoreCart.php
+++ b/application/wap/model/store/StoreCart.php
@@ -82,7 +82,7 @@ class StoreCart extends ModelBasic
*/
public static function removeUserCart($uid, $ids)
{
- return self::where('uid', $uid)->where('id', 'IN', $ids)->update(['is_del' => 1]);
+ return self::where('uid', $uid)->where('id', 'IN', explode(",", $ids))->update(['is_del' => 1]);
}
/**获取购物车数量
diff --git a/application/wap/model/topic/ExaminationRecord.php b/application/wap/model/topic/ExaminationRecord.php
index 198fce4e..178d89c4 100755
--- a/application/wap/model/topic/ExaminationRecord.php
+++ b/application/wap/model/topic/ExaminationRecord.php
@@ -18,6 +18,9 @@ use app\wap\model\topic\ExaminationWrongBank;
use app\wap\model\topic\TestPaper;
use app\wap\model\topic\TestPaperObtain;
use app\admin\model\questions\TestPaperScoreGrade;
+use app\wap\model\wap\Clearance;
+
+use service\ClearanceService;
/**
* 用户考试记录 Model
@@ -76,10 +79,18 @@ class ExaminationRecord extends ModelBasic
$array['yes_questions'] = $yes_questions;
$array['wrong_question'] = $wrong_question;
$array['is_submit'] = 1;
+ $array['end_time'] = time();
$array['duration'] = $data['duration'];
$array['score'] = ExaminationTestRecord::where(['e_id' => $record['id'], 'type' => $record['type'], 'is_correct' => 2])->sum('score');
$array['grade'] = TestPaperScoreGrade::getTestPaperScoreGrade($record['test_id'], $array['score']);
$res = self::edit($array, $record['id']);
+ //记录打卡记录
+ $clearance = Clearance::where('id', $data['special_id'] ?? 0)->find();
+ if ($clearance) {
+ ClearanceService::clockIn($uid, $clearance['subject_id'], 2, $clearance['id'], $data['examination_id'], 0, 0, $array['score'], $array['accuracy'], $array['end_time'] - $record['start_time']);
+ }
+
+
if (!$res) return self::setErrorInfo('记录修改错误!');
$res1 = ExaminationWrongBank::addWrongBank($record['id'], $record['test_id'], $record['type'], $uid);
$res2 = TestPaper::PreExercisesWhere()->where(['id' => $record['test_id']])->setInc('answer');
diff --git a/application/wap/model/user/Message.php b/application/wap/model/user/Message.php
new file mode 100644
index 00000000..9287debd
--- /dev/null
+++ b/application/wap/model/user/Message.php
@@ -0,0 +1,26 @@
+where("CONCAT(',',cid,',') LIKE '%,$cid,%'", 'exp');
+ return $model->field($field)->where('status', 1)->where('hide', 0)->order('sort DESC,add_time DESC')->limit($first, $limit)->select();
+ }
+}
diff --git a/application/wap/model/wap/Helpcenter.php b/application/wap/model/wap/Helpcenter.php
new file mode 100644
index 00000000..4c10d99b
--- /dev/null
+++ b/application/wap/model/wap/Helpcenter.php
@@ -0,0 +1,33 @@
+where("CONCAT(',',cid,',') LIKE '%,$cid,%'", 'exp');
+ return $model->field($field)->where('status', 1)->where('hide', 0)->order('sort DESC,add_time DESC')->limit($first, $limit)->select();
+ }
+}
diff --git a/application/wap/model/wap/UserClearance.php b/application/wap/model/wap/UserClearance.php
new file mode 100644
index 00000000..3ca8c70e
--- /dev/null
+++ b/application/wap/model/wap/UserClearance.php
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+ 商品分类
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+