Skip to content

梁建民 / h5

Go to a project
Commit 58ae9c5f by 施宇
Options

Merge branch 'h5_zyly_vue_0517' of http://119.23.72.7/liangjianmin/h5 into h5_zyly_vue_0517

parents 5254f6f5 e2d11126
Expand all
Inline Side-by-side
Showing with 227 additions and 20 deletions
src/assets/css/base.scss
......@@ -127,10 +127,19 @@ html, body {
-webkit-overflow-scrolling: touch;
}
body {
overflow-x: hidden;
}
.f-blue{color:#1080d0;}
.f-red{color:#ff0000;}
.f-999{color:#999;}
.f-333{color:#666;}
.fw{font-weight: bold;}
.ta-c{text-align: center;}
.ta-l{text-align: left;}
.ta-r{text-align: right;}
.mt-10{margin-top: 10px;}
.emptys {
margin-left: -1px;
width: 1px;
......
src/assets/css/car/index.less
.car-page{
color:#333;
.lxBox{
padding-bottom: 44px;
.lyNav{
color:#333;
position: fixed;
......@@ -8,6 +10,9 @@
right:0px;
height:44px;
border-bottom:1px solid #d6d7dc;
z-index:3;
background-color: #fff;
box-sizing: border-box;
span{
cursor: pointer;
width:50%;
......@@ -29,9 +34,19 @@
}
}
.zyBox{
padding-bottom: 44px;
.logintip{
top:44px;
}
.headxianhuoqihuo{
height:43px;
line-height: 43px;
border-bottom:1px solid #d6d7dc;
.zyqxtype{
font-size: 16px;
}
}
.dataBox{
padding-top: 44px;
}
......@@ -48,6 +63,7 @@
right: 0px;
font-size: 14px;
text-align: center;
z-index: 3;
a{
background: #e10601;
border-radius: 4px;
......@@ -71,10 +87,176 @@
left:0px;
right: 0px;
font-size: 12px;
border-bottom:1px solid #d6d7dc;
z-index: 3;
background: #fff;
box-sizing: border-box;
.remind{
color:#999;
i{color:#ffa200;position: relative;top:2px;left:5px;}
}
a{color:#1080d0;font-size: 14px;}
}
}
.shop-block{ font-size: 12px;border-bottom: 1px solid #d6d7dc;}
.shop-block .t-r{text-align: right;}
.shop-block .delete-tier{position: relative;top:2px;font-size: 20px;}
.shop-block h4{ font-size: 14px; padding: 12px 0; font-weight: 400; line-height: 20px; border-bottom: 1px solid #d6d7dc; word-wrap: break-word; word-break: break-all; }
.shop-block ul{ padding: 2% 3%; padding-left: 0; }
.shop-block li{ font-size: 12px; word-wrap: break-word;height:22px;line-height: 22px; word-break: break-all; position: relative;overflow:hidden;text-overflow:ellipsis;white-space: nowrap;}
.shop-block li span{float: left;width: 50px; }
.shop-block li p{padding-left: 50px; font-size: 12px; color: #333333;}
.shop-block .ichunt-blue{ font-size: 12px; font-weight: 400; padding: 1px 3px; margin-left: 5px; background: #1080d0; color: #fff; border-radius: 3px; }
.shop-block .ichunt-orange{ font-size: 12px; font-weight: 400; padding: 1px 3px; margin-left: 5px; background: #ffa200; color: #fff; border-radius: 3px; }
.shop-block .add-num{ padding: 0 3%; }
.shop-block .add-num .mui-numbox{ float: right; padding: 0 30px; width: 130px; height: 30px; border: 1px solid #e1e1e1; border-radius: 0;box-sizing: border-box;}
.shop-block .add-num .mui-numbox button{ height: 28px; width: 30px; font-size: 22px; line-height: 28px; background-color: #fff; color: #666;box-sizing: border-box;}
.shop-block .add-num .mui-numbox button i{font-size: 14px;}
.shop-block .add-num .mui-numbox button.no_click{ color: #999; }
.shop-block .add-num .mui-numbox input{ height: 28px; background: #fff; color: #333; font-size: 12px;box-sizing: border-box;}
.shop-block .subtotal{padding: 2% 3%; font-weight: bold; text-align: right; }
.shop-block .morePrice{ margin-bottom: 15px; }
.shop-block .morePrice p{font-size: 12px; color: #999;}
.shop-block .morePrice .list_data{display: none;}
.shop-block .morePrice .list_data.act p.mui-col-xs-4{ color: red!important; }
.shop-block .morePrice .list_data.act p.f-throug{color: red!important;}
.shop-block .more-height{ font-size: 12px; margin-right: 10%; height: 24px;margin-top: 5px; line-height:24px; border: 1px solid #e5e5e5; text-align: center; color: #666; }
.shop-block .more-height .iconfont{ font-size: 10px; margin-left: 5px; }
.shop-lose{ color: #999999; }
.shop-lose h4 a{ color: #999999; }
.shop-lose li p{ color: #999999; }
.shop-lose .lose-but{ height: 30px; padding-right: 3%; margin-bottom: 10px;}
.shop-lose .lose-but span{float: left; display:block; margin-top: 3px; font-size: 12px; background-color: #999; color: #fff; padding: 0 10px; height: 22px;line-height:22px; border-radius: 14px;}
.shop-lose .lose-but .but-bor-red{ display: block; color: #e10601; border: 1px solid #e10601; height: 28px; line-height: 28px; padding:0 10px; border-radius: 14px; }
.shop-but{ height: 44px;border-top: 1px solid #d6d7dc; position: fixed; bottom: 0; width: 100%; background-color: #fff; z-index: 99; }
.shop-but .mui-checkbox label{/* height: 26px; */ line-height: 45px;}
.shop-but .mui-checkbox span{padding-left: 20px; font-size: 14px; }
.shop-but .sum{ text-align: right;padding-right: 10px; padding-bottom: 0;box-sizing: border-box; }
.shop-but .sum h4{ font-size: 16px; line-height: 22px; padding-top: 4px; }
.shop-but .sum p{ font-size: 12px; line-height: 16px;}
.shop-but .button{position: relative;}
.shop-but .button a{display: block; height: 44px; line-height: 44px; font-size: 16px; border-radius: 0; text-align: center; color: #fff; background:red}
.shop-but .button span{ font-size: 12px; }
.shop-but .button .sxx{position: absolute;color:#1080d0;line-height: 44px;top:0px;left:-113%;background: #fff;display:none;}
.shop-but .checkallbox{line-height: 40px;padding-left:10px;box-sizing: border-box;}
.shop-but .button .but-orange{background: #ffa200;}
.shop-but .clearbtn{line-height: 44px;font-size: 14px!important;margin-right: 20px;}
.shop-but .delbtn{width:130px;}
.mui-btn
{
font-size: 14px;
font-weight: 400;
line-height: 1.42;
position: relative;
display: inline-block;
margin-bottom: 0;
padding: 6px 12px;
cursor: pointer;
-webkit-transition: all;
transition: all;
-webkit-transition-timing-function: linear;
transition-timing-function: linear;
-webkit-transition-duration: .2s;
transition-duration: .2s;
text-align: center;
vertical-align: top;
white-space: nowrap;
color: #333;
border: 1px solid #ccc;
border-radius: 3px;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
background-color: #fff;
background-clip: padding-box;
}
.mui-numbox
{
position: relative;
display: inline-block;
overflow: hidden;
width: 120px;
height: 35px;
padding: 0 40px 0 40px;
vertical-align: top;
vertical-align: middle;
border: solid 1px #bbb;
border-radius: 3px;
}
.mui-numbox [class*=numbox-btn], .mui-numbox [class*=btn-numbox]
{
font-size: 18px;
font-weight: normal;
line-height: 100%;
position: absolute;
top: 0;
overflow: hidden;
width: 40px;
height: 100%;
padding: 0;
color: #555;
border: none;
border-radius: 0;
background-color: #f9f9f9;
}
.mui-numbox [class*=numbox-btn]:active, .mui-numbox [class*=btn-numbox]:active
{
background-color: #ccc;
}
.mui-numbox [class*=numbox-btn][disabled], .mui-numbox [class*=btn-numbox][disabled]
{
color: #c0c0c0;
}
.mui-numbox .mui-numbox-btn-plus, .mui-numbox .mui-btn-numbox-plus
{
right: 0;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
.mui-numbox .mui-numbox-btn-minus, .mui-numbox .mui-btn-numbox-minus
{
left: 0;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
.mui-numbox .mui-numbox-input, .mui-numbox .mui-input-numbox
{
display: inline-block;
overflow: hidden;
padding:0 3px;
width: 100% !important;
height: 100%;
margin: 0;
text-align: center;
text-overflow: ellipsis;
word-break: normal;
border: none !important;
border-right: solid 1px #ccc !important;
border-left: solid 1px #ccc !important;
border-radius: 0 !important;
}
.mui-input-row .mui-numbox
{
float: right;
box-sizing: border-box;
margin: 2px 8px;
}
\ No newline at end of file
src/assets/css/car/index.min.css
.car-page .lxBox .lyNav{color:#333;position:fixed;left:0px;top:44px;right:0px;height:44px;border-bottom:1px solid #d6d7dc}.car-page .lxBox .lyNav span{cursor:pointer;width:50%;box-sizing:border-box;font-size:14px;text-align:center;line-height:44px}.car-page .lxBox .lyNav span font{color:#333}.car-page .lxBox .lyNav span.act{color:#1080d0}.car-page .lxBox .logintip{top:88px}.car-page .lxBox .dataBox{padding-top:44px}.car-page .zyBox .logintip{top:44px}.car-page .zyBox .dataBox{padding-top:44px}.car-page .logintip{position:fixed;background:#fff6e5;height:44px;line-height:44px;color:#666;top:44px;left:0px;right:0px;font-size:14px;text-align:center}.car-page .logintip a{background:#e10601;border-radius:4px;text-align:center;width:70px;height:23px;color:#fff;font-size:12px;display:inline-block;line-height:23px;cursor:pointer;margin-left:10px}.car-page .editBox{position:fixed;padding:0 3%;height:44px;line-height:44px;color:#666;left:0px;right:0px;font-size:12px}.car-page .editBox .remind{color:#999}.car-page .editBox .remind i{color:#ffa200;position:relative;top:2px;left:5px}.car-page .editBox a{color:#1080d0;font-size:14px}
\ No newline at end of file
.car-page{color:#333}.car-page .lxBox{padding-bottom:44px}.car-page .lxBox .lyNav{color:#333;position:fixed;left:0px;top:44px;right:0px;height:44px;border-bottom:1px solid #d6d7dc;z-index:3;background-color:#fff;box-sizing:border-box}.car-page .lxBox .lyNav span{cursor:pointer;width:50%;box-sizing:border-box;font-size:14px;text-align:center;line-height:44px}.car-page .lxBox .lyNav span font{color:#333}.car-page .lxBox .lyNav span.act{color:#1080d0}.car-page .lxBox .logintip{top:88px}.car-page .lxBox .dataBox{padding-top:44px}.car-page .zyBox{padding-bottom:44px}.car-page .zyBox .logintip{top:44px}.car-page .zyBox .headxianhuoqihuo{height:43px;line-height:43px;border-bottom:1px solid #d6d7dc}.car-page .zyBox .headxianhuoqihuo .zyqxtype{font-size:16px}.car-page .zyBox .dataBox{padding-top:44px}.car-page .logintip{position:fixed;background:#fff6e5;height:44px;line-height:44px;color:#666;top:44px;left:0px;right:0px;font-size:14px;text-align:center;z-index:3}.car-page .logintip a{background:#e10601;border-radius:4px;text-align:center;width:70px;height:23px;color:#fff;font-size:12px;display:inline-block;line-height:23px;cursor:pointer;margin-left:10px}.car-page .editBox{position:fixed;padding:0 3%;height:44px;line-height:44px;color:#666;left:0px;right:0px;font-size:12px;border-bottom:1px solid #d6d7dc;z-index:3;background:#fff;box-sizing:border-box}.car-page .editBox .remind{color:#999}.car-page .editBox .remind i{color:#ffa200;position:relative;top:2px;left:5px}.car-page .editBox a{color:#1080d0;font-size:14px}.shop-block{font-size:12px;border-bottom:1px solid #d6d7dc}.shop-block .t-r{text-align:right}.shop-block .delete-tier{position:relative;top:2px;font-size:20px}.shop-block h4{font-size:14px;padding:12px 0;font-weight:400;line-height:20px;border-bottom:1px solid #d6d7dc;word-wrap:break-word;word-break:break-all}.shop-block ul{padding:2% 3%;padding-left:0}.shop-block li{font-size:12px;word-wrap:break-word;height:22px;line-height:22px;word-break:break-all;position:relative;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.shop-block li span{float:left;width:50px}.shop-block li p{padding-left:50px;font-size:12px;color:#333333}.shop-block .ichunt-blue{font-size:12px;font-weight:400;padding:1px 3px;margin-left:5px;background:#1080d0;color:#fff;border-radius:3px}.shop-block .ichunt-orange{font-size:12px;font-weight:400;padding:1px 3px;margin-left:5px;background:#ffa200;color:#fff;border-radius:3px}.shop-block .add-num{padding:0 3%}.shop-block .add-num .mui-numbox{float:right;padding:0 30px;width:130px;height:30px;border:1px solid #e1e1e1;border-radius:0;box-sizing:border-box}.shop-block .add-num .mui-numbox button{height:28px;width:30px;font-size:22px;line-height:28px;background-color:#fff;color:#666;box-sizing:border-box}.shop-block .add-num .mui-numbox button i{font-size:14px}.shop-block .add-num .mui-numbox button.no_click{color:#999}.shop-block .add-num .mui-numbox input{height:28px;background:#fff;color:#333;font-size:12px;box-sizing:border-box}.shop-block .subtotal{padding:2% 3%;font-weight:bold;text-align:right}.shop-block .morePrice{margin-bottom:15px}.shop-block .morePrice p{font-size:12px;color:#999}.shop-block .morePrice .list_data{display:none}.shop-block .morePrice .list_data.act p.mui-col-xs-4{color:red!important}.shop-block .morePrice .list_data.act p.f-throug{color:red!important}.shop-block .more-height{font-size:12px;margin-right:10%;height:24px;margin-top:5px;line-height:24px;border:1px solid #e5e5e5;text-align:center;color:#666}.shop-block .more-height .iconfont{font-size:10px;margin-left:5px}.shop-lose{color:#999999}.shop-lose h4 a{color:#999999}.shop-lose li p{color:#999999}.shop-lose .lose-but{height:30px;padding-right:3%;margin-bottom:10px}.shop-lose .lose-but span{float:left;display:block;margin-top:3px;font-size:12px;background-color:#999;color:#fff;padding:0 10px;height:22px;line-height:22px;border-radius:14px}.shop-lose .lose-but .but-bor-red{display:block;color:#e10601;border:1px solid #e10601;height:28px;line-height:28px;padding:0 10px;border-radius:14px}.shop-but{height:44px;border-top:1px solid #d6d7dc;position:fixed;bottom:0;width:100%;background-color:#fff;z-index:99}.shop-but .mui-checkbox label{line-height:45px}.shop-but .mui-checkbox span{padding-left:20px;font-size:14px}.shop-but .sum{text-align:right;padding-right:10px;padding-bottom:0;box-sizing:border-box}.shop-but .sum h4{font-size:16px;line-height:22px;padding-top:4px}.shop-but .sum p{font-size:12px;line-height:16px}.shop-but .button{position:relative}.shop-but .button a{display:block;height:44px;line-height:44px;font-size:16px;border-radius:0;text-align:center;color:#fff;background:red}.shop-but .button span{font-size:12px}.shop-but .button .sxx{position:absolute;color:#1080d0;line-height:44px;top:0px;left:-113%;background:#fff;display:none}.shop-but .checkallbox{line-height:40px;padding-left:10px;box-sizing:border-box}.shop-but .button .but-orange{background:#ffa200}.shop-but .clearbtn{line-height:44px;font-size:14px!important;margin-right:20px}.shop-but .delbtn{width:130px}.mui-btn{font-size:14px;font-weight:400;line-height:1.42;position:relative;display:inline-block;margin-bottom:0;padding:6px 12px;cursor:pointer;-webkit-transition:all;transition:all;-webkit-transition-timing-function:linear;transition-timing-function:linear;-webkit-transition-duration:.2s;transition-duration:.2s;text-align:center;vertical-align:top;white-space:nowrap;color:#333;border:1px solid #ccc;border-radius:3px;border-top-left-radius:3px;border-top-right-radius:3px;border-bottom-right-radius:3px;border-bottom-left-radius:3px;background-color:#fff;background-clip:padding-box}.mui-numbox{position:relative;display:inline-block;overflow:hidden;width:120px;height:35px;padding:0 40px 0 40px;vertical-align:top;vertical-align:middle;border:solid 1px #bbb;border-radius:3px}.mui-numbox [class*=numbox-btn],.mui-numbox [class*=btn-numbox]{font-size:18px;font-weight:normal;line-height:100%;position:absolute;top:0;overflow:hidden;width:40px;height:100%;padding:0;color:#555;border:none;border-radius:0;background-color:#f9f9f9}.mui-numbox [class*=numbox-btn]:active,.mui-numbox [class*=btn-numbox]:active{background-color:#ccc}.mui-numbox [class*=numbox-btn][disabled],.mui-numbox [class*=btn-numbox][disabled]{color:#c0c0c0}.mui-numbox .mui-numbox-btn-plus,.mui-numbox .mui-btn-numbox-plus{right:0;border-top-right-radius:3px;border-bottom-right-radius:3px}.mui-numbox .mui-numbox-btn-minus,.mui-numbox .mui-btn-numbox-minus{left:0;border-top-left-radius:3px;border-bottom-left-radius:3px}.mui-numbox .mui-numbox-input,.mui-numbox .mui-input-numbox{display:inline-block;overflow:hidden;padding:0 3px;width:100% !important;height:100%;margin:0;text-align:center;text-overflow:ellipsis;word-break:normal;border:none !important;border-right:solid 1px #ccc !important;border-left:solid 1px #ccc !important;border-radius:0 !important}.mui-input-row .mui-numbox{float:right;box-sizing:border-box;margin:2px 8px}
\ No newline at end of file
src/store/modules/lxshop/lxshop.js
......@@ -12,7 +12,8 @@ const state = {
supplierList:[],
supplierIds:"",
isLyData:false,
lyData:[]
lyData:[],
isHaveData:false
}
......
src/views/common/GoodsOne.vue
......@@ -56,7 +56,7 @@
<p class="mui-col-sm-6 mui-col-xs-6" v-html="itemPrice.purchases+'+'"></p>
<p class="mui-col-sm-6 mui-col-xs-6">￥{{itemPrice.price_cn}}</p>
</div>
<div class="mui-row list_data f-fff" v-if="itemchild.ladder_price.length==0">
<div class="mui-row list_data f-fff" v-if="itemchild.ladder_price&&itemchild.ladder_price.length==0">
<p class="mui-col-sm-6 mui-col-xs-6">- -</p>
<p class="mui-col-sm-6 mui-col-xs-6">- -</p>
</div>
......@@ -71,7 +71,7 @@
<p class="mui-col-sm-4 mui-col-xs-4">￥{{itemPrice.price_cn}}</p>
<p class="mui-col-sm-4 mui-col-xs-4">${{itemPrice.price_us}}</p>
</div>
<div class="mui-row list_data f-fff" v-if="itemchild.ladder_price.length==0">
<div class="mui-row list_data f-fff" v-if="itemchild.ladder_price&&itemchild.ladder_price.length==0">
<p class="mui-col-sm-4 mui-col-xs-4">- -</p>
<p class="mui-col-sm-4 mui-col-xs-4">- -</p>
<p class="mui-col-sm-4 mui-col-xs-4">- -</p>
......@@ -79,7 +79,7 @@
</template>
<div
class="more-height"
v-if="itemchild.ladder_price.length>limitLength"
v-if="itemchild.ladder_price&&itemchild.ladder_price.length>limitLength"
@click="priceRow(indexdata)"
v-html="itemchild.checkBtn||defaultBtn"
>
......
src/views/common/Header.vue
......@@ -4,8 +4,8 @@
<i class="icon iconfont icon-xiangzuo fl" @click="historyback"></i>
<div v-if="isCar">
<div class="car-title clr">
<span class="fl" :class="{'act':(type==1)}" @click="listTab(1)">联营(<font>0</font>)</span>
<span class="fl" :class="{'act':(type==2)}" @click="listTab(2)">自营(<font>0</font>)</span>
<span class="fl" :class="{'act':(type==1)}" @click="listTab(1)" v-back-top-window>联营(<font>0</font>)</span>
<span class="fl" :class="{'act':(type==2)}" @click="listTab(2)" v-back-top-window>自营(<font>0</font>)</span>
</div>
</div>
<div class="search" v-else-if="inputShow">
......@@ -92,6 +92,7 @@ export default {
position: fixed;
z-index: 3;
top: 0;
box-sizing: border-box;
.car-title{
width:170px;
position: fixed;
......
src/views/lxshop/lxshop.vue
......@@ -24,18 +24,15 @@
</div>
</div>
<!--数据渲染部分-->
<div class="search-list-box" v-if="lyData.length!=0">
<div class="data-group-supplier data-group-supplier-no" v-if="lyData.length==0">
<div class="toisx">
暂时没有数据,换个供应商看看吧
</div>
</div>
<div class="data-group-supplier" v-else v-for="item in lyData">
<div class="name-shop">
<div class="search-list-box" v-if="lyData">
<div class="data-group-supplier" v-for="item in lyData">
<div class="name-shop" >
<img :src="item.supplier_logo||'https://www.ichunt.com/v3/dist/res/m/images/materiel_img_3.png'" class="name-img" alt="aipco">
<a :href="item.supplier_ad.url" class="ad">{{item.supplier_ad.ad}}</a>
<a v-if="item.supplier_ad" :href="item.supplier_ad.url" class="ad">{{item.supplier_ad.ad}}</a>
<a v-else class="ad"></a>
</div>
<GoodsOne :dataList="item.data" ></GoodsOne>
<GoodsOne :dataList="item.data" @placeOrder="placeOrder"></GoodsOne>
<div class="more-number" v-if="item.fished">
为您找到<span>{{item.total}}</span>个商品，已全部显示
</div>
......@@ -47,10 +44,16 @@
</span>
</div>
</div>
<div class="data-group-supplier data-group-supplier-no" style="display:none;">
<div class="toisx">
暂时没有数据,换个供应商看看吧
</div>
</div>
</div>
</div>
<van-loading type="spinner" color="#000" class="loading-background" v-if="loading"/>
<SideBar :isWindow="isWindow" :carshow="carshow"></SideBar>
<goodsDetail :detailsData="detailsData"></goodsDetail>
</section>
</template>
......@@ -61,6 +64,7 @@
import {Loading} from 'vant';
import Header from '@/views/common/Header.vue';
import GoodsOne from '@/views/common/GoodsOne.vue';
import goodsDetail from '@/views/common/goodsDetail.vue';
import SideBar from '@/views/common/SideBar.vue';
Vue.use(Loading);
......@@ -68,6 +72,7 @@
name: 'news',
data() {
return {
detailsData: { isShow: false, id: "" },
carshow:true,
isWindow:true,
inputShow:true,
......@@ -87,6 +92,7 @@
supplierIds: state => state.lxshop.supplierIds,
isLyData: state => state.lxshop.isLyData,
lyData:state => state.lxshop.lyData,
isHaveData:state => state.lxshop.isHaveData,
})
},
......@@ -188,6 +194,12 @@
isMore:1
})
},
placeOrder(id) {
this.detailsData = {
isShow: true,
id: id
};
},
scrollFns() {
var self=this;
window.onscroll= function(){
......@@ -205,7 +217,8 @@
components: {
Header,
GoodsOne,
SideBar
SideBar,
goodsDetail
}
}
......
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