Skip to content

M
mr-julyedu
Commit b67778bc by xuzhenghua
Options

vip

parent a5fe57c6
Showing with 410 additions and 4 deletions
build/service-worker.js
......@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
"/precache-manifest.946cdc08b791b0ff52481b1e527b4359.js"
"/precache-manifest.51fbac38d5a876006a8801b296fb3bae.js"
);
workbox.clientsClaim();
......@@ -30,5 +30,5 @@ workbox.precaching.precacheAndRoute(self.__precacheManifest, {});
workbox.routing.registerNavigationRoute("/index.html", {
blacklist: [/^\/_/,/\/[^\/]+\.[^\/]+$/],
blacklist: [/^\/_/,/\/[^/]+\.[^/]+$/],
});
src/App.js
......@@ -166,7 +166,7 @@ class App extends Component {
return
}
http.get(`${API['home']}/m/wx_loginInfo/code/${code}?redirect=${encodeURIComponent(window.location.href)}`)
http.get(`${API["passport-api"]}/m/wx_loginInfo/code/${code}?redirect=${encodeURIComponent(window.location.href)}`)
.then(res => {
let data = res.data
if (data.errno == 200) {
......
src/components/activity/newyear-2019/myTreasure/index.js
......@@ -51,6 +51,8 @@ class MyTreasure extends Component {
const {userInfo} = nextProp
if (!userInfo.uid) {
history.push('/passport')
}else {
this.fetchMyTreasure();
}
}
......
src/components/vip/index.scss 0 → 100755
.new-vip {
.banner {
width: 100%;
height: 240px;
img {
width: 100%;
height: 100%;
}
}
.notice {
width: 375px;
height: 30px;
line-height: 30px;
background-color: #FFE670;
display: flex;
justify-content: space-between;
padding: 0 10px 0 15px;
font-size: 12px;
.tip {
img {
width: 15px;
height: 14px;
vertical-align: text-top;
}
span {
color: #0B060C;
display: inline-block;
margin-left: 9px;
}
}
.time {
color: #FF0002;
}
}
.privilege-box {
width: 100%;
padding: 30px 10px 60px 10px;
background-color: #FECD3C;
.privilege-name {
width: 190px;
height: 30px;
line-height: 30px;
background: linear-gradient(0deg, #E83B47 0%, #E95E32 100%);
box-shadow: 0 1px 5px 0 rgba(232, 60, 70, 0.4);
border-radius: 15px;
font-weight: 500;
font-size: 18px;
color: #fff;
text-align: center;
margin: 0 auto 20px auto;
}
.privilege-content {
background-color: #fff;
padding: 20px 12px 20px 12px;
box-shadow: 1px 2px 6px 0 rgba(232, 60, 70, 0.3);
border-radius: 6px;
margin-bottom: 15px;
.privilege-title {
width: 100%;
text-align: center;
color: #26402F;
font-size: 16px;
margin-bottom: 15px;
img {
vertical-align: text-bottom;
width: 18px;
height: 16px;
}
span {
display: inline-block;
margin-left: 10px;
border-bottom: 4px solid rgba(232, 60, 70, .8);
border-radius: 1px;
height: 20px;
}
}
.privilege-list {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
.course-box {
display: block;
width: 160px;
height: 115px;
margin-bottom: 10px;
img {
width: 100%;
height: 100%;
border-radius: 2px;
}
}
}
.privilege-list-row {
.privilege-list-gpu {
img {
width: 330px;
height: 150px;
border-radius: 3px;
margin-bottom: 10px;
}
img:last-child {
margin-bottom: 0;
}
}
.privilege-list-tip {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
margin-bottom: 10px;
.privilege-tip-item {
font-size: 12px;
color: #333;
width: 50%;
text-align: left;
span {
display: inline-block;
width: 16px;
height: 16px;
text-align: center;
line-height: 15px;
background: rgba(255, 104, 38, 1);
border: 1px solid rgba(255, 104, 38, 1);
border-radius: 50%;
font-size: 14px;
color: #ffff;
margin-top: 10px;
margin-right: 5px;
}
}
.privilege-tip-item:nth-of-type(even) {
width: 45%;
}
}
}
.privilege-teacher {
width: 100%;
text-align: center;
font-size: 12px;
color: #E83C46;
margin-top: -8px;
}
.teacher-list {
width: 100%;
padding: 0 10px;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
.teacher-item {
width: 70px;
text-align: center;
font-size: 12px;
margin-top: 15px;
img {
width: 55px;
height: 55px;
border-radius: 50%;
}
span {
display: block;
color: #26402F;
}
}
}
.privilege-test {
width: 100%;
margin-top: -8px;
img {
width: 165px;
height: 270px;
border-radius: 2px;
}
}
}
}
.tobuy {
width: 100%;
height: 50px;
line-height: 50px;
text-align: center;
background: rgba(255, 230, 112, 1);
box-shadow: 0px -2px 4px 0px rgba(224, 179, 48, 0.28);
font-size: 18px;
color: #FF4400;
position: fixed;
bottom: 0;
}
.connect {
position: absolute;
width: 10px;
text-align: center;
margin-top: -43px;
span {
display: block;
position: relative;
z-index: 1;
}
.top {
top: 5px;
}
.bottom {
top: -5px;
z-index: auto;
}
.top, .bottom {
width: 10px;
height: 10px;
background: rgba(246, 206, 90, 1);
border-radius: 50%;
}
.con {
width: 4px;
height: 47px;
background: rgba(255, 255, 255, 1);
box-shadow: 0 1px 3px 0 rgba(232, 60, 70, 0.4), 0px 1px 2px 0px rgba(246, 206, 90, 0.5);
border-radius: 1px;
margin: auto;
}
}
.left {
left: 20px;
}
.right {
right: 20px;
}
.checkout-mbc {
position: fixed;
background: rgba(0, 0, 0, 0.6);
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 1;
}
.checkout-box {
width: 100%;
border-radius: 10px 10px 0 0;
background-color: #fff;
position: fixed;
bottom: 0;
padding: 20px 15px;
z-index: 2;
.title {
color: #2B2B2B;
font-size: 18px;
text-align: center;
.close {
float: right;
color: #26402F;
}
}
.checkout-list {
margin-top: 15px;
width: 100%;
height: 44px;
line-height: 44px;
border-radius: 5px;
padding-left: 15px;
display: flex;
justify-content: space-between;
position: relative;
.type {
color: #26402F;
font-size: 16px;
}
.center {
display: flex;
width: 55%;
text-align: left;
}
.discounts-reason {
width: 60px;
height: 18px;
text-align: center;
line-height: 18px;
margin-top: 12px;
background: linear-gradient(90deg, rgba(255, 68, 0, 1) 2%, rgba(255, 0, 2, 1) 100%);
border-radius: 9px 9px 0 9px;
font-size: 12px;
color: #fff;
margin-right: 10px;
}
.price {
color: #FF0002;
font-size: 12px;
.new-price {
font-size: 22px;
}
.old-price {
display: inline-block;
margin-left: 10px;
color: #26402F;
}
}
.check-box {
width: 44px;
height: 44px;
border-left: 1px dashed #E5E5E5;
span {
width: 22px;
height: 22px;
display: block;
background-repeat: no-repeat;
background-size: contain;
margin-top: 10px;
margin-left: 10px;
}
.checked {
background-image: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/19VIP/newvip/choiced_ka%402x.png");
}
.check {
background-image: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/19VIP/newvip/choice_ka%402x.png");
}
}
}
.list-checked {
background: rgba(252, 249, 239, 1);
border: 1px solid rgba(240, 233, 197, 1);
}
.list-check {
background: #fff;
border: 1px solid rgba(229, 229, 229, 1);
}
.check-tobuy {
width: 280px;
height: 40px;
background: linear-gradient(90deg, rgba(255, 94, 0, 1) 2%, rgba(255, 0, 2, 1) 100%);
border-radius: 20px;
font-size: 18px;
color: #fff;
border: none;
position: relative;
left: 50%;
margin: 30px auto 0 -140px;
}
}
}
\ No newline at end of file
src/router/router-config.js
......@@ -35,6 +35,7 @@ const ExpandCallback = loadable(() => import('@/components/expand/callback'))
const ExpandShare = loadable(() => import('@/components/expand/share'))
const Activity = loadable(() => import(/* webpackChunkName: 'Activity' */'@/components/activity/1111/index'))
const Invite = loadable(() => import(/* webpackChunkName: 'Invite' */'@/components/activity/1111/invite'))
const NewVip = loadable(() => import(/* webpackChunkName: 'Invite' */'@/components/vip/index'))
export default [
{
path: '/',
......@@ -42,6 +43,10 @@ export default [
component: Index
},
{
path: '/vip/newvip',
component: NewVip
},
{
path: '/classify',
component: Classify
},
......@@ -239,7 +244,7 @@ export default [
path: '/year/yearIndex',
component: loadable(() => import(/* webpackChunkName: 'newyear-yearIndex' */ '@components/activity/newyear-2019/preheat/index'))
},
// 我的宝箱
{
path: '/year/yearTreasure',
......
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