Skip to content

梁建民 / h5

Go to a project
Commit 2b8bc2b9 by 肖康
Options

Merge branch 'XK_carB20190624' into Development 

# Conflicts:
#	src/views/common/GoodsOne.vue
parents 65108474 6a94b1d7
Expand all
Inline Side-by-side
Showing with 158 additions and 1 deletions
src/assets/css/rank/ranking.less 0 → 100644
.ranking-content{
*{padding:0px;margin:0px;}
.cp1{background: url("../../images/rank/p1.jpg") no-repeat ;height:380px;width:100%;background-size: 100% 100%; }
.cp2{background: url("../../images/rank/p2.jpg") no-repeat ;height:662px;width:100%;background-size: 100% 100%; }
.cp3{background: url("../../images/rank/p3.jpg") no-repeat ;height:799px;width:100%;background-size: 100% 100%; }
.cp4{
background: url("../../images/rank/p4.jpg") no-repeat ;
height:471px;width:100%;background-size: 100% 100%;
.content{
width:93%;
height:280px;
margin:0 auto;
position: relative;
top:180px;
p{
height:25px;
line-height: 25px;
text-align: center;
color:#fff;
font-size: 14px;
span{
width:33.33%;
&.l-z{
font{position: relative;left:4%;}
}
&.r-z{
font{position: relative;left:-8%;}
}
}
}
}
}
.cp5{background: url("../../images/rank/p5.jpg") no-repeat ;height:576px;width:100%;background-size: 100% 100%; }
}
src/assets/css/rank/ranking.min.css 0 → 100644
.ranking-content *{padding:0px;margin:0px}.ranking-content .cp1{background:url("../../images/rank/p1.jpg") no-repeat;height:380px;width:100%;background-size:100% 100%}.ranking-content .cp2{background:url("../../images/rank/p2.jpg") no-repeat;height:662px;width:100%;background-size:100% 100%}.ranking-content .cp3{background:url("../../images/rank/p3.jpg") no-repeat;height:799px;width:100%;background-size:100% 100%}.ranking-content .cp4{background:url("../../images/rank/p4.jpg") no-repeat;height:471px;width:100%;background-size:100% 100%}.ranking-content .cp4 .content{width:93%;height:280px;margin:0 auto;position:relative;top:180px}.ranking-content .cp4 .content p{height:25px;line-height:25px;text-align:center;color:#fff;font-size:14px}.ranking-content .cp4 .content p span{width:33.33%}.ranking-content .cp4 .content p span.l-z font{position:relative;left:4%}.ranking-content .cp4 .content p span.r-z font{position:relative;left:-8%}.ranking-content .cp5{background:url("../../images/rank/p5.jpg") no-repeat;height:576px;width:100%;background-size:100% 100%}
\ No newline at end of file
src/router.js
......@@ -39,6 +39,7 @@ const userCoupon = resolve => require(['@/views/user/coupon'], resolve);
const userAddress = resolve => require(['@/views/user/address'], resolve);
const brand = resolve => require(['@/views/brand/brand'], resolve);
const brandList = resolve => require(['@/views/brand/brandList'], resolve);
const ranking = resolve => require(['@/views/rank/ranking'], resolve);
Vue.use(Router);
const routes = [{
......@@ -324,6 +325,14 @@ const routes = [{
}
},
{
path: '/ranking',
component: ranking,
meta: {
title: '猎芯网-京东战投电子元器件商城_一站式解决电子元器件采购难题'
}
},
{
path: '*',
redirect: '/'
}
......
src/views/common/GoodsOne.vue
......@@ -16,6 +16,7 @@
<dd>
<template v-if="isZy">
<h4>{{itemchild.sku_name}}</h4>
<p v-if="itemchild.class_id2_name">分类：{{itemchild.class_id2_name}}</p>
<template v-if="itemchild.ac_type == 2 || itemchild.ac_type == 3">
<span class="youhui">优惠</span>
</template>
......
src/views/rank/ranking.vue 0 → 100644
<template>
<section class="ranking-content" >
<div class="cp1"></div>
<div class="cp2"></div>
<div class="cp3"></div>
<div class="cp4">
<div class="content">
<p class="clr">
<span class="fl l-z"><font>1</font></span>
<span class="fl">15997404637</span>
<span class="fl r-z"><font>2562536</font></span>
</p>
<p class="clr">
<span class="fl l-z"><font>1</font></span>
<span class="fl">15997404637</span>
<span class="fl r-z"><font>2562536</font></span>
</p>
<p class="clr">
<span class="fl l-z"><font>1</font></span>
<span class="fl">15997404637</span>
<span class="fl r-z"><font>2562536</font></span>
</p>
<p class="clr">
<span class="fl l-z"><font>1</font></span>
<span class="fl">15997404637</span>
<span class="fl r-z"><font>2562536</font></span>
</p>
<p class="clr">
<span class="fl l-z"><font>1</font></span>
<span class="fl">15997404637</span>
<span class="fl r-z"><font>2562536</font></span>
</p>
<p class="clr">
<span class="fl l-z"><font>1</font></span>
<span class="fl">15997404637</span>
<span class="fl r-z"><font>2562536</font></span>
</p>
<p class="clr">
<span class="fl l-z"><font>1</font></span>
<span class="fl">15997404637</span>
<span class="fl r-z"><font>2562536</font></span>
</p>
<p class="clr">
<span class="fl l-z"><font>1</font></span>
<span class="fl">15997404637</span>
<span class="fl r-z"><font>2562536</font></span>
</p>
<p class="clr">
<span class="fl l-z"><font>1</font></span>
<span class="fl">15997404637</span>
<span class="fl r-z"><font>2562536</font></span>
</p>
<p class="clr">
<span class="fl l-z"><font>1</font></span>
<span class="fl">15997404637</span>
<span class="fl r-z"><font>2562536</font></span>
</p>
</div>
</div>
<div class="cp5"></div>
</section>
</template>
<script>
import Vue from 'vue';
import {Loading } from 'vant';
import {mapState} from 'vuex'
Vue.use(Loading);
export default {
name: 'ranking',
data() {
return {
title:"猎芯网-京东战投电子元器件商城_一站式解决电子元器件采购难题",
}
},
computed: {
...mapState({
})
},
watch:{
},
created() {
},
methods: {
},
components: {
}
}
</script>
<style scoped>
@import "../../assets/css/rank/ranking.min.css";
</style>
\ No newline at end of file
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/19.js
This diff could not be displayed because it is too large.
view/20.js
This diff could not be displayed because it is too large.
view/35.js
This diff could not be displayed because it is too large.
view/44.js 0 → 100644
This diff is collapsed. Click to expand it.
view/index.html
......@@ -27,7 +27,7 @@
<script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js" type="text/javascript" charset="utf-8"></script>
<script src="//szh5static.ichunt.com/static/js/flexible.min.js" type="text/javascript" charset="utf-8"></script>
<script src="//szh5static.ichunt.com/static/js/shence.min.js" type="text/javascript" charset="utf-8"></script>
<link href="//szh5static.ichunt.com/0.js" rel="prefetch"><link href="//szh5static.ichunt.com/1.js" rel="prefetch"><link href="//szh5static.ichunt.com/10.js" rel="prefetch"><link href="//szh5static.ichunt.com/11.js" rel="prefetch"><link href="//szh5static.ichunt.com/12.js" rel="prefetch"><link href="//szh5static.ichunt.com/13.js" rel="prefetch"><link href="//szh5static.ichunt.com/14.js" rel="prefetch"><link href="//szh5static.ichunt.com/15.js" rel="prefetch"><link href="//szh5static.ichunt.com/16.js" rel="prefetch"><link href="//szh5static.ichunt.com/17.js" rel="prefetch"><link href="//szh5static.ichunt.com/18.js" rel="prefetch"><link href="//szh5static.ichunt.com/19.js" rel="prefetch"><link href="//szh5static.ichunt.com/2.js" rel="prefetch"><link href="//szh5static.ichunt.com/20.js" rel="prefetch"><link href="//szh5static.ichunt.com/21.js" rel="prefetch"><link href="//szh5static.ichunt.com/22.js" rel="prefetch"><link href="//szh5static.ichunt.com/23.js" rel="prefetch"><link href="//szh5static.ichunt.com/24.js" rel="prefetch"><link href="//szh5static.ichunt.com/25.js" rel="prefetch"><link href="//szh5static.ichunt.com/26.js" rel="prefetch"><link href="//szh5static.ichunt.com/27.js" rel="prefetch"><link href="//szh5static.ichunt.com/28.js" rel="prefetch"><link href="//szh5static.ichunt.com/29.js" rel="prefetch"><link href="//szh5static.ichunt.com/3.js" rel="prefetch"><link href="//szh5static.ichunt.com/30.js" rel="prefetch"><link href="//szh5static.ichunt.com/31.js" rel="prefetch"><link href="//szh5static.ichunt.com/32.js" rel="prefetch"><link href="//szh5static.ichunt.com/33.js" rel="prefetch"><link href="//szh5static.ichunt.com/34.js" rel="prefetch"><link href="//szh5static.ichunt.com/35.js" rel="prefetch"><link href="//szh5static.ichunt.com/36.js" rel="prefetch"><link href="//szh5static.ichunt.com/37.js" rel="prefetch"><link href="//szh5static.ichunt.com/38.js" rel="prefetch"><link href="//szh5static.ichunt.com/39.js" rel="prefetch"><link href="//szh5static.ichunt.com/4.js" rel="prefetch"><link href="//szh5static.ichunt.com/40.js" rel="prefetch"><link href="//szh5static.ichunt.com/41.js" rel="prefetch"><link href="//szh5static.ichunt.com/42.js" rel="prefetch"><link href="//szh5static.ichunt.com/43.js" rel="prefetch"><link href="//szh5static.ichunt.com/5.js" rel="prefetch"><link href="//szh5static.ichunt.com/6.js" rel="prefetch"><link href="//szh5static.ichunt.com/7.js" rel="prefetch"><link href="//szh5static.ichunt.com/8.js" rel="prefetch"><link href="//szh5static.ichunt.com/9.js" rel="prefetch"><link href="//szh5static.ichunt.com/app.js" rel="preload" as="script"></head>
<link href="//szh5static.ichunt.com/0.js" rel="prefetch"><link href="//szh5static.ichunt.com/1.js" rel="prefetch"><link href="//szh5static.ichunt.com/10.js" rel="prefetch"><link href="//szh5static.ichunt.com/11.js" rel="prefetch"><link href="//szh5static.ichunt.com/12.js" rel="prefetch"><link href="//szh5static.ichunt.com/13.js" rel="prefetch"><link href="//szh5static.ichunt.com/14.js" rel="prefetch"><link href="//szh5static.ichunt.com/15.js" rel="prefetch"><link href="//szh5static.ichunt.com/16.js" rel="prefetch"><link href="//szh5static.ichunt.com/17.js" rel="prefetch"><link href="//szh5static.ichunt.com/18.js" rel="prefetch"><link href="//szh5static.ichunt.com/19.js" rel="prefetch"><link href="//szh5static.ichunt.com/2.js" rel="prefetch"><link href="//szh5static.ichunt.com/20.js" rel="prefetch"><link href="//szh5static.ichunt.com/21.js" rel="prefetch"><link href="//szh5static.ichunt.com/22.js" rel="prefetch"><link href="//szh5static.ichunt.com/23.js" rel="prefetch"><link href="//szh5static.ichunt.com/24.js" rel="prefetch"><link href="//szh5static.ichunt.com/25.js" rel="prefetch"><link href="//szh5static.ichunt.com/26.js" rel="prefetch"><link href="//szh5static.ichunt.com/27.js" rel="prefetch"><link href="//szh5static.ichunt.com/28.js" rel="prefetch"><link href="//szh5static.ichunt.com/29.js" rel="prefetch"><link href="//szh5static.ichunt.com/3.js" rel="prefetch"><link href="//szh5static.ichunt.com/30.js" rel="prefetch"><link href="//szh5static.ichunt.com/31.js" rel="prefetch"><link href="//szh5static.ichunt.com/32.js" rel="prefetch"><link href="//szh5static.ichunt.com/33.js" rel="prefetch"><link href="//szh5static.ichunt.com/34.js" rel="prefetch"><link href="//szh5static.ichunt.com/35.js" rel="prefetch"><link href="//szh5static.ichunt.com/36.js" rel="prefetch"><link href="//szh5static.ichunt.com/37.js" rel="prefetch"><link href="//szh5static.ichunt.com/38.js" rel="prefetch"><link href="//szh5static.ichunt.com/39.js" rel="prefetch"><link href="//szh5static.ichunt.com/4.js" rel="prefetch"><link href="//szh5static.ichunt.com/40.js" rel="prefetch"><link href="//szh5static.ichunt.com/41.js" rel="prefetch"><link href="//szh5static.ichunt.com/42.js" rel="prefetch"><link href="//szh5static.ichunt.com/43.js" rel="prefetch"><link href="//szh5static.ichunt.com/44.js" rel="prefetch"><link href="//szh5static.ichunt.com/5.js" rel="prefetch"><link href="//szh5static.ichunt.com/6.js" rel="prefetch"><link href="//szh5static.ichunt.com/7.js" rel="prefetch"><link href="//szh5static.ichunt.com/8.js" rel="prefetch"><link href="//szh5static.ichunt.com/9.js" rel="prefetch"><link href="//szh5static.ichunt.com/app.js" rel="preload" as="script"></head>
<body class="boxsiz">
<noscript>
<strong>网站出现了一点小问题，正在紧急修复中.......</strong>
......
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