Skip to content

梁建民 / h5

Go to a project
Commit d9106a28 by 施宇
Options

Merge branch 'lt_yaohaoyou' into Development 

# Conflicts:
#	src/views/common/zyDetail.vue
#	src/views/sample/sample.vue
#	view/0.js
#	view/1.js
#	view/10.js
#	view/11.js
#	view/12.js
#	view/13.js
#	view/14.js
#	view/15.js
#	view/16.js
#	view/17.js
#	view/18.js
#	view/19.js
#	view/2.js
#	view/20.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/27.js
#	view/28.js
#	view/29.js
#	view/3.js
#	view/30.js
#	view/31.js
#	view/32.js
#	view/33.js
#	view/34.js
#	view/35.js
#	view/36.js
#	view/37.js
#	view/38.js
#	view/39.js
#	view/4.js
#	view/40.js
#	view/41.js
#	view/42.js
#	view/43.js
#	view/44.js
#	view/45.js
#	view/46.js
#	view/47.js
#	view/48.js
#	view/49.js
#	view/5.js
#	view/50.js
#	view/51.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js
parents 4e636bf4 83c9301b Development
Expand all
Inline Side-by-side
Showing with 1051 additions and 67 deletions
src/App.vue
<template>
<div id="app">
<keep-alive exclude="newsDetail,pointchange,wallet,walletRetrieve,walletDetail,walletRecord,walletStatus,walletWithdraw,walletRecharge,xianhuo,lxshop,brand,brandList,sampleapply,risk,risksuccess">
<keep-alive exclude="newsDetail,pointchange,wallet,walletRetrieve,walletDetail,walletRecord,walletStatus,walletWithdraw,walletRecharge,xianhuo,lxshop,brand,brandList,sampleapply,risk,risksuccess,sample">
<router-view class="router-view"></router-view>
</keep-alive>
</div>
......
src/api/index.js
......@@ -445,7 +445,23 @@ export const apis = {
/**
* 获取banner
*/
getsamplebanner: url + '/getsamplebanner'
getsamplebanner: url + '/getsamplebanner',
/**
* 示波器页面访问数据统计
*/
invited:urlApi+'/activity/invited',
/**
* 示波器页面广告文字轮播数据
*/
rotation:urlApi+'/activity/rotation',
/**
* 示波器页面奖品信息
*/
yaoHaoYouJP:urlApi+'/activity/yaoHaoYouJP',
/**
* 示波器页面获取示波器商品id
*/
getYaoHaoYouGoodId:urlApi+'/activity/getYaoHaoYouGoodId',
}
......@@ -754,5 +770,22 @@ export const services = {
},
getsamplebanner(params){
return axios.post(apis.getsamplebanner, params)
},
oscilloscopeinvited(params){
return axios.post(apis.invited,params)
},
getBannerData(params){
return axios.post(apis.rotation,params)
},
yaoHaoYouJP(params){
return axios.post(apis.yaoHaoYouJP ,params)
},
getYaoHaoYouGoodId(params){
return axios.get(apis.getYaoHaoYouGoodId, {
params: {
...params
}
})
}
};
\ No newline at end of file
src/assets/css/oscilloscope/oscilloscope.css 0 → 100644
.oscilloscope {
padding-top: 1.067rem;
padding-bottom: 1.513rem;
}
.oscilloscope .top-users {
height: 1.067rem;
background-color: #5267ff;
font-size: 15px;
color: #fff;
position: fixed;
top: 44px;
left: 0;
right: 0;
overflow: hidden;
z-index: 2;
}
.oscilloscope .top-users ul {
position: absolute;
top: 0;
left: 0;
right: 0;
}
.oscilloscope .top-users ul.animate-ul {
top: -1.067rem;
transition: all 0.5s;
}
.oscilloscope .top-users ul li {
height: 1.067rem;
line-height: 1.067rem;
text-align: center;
}
.oscilloscope .oscilloscope-wrapper .banner-div {
height: 5.333rem;
background-color: #b0c2d4;
}
.oscilloscope .oscilloscope-wrapper .prize-div {
padding: 0.667rem 0.4rem 0;
background-color: #edf6ff;
}
.oscilloscope .oscilloscope-wrapper .prize-div .title {
margin: 0 auto;
background-repeat: no-repeat;
background-size: 100% 100%;
}
.oscilloscope .oscilloscope-wrapper .prize-div .title.title1 {
width: 7.28rem;
height: 0.827rem;
background-image: url('../../images/oscilloscope/title1.png');
margin-bottom: 0.21rem;
}
.oscilloscope .oscilloscope-wrapper .prize-div .title.title2 {
width: 6.6rem;
height: 0.84rem;
background-image: url('../../images/oscilloscope/title2.png');
margin-bottom: 0.21rem;
margin-top: 0.853rem;
}
.oscilloscope .oscilloscope-wrapper .prize-div .title.title3 {
width: 6.613rem;
height: 0.827rem;
background-image: url('../../images/oscilloscope/title3.png');
margin-bottom: 0.533rem;
margin-top: 0.853rem;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper {
background-color: #ffffff;
box-shadow: 0rem 0rem 0.24rem 0rem rgba(131, 189, 246, 0.31);
border-radius: 0.053rem;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper .prize-title {
text-align: center;
padding: 0.333rem 0 0.373rem;
font-size: 15px;
color: #333333;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper .prize-items {
text-align: center;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper .prize-items .prize-item {
margin-bottom: 1.04rem;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper .prize-items .prize-item:nth-child(even) {
margin-left: 1.773rem;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper .prize-items .prize-item .item-top {
box-sizing: border-box;
width: 2.933rem;
height: 2.187rem;
border-radius: 0.053rem;
border: solid 0.08rem #bcf3f9;
text-align: center;
line-height: 2.187rem;
position: relative;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper .prize-items .prize-item .item-top img {
width: 2.427rem;
height: 1.747rem;
margin-top: 0.12rem;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper .prize-items .prize-item .item-top .text {
display: block;
width: 0.827rem;
height: 0.827rem;
background-color: #5267ff;
border-radius: 50% 50%;
color: #fff;
text-align: center;
line-height: 0.827rem;
font-size: 18px;
position: absolute;
right: -0.28rem;
top: -0.253rem;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper .prize-items .prize-item .item-bottom {
position: relative;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper .prize-items .prize-item .item-bottom .arrow-bottom {
display: block;
width: 0;
height: 0;
border-right: 0.313rem solid transparent;
border-left: 0.313rem solid transparent;
border-top: 0.52rem solid #bcf3f9;
}
.oscilloscope .oscilloscope-wrapper .prize-div .prize-items-wrapper .prize-items .prize-item .item-bottom .num {
position: absolute;
font-size: 14px;
color: #fff;
padding: 0.1rem 0.25rem;
min-width: 2rem;
max-width: 2.5rem;
background-color: #cfa972;
border-radius: 0.053rem;
top: -0.2rem;
left: 1rem;
white-space: nowrap;
text-align: center;
box-sizing: border-box;
text-overflow: ellipsis;
overflow: hidden;
}
.oscilloscope .oscilloscope-wrapper .prize-div .reward-div {
box-shadow: 0rem 0rem 0.24rem 0rem rgba(131, 189, 246, 0.31);
border-radius: 0.053rem;
font-size: 14px;
color: #333;
padding: 0.093rem;
background-color: #fff;
}
.oscilloscope .oscilloscope-wrapper .prize-div .reward-div .reward-div-header {
padding: 0.2rem 0;
background-color: #fffbf4;
}
.oscilloscope .oscilloscope-wrapper .prize-div .reward-div .reward-div-header div {
width: 33.33%;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.oscilloscope .oscilloscope-wrapper .prize-div .reward-div .reward-datas {
padding: 0.2rem 0;
}
.oscilloscope .oscilloscope-wrapper .prize-div .reward-div .reward-datas .reward-data div {
width: 33.33%;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding: 0.387rem 0;
box-sizing: border-box;
}
.oscilloscope .oscilloscope-wrapper .prize-div .reward-div .reward-datas .reward-data div.no-data {
width: 100%;
}
.oscilloscope .oscilloscope-wrapper .prize-div .rule-datas {
font-size: 12px;
color: #333;
padding-bottom: 1.333rem;
}
.oscilloscope .oscilloscope-wrapper .prize-div .rule-datas p {
line-height: 0.801rem;
}
.oscilloscope .oscilloscope-wrapper .prize-div .rule-datas p span {
color: #3247e1;
}
.oscilloscope .oscilloscope-wrapper .footer-btns {
position: fixed;
bottom: 0;
left: 0;
right: 0;
}
.oscilloscope .oscilloscope-wrapper .footer-btns .btn {
width: 50%;
height: 1.513rem;
text-align: center;
line-height: 1.513rem;
font-size: 20px;
color: #fff;
}
.oscilloscope .oscilloscope-wrapper .footer-btns .btn.gm-btn {
background-color: #869fff;
}
.oscilloscope .oscilloscope-wrapper .footer-btns .btn.fx-btn {
background-color: #3c5fe3;
}
src/assets/css/oscilloscope/oscilloscope.less 0 → 100644
.oscilloscope {
padding-top: 1.067rem;
padding-bottom: 1.513rem;
.top-users {
height: 1.067rem;
background-color: #5267ff;
font-size: 15px;
color: #fff;
position: fixed;
top: 44px;
left: 0;
right: 0;
overflow: hidden;
z-index: 2;
ul {
position: absolute;
top: 0;
left: 0;
right: 0;
&.animate-ul{
top:-1.067rem;
transition: all 0.5s;
}
li {
height: 1.067rem;
line-height: 1.067rem;
text-align: center;
}
}
}
.oscilloscope-wrapper {
.banner-div {
height: 5.333rem;
background-color: #b0c2d4;
}
.prize-div {
padding: 0.667rem .4rem 0 ;
background-color: #edf6ff;
.title{
margin:0 auto;
&.title1{
width: 7.28rem;
height: 0.827rem;
background-image: url('../../images/oscilloscope/title1.png');
margin-bottom: .21rem;
}
&.title2{
width: 6.6rem;
height: 0.84rem;
background-image: url('../../images/oscilloscope/title2.png');
margin-bottom: .21rem;
margin-top: .853rem;
}
&.title3{
width: 6.613rem;
height: 0.827rem;
background-image: url('../../images/oscilloscope/title3.png');
margin-bottom: .533rem;
margin-top: .853rem;
}
background-repeat: no-repeat;
background-size: 100% 100%;
}
.prize-items-wrapper {
background-color: #ffffff;
box-shadow: 0rem 0rem 0.24rem 0rem rgba(131, 189, 246, 0.31);
border-radius: 0.053rem;
.prize-title {
text-align: center;
padding: 0.333rem 0 0.373rem;
font-size: 15px;
color: #333333;
}
.prize-items {
text-align: center;
.prize-item {
margin-bottom: 1.04rem;
&:nth-child(even){
margin-left: 1.773rem;
}
.item-top {
box-sizing: border-box;
width: 2.933rem;
height: 2.187rem;
border-radius: 0.053rem;
border: solid 0.08rem #bcf3f9;
text-align: center;
line-height: 2.187rem;
position: relative;
img {
width: 2.427rem;
height: 1.747rem;
margin-top: .12rem;
}
.text {
display: block;
width: 0.827rem;
height: 0.827rem;
background-color: #5267ff;
border-radius: 50% 50%;
color: #fff;
text-align: center;
line-height: 0.827rem;
font-size: 18px;
position: absolute;
right: -0.28rem;
top: -0.253rem;
}
}
.item-bottom {
position: relative;
.arrow-bottom {
display: block;
width: 0;
height: 0;
border-right: 0.313rem solid transparent;
border-left: 0.313rem solid transparent;
border-top: 0.52rem solid #bcf3f9;
}
.num{
position: absolute;
font-size: 14px;
color:#fff;
padding:.1rem .25rem;
min-width: 2rem;
max-width: 2.5rem;
background-color: #cfa972;
border-radius: 0.053rem;
top:-.2rem;
left:1rem;
white-space: nowrap;
text-align: center;
box-sizing: border-box;
text-overflow: ellipsis;
overflow: hidden;
}
}
}
}
}
.reward-div{
box-shadow: 0rem 0rem 0.24rem 0rem
rgba(131, 189, 246, 0.31);
border-radius: 0.053rem;
font-size: 14px;
color:#333;
padding:.093rem;
background-color: #fff;
.reward-div-header{
padding:.2rem 0;
background-color: #fffbf4;
div{
width:33.33%;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
.reward-datas{
padding:.2rem 0;
.reward-data{
div{
width:33.33%;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding:.387rem 0 ;
box-sizing: border-box;
&.no-data{
width:100%;
}
}
}
}
}
.rule-datas{
font-size: 12px;
color:#333;
padding-bottom: 1.333rem;
p{
line-height: 0.801rem;
span{
color:#3247e1 ;
}
}
}
}
.footer-btns{
position: fixed;
bottom: 0;
left:0;
right:0;
.btn{
width: 50%;
height:1.513rem;
text-align: center;
line-height: 1.513rem;
font-size: 20px;
color:#fff;
&.gm-btn{
background-color: #869fff;
}
&.fx-btn{
background-color: #3c5fe3;
}
}
}
}
}
\ No newline at end of file
src/assets/css/sample/sample.css
......@@ -30,6 +30,7 @@
.sample .fx_text {
color: #999;
text-align: right;
padding-top: 15px;
}
.sample .fx_text div {
padding: 0 15px 10px;
......@@ -39,7 +40,7 @@
}
.sample .nav {
position: relative;
z-index: 100;
z-index: 2;
}
.sample .nav .van-hairline--top-bottom::after {
border-width: 0 0 1px 0;
......@@ -229,6 +230,8 @@
color: #333;
transition: all 0.2s ease;
border: 1px solid transparent;
overflow: hidden;
text-overflow: ellipsis;
}
.sample .sample-search ul li dl dd.curr {
border: 1px solid #1080d0;
......
src/assets/css/sample/sample.css.map
{"version":3,"sources":["sample.less"],"names":[],"mappings":"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","file":"sample.css"}
\ No newline at end of file
{"version":3,"sources":["sample.less"],"names":[],"mappings":"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","file":"sample.css"}
\ No newline at end of file
src/assets/css/sample/sample.less
......@@ -35,7 +35,7 @@
.fx_text {
color: #999;
text-align: right;
padding-top: 15px;
div {
padding: 0 15px 10px;
}
......@@ -47,7 +47,7 @@
.nav {
position: relative;
z-index: 100;
z-index: 2;
.van-hairline--top-bottom::after {
border-width: 0 0 1px 0;
......@@ -260,6 +260,8 @@
color: #333;
transition: all 0.2s ease;
border: 1px solid transparent;
overflow: hidden;
text-overflow: ellipsis;
&.curr {
border: 1px solid #1080d0;
color: #1080d0;
......
src/assets/css/sample/sample.min.css 0 → 100644
.sample{padding-bottom:50px}.sample .ele{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.sample .banner{height:173px;width:100%}.sample .banner img{width:100%}.sample .zititle{padding:15px}.sample .zititle span{color:#333;font-size:16px}.sample .zititle font{font-size:12px;color:#999;margin-left:10px;height:20px;line-height:20px}.sample .fx_text{color:#999;text-align:right;padding-top:15px}.sample .fx_text div{padding:0 15px 10px}.sample .fx_text span{color:#ffa200}.sample .nav{position:relative;z-index:2}.sample .nav .van-hairline--top-bottom::after{border-width:0 0 1px 0}.sample .con .con-group{padding:15px;padding-bottom:0px}.sample .con .con-group .img-box{width:2.933rem;height:2.933rem}.sample .con .con-group .img-box img{width:100%;height:100%}.sample .con .con-group .cb-box{width:6rem;height:2.933rem;padding-bottom:15px}.sample .con .con-group .cb-box .title{color:#333;font-size:16px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;margin-bottom:.15rem}.sample .con .con-group .cb-box p{color:#333;font-size:12px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;height:.45rem;line-height:.45rem}.sample .con .con-group .cb-box p span{color:#666}.sample .con .con-group .cb-box .btn-wrap{margin-top:.2rem}.sample .con .con-group .cb-box .btn-wrap .btnw{width:2.133rem;height:30px;line-height:30px;border-radius:4px;font-size:13px;color:#1080d0;border:solid 1px #1080d0;text-align:center}.sample .con .con-group .cb-box .btn-wrap .btnx{width:3.5rem;height:30px;line-height:30px;border-radius:4px;background:#1080d0;color:#fff;text-align:center;cursor:pointer}@media screen and (max-width:320px){.sample .con .con-group .cb-box{width:5.8rem;height:2.933rem}.sample .con .con-group .cb-box .title{margin-bottom:.05rem}}.sample .fix-btns{position:fixed;left:0;bottom:0;right:0;height:50px;line-height:50px;color:#fff;font-size:16px;text-align:center;background:#1080d0;box-shadow:0 0 10px #000;cursor:pointer}.sample .get-user-pop .get-user-con{background:#fff;width:8.667rem;height:5.52rem;border-radius:3px;position:fixed;top:50%;left:50%;margin-left:-4.3335rem;margin-top:-2.76rem;box-shadow:0 0 20px #e5e5e5;z-index:99999}.sample .get-user-pop .get-user-con h3{color:#ffa200;font-size:16px;height:2.027rem;line-height:2.027rem;text-align:center}.sample .get-user-pop .get-user-con h3 i{position:relative;float:right;top:-1.4rem;color:#fff;font-size:20px}.sample .get-user-pop .get-user-con h2{color:#000;font-size:14px;text-align:center;width:60%;margin:0 auto}.sample .get-user-pop .get-user-con span{display:block;cursor:pointer;height:30px;line-height:30px;width:150px;text-align:center;background:#1080d0;color:#fff;font-size:14px;border-radius:30px;margin:0 auto;margin-top:50px}.sample .get-user-pop .mask{position:fixed;bottom:0;top:0;left:0;right:0;background:rgba(0,0,0,0.3);z-index:999}.sample .sample-search{position:absolute;top:46px;left:0;right:0;width:100%;background:#fff;z-index:101}.sample .sample-search .mask{position:fixed;bottom:0;left:0;right:0;background:rgba(0,0,0,0.3);z-index:999}.sample .sample-search ul{background:#fff;padding-bottom:3px;height:200px;overflow-x:hidden;overflow-y:auto}.sample .sample-search ul li .tit{color:#333;font-size:16px;font-weight:700;padding:.4rem 0 .4rem .2rem;height:.53333rem;line-height:.53333rem}.sample .sample-search ul li dl{display:flex;flex-wrap:wrap}.sample .sample-search ul li dl dd{flex:0 0 50%;text-align:center;height:32px;line-height:32px;font-size:14px;color:#333;transition:all .2s ease;border:1px solid transparent;overflow:hidden;text-overflow:ellipsis}.sample .sample-search ul li dl dd.curr{border:1px solid #1080d0;color:#1080d0}.sample .sample-search .button{border-top:1px solid #d6d7dc;height:40px;line-height:40px;background:#fff;-webkit-box-shadow:0 2px 5px #eee;box-shadow:0 2px 5px #eee;display:flex;flex-direction:row;justify-content:space-around}.sample .sample-search .button a{width:50%;font-size:14px;height:39px;line-height:39px;display:block;text-align:center}.sample .sample-search .button a.cancel{color:#333;border-radius:5px}.sample .sample-search .button a.confirm{background:#1080d0;color:#fff;text-decoration:none;border:none}
\ No newline at end of file
src/assets/css/sample/sampleapply.css
......@@ -122,7 +122,6 @@
color: #999;
}
.sample-apply .form-info .form-group.by {
padding-top: 25px;
padding-bottom: 25px;
}
.sample-apply .form-info .form-group.adderss-sample {
......@@ -143,6 +142,17 @@
position: relative;
top: -0.8rem;
}
.sample-apply .form-info .form-group .txt span {
color: #ffa200;
font-size: 14px;
padding: 10px 0 0 0;
display: inline-block;
}
.sample-apply .form-info .form-group .txt p {
color: #666;
font-size: 14px;
margin-bottom: 9px;
}
.sample-apply .fix-btns {
position: fixed;
left: 0;
......
src/assets/css/sample/sampleapply.css.map
{"version":3,"sources":["sampleapply.less"],"names":[],"mappings":"AAAA;EACE,oBAAA;;AADF,aAGE;EACE,uBAAA;EACA,gBAAA;EACA,mBAAA;;AANJ,aASE;EACE,WAAA;EACA,mBAAA;;AAXJ,aAcE;EACE,gBAAA;EACA,mBAAA;;AAhBJ,aAmBE;EACE,eAAA;;AApBJ,aAuBE,UACE;EACE,yBAAA;EACA,sBAAA;EACA,WAAA;EACA,YAAA;;AA5BN,aAuBE,UACE,SAME;EACE,WAAA;EACA,YAAA;;AAhCR,aAuBE,UAaE;EACE,aAAA;EACA,YAAA;;AAtCN,aAuBE,UAaE,QAIE;EACE,WAAA;EACA,eAAA;EAtCJ,uBAAA;EACA,gBAAA;EACA,mBAAA;EAsCI,sBAAA;;AA5CR,aAuBE,UAaE,QAWE;EACE,WAAA;EACA,eAAA;EA7CJ,uBAAA;EACA,gBAAA;EACA,mBAAA;EAkDI,eAAA;EACA,oBAAA;;AAzDR,aAuBE,UAaE,QAWE,EAIE;EACE,WAAA;;AASN,mBAAqC;EAArC,aAtCF,UAuCI;IACE,aAAA;IACA,kBAAA;IACA,YAAA;;EAJJ,aAtCF,UAuCI,QAKE;IACE,mBAAA;;;AApEV,aA0EE;EACE,gBAAA;EACA,oBAAA;;AA5EJ,aA0EE,aAIE;EACE,WAAA;EACA,eAAA;EA5EF,uBAAA;EACA,gBAAA;EACA,mBAAA;EAiFE,cAAA;EACA,mBAAA;;AAxFN,aA0EE,aAIE,EAKE;EACE,WAAA;;AAMF,aAhBJ,aAIE,EAYG;EACC,gBAAA;EACA,uBAAA;EACA,mBAAA;EACA,oBAAA;EACA,qBAAA;EACA,4BAAA;EACA,YAAA;;AAjGR,aAsGE,WAEE;EACE,gBAAA;EACA,aAAA;EACA,6BAAA;;AA3GN,aAsGE,WAEE,YAKE;EACE,WAAA;EACA,eAAA;;AA/GR,aAsGE,WAEE,YAKE,GAIE,KAAI;EACF,WAAA;;AAlHV,aAsGE,WAEE,YAcE;EACE,WAAA;EACA,cAAA;EACA,kBAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;EACA,sBAAA;EACA,mBAAA;;AA9HR,aAsGE,WAEE,YAyBE;EACE,WAAA;EACA,cAAA;EACA,kBAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;EACA,sBAAA;;AAxIR,aAsGE,WAEE,YAmCE,MAAK;AA3IX,aAsGE,WAEE,YAmCoC,SAAQ;EACxC,WAAA;;AAGF,aAzCJ,WAEE,YAuCG;EACC,iBAAA;EACA,oBAAA;;AAGF,aA9CJ,WAEE,YA4CG;EACC,iBAAA;EACA,oBAAA;;AAFF,aA9CJ,WAEE,YA4CG,eAIC;EACE,WAAA;EACA,eAAA;EACA,eAAA;EACA,oBAAA;EACA,UAAA;EAzJN,uBAAA;EACA,gBAAA;EACA,mBAAA;;AA8IE,aA9CJ,WAEE,YA4CG,eAaC;EACE,kBAAA;EACA,YAAA;;AAnKV,aAyKE;EACE,eAAA;EACA,OAAA;EACA,SAAA;EACA,QAAA;EACA,YAAA;EACA,iBAAA;EACA,WAAA;EACA,eAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,eAAA;;AArLJ,aAwLE,oBACE;EACE,gBAAA;EACA,eAAA;EACA,cAAA;EACA,kBAAA;EACA,eAAA;EACA,QAAA;EACA,SAAA;EACA,uBAAA;EACA,mBAAA;EACA,4BAAA;EACA,cAAA;;AApMN,aAwLE,oBACE,cAaE;EACE,cAAA;EACA,eAAA;EACA,cAAA;EACA,mBAAA;EACA,kBAAA;;AA3MR,aAwLE,oBACE,cAaE,GAOE;EACE,kBAAA;EACA,YAAA;EACA,YAAA;EACA,WAAA;EACA,eAAA;;AAlNV,aAwLE,oBACE,cA6BE;EACE,kBAAA;EACA,eAAA;EACA,WAAA;EACA,qBAAA;;AA1NR,aAwLE,oBACE,cAoCE;EACE,WAAA;EACA,eAAA;EACA,kBAAA;EACA,UAAA;EACA,cAAA;;AAlOR,aAwLE,oBACE,cA2CE;EACE,aAAA;EACA,8BAAA;EACA,qBAAA;EACA,UAAA;;AAxOR,aAwLE,oBACE,cA2CE,KAKE;EACE,eAAA;EACA,cAAA;;AA3OV,aAwLE,oBACE,cAqDE;EACE,aAAA;EACA,8BAAA;EACA,uBAAA;EACA,UAAA;;AAlPR,aAwLE,oBACE,cAqDE,gBAKE;EACE,YAAA;EACA,eAAA;EACA,YAAA;EACA,iBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,mBAAA;;AA5PV,aAwLE,oBACE,cAqDE,gBAiBE;EACE,eAAA;EACA,YAAA;EACA,iBAAA;EACA,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;EACA,eAAA;EACA,mBAAA;;AAxQV,aAwLE,oBACE,cAoFE;EACE,WAAA;EACA,eAAA;EACA,kBAAA;EACA,gBAAA;;AAjRR,aAwLE,oBACE,cAoFE,MAME;EACE,cAAA;EACA,oBAAA;;AArRV,aAwLE,oBAkGE;EACE,eAAA;EACA,SAAA;EACA,MAAA;EACA,OAAA;EACA,QAAA;EACA,8BAAA;EACA,YAAA","file":"sampleapply.css"}
\ No newline at end of file
{"version":3,"sources":["sampleapply.less"],"names":[],"mappings":"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","file":"sampleapply.css"}
\ No newline at end of file
src/assets/css/sample/sampleapply.less
......@@ -142,7 +142,6 @@
}
&.by {
padding-top: 25px;
padding-bottom: 25px;
}
......@@ -164,6 +163,20 @@
top: -0.8rem;
}
}
.txt{
span{
color: #ffa200;
font-size: 14px;
padding:10px 0 0 0;
display: inline-block;
}
p{
color: #666;
font-size: 14px;
margin-bottom: 9px;
}
}
}
}
......
src/assets/css/sample/sampleapply.min.css 0 → 100644
.sample-apply{padding-bottom:55px}.sample-apply .ele{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.sample-apply .line{height:5px;background:#f3f3f3}.sample-apply .van-collapse-item__content{padding-top:0px;padding-bottom:0px}.sample-apply .van-cell__title{font-size:16px}.sample-apply .info-con .img-box{border:1px solid #e5e5e5;box-sizing:border-box;width:2rem;height:2rem}.sample-apply .info-con .img-box img{width:100%;height:100%}.sample-apply .info-con .cb-box{width:6.9rem;height:2rem}.sample-apply .info-con .cb-box .title{color:#333;font-size:16px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;margin-bottom:.08rem}.sample-apply .info-con .cb-box p{color:#333;font-size:12px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;height:.45rem;line-height:.45rem}.sample-apply .info-con .cb-box p span{color:#666}@media screen and (max-width:320px){.sample-apply .info-con .cb-box{width:6.8rem;position:relative;top:-0.1rem}.sample-apply .info-con .cb-box .title{margin-bottom:0rem}}.sample-apply .info-detail{margin-top:18px;padding-bottom:25px}.sample-apply .info-detail p{color:#333;font-size:12px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;height:.5rem;line-height:.5rem}.sample-apply .info-detail p span{color:#666}.sample-apply .info-detail p.canshudetail{overflow:hidden;text-overflow:ellipsis;white-space:normal;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;height:auto}.sample-apply .form-info .form-group{background:#fff;padding:15px;border-top:5px solid #f3f3f3}.sample-apply .form-info .form-group h3{color:#666;font-size:16px}.sample-apply .form-info .form-group h3 span.fr{color:#333}.sample-apply .form-info .form-group input{border:0px;display:block;padding:15px 16px;color:#333;font-size:14px;width:100%;box-sizing:border-box;padding-bottom:0px}.sample-apply .form-info .form-group textarea{border:0px;display:block;padding:15px 16px;color:#333;font-size:14px;width:100%;box-sizing:border-box}.sample-apply .form-info .form-group input::-webkit-input-placeholder,.sample-apply .form-info .form-group textarea::-webkit-input-placeholder{color:#999}.sample-apply .form-info .form-group.by{padding-bottom:25px}.sample-apply .form-info .form-group.adderss-sample{padding-top:12px;padding-bottom:12px}.sample-apply .form-info .form-group.adderss-sample p{color:#333;font-size:12px;height:.55rem;line-height:.55rem;width:90%;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.sample-apply .form-info .form-group.adderss-sample span{position:relative;top:-0.8rem}.sample-apply .form-info .form-group .txt span{color:#ffa200;font-size:14px;padding:10px 0 0 0;display:inline-block}.sample-apply .form-info .form-group .txt p{color:#666;font-size:14px;margin-bottom:9px}.sample-apply .fix-btns{position:fixed;left:0;bottom:0;right:0;height:50px;line-height:50px;color:#fff;font-size:16px;text-align:center;background:#1080d0;box-shadow:0 0 10px #000;cursor:pointer}.sample-apply .submit-success-pop .get-user-con{background:#fff;width:8.667rem;height:6.4rem;border-radius:3px;position:fixed;top:50%;left:50%;margin-left:-4.3335rem;margin-top:-3.2rem;box-shadow:0 0 20px #e5e5e5;z-index:99999}.sample-apply .submit-success-pop .get-user-con h3{color:#ffa200;font-size:16px;height:1.8rem;line-height:1.8rem;text-align:center}.sample-apply .submit-success-pop .get-user-con h3 i{position:relative;float:right;top:-1.4rem;color:#fff;font-size:20px}.sample-apply .submit-success-pop .get-user-con p{text-align:center;font-size:12px;color:#666;margin-bottom:.5rem}.sample-apply .submit-success-pop .get-user-con h2{color:#000;font-size:14px;text-align:center;width:60%;margin:0 auto}.sample-apply .submit-success-pop .get-user-con .txt{display:flex;justify-content:space-between;margin:.3rem auto 0;width:64%}.sample-apply .submit-success-pop .get-user-con .txt span{font-size:13px;color:#999999}.sample-apply .submit-success-pop .get-user-con .share-btn-wrap{display:flex;justify-content:space-between;margin:.627rem auto 0;width:83%}.sample-apply .submit-success-pop .get-user-con .share-btn-wrap .l{width:100px;cursor:pointer;height:30px;line-height:30px;border:solid 1px #0080cc;text-align:center;color:#1080d0;font-size:14px;border-radius:30px}.sample-apply .submit-success-pop .get-user-con .share-btn-wrap .r{cursor:pointer;height:30px;line-height:30px;width:150px;text-align:center;background:#1080d0;color:#fff;font-size:14px;border-radius:30px}.sample-apply .submit-success-pop .get-user-con .tips{color:#999;font-size:12px;text-align:center;margin-top:15px}.sample-apply .submit-success-pop .get-user-con .tips em{color:#cf1111;margin-right:.1rem}.sample-apply .submit-success-pop .mask{position:fixed;bottom:0;top:0;left:0;right:0;background:rgba(0,0,0,0.3);z-index:999}
\ No newline at end of file
src/assets/css/zyly/zyly.min.css
.zl_Detail *{box-sizing:border-box;font-family:"Helvetica Neue", Helvetica, sans-serif}.zl_Detail .details-head .head_top{border-bottom:1px solid #d6d7dc;padding:10px}.zl_Detail .details-head .head_top .head_top_left{width:56px}.zl_Detail .details-head .head_top .head_top_left img{display:block;width:56px;height:56px;border:1px solid #e5e5e5}.zl_Detail .details-head .head_top .head_top_right{padding-left:66px}.zl_Detail .details-head .head_top .head_top_right h4{padding-bottom:10px;font-size:18px;color:#333333}.zl_Detail .details-head .head_bottom{border-bottom:1px solid #d6d7dc;padding:5px 10px}.zl_Detail .details-head .head_bottom li{width:50%;line-height:20px;height:20px;font-size:12px;color:#999}.zl_Detail .details-head .head_bottom li b{display:block;float:left;line-height:20px;height:20px;font-weight:400}.zl_Detail .details-head .head_bottom li span{color:#333;line-height:20px;height:20px;display:block;padding:0 5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.zl_Detail .details-head .head_bottom li .f-orange{color:#ffa200;margin-left:5px}.zl_Detail .details-cont{position:absolute;top:149px;bottom:44px;width:100%;padding:10px;overflow-y:auto}.zl_Detail .details-cont .gradient{width:100%}.zl_Detail .details-cont .gradient table{width:100%;line-height:32px;font-size:12px;text-align:center;color:#666666;border:1px solid #d9d9d9}.zl_Detail .details-cont .gradient table .xs-6{width:50%}.zl_Detail .details-cont .gradient table .xs-4{width:33.33%}.zl_Detail .details-cont .gradient table .xs-3{width:25%}.zl_Detail .details-cont .gradient table th{border:1px solid #d9d9d9;font-weight:400;color:#666}.zl_Detail .details-cont .gradient table td{border:1px solid #d9d9d9;color:#333}.zl_Detail .details-cont .gradient .zkxk{font-size:12px;height:24px;line-height:24px;border:1px solid #e5e5e5;border-top:none;text-align:center;color:#666}.zl_Detail .details-cont .gradient .zkxk .icon-top{bottom:9px;position:relative;content:"";height:0;width:0;pointer-events:none;border:solid transparent;border-bottom-color:#4d4d4d;border-width:4px;margin-left:5px}.zl_Detail .details-cont .gradient .zkxk .icon-bot{top:9px;position:relative;content:"";height:0;width:0;pointer-events:none;border:solid transparent;border-top-color:#4d4d4d;border-width:4px;margin-left:5px}.zl_Detail .details-cont .price{padding-top:10px}.zl_Detail .details-cont .price .zyqhc{position:absolute;width:4.5333333333rem;height:.9333333333rem;color:#999;font-size:.2666666667rem;border:1px solid #ffa200;left:130px;line-height:.3733333333rem;padding:.0666666667rem;box-shadow:0px 0px 3px #ffd07f;border-radius:3px}.zl_Detail .details-cont .price .zyqhc .lfldiv{width:.4rem}.zl_Detail .details-cont .price .zyqhc .lfldiv font{position:relative;font-size:.2933333333rem;margin-right:.0666666667rem}.zl_Detail .details-cont .price .zyqhc .lfrdiv{width:3.8666666667rem}.zl_Detail .details-cont .price .bbiu{display:inline-block;position:absolute;border-width:6px;border-style:solid;border-color:transparent #ffa200 transparent transparent;left:118px;top:.2rem}.zl_Detail .details-cont .price .bbiu1{display:inline-block;position:absolute;border-width:6px;border-style:solid;border-color:transparent #fff transparent transparent;left:120px;top:.2rem}.zl_Detail .details-cont .price .em1{padding:0 0.5em}.zl_Detail .details-cont .price dl{font-size:12px}.zl_Detail .details-cont .price dl dt{width:5em;color:#999;float:left;line-height:30px}.zl_Detail .details-cont .price dl dd{padding-left:5em;color:#333;line-height:30px}.zl_Detail .details-cont .price dl dd.onePrice{font-size:14px}.zl_Detail .details-cont .price dl dd.totalPrice{font-weight:bold;color:red;font-size:14px}.zl_Detail .details-cont .price dl dd.tab span{display:block;float:left;margin:2px 10px 0 0;color:#333;height:23px;line-height:22px;padding:0 10px;border:1px solid #d9d9d9;border-radius:3px;background:#fff}.zl_Detail .details-cont .price dl dd.tab span.act{color:#e10601;border-color:#e10601}.zl_Detail .details-cont .price dl dd.tab span.act-blue{color:#1080d0;border-color:#1080d0}.zl_Detail .details-cont .price dl dd .number{float:left;width:118px;height:30px;border:1px solid #d9d9d9;border-radius:3px;background:#fff;position:relative}.zl_Detail .details-cont .price dl dd .number i{cursor:pointer;height:28px;width:28px;text-align:center;line-height:28px;display:block;float:left;background:none;color:#999999;font-size:18px}.zl_Detail .details-cont .price dl dd .number input{text-align:center;float:left;padding:4px 5px;line-height:20px;height:28px;width:60px;background:none;color:#333333;font-size:12px;border:none;border-left:1px solid #e5e5e5;border-right:1px solid #e5e5e5}.zl_Detail .details-foot{height:43px;border-top:1px solid #d6d7dc;width:100%;position:absolute;bottom:0}.zl_Detail .details-foot span{width:50%;display:block;float:left;height:43px;line-height:43px;font-size:14px;color:#fff;text-decoration:none;text-align:center;border:none}.zl_Detail .details-foot span.but-blue{background:#1080d0}.zl_Detail .details-foot span.but-red{background:#e10601}
/*# sourceMappingURL=zyly.min.css.map */
.zl_Detail *{box-sizing:border-box;font-family:"Helvetica Neue", Helvetica, sans-serif}.zl_Detail .details-head .head_top{border-bottom:1px solid #d6d7dc;padding:10px}.zl_Detail .details-head .head_top .head_top_left{width:56px}.zl_Detail .details-head .head_top .head_top_left img{display:block;width:56px;height:56px;border:1px solid #e5e5e5}.zl_Detail .details-head .head_top .head_top_right{padding-left:66px}.zl_Detail .details-head .head_top .head_top_right h4{padding-bottom:10px;font-size:18px;color:#333333}.zl_Detail .details-head .head_bottom{border-bottom:1px solid #d6d7dc;padding:5px 10px}.zl_Detail .details-head .head_bottom li{width:50%;line-height:20px;height:20px;font-size:12px;color:#999}.zl_Detail .details-head .head_bottom li b{display:block;float:left;line-height:20px;height:20px;font-weight:400}.zl_Detail .details-head .head_bottom li span{color:#333;line-height:20px;height:20px;display:block;padding:0 5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.zl_Detail .details-head .head_bottom li .f-orange{color:#ffa200;margin-left:5px}.zl_Detail .details-cont{position:absolute;top:149px;bottom:44px;width:100%;padding:10px;overflow-y:auto}.zl_Detail .details-cont .gradient{width:100%}.zl_Detail .details-cont .gradient table{width:100%;line-height:32px;font-size:12px;text-align:center;color:#666666;border:1px solid #d9d9d9}.zl_Detail .details-cont .gradient table .xs-6{width:50%}.zl_Detail .details-cont .gradient table .xs-4{width:33.33%}.zl_Detail .details-cont .gradient table .xs-3{width:25%}.zl_Detail .details-cont .gradient table th{border:1px solid #d9d9d9;font-weight:400;color:#666}.zl_Detail .details-cont .gradient table td{border:1px solid #d9d9d9;color:#333}.zl_Detail .details-cont .gradient .zkxk{font-size:12px;height:24px;line-height:24px;border:1px solid #e5e5e5;border-top:none;text-align:center;color:#666}.zl_Detail .details-cont .gradient .zkxk .icon-top{bottom:9px;position:relative;content:"";height:0;width:0;pointer-events:none;border:solid transparent;border-bottom-color:#4d4d4d;border-width:4px;margin-left:5px}.zl_Detail .details-cont .gradient .zkxk .icon-bot{top:9px;position:relative;content:"";height:0;width:0;pointer-events:none;border:solid transparent;border-top-color:#4d4d4d;border-width:4px;margin-left:5px}.zl_Detail .details-cont .price{padding-top:10px}.zl_Detail .details-cont .price .zyqhc{position:absolute;width:4.53333rem;height:.93333rem;color:#999;font-size:.26667rem;border:1px solid #ffa200;left:130px;line-height:.37333rem;padding:.06667rem;box-shadow:0px 0px 3px #ffd07f;border-radius:3px}.zl_Detail .details-cont .price .zyqhc .lfldiv{width:.4rem}.zl_Detail .details-cont .price .zyqhc .lfldiv font{position:relative;font-size:.29333rem;margin-right:.06667rem}.zl_Detail .details-cont .price .zyqhc .lfrdiv{width:3.86667rem}.zl_Detail .details-cont .price .bbiu{display:inline-block;position:absolute;border-width:6px;border-style:solid;border-color:transparent #ffa200 transparent transparent;left:118px;top:.2rem}.zl_Detail .details-cont .price .bbiu1{display:inline-block;position:absolute;border-width:6px;border-style:solid;border-color:transparent #fff transparent transparent;left:120px;top:.2rem}.zl_Detail .details-cont .price .em1{padding:0 0.5em}.zl_Detail .details-cont .price dl{font-size:12px}.zl_Detail .details-cont .price dl dt{width:5em;color:#999;float:left;line-height:30px}.zl_Detail .details-cont .price dl dd{padding-left:5em;color:#333;line-height:30px}.zl_Detail .details-cont .price dl dd.onePrice{font-size:14px}.zl_Detail .details-cont .price dl dd.totalPrice{font-weight:bold;color:red;font-size:14px}.zl_Detail .details-cont .price dl dd.tab span{display:block;float:left;margin:2px 10px 0 0;color:#333;height:23px;line-height:22px;padding:0 10px;border:1px solid #d9d9d9;border-radius:3px;background:#fff}.zl_Detail .details-cont .price dl dd.tab span.act{color:#e10601;border-color:#e10601}.zl_Detail .details-cont .price dl dd.tab span.act-blue{color:#1080d0;border-color:#1080d0}.zl_Detail .details-cont .price dl dd .number{float:left;width:118px;height:30px;border:1px solid #d9d9d9;border-radius:3px;background:#fff;position:relative}.zl_Detail .details-cont .price dl dd .number i{cursor:pointer;height:28px;width:28px;text-align:center;line-height:28px;display:block;float:left;background:none;color:#999999;font-size:18px}.zl_Detail .details-cont .price dl dd .number input{text-align:center;float:left;padding:4px 5px;line-height:20px;height:28px;width:60px;background:none;color:#333333;font-size:12px;border:none;border-left:1px solid #e5e5e5;border-right:1px solid #e5e5e5}.zl_Detail .details-foot{height:43px;border-top:1px solid #d6d7dc;width:100%;position:absolute;bottom:0}.zl_Detail .details-foot span{width:50%;display:block;float:left;height:43px;line-height:43px;font-size:14px;color:#fff;text-decoration:none;text-align:center;border:none}.zl_Detail .details-foot span.but-blue{background:#1080d0}.zl_Detail .details-foot span.but-red{background:#e10601}
src/directive/shareMask.js
......@@ -4,8 +4,9 @@ export default {
bind(el, binding) {
el.addEventListener('click', function () {
var loginpta = Util.isLogin() ? true : false;
var value = binding.value;
if (!loginpta) {
window.location.href = '/v3/login?referer=' + encodeURIComponent(window.location.href);
window.location.href = ('/v3/login?referer=' + encodeURIComponent(window.location.href))+((value == 'sbq')?'&ptag=oscilloscope':'');
return;
}
var rootElement = document.body;
......
src/main.js
......@@ -87,6 +87,8 @@ Services.wxaccess(params).then((res) => {
//路由页面回跳处理 mate里面参数 back：true 开启登录态回跳
router.beforeEach((to, from, next) => {
const title = to.meta && to.meta.title;
const noLoginArr = ['/oscilloscope'];//不需要跳转到登入的页面
let path = to.path;
if (title) {
document.title = title;
}
......@@ -94,7 +96,7 @@ router.beforeEach((to, from, next) => {
var backurl_g = to.meta.back || "";
if (backurl_g) {
var loginpta = Util.isLogin() ? true : false;
if (!loginpta) {
if (!loginpta&&(noLoginArr.indexOf(path)==-1)) {
window.location.href = '/v3/login?referer=' + encodeURIComponent(window.location.href);
} else {
next();
......
src/router.js
......@@ -46,6 +46,7 @@ const sampleapply = resolve => require(['@/views/sample/sampleapply'], resolve);
const Special = resolve => require(['@/views/special/Index'], resolve);
const Risk = resolve => require(['@/views/risk/Index'], resolve);
const RiskSuccess = resolve => require(['@/views/risk/Success'], resolve);
const oscilloscope = resolve => require(['@/views/oscilloscope/Index'], resolve);
Vue.use(Router);
......@@ -377,6 +378,15 @@ const routes = [{
}
},
{
path: '/oscilloscope',
name: "oscilloscope",
component: oscilloscope,
meta: {
title: '示波器',
back: true
}
},
{
path: '/special',
name: "special",
component: Special,
......
src/store/modules/download/index.js
......@@ -43,12 +43,12 @@ const actions = {
});
},
downloadFile: function ({commit}, payload) {
let param = {
data_id: payload.id,
download:payload.download
download: payload.download
}
let params = Util.getParams(param);
......@@ -58,12 +58,12 @@ const actions = {
if (data.err_code == 0) {
let platform = Util.isUerAgent();
if(payload.download == 1){
if (payload.download == 1) {
Toast({
message: data.err_msg,
duration: 2000
});
}else{
} else {
if (platform == 'ios') {
Toast({
message: '该文件只能在safari浏览器中下载保存，请在safari中打开页面并下载\n',
......@@ -103,8 +103,9 @@ const actions = {
forbidClick: true,
loadingType: 'spinner'
});
let param={
class_id:payload.class_id
let param = {
limit: 300,
class_id: payload.class_id
}
let params = Util.getParams(param);
Services.articleShowData(params).then((res) => {
......@@ -127,6 +128,8 @@ const actions = {
});
},
showClass({commit}, payload) {
var params = Util.getParams();
Services.showClass(params).then((res) => {
let data = res.data;
......
src/store/modules/oscilloscope/index.js 0 → 100644
import Vue from 'vue'
import {
Toast
} from 'vant';
import {
services as Services
} from '../../../api/index'
import Util from "../../../util";
Vue.use(Toast);
const state = {
bannerData: [],
isLodingFinishData: false,
prizeData: {},
goodId: "",
}
const mutations = {
getBannerData(state, payload) {
state.bannerData = payload.data
},
changeBannerData(state) {
let data = state.bannerData;
data.push(data[0]);
data.shift();
state.bannerData = data;
},
changeIsLodingFinishData(state, payload) {
state.isLodingFinishData = payload.bool
},
yaoHaoYouJP(state, payload) {
state.prizeData = payload.obj
},
changeGoodId(state, payload) {
state.goodId = payload.id
}
}
const actions = {
oscilloscopeinvited({
commit
}, payload) {
let obj = {
...payload.data,
};
let params = Util.getParams(obj);
Services.oscilloscopeinvited(params).then((res) => {
}).catch(function (err) {
});
},
getbannerdata({
commit
}, payload) {
let obj = {
...payload.data,
};
commit({
type: 'changeIsLodingFinishData',
bool: false
})
let params = Util.getParams(obj);
Services.getBannerData(params).then((res) => {
let data = res.data;
if (data.err_code == 0) {
commit({
type: 'getBannerData',
data: data.data
});
commit({
type: 'changeIsLodingFinishData',
bool: true
})
}
}).catch(function (err) {
});
},
yaoHaoYouJP({
commit
}, payload) {
Toast.loading({
message: '加载中...',
forbidClick: true,
loadingType: 'spinner'
});
let obj = {
...payload.data
};
let params = Util.getParams(obj);
Services.yaoHaoYouJP(params).then((res) => {
Toast.clear();
let data = res.data;
if (data.err_code == 0) {
commit({
type: 'yaoHaoYouJP',
obj: data.data,
});
}
}).catch(function (err) {
Toast.clear();
});
},
getYaoHaoYouGoodId({
commit
}, payload) {
let obj = {
...payload.data,
};
commit({
type: 'changeGoodId',
id: ''
})
Services.getYaoHaoYouGoodId(obj).then((res) => {
let data = res.data;
if (data.err_code == 0) {
commit({
type: 'changeGoodId',
id: data.data.id
});
}else {
Toast({
message: data.err_msg,
duration: 3000
});
}
}).catch(function (err) {
});
},
}
export default {
state,
actions,
mutations
}
\ No newline at end of file
src/store/modules/sample/index.js
......@@ -17,17 +17,20 @@ const state = {
aggSample: [],
aggs: {},
aggsFlag: [],
ziYingIndex:{},
smaple_class_id:'',
getsamplebanner:[]
ziYingIndex: [],
smaple_class_id: '',
getsamplebanner: [],
}
const mutations = {
ziYingIndex(state, payload) {
state.ziYingIndex= payload.data;
let arr = [];
for (let k in payload.data.data.data_list) {
arr.push(payload.data.data.data_list[k])
}
state.ziYingIndex = state.ziYingIndex.concat(arr);
},
aggs(state, payload) {
var arr = [];
var obj = Object.keys(payload.data.aggs);
if (payload.id) {
arr = payload.id.split(",");
......@@ -40,20 +43,23 @@ const mutations = {
for (let j = 0; j < arr.length; j++) {
if (payload.data.aggs[k].list[i].id == arr[j]) {
payload.data.aggs[k].list[i].check = !payload.data.aggs[k].list[i].check;
payload.data.aggs[k].list[i].flag=!payload.data.aggs[k].list[i].flag;
payload.data.aggs[k].list[i].flag = !payload.data.aggs[k].list[i].flag;
}
}
}
}
state.aggs = payload.data;
},
aggSample(state, payload) {
state.smaple_class_id=payload.data[0].smaple_class_id;
state.aggSample = payload.data
state.smaple_class_id = payload.data[0].smaple_class_id;
state.aggSample = payload.data;
},
classListM(state, payload) {
state.classList = payload.data
......@@ -66,49 +72,76 @@ const mutations = {
state.goodList = state.goodList.concat(arr)
},
getsamplebanner(state, payload) {
state.getsamplebanner= payload.data;
state.getsamplebanner = payload.data;
}
};
const actions = {
ziYingIndex({commit}, payload) {
Toast.loading({
message: '加载中...',
forbidClick: true,
loadingType: 'spinner'
});
state.loading = true;
state.finished = false;
if(payload.params.p == 1){
state.ziYingIndex = [];
}
let param = {
'sample_status/eq': 1
let obj = {
...payload.params,
'offset': 10,
'sample_status/eq': 1,
};
let obj = Object.assign({}, param, payload.params);
let params = Util.getParams(obj);
Services.ZiYingIndex(params).then((res) => {
state.loading = false;
Toast.clear();
let data = res.data;
state.loading = false;
if (data.error_code == 0) {
let totalPage = 0;
if (data.data.total) {
totalPage = Math.ceil(data.data.total * 1 / 10);
}
if (payload.params.p >= totalPage || !totalPage) {
state.finished = true;
}
commit({
type: 'ziYingIndex',
data: data.data
});
state.finished = true;
} else {
state.loading = false;
state.finished = true;
Toast({
message: data.error_msg,
duration: 3000
});
}
}).catch(function (err) {
Toast.clear();
state.loading = false;
state.finished = true;
});
},
aggs({commit}, payload) {
Toast.loading({
message: '加载中...',
forbidClick: true,
loadingType: 'spinner'
});
let param = {
'sample_status/eq': 1
};
......@@ -119,11 +152,13 @@ const actions = {
Services.aggs(params).then((res) => {
Toast.clear();
let data = res.data;
if (data.error_code == 0) {
commit({
type: 'aggs',
data: data.data,
reset: payload.params.reset,
id: payload.params.id
});
} else {
......@@ -133,7 +168,7 @@ const actions = {
});
}
}).catch(function (err) {
Toast.clear();
});
},
aggSample({commit}, payload) {
......@@ -211,7 +246,7 @@ const actions = {
},
getsamplebanner({commit}, payload) {
var params=Util.getParams();
var params = Util.getParams();
Services.getsamplebanner(params).then((res) => {
state.loading = false;
......
src/store/modules/user/address.js
......@@ -167,7 +167,7 @@ const actions = {
duration: 3000
});
if(payload.orderpg){
history.go(-1);
window.location.href=document.referrer;
}else{
history.go(0);
}
......
src/store/modules/wallet/wallet.js
......@@ -489,6 +489,9 @@ const actions = {
var params = {
amount: payload.amount,
}
if(payload.order_id){
params.order_id=payload.order_id;
}
Services.walletRecharge(qs.stringify(params)).then((res) => {
let data = res.data;
......
src/store/modules/xianhuo/xianhuo.js
......@@ -53,6 +53,11 @@ const actions = {
state.loading = false;
let data = res.data;
if (data.error_code == 0) {
if(!data.data.data){
state.finished = true;
return;
}
let totalPage = Math.ceil(data.data.total / 10);
if (p == totalPage) {
state.finished = true;
......
src/store/store.js
......@@ -30,6 +30,7 @@ import download from './modules/download/index'
import sample from './modules/sample/index'
import sampleapply from './modules/sample/sampleapply'
import special from './modules/special/index'
import oscilloscope from './modules/oscilloscope/index'
Vue.use(Vuex)
......@@ -65,6 +66,7 @@ export default new Vuex.Store({
download,
sample,
sampleapply,
special
special,
oscilloscope
}
})
src/util/index.js
......@@ -107,7 +107,7 @@ export default {
isLogin() {
var state_ = 0;
if (this.getCookie("Yo4teW_uid")) {
state_ = 2;//强弱登录态
state_ = 2;//弱登录态
if (this.getCookie("Yo4teW_skey")) {
state_ = 1;//强登录态
}
......
src/views/common/wxShare.vue
......@@ -12,6 +12,10 @@
type: Boolean,
default: true
},
isSbq: {
type: Boolean,
default: false
},
url: {
type: String,
default: window.location.href
......@@ -81,7 +85,6 @@
methods: {
share() {
var self = this;
try {
setShareInfo({
title: self.shareObj.title, // 分享标题
......@@ -109,7 +112,7 @@
jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareWeibo', 'onMenuShareQZone', 'updateAppMessageShareData', 'updateTimelineShareData']
});
wx.ready(function () {
wx.checkJsApi({
jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareWeibo', 'onMenuShareQZone', 'updateAppMessageShareData', 'updateTimelineShareData'], //需要检测的JS接口列表，所有JS接口列表见附录2,
success: function (res) {
......@@ -118,6 +121,25 @@
});
// 获取“分享到朋友圈”按钮点击状态及自定义分享内容接口
if(self.isSbq){
self.shareObj = Object.assign({},self.shareObj,{
success:function(res){
alert('垃圾微信模拟器')
let {invitedId} = self.$route.query;
let userId = util.getCookie("Yo4teW_uid");
let data = {"share_num":true};
invitedId&&(data['invited_uid']=invitedId);
userId&&(data['user_id '] = userId);
统计邀请的人数和页面访问统计
self.$store.dispatch({
type: "oscilloscopeinvited",
data: {
...data
}
});
}
})
}
wx.onMenuShareTimeline(self.shareObj);
// 获取“分享给朋友”按钮点击状态及自定义分享内容接口
......
src/views/common/zyDetail.vue
......@@ -66,7 +66,8 @@
{{goodDetail.goods_unit_name}}
</li>
<li class="fl">
<b class="f-orange">国内现货，当天发货</b>
<b class="f-orange" v-show="!isYushou">国内现货，当天发货</b>
<b class="f-orange" v-show="isYushou">{{goodDetail.cn_delivery_time||"3-7个工作日"}}</b>
</li>
<li
class="fl"
......@@ -243,6 +244,7 @@
</template>
</dd>
</dl>
<div class="f-orange" v-show="isYushou">因下单客户较多，库存情况以订单最终确认为准</div>
</div>
</div>
<div class="details-foot">
......@@ -283,7 +285,8 @@ export default {
zyladderArr: [], //阶梯价
zySingleInit: 0, //自营数量初始值
goodsNum: 0, //商品数量
isCookie: getCookie("Yo4teW_uid")
isCookie: getCookie("Yo4teW_uid"),
isYushou:false
};
},
computed: {
......@@ -359,6 +362,7 @@ export default {
this.goodsNum = String(now).replace(/\D/g, "");
this.ladderComputer(now);
if (Number(now) > this.stockNum) {
this.isYushou=true;
this.tipText = "库存不足，下单后我们将帮您订货";
if(this.goodDetail.ac_type == 6){
this.$toast("想要购买更多，请联系客服");
......@@ -388,6 +392,7 @@ export default {
}
} else {
this.isYushou=false;
this.tipText = "想要购买更多？直接下单，我们帮您订货";
this.btnText = "立即购买";
}
......
src/views/download/Index.vue
......@@ -82,11 +82,29 @@
computed: {
...mapState({
getfileuploadbanner: state => state.download.getfileuploadbanner,
articleShowData: state => state.download.articleShowData,
articleShowData: state => state.download.articleShowData.result,
loginCheck: state => state.common.loginCheck,
showClass: state => state.download.showClass
})
},
beforeCreate() {
if (!/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
let url = "";
let paramsStr = '';
for (let k in this.$route.query) {
paramsStr += k + '=' + this.$route.query[k] + '&'
}
paramsStr = paramsStr.slice(0, -1);
switch (window.location.hostname) {
case "m.liexin.com":
window.location.href = (paramsStr ? ("http://www.liexin.com/v3/download?" + paramsStr) : ("http://www.liexin.com/v3/download"));
break;
default:
window.location.href = window.location.origin + (paramsStr ? ("/v3/download?" + paramsStr) : ("/v3/download"));
break;
}
}
},
created() {
this.getData();
},
......
src/views/oscilloscope/Index.vue 0 → 100644
<template>
<section class="oscilloscope">
<Header :title="title" :meaushow="meaushow" :bgcolor="bgcolor"></Header>
<wxShare :link="shareUrl" :isSbq="true"></wxShare>
<div class="top-users">
<ul :class="{'animate-ul':animate}">
<li v-for="item in bannerData">{{item}}</li>
</ul>
</div>
<div class="oscilloscope-wrapper">
<div class="banner-div"></div>
<div class="prize-div">
<h3 class="title1 title"></h3>
<div class="prize-items-wrapper">
<h3 class="prize-title">好友成功购买ZDS1104台数</h3>
<div class="prize-items lbBox">
<div class="prize-item lineBlock">
<div class="item-top">
<img src="../../assets/images/oscilloscope/30.jpg" alt />
<span class="text">奖</span>
</div>
<div class="item-bottom">
<span class="arrow-bottom"></span>
<p class="num">1台</p>
</div>
</div>
<div class="prize-item lineBlock">
<div class="item-top">
<img src="../../assets/images/oscilloscope/100.jpg" alt />
<span class="text">奖</span>
</div>
<div class="item-bottom">
<span class="arrow-bottom"></span>
<p class="num">2-4台</p>
</div>
</div>
<div class="prize-item lineBlock">
<div class="item-top">
<img src="../../assets/images/oscilloscope/300.jpg" alt />
<span class="text">奖</span>
</div>
<div class="item-bottom">
<span class="arrow-bottom"></span>
<p class="num">5-9台</p>
</div>
</div>
<div class="prize-item lineBlock">
<div class="item-top">
<img src="../../assets/images/oscilloscope/800.jpg" alt />
<span class="text">奖</span>
</div>
<div class="item-bottom">
<span class="arrow-bottom"></span>
<p class="num">10台及以上</p>
</div>
</div>
</div>
</div>
<h3 class="title2 title"></h3>
<div class="reward-div">
<div class="reward-div-header clr">
<div class="fl">邀请好友数</div>
<div class="fl">好友购买台数</div>
<div class="fl">奖励</div>
</div>
<div class="reward-datas">
<div class="reward-data clr">
<template v-if="prizeData.goodsNums||prizeData.peopleNums||prizeData.prize">
<div class="fl">{{prizeData.peopleNums}}人</div>
<div class="fl">{{prizeData.goodsNums}}台</div>
<div class="fl">{{prizeData.prize}}元京东卡</div>
</template>
<template v-else>
<div class="no-data">您还没有相关奖品数据</div>
</template>
</div>
</div>
</div>
<h3 class="title3 title"></h3>
<div class="rule-datas">
<p>1，活动时间：2020年6月15日-6月28日；</p>
<p>2，京东E卡将在活动结束<span>7个</span>工作日内分发，卡号卡密将直接发送到用户注册猎芯网账号【会员中心】-<span>【我的消息】</span>；</p>
<p>3，在法律允许范围内，本活动最终解释权归猎芯网所有，详情可致电4008-755-881。</p>
</div>
</div>
<div class="footer-btns clr">
<div class="btn fl gm-btn" @click="buyFun">立即购买</div>
<div class="btn fl fx-btn" v-shareMask="'sbq'">立即分享</div>
</div>
</div>
</section>
</template>
<script>
import Header from "@/views/common/Header.vue";
import util from "../../util/index";
import {mapState,mapMutations } from "vuex";
import wxShare from "@/views/common/wxShare.vue";
export default {
name: "oscilloscope",
data() {
return {
title: "",
meaushow: true,
bgcolor: "#fafafa",
animate:false,
shareUrl: window.location.origin + window.location.pathname + ((util.getCookie("Yo4teW_uid"))?('#/?invitedId='+util.getCookie("Yo4teW_uid")):"#/")
};
},
created(){
this.oscilloscopeinvited();
this.getBannerData();
this.yaoHaoYouJP();
this.getYaoHaoYouGoodId()
},
computed: {
...mapState({
bannerData: state => state.oscilloscope.bannerData,
isLodingFinishData:state => state.oscilloscope.isLodingFinishData,
prizeData:state => state.oscilloscope.prizeData,
goodId:state => state.oscilloscope.goodId
})
},
watch:{
isLodingFinishData(now){
let me = this
if(now){
setInterval(this.showMarquee, 2000)
}
}
},
methods:{
...mapMutations([
'changeBannerData'
]),
getYaoHaoYouGoodId:function(){
//获取商品id
this.$store.dispatch({
type: "getYaoHaoYouGoodId",
data: {
"type_id":1
}
});
},
yaoHaoYouJP:function(){
//获取奖品信息
this.$store.dispatch({
type: "yaoHaoYouJP"
});
},
showMarquee: function () {
        this.animate = true;
setTimeout(()=>{
this.changeBannerData();
this.animate = false;
     },500)},
oscilloscopeinvited() {
let {invitedId} = this.$route.query;
let userId = util.getCookie("Yo4teW_uid");
let data = {};
if(invitedId){
SetCookie('sbqinvitedId',invitedId,1);
data['invited_uid']=invitedId
}else{
getCookie('sbqinvitedId')&&(data['user_id '] = getCookie('sbqinvitedId'));
}
userId&&(data['user_id '] = userId);
//统计邀请的人数和页面访问统计
this.$store.dispatch({
type: "oscilloscopeinvited",
data: {
...data
}
});
},
getBannerData:function(){
//获取广告文字轮播
this.$store.dispatch({
type: "getbannerdata",
data: {
'is_liexin':1
}
});
},
buyFun:function(){
//立即购买
this.judgeLogin(()=>{
if(!this.goodId){
return
}
let datax = {
id: this.goodId,
num:1,
buy: 1
};
this.$store.dispatch({
type: "addGoods",
data: { datax: datax }
});
})
},
judgeLogin(callback) {
if (util.isLogin()==1) {
//已登入
callback()
} else {
//未登入
window.location.href = '/v3/login?referer=' + encodeURIComponent(window.location.href)+'&ptag=oscilloscope';
}
},
},
components: {
Header,
wxShare
}
};
</script>
<style scoped>
@import "../../assets/css/oscilloscope/oscilloscope.css";
</style>
\ No newline at end of file
src/views/sample/sampleapply.vue
......@@ -2,7 +2,7 @@
<section class="sample-apply">
<Header :title="title" :meaushow='meaushow' :bgcolor="bgcolor"></Header>
<wxShare :url="shareUrl"></wxShare>
<van-collapse v-model="activeName" accordion :border="noborder">
<van-collapse v-model="activeName" accordion :border="noborder" v-if="ypGoodDetail.goods_info">
<van-collapse-item title="商品信息" name="1" :border="noborder">
<div class="info-con clr">
<div class="fl img-box">
......@@ -21,7 +21,7 @@
<span>参数描述: </span>
{{ypGoodDetail.goods_info.sku_name}}由{{ypGoodDetail.goods_info.brand_name}}设计生产制造，在猎芯网自营现货销售。{{ypGoodDetail.goods_info.goods_name}}的封装/规格参数为：{{ypGoodDetail.goods_info.encap}}；您可以选择下载{{ypGoodDetail.goods_info.sku_name}}中文资料等数据手册功能说明书，资料中有{{ypGoodDetail.goods_info.class_id1_name}}、{{ypGoodDetail.goods_info.class_id2_name}}详细使用方法及教程。
</p>
<p><span>需邀请好友人数: </span>{{ypGoodDetail.quota}}</p>
<p><span>需邀请好友人数: </span><em class="f-red">{{ypGoodDetail.quota}}</em></p>
</div>
</van-collapse-item>
......@@ -50,13 +50,18 @@
<textarea name="" v-model="sample_demand_desc" placeholder="“参考描述：例1、无人机项目研发需要 例2、运动相机新方案验证需要 例3、毕业设计激光测距项目需要”" class="placeh"></textarea>
</div>
<div class="form-group by">
<h3>运费信息 <span class="fr">包邮</span></h3>
<div class="txt">
<span>注意：</span>
<p>1、请填写真是姓名（或某小姐/先生），并确保电话畅通，可能会有客服人员人工确认订单</p>
<p>2、如果恶意刷单行为，本站将视情拒绝申请，猎芯网保留本活动解释权</p>
</div>
</div>
<div class="line"></div>
</div>
<div class="fix-btns" @click="submitS">确认提交</div>
<!--获得机会弹窗-->
<div class="submit-success-pop" v-show="successPop">
<div class="submit-success-pop" v-show="successPop" v-if="ypGoodDetail.goods_info">
<div class="mask"></div>
<div class="get-user-con">
<h3>样片领取成功<i class="icon iconfont icon-guanbi" @click="getuserf"></i></h3>
......@@ -69,7 +74,7 @@
<span class="l" @click="toUrl">继续领取</span>
<span class="r" v-shareMask>给好友送免费样片</span>
</div>
<div class="tips"><em>*</em>快递预计1-个工作日内送达，请耐心等待</div>
<div class="tips"><em>*</em>快递预计1-5个工作日内送达，请耐心等待</div>
</div>
</div>
<van-loading type="spinner" color="#000" class="loading-background" v-if="loading"/>
......
src/views/user/coupon.vue
......@@ -28,7 +28,7 @@
<h4>适用于<span>{{item.coupon_mall_type==1?'全站':(item.coupon_mall_type==2?'全部自营':'全部联营')}}</span>商品</h4>
</template>
<template v-else>
<h4>适用于制造商<span>{{item.selected_brand}}</span>所有商品</h4>
<h4>适用于<span>{{item.selected_supplier?("供应商"+item.selected_supplier):""}}{{item.selected_brand?("制造商"+item.selected_brand):""}}</span>所有商品</h4>
</template>
<p class="clr">
<a :href="item.redirect_url" class="fr but-bg" v-if="item.status==-1">立即使用</a>
......
src/views/user/userInfo.vue
......@@ -190,13 +190,13 @@
actShow1:false,
actions1:[{
value: 3,
name: '授权分销商'
name: '代理商'
}, {
value: 1,
name: '终端采购商'
}, {
value: 2,
name: '原厂制造商'
name: '代工厂'
}, {
value: 4,
name: '学校、科研机构'
......@@ -205,7 +205,7 @@
name: '贸易商'
}, {
value: 0,
name: '个体经营者'
name: '个人'
}, {
value: 0,
name: '其他'
......
src/views/wallet/Recharge.vue
......@@ -5,7 +5,7 @@
<div class="wallet-account">钱包账号：{{walletInfoData.safe_mobile}}</div>
<div class="recharge-amount">
<p>充值金额</p>
<span>￥</span><input type="number" class="money" v-model="inputNum"/>
<span>￥</span><input type="number" class="money" v-model="inputNum" :readonly="wallet_id? true : false"/>
</div>
<p class="payment-method">支付方式</p>
<van-radio-group v-model="radio">
......@@ -49,6 +49,7 @@
title: "钱包充值",
meaushow: true,
inputNum: this.$route.query.amount || '',
wallet_id:this.$route.query.wallet_id || '',
radio: '1'
}
},
......@@ -92,7 +93,8 @@
//充值申请
this.$store.dispatch({
type: 'walletRecharge',
amount: this.inputNum
amount: this.inputNum,
order_id:this.wallet_id
});
}
}
......
src/views/wallet/Record.vue
......@@ -17,7 +17,7 @@
</div>
<div class="record-num" v-if="item.wallet_type == 1">
{{item.amount_format}}<br/>
<span v-if="item.status == 1" class="rechargeBtn" @click="detail(item.amount)">待支付</span>
<span v-if="item.status == 1" class="rechargeBtn" @click="detail(item.amount,item.wallet_id)">待支付</span>
<span v-else class="successText">已完成</span>
</div>
</li>
......@@ -242,12 +242,14 @@
onTypeCancel() {
this.typeShow = false;
},
detail(amount) { //待支付的钱包充值订单，可跳去查看详情
detail(amount,wallet_id) { //待支付的钱包充值订单，可跳去查看详情
//直接调用$router.push实现携带参数的跳转
this.$router.push({
path: '/wallet/recharge',
query: {
amount: amount
amount: amount,
wallet_id:wallet_id
}
})
}
......
src/views/xianhuo/xianhuo.vue
......@@ -414,6 +414,10 @@ export default {
} else if (this.zyRankInit == 4) {
params["single_rank"] = 2;
}
params["need_aggs"] = 1;
if (rightFilterStr !== "{}") {
if (JSON.stringify(this.rightFilterData.filterData) !== "{}") {
params["attrs/nested"] = JSON.stringify(
......@@ -434,6 +438,7 @@ export default {
params["avail_rank"] = 1;
}
}
this.$store.dispatch({
type: "getZyData",
data: params
......
view/10.js
This diff could not be displayed because it is too large.
view/11.js
This diff could not be displayed because it is too large.
view/12.js
This diff could not be displayed because it is too large.
view/13.js
This diff could not be displayed because it is too large.
view/14.js
This diff could not be displayed because it is too large.
view/15.js
This diff could not be displayed because it is too large.
view/16.js
This diff could not be displayed because it is too large.
view/17.js
This diff could not be displayed because it is too large.
view/23.js
This diff could not be displayed because it is too large.
view/24.js
This diff could not be displayed because it is too large.
view/26.js
This diff could not be displayed because it is too large.
view/27.js
This diff could not be displayed because it is too large.
view/3.js
This diff could not be displayed because it is too large.
view/34.js
This diff could not be displayed because it is too large.
view/4.js
This diff could not be displayed because it is too large.
view/41.js
This diff could not be displayed because it is too large.
view/42.js
This diff could not be displayed because it is too large.
view/43.js
This diff could not be displayed because it is too large.
view/5.js
This diff could not be displayed because it is too large.
view/52.js 0 → 100644
This diff is collapsed. Click to expand it.
view/6.js
This diff could not be displayed because it is too large.
view/7.js
This diff could not be displayed because it is too large.
view/8.js
This diff could not be displayed because it is too large.
view/9.js
This diff could not be displayed because it is too large.
view/app.js
This diff could not be displayed because it is too large.
view/img/100.2f2d0685.jpg 0 → 100644
view/img/100.2f2d0685.jpg

33.7 KB
view/img/30.9c67e601.jpg 0 → 100644
view/img/30.9c67e601.jpg

30 KB
view/img/300.31ee7e0e.jpg 0 → 100644
view/img/300.31ee7e0e.jpg

29.2 KB
view/img/800.e24fdd1c.jpg 0 → 100644
view/img/800.e24fdd1c.jpg

34 KB
view/img/title1.2f5905c1.png 0 → 100644
view/img/title1.2f5905c1.png

19.3 KB
view/img/title2.30382b4e.png 0 → 100644
view/img/title2.30382b4e.png

14.3 KB
view/img/title3.5795accf.png 0 → 100644
view/img/title3.5795accf.png

14.7 KB
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 sign in to comment