Browse Source

fix(front): 课程样式

Go 5 years ago
parent
commit
d22dd0013c

+ 4 - 3
front/project/www/components/Item/index.js

@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
 import './index.less';
 import Assets from '@src/components/Assets';
 import { getMap, formatSeconds, formatDate } from '@src/services/Tools';
@@ -45,7 +46,7 @@ export class SingleItem extends Component {
         <div className="img" onClick={() => linkTo(`/course/detail/${data.id}`)}>
           <div className="title">
             <div className="tag">{CrowdMap[data.crowd]}</div>
-            {data.title}
+            <Link to={`/course/detail/${data.id}`} target="_blank">{data.title}</Link>
           </div>
           <div className="left">
             <span>课时数: {data.noNumber}</span>
@@ -137,12 +138,12 @@ export class PackageItem extends Component {
     const teachers = Object.keys(teacherMap);
     return (
       <div className="package-item">
-        <div className="block m-b-1" onClick={() => linkTo(`/course/package/detail/${data.id}`)}>
+        <div className="block m-b-1 c-p" onClick={() => linkTo(`/course/package/detail/${data.id}`)}>
           <div className="title t-1 m-b-5 f-w-b">
             <div hidden={!novice} className="tag f-w-d">
               新手
             </div>
-            {data.title}
+            <Link to={`/course/package/detail/${data.id}`} target="_blank">{data.title}</Link>
           </div>
           <div className="t-1 t-s-12 m-b-5">授课老师 {teachers.join(' ')}</div>
           <div className="t-1 t-s-12 m-b-2">{data.description}</div>

+ 4 - 0
front/project/www/routes/course/vs/index.less

@@ -67,6 +67,10 @@
         .right {
           padding-left: 490px;
 
+          p {
+            margin: 0;
+          }
+
           .input {
             position: relative;
             line-height: 32px;

+ 3 - 2
front/project/www/routes/course/vs/page.js

@@ -68,8 +68,8 @@ export default class extends Page {
     }
     if (!this.teacherMap[key]) {
       Course.allTeacher(item.id).then(result => {
-        this.teacherMap[key] = result.list;
-        this.setState({ teachers: result.list });
+        this.teacherMap[key] = result;
+        this.setState({ teachers: result });
       });
     }
     this.setState({ key, data: item, faqs: this.faqs, comments: this.commentMap[key], teachers: this.teacherMap[key] });
@@ -260,6 +260,7 @@ export default class extends Page {
   renderTab1() {
     const { teachers = [] } = this.state;
     const [teacher] = teachers;
+    if (!teacher) return null;
     return (
       <div className="tab-layout">
         <div className="teach-item">

+ 3 - 3
front/project/www/routes/page/cart/page.js

@@ -42,7 +42,7 @@ export default class extends Page {
   }
 
   onAll(checked) {
-    const { selectList } = this.state;
+    const { selectList = [] } = this.state;
     const { list = [] } = this.state;
     if (checked) {
       list.forEach(item => {
@@ -296,10 +296,10 @@ class OrderItem extends Component {
         <div style={{ width: 350 }} className="d-i-b t-1 t-s-16">
           {data.title}
         </div>
-        <div style={{ width: 430 }} className="d-i-b t-8 t-s-12">
+        {data.productType !== 'course_package' && <div style={{ width: 430 }} className="d-i-b t-8 t-s-12">
           <span className="m-r-2">开通有效期: {checkout.expireDays ? `${checkout.expireDays}天` : '付款后立即生效'}</span>
           <span className="m-l-2">使用有效期: {checkout.useExpireDays ? `${checkout.useExpireDays}天` : '永久'}</span>
-        </div>
+        </div>}
         <div style={{ width: 120 }} className="d-i-b t-8 t-s-12 p-r">
           {data.number > 0 && ['数量',
             <input value={data.number} style={{ width: 32 }} className="m-l-5 t-c" />,

+ 1 - 1
server/data/src/main/java/com/qxgmat/data/relation/mapping/QuestionNoRelationMapper.xml

@@ -230,7 +230,7 @@
       and ep.`id` = #{paperId,jdbcType=VARCHAR}
     </if>
     where q.`id` &gt; 0 and qn.`question_id` &gt; 0 and qn.`delete_time` = null
-    and qn.`module` = "examination" and
+    and qn.`module` = "examination"
     <if test="paperId != null">
       and ep.`id` &gt; 0
     </if>

+ 1 - 0
server/data/src/main/resources/db/migration/V1__init_table.sql

@@ -995,6 +995,7 @@ CREATE TABLE user (
   invite_code varchar(20) NOT NULL DEFAULT '' COMMENT '个人邀请码',
   total_money decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '消费金额',
   invite_number int(11) unsigned NOT NULL DEFAULT '0' COMMENT '邀请人数',
+  invite_latest_time datetime DEFAULT NULL COMMENT '最后邀请人时间',
   textbook_half int(11) unsigned NOT NULL DEFAULT '0' COMMENT '半价机经券',
   qx_cat int(11) unsigned NOT NULL DEFAULT '0' COMMENT '千行cat次数',
   register_ip varchar(255) NOT NULL DEFAULT '' COMMENT '注册ip',