Skip to content

梁建民 / h5

Go to a project
Commit c138ee57 by 施宇
Options

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

# Conflicts:
#	view/index.html
parents 5e48c457 1add9b41
Inline Side-by-side
Showing with 81 additions and 31 deletions
.gitignore
...@@ -20,3 +20,4 @@ yarn-error.log* ...@@ -20,3 +20,4 @@ yarn-error.log*
*.sw* *.sw*
/view /view
/view /view
/view/index.html
src/assets/css/lxshop/lxshop.less
.lxshop{ .lxshop{
.lxshop-content{ .lxshop-content{
.f-blue{color: #1080d0;} .f-blue{color: #1080d0;}
.sosoarr{ display: none; background-color: #fff; font-size: 15px; font-weight: 400; height: 44px; line-height: 44px; overflow: hidden; width: 100%; -webkit-box-shadow: 0 2px 5px #eeeeee; box-shadow: 0 2px 5px #eeeeee; table-layout: fixed; border-bottom: 1px solid #d6d7dc; }
.sosoarr{text-align: center; padding: 0 15%;box-sizing:border-box;overflow:hidden;text-overflow:ellipsis;white-space: nowrap; }
.layer-fix{ display: block; position: fixed; top: 44px; left: 0; right: 0; z-index: 10; }
.sift-box{ .sift-box{
position: relative; padding-top: 5px; padding-left: 2.5%; height: 36px; line-height: 36px; border-bottom: 1px solid #d6d7dc; background-color: #fff; position: relative; padding-top: 5px; padding-left: 2.5%; height: 36px; line-height: 36px; border-bottom: 1px solid #d6d7dc; background-color: #fff;
dl{ dl{
......
src/assets/css/lxshop/lxshop.min.css
.lxshop .lxshop-content .f-blue{color:#1080d0}.lxshop .lxshop-content .sift-box{position:relative;padding-top:5px;padding-left:2.5%;height:36px;line-height:36px;border-bottom:1px solid #d6d7dc;background-color:#fff}.lxshop .lxshop-content .sift-box dl{float:left;width:35%;margin-right:0;height:35px;color:#333}.lxshop .lxshop-content .sift-box dl dt{text-align:center;font-size:12px;height:30px;line-height:30px;background:#f3f3f3;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0 5px}.lxshop .lxshop-content .sift-box dl dd{position:absolute;top:42px;left:0;width:100%;bottom:140px;z-index:3;display:none}.lxshop .lxshop-content .sift-box dl dd ul{background:#fff;padding-bottom:3px;height:200px;overflow-x:auto}.lxshop .lxshop-content .sift-box dl dd ul li{width:46%;color:#333;font-size:14px;border:1px solid #fff;margin:0 2%;margin-top:3px;padding:0 10px;box-sizing:border-box;height:32px;line-height:32px}.lxshop .lxshop-content .sift-box dl dd ul li.check{border:1px solid #1080d0;color:#1080d0}.lxshop .lxshop-content .sift-box dl dd .button{border-top:1px solid #d6d7dc;height:40px;line-height:40px;background:#fff;-webkit-box-shadow:0 2px 5px #eeeeee;box-shadow:0 2px 5px #eeeeee}.lxshop .lxshop-content .sift-box dl dd .button a{width:50%;font-size:14px;height:39px;line-height:39px;display:block;float:left;text-align:center;color:#333}.lxshop .lxshop-content .sift-box dl dd .button a.but-blue{background:#1080d0;color:#fff;text-decoration:none;text-align:center;border:none}.lxshop .lxshop-content .sift-box dl.p_act{border:1px solid #d6d7dc;border-bottom:none}.lxshop .lxshop-content .sift-box dl.p_act dd{display:block}.lxshop .lxshop-content .sift-box dl.p_act dt{background:#fff;height:34px;line-height:34px;border-bottom:2px solid #fff}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop{padding:10px 10px 10px 0;margin-left:10px;background:#fff}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop img{width:60px;height:30px;display:block;float:left;border:1px solid #e5e5e5;margin-right:10px}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop .ad{color:#666666;font-size:12px;display:block;line-height:16px;overflow:hidden;height:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk{color:#999999;background:#f3f3f3;height:32px;line-height:32px;font-size:12px;text-align:center}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number .cup,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk .cup{cursor:pointer;color:#1080d0}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number .cup:hover,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk .cup:hover{cursor:pointer;color:#0073c5;font-weight:bold}.lxshop .lxshop-content .data-group-supplier-no{color:#999999;font-size:16px;line-height:28px}.lxshop .lxshop-content .data-group-supplier-no .toisx{text-align:center;margin-top:100px}/*# sourceMappingURL=lxshop.min.css.map */ .lxshop .lxshop-content .f-blue{color:#1080d0}.lxshop .lxshop-content .sosoarr{display:none;background-color:#fff;font-size:15px;font-weight:400;height:44px;line-height:44px;overflow:hidden;width:100%;-webkit-box-shadow:0 2px 5px #eeeeee;box-shadow:0 2px 5px #eeeeee;table-layout:fixed;border-bottom:1px solid #d6d7dc}.lxshop .lxshop-content .sosoarr{text-align:center;padding:0 15%;box-sizing:border-box;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.lxshop .lxshop-content .layer-fix{display:block;position:fixed;top:44px;left:0;right:0;z-index:10}.lxshop .lxshop-content .sift-box{position:relative;padding-top:5px;padding-left:2.5%;height:36px;line-height:36px;border-bottom:1px solid #d6d7dc;background-color:#fff}.lxshop .lxshop-content .sift-box dl{float:left;width:35%;margin-right:0;height:35px;color:#333}.lxshop .lxshop-content .sift-box dl dt{text-align:center;font-size:12px;height:30px;line-height:30px;background:#f3f3f3;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0 5px}.lxshop .lxshop-content .sift-box dl dd{position:absolute;top:42px;left:0;width:100%;bottom:140px;z-index:3;display:none}.lxshop .lxshop-content .sift-box dl dd ul{background:#fff;padding-bottom:3px;height:200px;overflow-x:auto}.lxshop .lxshop-content .sift-box dl dd ul li{width:46%;color:#333;font-size:14px;border:1px solid #fff;margin:0 2%;margin-top:3px;padding:0 10px;box-sizing:border-box;height:32px;line-height:32px}.lxshop .lxshop-content .sift-box dl dd ul li.check{border:1px solid #1080d0;color:#1080d0}.lxshop .lxshop-content .sift-box dl dd .button{border-top:1px solid #d6d7dc;height:40px;line-height:40px;background:#fff;-webkit-box-shadow:0 2px 5px #eeeeee;box-shadow:0 2px 5px #eeeeee}.lxshop .lxshop-content .sift-box dl dd .button a{width:50%;font-size:14px;height:39px;line-height:39px;display:block;float:left;text-align:center;color:#333}.lxshop .lxshop-content .sift-box dl dd .button a.but-blue{background:#1080d0;color:#fff;text-decoration:none;text-align:center;border:none}.lxshop .lxshop-content .sift-box dl.p_act{border:1px solid #d6d7dc;border-bottom:none}.lxshop .lxshop-content .sift-box dl.p_act dd{display:block}.lxshop .lxshop-content .sift-box dl.p_act dt{background:#fff;height:34px;line-height:34px;border-bottom:2px solid #fff}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop{padding:10px 10px 10px 0;margin-left:10px;background:#fff}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop img{width:60px;height:30px;display:block;float:left;border:1px solid #e5e5e5;margin-right:10px}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop .ad{color:#666666;font-size:12px;display:block;line-height:16px;overflow:hidden;height:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk{color:#999999;background:#f3f3f3;height:32px;line-height:32px;font-size:12px;text-align:center}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number .cup,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk .cup{cursor:pointer;color:#1080d0}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number .cup:hover,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk .cup:hover{cursor:pointer;color:#0073c5;font-weight:bold}.lxshop .lxshop-content .data-group-supplier-no{color:#999999;font-size:16px;line-height:28px}.lxshop .lxshop-content .data-group-supplier-no .toisx{text-align:center;margin-top:100px}/*# sourceMappingURL=lxshop.min.css.map */
\ No newline at end of file \ No newline at end of file
src/assets/css/lxshop/lxshop.min.css.map
{"version":3,"sources":["lxshop.less"],"names":[],"mappings":"AAAA,OACE,gBACE,SAAQ,cAFZ,OACE,gBAEE,WACE,iBAAA,CAAqB,eAAA,CAAkB,iBAAA,CAAoB,WAAA,CAAc,gBAAA,CAAmB,+BAAA,CAAkC,sBAJpI,OACE,gBAEE,UAEE,IACE,UAAA,CAAa,SAAA,CAAY,cAAA,CAAiB,WAAA,CAC1C,WAPR,OACE,gBAEE,UAEE,GAGE,IACE,iBAAA,CAAoB,cAAA,CAAiB,WAAA,CAAc,gBAAA,CACnD,kBAAA,CAAoB,eAAA,CAAgB,sBAAA,CACpC,kBAAA,CAAqB,cAX/B,OACE,gBAEE,UAEE,GAQE,IACE,iBAAA,CAAoB,QAAA,CACpB,MAAA,CAAS,UAAA,CAAa,YAAA,CACtB,SAAA,CAAW,aAhBrB,OACE,gBAEE,UAEE,GAQE,GAIE,IACE,eAAA,CAAkB,kBAAA,CAAoB,YAAA,CAAe,gBAlBjE,OACE,gBAEE,UAEE,GAQE,GAIE,GAEE,IACE,SAAA,CAAY,UAAA,CAAa,cAAA,CAAkB,qBAAA,CAAuB,WAAA,CAClE,cAAA,CAAiB,cAAA,CAAgB,qBAAA,CAAwB,WAAA,CAAc,iBACvE,OArBZ,gBAEE,UAEE,GAQE,GAIE,GAEE,GAGG,OACC,wBAAA,CAA4B,cAvB5C,OACE,gBAEE,UAEE,GAQE,GAeE,SACE,4BAAA,CAA+B,WAAA,CAC/B,gBAAA,CAAmB,eAAA,CAAkB,oCAAA,CACrC,6BA/BZ,OACE,gBAEE,UAEE,GAQE,GAeE,QAKE,GACE,SAAA,CAAY,cAAA,CAAiB,WAAA,CAC7B,gBAAA,CAAmB,aAAA,CAAgB,UAAA,CACnC,iBAAA,CACA,WACA,OArCZ,gBAEE,UAEE,GAQE,GAeE,QAKE,EAKG,UACC,kBAAA,CACA,UAAA,CACA,oBAAA,CACA,iBAAA,CACA,YAKR,OA/CN,gBAEE,UAEE,GA2CG,OACC,wBAAA,CACA,mBAFF,OA/CN,gBAEE,UAEE,GA2CG,MAGC,IAAG,cAHL,OA/CN,gBAEE,UAEE,GA2CG,MAIC,IAAI,eAAA,CAAkB,WAAA,CAAc,gBAAA,CAAkB,6BApDhE,OACE,gBAwDE,iBACE,qBAEE,YACG,wBAAA,CACD,gBAAA,CAAoB,gBA9D9B,OACE,gBAwDE,iBACE,qBAEE,WAGE,KAAK,UAAA,CAAa,WAAA,CAAc,aAAA,CAAgB,UAAA,CAAa,wBAAA,CAA2B,kBA/DlG,OACE,gBAwDE,iBACE,qBAEE,WAIE,KAAI,aAAA,CAAgB,cAAA,CAAiB,aAAA,CAAe,gBAAA,CAAmB,eAAA,CAAkB,WAAA,CAAa,mBAAA,CAAqB,mBAAA,CAAqB,YAAA,CAAc,wBAAA,CAA0B,4BAAA,CAA8B,2BAAA,CAA6B,4BAAA,CAA8B,yBAAA,CAA2B,sBAhEtT,OACE,gBAwDE,iBACE,qBAQE,cAlER,OACE,gBAwDE,iBACE,qBAQe,CAAA,eACX,aAAA,CAAgB,kBAAA,CAAqB,WAAA,CAAc,gBAAA,CAAmB,cAAA,CAAiB,kBAnEjG,OACE,gBAwDE,iBACE,qBAQE,aAGE,MArEV,OACE,gBAwDE,iBACE,qBAQe,CAAA,cAGX,MAAK,cAAA,CAAiB,cACtB,OArER,gBAwDE,iBACE,qBAQE,aAGE,KACC,OAAD,OArER,gBAwDE,iBACE,qBAQe,CAAA,cAGX,KACC,OAAO,cAAA,CAAiB,aAAA,CAAgB,iBAtEnD,OACE,gBA0EE,yBACE,aAAA,CACA,cAAA,CACA,iBA9EN,OACE,gBA0EE,wBAIE,QAAO,iBAAA,CAAmB","file":"lxshop.min.css"} {"version":3,"sources":["lxshop.less"],"names":[],"mappings":"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","file":"lxshop.min.css"}
\ No newline at end of file \ No newline at end of file
src/views/common/GoodsOne.vue
...@@ -2,35 +2,59 @@ ...@@ -2,35 +2,59 @@
<section> <section>
<div class="block oneDataGoods" v-for="(itemchild,indexdata) in dataList"> <div class="block oneDataGoods" v-for="(itemchild,indexdata) in dataList">
<dl class="mui-row img-box"> <dl class="mui-row img-box">
<a :href="'https://m.ichunt.com/goods_'+itemchild.goods_id+'.html?ptag=lxshop'"> <a :href="isZy?('https://m.ichunt.com/item/'+itemchild.goods_id+'.html?ptag=selfshop'):('https://m.ichunt.com/goods_'+itemchild.goods_id+'.html?ptag=lxshop')">
<dt v-lazy-container="{selector:'img'}"> <dt v-lazy-container="{selector:'img'}">
<img class="lazy img-lazy" :alt="itemchild.goods_name_temp" :data-src="itemchild.goods_img" data-error="https://www.ichunt.com/v3/dist/res/m/images/materiel_img_3.png" /> <img class="lazy img-lazy" :alt="itemchild.goods_name_temp" :data-src="isZy?itemchild.goods_images:itemchild.goods_img" data-error="https://www.ichunt.com/v3/dist/res/m/images/materiel_img_3.png" />
</dt> </dt>
<dd> <dd>
<h4>{{itemchild.goods_name_temp}}</h4> <template v-if="isZy">
<p>制造商：{{itemchild.brand_name||'- -'}}</p> <h4>{{itemchild.sku_name}}</h4>
<p> <p v-if="itemchild.class_name2">分类：{{itemchild.class_name2}}</p>
库存：<span v-html="itemchild.stock||0"></span> <p>制造商：{{itemchild.brand_name}}</p>
</p> <p v-if="itemchild.encap">封装：{{itemchild.encap}}</p>
<p> <p>库存：
起订：<span v-html="itemchild.moq||1"></span> <span v-html="itemchild.stock"></span>
</p> (<span v-html="itemchild.purchase_info"></span>)
<p>MPQ：<span v-html="itemchild.mpq||1"></span></p> </p>
</template>
<template v-else>
<h4>{{itemchild.goods_name_temp}}</h4>
<p>制造商：{{itemchild.brand_name||'- -'}}</p>
<p>
库存：<span v-html="itemchild.stock||0"></span>
</p>
<p>
起订：<span v-html="itemchild.moq||1"></span>
</p>
<p>MPQ：<span v-html="itemchild.mpq||1"></span></p>
</template>
</dd> </dd>
</a> </a>
</dl> </dl>
<div class="mui-row block-but"> <div class="mui-row block-but">
<div class="morePrice"> <div class="morePrice">
<div class="mui-row list_data" v-for="(itemPrice,index) in itemchild.ladder_price" :class="{'dataNo':(index>(limitLength-1))&&!itemchild.check}" > <template v-if="isZy">
<p class="mui-col-sm-4 mui-col-xs-4" v-html="itemPrice.purchases+'+'"></p> <div class="mui-row list_data" v-for="(itemPrice,index) in itemchild.ladder_price" :class="{'dataNo':(index>(limitLength-1))&&!itemchild.check}" >
<p class="mui-col-sm-4 mui-col-xs-4">￥{{itemPrice.price_cn}}</p> <p class="mui-col-sm-6 mui-col-xs-6" v-html="itemPrice.purchases+'+'"></p>
<p class="mui-col-sm-4 mui-col-xs-4">${{itemPrice.price_us}}</p> <p class="mui-col-sm-6 mui-col-xs-6">￥{{itemPrice.price_cn}}</p>
</div> </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.length==0">
<p class="mui-col-sm-4 mui-col-xs-4" >- -</p> <p class="mui-col-sm-6 mui-col-xs-6" >- -</p>
<p class="mui-col-sm-4 mui-col-xs-4">- -</p> <p class="mui-col-sm-6 mui-col-xs-6">- -</p>
<p class="mui-col-sm-4 mui-col-xs-4">- -</p> </div>
</div> </template>
<template v-else>
<div class="mui-row list_data" v-for="(itemPrice,index) in itemchild.ladder_price" :class="{'dataNo':(index>(limitLength-1))&&!itemchild.check}" >
<p class="mui-col-sm-4 mui-col-xs-4" v-html="itemPrice.purchases+'+'"></p>
<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">
<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>
</div>
</template>
<div class="more-height" v-if="itemchild.ladder_price.length>limitLength" @click="priceRow(indexdata)" v-html="itemchild.checkBtn||defaultBtn"> <div class="more-height" v-if="itemchild.ladder_price.length>limitLength" @click="priceRow(indexdata)" v-html="itemchild.checkBtn||defaultBtn">
更多梯度价格<i class="icon-bot"></i> 更多梯度价格<i class="icon-bot"></i>
</div> </div>
...@@ -49,9 +73,13 @@ ...@@ -49,9 +73,13 @@
export default { export default {
name: "GoodsOne", name: "GoodsOne",
props: { props: {
dataList: { dataList: {//数组数据
type: Array, type: Array,
default: [] default: []
},
isZy:{//是否自营
type: Boolean,
default: false
} }
}, },
data() { data() {
...@@ -117,8 +145,8 @@ ...@@ -117,8 +145,8 @@
p{ font-size: 12px; color: #666; line-height: 19px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap; } p{ font-size: 12px; color: #666; line-height: 19px;overflow:hidden;text-overflow:ellipsis;white-space: nowrap; }
} }
.but-shop{ width: 25%; vertical-align: middle; display: table-cell;} .but-shop{ width: 25%; vertical-align: middle; display: table-cell;}
.but{height: 30px; float: right; line-height:30px;padding: 0 20px; width: 60px; font-size: 14px; .but{height: 30px; float: right; line-height:30px;padding: 0 20px; width:100px; font-size: 14px;
display: block;color:#fff;background: #1080d0;text-align: center;cursor: pointer; display: block;color:#fff;background: #1080d0;text-align: center;cursor: pointer;box-sizing: border-box;
border-radius: 4px; border-radius: 4px;
} }
} }
......
src/views/lxshop/lxshop.vue
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
<section class="lxshop"> <section class="lxshop">
<Header :meaushow='meaushow' :inputShow="inputShow" @toSearch="toSearchp"></Header> <Header :meaushow='meaushow' :inputShow="inputShow" @toSearch="toSearchp"></Header>
<div class="lxshop-content"> <div class="lxshop-content">
<!--固定供应商-->
<div class="sosoarr layer-fix" v-if="popdetailbool">{{confirmSupplierNames}}</div>
<!--供应商--> <!--供应商-->
<div class="search-sift" > <div class="search-sift" >
<div class="sift-box pool-sift"> <div class="sift-box pool-sift">
...@@ -33,7 +35,7 @@ ...@@ -33,7 +35,7 @@
<img :src="item.supplier_logo||'https://www.ichunt.com/v3/dist/res/m/images/materiel_img_3.png'" class="name-img" alt="aipco"> <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 :href="item.supplier_ad.url" class="ad">{{item.supplier_ad.ad}}</a>
</div> </div>
<GoodsOne :dataList="item.data"></GoodsOne> <GoodsOne :dataList="item.data" ></GoodsOne>
<div class="more-number" v-if="item.fished"> <div class="more-number" v-if="item.fished">
为您找到<span>{{item.total}}</span>个商品，已全部显示 为您找到<span>{{item.total}}</span>个商品，已全部显示
</div> </div>
...@@ -70,7 +72,8 @@ ...@@ -70,7 +72,8 @@
confirmSupplierNames:"全部供应商", confirmSupplierNames:"全部供应商",
confirmSuppliers:"", confirmSuppliers:"",
supplierListLocal:[], supplierListLocal:[],
supplierIsBlue:false supplierIsBlue:false,
popdetailbool:false
} }
}, },
computed: { computed: {
...@@ -98,6 +101,7 @@ ...@@ -98,6 +101,7 @@
}, },
created() { created() {
this.allSUpplier(); this.allSUpplier();
this.scrollFns();
}, },
mounted() { mounted() {
...@@ -179,6 +183,19 @@ ...@@ -179,6 +183,19 @@
p:p, p:p,
isMore:1 isMore:1
}) })
},
scrollFns() {
var self=this;
window.onscroll= function(){
var t = document.documentElement.scrollTop||document.body.scrollTop;
if (t >= 200) {
if(self.confirmSupplierNames!='全部供应商'){
self.popdetailbool = true;
}
}else{
self.popdetailbool = false;
}
}
} }
}, },
components: { components: {
......
src/views/xianhuo/xianhuo.vue
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
finished-text="我是有底线的噢" finished-text="我是有底线的噢"
@load="onLoad" @load="onLoad"
> >
<GoodsOne :dataList="zyData"></GoodsOne> <GoodsOne :dataList="zyData" :isZy="isZy"></GoodsOne>
</van-list> </van-list>
</div> </div>
</div> </div>
...@@ -183,6 +183,7 @@ export default { ...@@ -183,6 +183,7 @@ export default {
}, },
data() { data() {
return { return {
isZy:true,
zyFilterInit: -1, zyFilterInit: -1,
zyRankInit: 0, //0综合 1库存多到少 2//库存少到多 3//价格高到低 4//价格低到高 zyRankInit: 0, //0综合 1库存多到少 2//库存少到多 3//价格高到低 4//价格低到高
classFilter: "", classFilter: "",
......
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