Skip to content

梁建民 / h5

Go to a project
Commit cd83c57b by 肖康
Options

Merge branch 'h5_zyly_vue_0517' into Development 

# Conflicts:
#	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/4.js
#	view/5.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js
#	view/index.html
parents a5e8e674 f2d354d9
Expand all
Inline Side-by-side
Showing with 85 additions and 38 deletions
src/App.vue
<template> <template>
<div id="app"> <div id="app">
<keep-alive exclude="newsDetail,pointchange,wallet,walletRetrieve,walletDetail,walletRecord,walletStatus,walletWithdraw,walletRecharge,xianhuo"> <keep-alive exclude="newsDetail,pointchange,wallet,walletRetrieve,walletDetail,walletRecord,walletStatus,walletWithdraw,walletRecharge,xianhuo,lxshop">
<router-view class="router-view"></router-view> <router-view class="router-view"></router-view>
</keep-alive> </keep-alive>
</div> </div>
......
src/assets/css/car/index.less
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
border-width: 4px; border-width: 4px;
margin-left: 5px; margin-left: 5px;
} }
.dataNo{display: none;} //.dataNo{display: none;}
/*微信购物车-空*/ /*微信购物车-空*/
.shop-empty{ padding: 25% 3% 10% 3%; text-align: center; } .shop-empty{ padding: 25% 3% 10% 3%; text-align: center; }
...@@ -292,4 +292,11 @@ ...@@ -292,4 +292,11 @@
.shop-empty dt i{ font-size: 34px; } .shop-empty dt i{ font-size: 34px; }
.shop-empty dd{ padding-top: 5%; } .shop-empty dd{ padding-top: 5%; }
.shop-empty dd h4{ font-size: 16px; padding-bottom: 10%; font-weight: bold;} .shop-empty dd h4{ font-size: 16px; padding-bottom: 10%; font-weight: bold;}
.shop-empty dd p a{ font-size: 14px;color:#1080d0; } .shop-empty dd p a{ font-size: 14px;color:#1080d0; }
\ No newline at end of file .lyClass {
height: auto !important;
}
.lyMoreData {
height: 48px;
overflow: hidden;
}
\ No newline at end of file
src/store/modules/car/index.js
...@@ -139,7 +139,9 @@ const mutations = { ...@@ -139,7 +139,9 @@ const mutations = {
list_[i].goods_amount_format=payload.data.goods_amount_format; list_[i].goods_amount_format=payload.data.goods_amount_format;
list_[i].goods_price=payload.data.goods_price; list_[i].goods_price=payload.data.goods_price;
list_[i].goods_price_format=payload.data.goods_price_format; list_[i].goods_price_format=payload.data.goods_price_format;
} }
} }
}else{ }else{
//自营 //自营
...@@ -151,6 +153,11 @@ const mutations = { ...@@ -151,6 +153,11 @@ const mutations = {
list_1[i].goods_amount_format=payload.data.goods_amount_format; list_1[i].goods_amount_format=payload.data.goods_amount_format;
list_1[i].goods_price=payload.data.goods_price; list_1[i].goods_price=payload.data.goods_price;
list_1[i].goods_price_format=payload.data.goods_price_format; list_1[i].goods_price_format=payload.data.goods_price_format;
if(payload.data.sale_type==2){
var arrj=list_1[i];
list_1.splice(i,1);
state.zy2Data.push(arrj)
}
} }
} }
for(var j=0;j<list_2.length;j++){ for(var j=0;j<list_2.length;j++){
...@@ -159,7 +166,11 @@ const mutations = { ...@@ -159,7 +166,11 @@ const mutations = {
list_2[j].goods_amount=payload.data.goods_amount; list_2[j].goods_amount=payload.data.goods_amount;
list_2[j].goods_amount_format=payload.data.goods_amount_format; list_2[j].goods_amount_format=payload.data.goods_amount_format;
list_2[j].goods_price=payload.data.goods_price; list_2[j].goods_price=payload.data.goods_price;
list_2[j].goods_price_format=payload.data.goods_price_format; if(payload.data.sale_type==1){
var arrj=list_2[j];
list_2.splice(j,1);
state.zy1Data.push(arrj)
}
} }
} }
} }
...@@ -262,7 +273,9 @@ const actions = { ...@@ -262,7 +273,9 @@ const actions = {
}, },
changenum({commit},payload){ changenum({commit},payload){
//state.loading=true; if(payload.types==1||payload.types==2){
state.loading=true;
}
var params = { var params = {
cart_id: payload.cart_id, cart_id: payload.cart_id,
num: payload.num, num: payload.num,
...@@ -270,7 +283,7 @@ const actions = { ...@@ -270,7 +283,7 @@ const actions = {
} }
state.totlaMState=false; state.totlaMState=false;
Services.changenum(qs.stringify(params)).then((res) => { Services.changenum(qs.stringify(params)).then((res) => {
//state.loading=false; state.loading=false;
let data = res.data; let data = res.data;
if (data.err_code == 0) { if (data.err_code == 0) {
commit({ commit({
......
src/views/car/car.vue
...@@ -54,13 +54,18 @@ ...@@ -54,13 +54,18 @@
<div class="mui-row"> <div class="mui-row">
<div class="mui-col-sm-7 mui-col-xs-7"> <div class="mui-col-sm-7 mui-col-xs-7">
<div class="morePrice"> <div class="morePrice">
<div class="mui-row act" v-for="(itemPrice,index) in item.tiered" <div
:class="{'dataNo':(index>2)&&!item.priceCheck}"> :id="'priceContent'+item.cart_id"
<p class="mui-col-sm-3 mui-col-xs-3"><font v-html="itemPrice.purchases"></font>+</p> :class="{'lyClass':item.tiered&&item.tiered.length<4,'lyMoreData':item.tiered&&item.tiered.length>3}"
<p class="mui-col-sm-4 mui-col-xs-4 f-red">￥{{itemPrice.price_cn}}</p> >
<div class="mui-row act" v-for="(itemPrice,index) in item.tiered"
:class="{'dataNo':(index>2)&&!item.priceCheck}">
<p class="mui-col-sm-3 mui-col-xs-3"><font v-html="itemPrice.purchases"></font>+</p>
<p class="mui-col-sm-4 mui-col-xs-4 f-red">￥{{itemPrice.price_cn}}</p>
</div>
</div> </div>
<div class="more-height" v-if="item.tiered&&item.tiered.length>3" <div class="more-height" v-if="item.tiered&&item.tiered.length>3"
@click="priceRow(ly1Data,indexdata)" @click="priceRow(ly1Data,indexdata,item.cart_id)"
v-html="item.checkBtn||defaultBtn">更多梯度价格<i class="iconfont icon-bot"></i></div> v-html="item.checkBtn||defaultBtn">更多梯度价格<i class="iconfont icon-bot"></i></div>
</div> </div>
</div> </div>
...@@ -159,13 +164,18 @@ ...@@ -159,13 +164,18 @@
<div class="mui-row"> <div class="mui-row">
<div class="mui-col-sm-7 mui-col-xs-7"> <div class="mui-col-sm-7 mui-col-xs-7">
<div class="morePrice"> <div class="morePrice">
<div class="mui-row act" v-for="(itemPrice,index) in item.tiered" <div
:class="{'dataNo':(index>2)&&!item.priceCheck}"> :id="'priceContent'+item.cart_id"
<p class="mui-col-sm-3 mui-col-xs-3"><font v-html="itemPrice.purchases"></font>+</p> :class="{'lyClass':item.tiered&&item.tiered.length<4,'lyMoreData':item.tiered&&item.tiered.length>3}"
<p class="mui-col-sm-4 mui-col-xs-4 f-red">${{itemPrice.price_us}}</p> >
<div class="mui-row act" v-for="(itemPrice,index) in item.tiered"
:class="{'dataNo':(index>2)&&!item.priceCheck}">
<p class="mui-col-sm-3 mui-col-xs-3"><font v-html="itemPrice.purchases"></font>+</p>
<p class="mui-col-sm-4 mui-col-xs-4 f-red">${{itemPrice.price_us}}</p>
</div>
</div> </div>
<div class="more-height" v-if="item.tiered&&item.tiered.length>3" <div class="more-height" v-if="item.tiered&&item.tiered.length>3"
@click="priceRow(ly2Data,indexdata)" @click="priceRow(ly2Data,indexdata,item.cart_id)"
v-html="item.checkBtn||defaultBtn">更多梯度价格<i class="iconfont icon-bot"></i></div> v-html="item.checkBtn||defaultBtn">更多梯度价格<i class="iconfont icon-bot"></i></div>
</div> </div>
</div> </div>
...@@ -293,13 +303,18 @@ ...@@ -293,13 +303,18 @@
<div class="mui-row"> <div class="mui-row">
<div class="mui-col-sm-7 mui-col-xs-7"> <div class="mui-col-sm-7 mui-col-xs-7">
<div class="morePrice"> <div class="morePrice">
<div class="mui-row act" v-for="(itemPrice,index) in item.tiered" <div
:class="{'dataNo':(index>2)&&!item.priceCheck}"> :id="'priceContent'+item.cart_id"
<p class="mui-col-sm-6 mui-col-xs-6"><font v-html="itemPrice.purchases"></font>+</p> :class="{'lyClass':item.tiered&&item.tiered.length<4,'lyMoreData':item.tiered&&item.tiered.length>3}"
<p class="mui-col-sm-6 mui-col-xs-6 f-red">￥{{itemPrice.price_cn}}</p> >
<div class="mui-row act" v-for="(itemPrice,index) in item.tiered"
:class="{'dataNo':(index>2)&&!item.priceCheck}">
<p class="mui-col-sm-6 mui-col-xs-6"><font v-html="itemPrice.purchases"></font>+</p>
<p class="mui-col-sm-6 mui-col-xs-6 f-red">￥{{itemPrice.price_cn}}</p>
</div>
</div> </div>
<div class="more-height" v-if="item.tiered&&item.tiered.length>3" <div class="more-height" v-if="item.tiered&&item.tiered.length>3"
@click="priceRow(zy1Data,indexdata)" @click="priceRow(zy1Data,indexdata,item.cart_id)"
v-html="item.checkBtn||defaultBtn">更多梯度价格<i class="iconfont icon-bot"></i></div> v-html="item.checkBtn||defaultBtn">更多梯度价格<i class="iconfont icon-bot"></i></div>
</div> </div>
...@@ -371,13 +386,18 @@ ...@@ -371,13 +386,18 @@
<div class="mui-row"> <div class="mui-row">
<div class="mui-col-sm-7 mui-col-xs-7"> <div class="mui-col-sm-7 mui-col-xs-7">
<div class="morePrice"> <div class="morePrice">
<div class="mui-row act" v-for="(itemPrice,index) in item.tiered" <div
:class="{'dataNo':(index>2)&&!item.priceCheck}"> :id="'priceContent'+item.cart_id"
<p class="mui-col-sm-6 mui-col-xs-6"><font v-html="itemPrice.purchases"></font>+</p> :class="{'lyClass':item.tiered&&item.tiered.length<4,'lyMoreData':item.tiered&&item.tiered.length>3}"
<p class="mui-col-sm-6 mui-col-xs-6 f-red">￥{{itemPrice.price_cn}}</p> >
<div class="mui-row act" v-for="(itemPrice,index) in item.tiered"
:class="{'dataNo':(index>2)&&!item.priceCheck}">
<p class="mui-col-sm-6 mui-col-xs-6"><font v-html="itemPrice.purchases"></font>+</p>
<p class="mui-col-sm-6 mui-col-xs-6 f-red">￥{{itemPrice.price_cn}}</p>
</div>
</div> </div>
<div class="more-height" v-if="item.tiered&&item.tiered.length>3" <div class="more-height" v-if="item.tiered&&item.tiered.length>3"
@click="priceRow(zy2Data,indexdata)" @click="priceRow(zy2Data,indexdata,item.cart_id)"
v-html="item.checkBtn||defaultBtn">更多梯度价格<i class="iconfont icon-bot"></i></div> v-html="item.checkBtn||defaultBtn">更多梯度价格<i class="iconfont icon-bot"></i></div>
</div> </div>
...@@ -715,8 +735,12 @@ ...@@ -715,8 +735,12 @@
this.getData(); this.getData();
}, },
//阶梯价格处理 //阶梯价格处理
priceRow: function(dataList,index) { priceRow: function(dataList,index,id) {
let dom = document.getElementById("priceContent" + id);
let arrLength = dataList[index].tiered.length;
if (dataList[index]["priceCheck"]) { if (dataList[index]["priceCheck"]) {
console.log(1)
dom.style.height = "48px";
this.$set(dataList[index], "priceCheck", false); this.$set(dataList[index], "priceCheck", false);
this.$set( this.$set(
dataList[index], dataList[index],
...@@ -724,6 +748,11 @@ ...@@ -724,6 +748,11 @@
'更多梯度价格<i class="icon-bot"></i>' '更多梯度价格<i class="icon-bot"></i>'
); );
} else { } else {
console.log(2)
dom.style.height = 16 * arrLength + "px";
dom.style.transition = `height ${(arrLength - 3) * 0.125}s linear`;
dom.style.webkitTransition = `height ${(arrLength - 3) *
0.125}s linear`;
this.$set(dataList[index], "priceCheck", true); this.$set(dataList[index], "priceCheck", true);
this.$set( this.$set(
dataList[index], dataList[index],
...@@ -1082,7 +1111,8 @@ ...@@ -1082,7 +1111,8 @@
type: 'changenum', type: 'changenum',
cart_id:cart_id, cart_id:cart_id,
num: summitNum, num: summitNum,
delivery_place:(self.type==1)?self.delivery:"" delivery_place:(self.type==1)?self.delivery:"",
types:type
}) })
} }
......
src/views/common/SideBar.vue
...@@ -79,13 +79,6 @@ export default { ...@@ -79,13 +79,6 @@ export default {
default: false default: false
} }
}, },
created(){
var self=this;
bus.$on('xunjia',function(){
self.recordFn()
})
},
data() { data() {
return { return {
flag: false, flag: false,
...@@ -107,6 +100,10 @@ export default { ...@@ -107,6 +100,10 @@ export default {
} }
}, },
created(){ created(){
var self=this;
bus.$on('xunjia',function(){
self.recordFn()
})
if(this.carshow){ if(this.carshow){
this.$store.dispatch({ this.$store.dispatch({
type: 'cartCount' type: 'cartCount'
......
src/views/lxshop/lxshop.vue
...@@ -85,7 +85,7 @@ import addCarAlert from "@/views/common/addCarAlert"; ...@@ -85,7 +85,7 @@ import addCarAlert from "@/views/common/addCarAlert";
Vue.use(Loading); Vue.use(Loading);
export default { export default {
name: "news", name: "lxshop",
data() { data() {
return { return {
detailsData: { isShow: false, id: "" }, detailsData: { isShow: false, id: "" },
......
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/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/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/18.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/3.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/5.js
This diff could not be displayed because it is too large.
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/index.html
...@@ -27,7 +27,7 @@ ...@@ -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="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/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> <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/4.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/4.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"> <body class="boxsiz">
<noscript> <noscript>
<strong>网站出现了一点小问题，正在紧急修复中.......</strong> <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