Skip to content

M
mr-julyedu
Commit 5ca713ee by xuzhenghua
Options

bug

parent 95e7986c
Showing with 148 additions and 123 deletions
src/assets/css/index.scss
...@@ -73,7 +73,8 @@ body { ...@@ -73,7 +73,8 @@ body {
line-height: 1.5; line-height: 1.5;
color: $body-color; color: $body-color;
background-color: $body-bg; background-color: $body-bg;
font-size: 0.24rem; //font-size: 0.24rem;
font-size: 12px;
padding-bottom: constant(safe-area-inset-bottom); padding-bottom: constant(safe-area-inset-bottom);
} }
...@@ -498,3 +499,16 @@ input[type="radio"]:checked:before { ...@@ -498,3 +499,16 @@ input[type="radio"]:checked:before {
color: #333333; color: #333333;
font-weight: 600; font-weight: 600;
} }
.am-modal-button-group-h{
.am-modal-button {
font-size: 15px;
}
}
.am-modal-alert-content, .am-modal-propmt-content{
color: #333;
font-size: 15px;
}
\ No newline at end of file
src/assets/font/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/common/HeaderBar/index.scss
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
text-align: center; text-align: center;
i { i {
font-size: 18px !important; font-size: 22px !important;
} }
i:nth-of-type(1) { i:nth-of-type(1) {
......
src/common/Tag/tag.scss
.tagLately, .tagHot{ .tagLately, .tagHot {
display: block; display: block;
max-width: 100%; max-width: 100%;
overflow: hidden; overflow: hidden;
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px; margin-bottom: 10px;
font-size:12px; font-size: 12px;
padding:4px 10px; padding: 4px 10px;
border-radius: 11px; border-radius: 14px;
float: left; float: left;
background-color: #F5F5F5; background-color: #F5F5F5;
line-height: 20px; line-height: 20px;
color: #666; color: #666;
} }
.tagHot{
.tagHot {
color: #333; color: #333;
} }
\ No newline at end of file
src/components/Index/index.scss
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
} }
.index-swiper { .index-swiper {
margin-top: 7px; //margin-top: 7px;
height: 168px; height: 168px;
.swiper-container { .swiper-container {
...@@ -203,6 +203,7 @@ ...@@ -203,6 +203,7 @@
width: 100px; width: 100px;
height: 72px; height: 72px;
margin-right: 8px; margin-right: 8px;
border-radius: 3px;
} }
.item-content .item-title, .item-teacher, .item-time { .item-content .item-title, .item-teacher, .item-time {
......
src/components/detail/group/index.js
import React, { Component } from 'react' import React, { Component } from 'react'
import './index.scss' import './index.scss'
import { getParam } from "@/utils" import { getParam, http } from "@/utils"
import { connect } from "react-redux" import { connect } from "react-redux"
import { Flex } from 'antd-mobile' import { Flex } from 'antd-mobile'
import {browser} from "@/utils" import {browser} from "@/utils"
...@@ -19,6 +19,7 @@ class Group extends Component { ...@@ -19,6 +19,7 @@ class Group extends Component {
countdown: props.countdown, countdown: props.countdown,
now_groupon_list: [], now_groupon_list: [],
} }
console.log(props);
} }
// 查看更多 // 查看更多
...@@ -53,63 +54,24 @@ class Group extends Component { ...@@ -53,63 +54,24 @@ class Group extends Component {
isShowMore: false, isShowMore: false,
alreadyIn: false, alreadyIn: false,
}); });
const { pdd_price, number, data } = this.state; this.props.invitedFriends();
if (browser.isWeixin) { }
let share = this.state.share;
this.setState({
share: !share,
});
let shareData = {
title: `【仅剩${number}个名额】我${pdd_price}元拼了《${data.course_title}》`,
desc: data.course_title, // 分享描述
link: location.origin + `/detail??id=${data.course_id}`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
imgUrl: data.image_name, // 分享图标
};
http.post(`${API['base-api']}/m/sale/signature`).then(res => { componentWillReceiveProps(nextProps) {
const {nonce_str, signature, timestamp} = res.data; if (nextProps.courseInfo && nextProps.courseInfo.courseInfo && nextProps.courseInfo.courseInfo.course_info && nextProps.courseInfo.courseInfo.course_info.pdd_group_info) {
wx.config({ let now_groupon_list = nextProps.courseInfo.courseInfo.course_info.pdd_group_info.now_groupon_list;
"debug": false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 if (now_groupon_list && now_groupon_list.length > 0) {
"appId": 'wx23dac6775ac82877', // 必填，公众号的唯一标识 now_groupon_list.map(item => {
"timestamp": timestamp, // 必填，生成签名的时间戳 item.end_time -= 1;
"nonceStr": nonce_str, // 必填，生成签名的随机串 return item;
"signature": signature, // 必填，签名
jsApiList: [
'hideMenuItems',
'showMenuItems',
'updateAppMessageShareData',
'updateTimelineShareData',
'onMenuShareWeibo',
'onMenuShareAppMessage',
], // 必填，需要使用的JS接口列表
});
});
wx.ready(function () { //需在用户可能点击分享按钮前就先调用
wx.hideAllNonBaseMenuItem();
wx.showMenuItems({
menuList: ['menuItem:share:appMessage', 'menuItem:share:timeline'] // 要显示的菜单项，所有menu项见附录3
}); });
wx.updateAppMessageShareData({ this.setState({
...shareData, now_groupon_list,
success: function () {
// 设置成功
}
}) })
wx.updateTimelineShareData({
...shareData,
success: function () {
// 设置成功
}
})
});
} else {
Toast.info('请在微信中使用分享功能！', 2);
} }
} }
componentWillReceiveProps(nextProps) {
this.setState({ this.setState({
countdown: nextProps.countdown, countdown: nextProps.countdown
}) })
} }
...@@ -117,7 +79,7 @@ class Group extends Component { ...@@ -117,7 +79,7 @@ class Group extends Component {
if (this.props.courseInfo && this.props.courseInfo.courseInfo && this.props.courseInfo.courseInfo.course_info && this.props.courseInfo.courseInfo.course_info.pdd_group_info) { if (this.props.courseInfo && this.props.courseInfo.courseInfo && this.props.courseInfo.courseInfo.course_info && this.props.courseInfo.courseInfo.course_info.pdd_group_info) {
let now_groupon_list = this.props.courseInfo.courseInfo.course_info.pdd_group_info.now_groupon_list; let now_groupon_list = this.props.courseInfo.courseInfo.course_info.pdd_group_info.now_groupon_list;
if (now_groupon_list && now_groupon_list.length > 0) { if (now_groupon_list && now_groupon_list.length > 0) {
setInterval(() => { // setInterval(() => {
now_groupon_list.map(item => { now_groupon_list.map(item => {
item.end_time -= 1; item.end_time -= 1;
return item; return item;
...@@ -125,7 +87,7 @@ class Group extends Component { ...@@ -125,7 +87,7 @@ class Group extends Component {
this.setState({ this.setState({
now_groupon_list, now_groupon_list,
}) })
}, 1000); // }, 1000);
} }
} }
} }
......
src/components/detail/outline/index.js
...@@ -123,7 +123,8 @@ class OutLine extends Component { ...@@ -123,7 +123,8 @@ class OutLine extends Component {
{ {
// 返现课程 是返现课程 未开课 已开课 是返现课程 未开课 已开课 已练习 // 返现课程 是返现课程 未开课 已开课 是返现课程 未开课 已开课 已练习
introduce.is_aist && (!item.is_open || introduce.is_baoming === 0) && introduce.is_aist && (!item.is_open || introduce.is_baoming === 0) &&
<i className='aist aist_close'></i>
<i className='aist iconfont iconiconfront-74'></i>
} }
</h2> </h2>
{ {
......
src/components/detail/outline/index.scss
...@@ -142,10 +142,8 @@ ...@@ -142,10 +142,8 @@
} }
.aist { .aist {
display: inline-block;
position: absolute; position: absolute;
width: 22px; line-height: 33px;
height: 22px;
right: 22px; right: 22px;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
......
src/components/detail/single/index.js
import React, {Component} from 'react' import React, { Component } from 'react'
import './index.scss' import './index.scss'
import {api, getParam, http, browser} from "@/utils"; import { getParam, http, browser } from "@/utils";
import {Toast} from 'antd-mobile'; import { Toast } from 'antd-mobile';
import {Link, withRouter} from "react-router-dom"; import { Link, withRouter } from "react-router-dom";
import {compose} from "redux"; import { compose } from "redux";
import {connect} from "react-redux"; import { connect } from "react-redux";
import {differenceInHours, differenceInMinutes, differenceInSeconds} from "date-fns"; import { differenceInHours, differenceInMinutes, differenceInSeconds } from "date-fns";
class Single extends Component { class Single extends Component {
...@@ -270,7 +270,7 @@ class Single extends Component { ...@@ -270,7 +270,7 @@ class Single extends Component {
{ {
!browser.isWeixin && !browser.isWeixin &&
<p onClick={this.check.bind(this, '1')}> <p onClick={this.check.bind(this, '1')}>
<i className='iconfont iconzhifubaox-'></i> <i className='iconfont iconalipay'></i>
<span>支付宝</span> <span>支付宝</span>
<i className={`iconfont icondanseshixintubiao-5 redio ${this.state.payType === '1' ? 'redioed' : ''}`}></i> <i className={`iconfont icondanseshixintubiao-5 redio ${this.state.payType === '1' ? 'redioed' : ''}`}></i>
</p> </p>
......
src/components/detail/single/index.scss
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
margin-top: 10px; margin-top: 10px;
position: relative; position: relative;
.iconzhifubaox- { .iconalipay {
font-size: 22px; font-size: 22px;
color: #01aaef; color: #01aaef;
} }
......
src/components/myOrders/index.scss
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
.cancel { .cancel {
color: $color_333; color: $color_333;
border: 1px solid $bg_333; border: 1px solid $bg_999;
margin-right: 15px; margin-right: 15px;
} }
......
src/components/order/order.scss
...@@ -156,7 +156,6 @@ ...@@ -156,7 +156,6 @@
.order-bar-text { .order-bar-text {
flex: 1; flex: 1;
font-weight: 500;
text-align: right; text-align: right;
color: #323233; color: #323233;
padding-right: 20px; padding-right: 20px;
...@@ -206,6 +205,11 @@ ...@@ -206,6 +205,11 @@
} }
.order-prefer { .order-prefer {
.am-list-body{
&::after{
display: none;
}
}
.am-list-content { .am-list-content {
font-size: 15px !important; font-size: 15px !important;
} }
...@@ -231,6 +235,12 @@ ...@@ -231,6 +235,12 @@
.am-list-content .iconiconfront-22.question-mark { .am-list-content .iconiconfront-22.question-mark {
font-size: 24px; font-size: 24px;
} }
.am-list-body{
&::before, &::after{
display: none;
}
}
.balance-used { .balance-used {
font-size: 24px; font-size: 24px;
color: #0099FF; color: #0099FF;
......
src/components/order/payOrder/PayOrder.scss
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
font-size: 15px; font-size: 15px;
color: #333333; color: #333333;
} }
.number { .number {
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
...@@ -21,13 +22,19 @@ ...@@ -21,13 +22,19 @@
} }
.pay-type-list { .pay-type-list {
.am-list-body {
&::after {
display: none;
}
}
.am-list-header { .am-list-header {
color: #333333; color: #333333;
font-size: 15px; font-size: 15px;
background-color: #fff; background-color: #fff;
} }
.iconzhifubaox- { .iconalipay {
font-size: 22px; font-size: 22px;
color: #01aaef; color: #01aaef;
} }
...@@ -48,6 +55,7 @@ ...@@ -48,6 +55,7 @@
border-radius: 50%; border-radius: 50%;
background-color: #c1c1c1; background-color: #c1c1c1;
} }
.am-radio-inner:after { .am-radio-inner:after {
display: block; display: block;
border-color: #fff; border-color: #fff;
...@@ -61,6 +69,7 @@ ...@@ -61,6 +69,7 @@
width: 20px; width: 20px;
height: 20px; height: 20px;
} }
.am-radio.am-radio-checked .am-radio-inner:after { .am-radio.am-radio-checked .am-radio-inner:after {
display: block; display: block;
} }
...@@ -108,7 +117,7 @@ ...@@ -108,7 +117,7 @@
background-color: #FFF; background-color: #FFF;
padding-bottom: 10px; padding-bottom: 10px;
.check-title{ .check-title {
color: #333333; color: #333333;
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
...@@ -124,6 +133,7 @@ ...@@ -124,6 +133,7 @@
.am-list-item .am-list-line .am-list-extra { .am-list-item .am-list-line .am-list-extra {
flex-basis: 16%; flex-basis: 16%;
} }
.am-radio-inner { .am-radio-inner {
width: 20px; width: 20px;
height: 20px; height: 20px;
...@@ -131,12 +141,14 @@ ...@@ -131,12 +141,14 @@
border: 1px solid #BFBFBF; border: 1px solid #BFBFBF;
background-color: #fff; background-color: #fff;
} }
.am-radio-inner:after { .am-radio-inner:after {
display: block; display: block;
border-color: #fff; border-color: #fff;
top: 0; top: 0;
right: 6px; right: 6px;
} }
.am-radio.am-radio-checked .am-radio-inner { .am-radio.am-radio-checked .am-radio-inner {
background-color: #009aff; background-color: #009aff;
border: 1px solid #FFF; border: 1px solid #FFF;
...@@ -144,6 +156,7 @@ ...@@ -144,6 +156,7 @@
width: 20px; width: 20px;
height: 20px; height: 20px;
} }
.am-radio.am-radio-checked .am-radio-inner:after { .am-radio.am-radio-checked .am-radio-inner:after {
display: block; display: block;
} }
...@@ -186,7 +199,6 @@ ...@@ -186,7 +199,6 @@
.v-list-item { .v-list-item {
padding: 10px 15px; padding: 10px 15px;
background-color: #fff; background-color: #fff;
border-bottom: 1px solid #e7eaf1;
.content { .content {
border: none; border: none;
......
src/components/purchased/index.js
...@@ -48,7 +48,7 @@ class Purchased extends Component { ...@@ -48,7 +48,7 @@ class Purchased extends Component {
const uid = user && user.data && user.data.uid const uid = user && user.data && user.data.uid
return ( return (
<div className='purchased-box'> <div className='purchased-box'>
<HeaderBar title='已购课程' cart={false} href='/my'></HeaderBar> <HeaderBar arrow={true} title='已购课程' cart={false} href='/my' />
<Loading isLoading={this.state.isLoading}> <Loading isLoading={this.state.isLoading}>
{ {
this.state.data && this.state.data.length > 0 ? this.state.data && this.state.data.length > 0 ?
......
src/components/purchased/index.scss
...@@ -4,7 +4,7 @@ html, body, #root { ...@@ -4,7 +4,7 @@ html, body, #root {
.purchased-box { .purchased-box {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: $bg_f5f5f5; //background-color: $bg_f5f5f5;
.tip { .tip {
......
src/components/search/index.js
...@@ -59,6 +59,8 @@ class Search extends PureComponent { ...@@ -59,6 +59,8 @@ class Search extends PureComponent {
/> />
<Loading isLoading={this.state.isLoading}> <Loading isLoading={this.state.isLoading}>
<div className="search-main"> <div className="search-main">
{
searchHistory.length > 0 &&
<div className="search-land"> <div className="search-land">
<div className='search-history'> <div className='search-history'>
<span>最近搜索</span> <span>最近搜索</span>
...@@ -66,7 +68,7 @@ class Search extends PureComponent { ...@@ -66,7 +68,7 @@ class Search extends PureComponent {
</div> </div>
<div className="search-tag"> <div className="search-tag">
{ {
searchHistory.length > 0 ?
searchHistory.map((v, i) => { searchHistory.map((v, i) => {
return ( return (
<Link <Link
...@@ -77,10 +79,10 @@ class Search extends PureComponent { ...@@ -77,10 +79,10 @@ class Search extends PureComponent {
</Link> </Link>
) )
}) })
: <div className={'no_search_history'} style={{textAlign: 'center', padding: '20px'}}>暂无历史</div>
} }
</div> </div>
</div> </div>
}
<div className="search-land search-hot"> <div className="search-land search-hot">
<label className={'search-history'}> <label className={'search-history'}>
<span>热门搜索</span> <span>热门搜索</span>
......
src/components/search/search-result.scss
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
color: $color_666; color: $color_666;
padding: 30px 0; padding: 30px 0;
text-align: center; text-align: center;
background-color: $bg_ccc; background-color: #f5f5f5;
} }
.status { .status {
......
src/components/search/search_header.scss
.search-head{ .search-head {
height:44px; height: 44px;
display: flex; display: flex;
background-color: #F7F9FC; background-color: #F7F9FC;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
.left{
width:44px; .left {
height:44px; width: 44px;
line-height:44px; height: 44px;
line-height: 44px;
text-align: center; text-align: center;
img{
width:14px; img {
height:14px; width: 14px;
height: 14px;
display: block; display: block;
padding:15px; padding: 15px;
} }
} }
.center{
.center {
flex: 1; flex: 1;
.am-search{
.am-search {
background-color: #F7F9FC; background-color: #F7F9FC;
.am-search-input{ .am-search-input {
background-color: #EBEFF5; background: #F0F2F6;
border-radius:44px; border-radius: 44px;
} }
} }
.am-search-start {
.am-search-input {
background: #fff;
border-radius: 44px;
} }
.right{
width:44px;
height:44px;
line-height:44px;
.am-icon-md{
padding:11px;
} }
} }
.right-btn{
width:auto; .right {
.submit-btn{ width: 44px;
height: 44px;
line-height: 44px;
.am-icon-md {
padding: 11px;
}
}
.right-btn {
width: auto;
.submit-btn {
line-height: 30px; line-height: 30px;
border:0; border: 0;
height:30px; height: 30px;
margin:7px 0px; margin: 7px 0px;
padding: 0 12px; padding: 0 12px;
margin-left:0; margin-left: 0;
border-radius:3px; border-radius: 3px;
font-size: $font_14; font-size: $font_14;
color: $color_333; color: $color_333;
} }
} }
} }
.am-search{ .am-search {
height: 43px; height: 43px;
padding: 0; padding: 0;
} }
\ No newline at end of file
src/components/shopCart/card.scss
html, body, #root { html, body, #root {
height: 100%!important; height: 100% !important;
} }
.cart-page { .cart-page {
...@@ -202,7 +202,6 @@ html, body, #root { ...@@ -202,7 +202,6 @@ html, body, #root {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-top: 1px solid #eee;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
height: 50px; height: 50px;
...@@ -252,7 +251,7 @@ html, body, #root { ...@@ -252,7 +251,7 @@ html, body, #root {
line-height: 50px; line-height: 50px;
text-align: center; text-align: center;
font-size: $font_16; font-size: $font_16;
background-color: $bg_ff3131; background-color: #999;
color: $white; color: $white;
span { span {
...@@ -262,7 +261,7 @@ html, body, #root { ...@@ -262,7 +261,7 @@ html, body, #root {
} }
div.active { div.active {
background-color: #ff5b05; background-color: #ff3131;
color: #fff; color: #fff;
} }
} }
...@@ -270,5 +269,6 @@ html, body, #root { ...@@ -270,5 +269,6 @@ html, body, #root {
.am-navbar-light { .am-navbar-light {
background-color: $bg_f7f9fc; background-color: $bg_f7f9fc;
} }
} }
src/components/study/study.scss
...@@ -36,7 +36,7 @@ html, body, #root { ...@@ -36,7 +36,7 @@ html, body, #root {
flex: 1 1 auto; flex: 1 1 auto;
overflow-y: auto; overflow-y: auto;
box-sizing: border-box; box-sizing: border-box;
background: $bg_f5f5f5; //background: $bg_f5f5f5;
} }
.active { .active {
......
src/components/video/camp/camp.scss
.camp-test-container { .camp-test-container {
height: 100vh; height: 100vh;
width: 100vw;
background-color: #F7F8F9; background-color: #F7F8F9;
.icon { .icon {
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
.camp-test-time { .camp-test-time {
span { span {
color: #111111; color: #111111;
font-size: 14px;
} }
} }
.icon-close { .icon-close {
...@@ -223,6 +225,7 @@ ...@@ -223,6 +225,7 @@
border: 1px solid #0099FF; border: 1px solid #0099FF;
color: #0099FF; color: #0099FF;
border-radius: 17px; border-radius: 17px;
font-size: 16px;
} }
.first_question { .first_question {
border: 1px solid #999999; border: 1px solid #999999;
......
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