Skip to content

肖康 / H5_2.0

Go to a project
Commit 6848c18e by LJM
Options

Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

parents aac0d1b8 cd47d147
Inline Side-by-side
Showing with 235 additions and 192 deletions
assets/css/common/addcar.scss
.addcar-pop{ .addcar-pop{
$actcolorbl:$uni-coloract;//区分活动变量 $actcolorbl:$uni-coloract;//区分活动变量
background: rgba(0,0,0,0.5);
position: fixed;
z-index: 5;
left:0rpx;
top:0rpx;
bottom:0rpx;
right:0rpx;
.addcarpopbox{ .addcarpopbox{
width:100%; width:100%;
height:100%; height:100%;
position: relative;
.cons{ .cons{
position: absolute; width: 100%;
left:0rpx;
bottom:0rpx;
width: 750rpx;
background: linear-gradient(180deg, #F0F6FF 0%, #FFFFFF 100%); background: linear-gradient(180deg, #F0F6FF 0%, #FFFFFF 100%);
border-radius: 10rpx 10rpx 0px 0px; border-radius: 10rpx 10rpx 0px 0px;
padding-bottom: 10rpx; padding-bottom: 10rpx;
.pophead{ .pophead{
height:93rpx; height:93rpx;
...@@ -193,13 +180,13 @@ ...@@ -193,13 +180,13 @@
font-size: 24rpx; font-size: 24rpx;
color:$uni-color999; color:$uni-color999;
.tje{ .tje{
color:$actcolorbl; color:$uni-colorwarning;
font-size: 32rpx; font-size: 32rpx;
font-weight: 600; font-weight: 600;
} }
} }
.addcarbtn{ .addcarbtn{
width: 344rpx; width: 300rpx;
height: 68rpx; height: 68rpx;
line-height: 68rpx; line-height: 68rpx;
text-align: center; text-align: center;
...@@ -211,12 +198,12 @@ ...@@ -211,12 +198,12 @@
} }
.kfbtn{ .kfbtn{
height: 68rpx; height: 68rpx;
line-height: 50rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 10rpx; border-radius: 10rpx;
border: 2px solid $actcolorbl; border: 1rpx solid $actcolorbl;
color:$actcolorbl; color:$actcolorbl;
text-align: center; text-align: center;
font-size: 28rpx;
.icon{font-size: 44rpx;margin-right: 12rpx;position: relative;top:5rpx;} .icon{font-size: 44rpx;margin-right: 12rpx;position: relative;top:5rpx;}
} }
} }
......
assets/css/detail/detail.scss
...@@ -318,4 +318,30 @@ ...@@ -318,4 +318,30 @@
} }
} }
}
.layer-box{
.title{
padding:0 25rpx;
width: 100%;
height: 88rpx;
background: linear-gradient(180deg, #F0F6FF 0%, #FFFFFF 100%);
border-radius: 10rpx 10rpx 0rpx 0rpx;
font-size: 24rpx;
color:$uni-color666;
text{color:$uni-coloract;margin:0 5rpx;}
.iconfont{font-size: 40rpx;color:$uni-color999;}
}
.cons{
background: #fff;
padding:0 25rpx;
padding-bottom: 100rpx;
.group{
height:88rpx;
.goods{max-width: 600rpx;}
.icon{font-size: 34rpx;color:$uni-color999;}
border-top: 1rpx solid #F0F0F2;
}
}
} }
\ No newline at end of file
assets/css/search/searchlist.scss
...@@ -258,22 +258,9 @@ ...@@ -258,22 +258,9 @@
} }
.shift-pop{ .shift-pop{
background: rgba(0,0,0,0.5);
position: fixed;
z-index: 5;
left:0rpx;
top:0rpx;
bottom:0rpx;
right:0rpx;
.shiftpopbox{ .shiftpopbox{
width:100%;
height:100%;
position: relative;
.cons{ .cons{
position: absolute; width: 100%;
left:0rpx;
bottom:0rpx;
width: 750rpx;
background: linear-gradient(180deg, #F0F6FF 0%, #FFFFFF 100%); background: linear-gradient(180deg, #F0F6FF 0%, #FFFFFF 100%);
border-radius: 10rpx 10rpx 0px 0px; border-radius: 10rpx 10rpx 0px 0px;
padding: 24rpx; padding: 24rpx;
......
components/addcar.vue
<template> <template>
<view class="addcar " v-show="popIsShow"> <view>
<view class="addcar-pop "> <uni-popup ref="popup" type="bottom">
<view class="addcarpopbox" @click="popIsShow=!popIsShow"> <view class="addcar " >
<view class="cons" @click.stop="popIsShow=popIsShow"> <view class="addcar-pop ">
<view class="pophead row bothSide"> <view class="addcarpopbox" >
<view class="tits row"> <view class="cons" >
<text class="goodsName elep">lm358asdasdasdasdasdads</text> <view class="pophead row bothSide">
<text class="actag">91折</text> <view class="tits row">
</view> <text class="goodsName elep">lm358asdasdasdasdasdads</text>
<text class="icon iconfont icon-xxx" @click.stop="popIsShow=!popIsShow"></text> <text class="actag">91折</text>
</view> </view>
<view class="popcons"> <text class="icon iconfont icon-xxx" @click="close()"></text>
<view class="infobox">
<view class="itemone row bothSide">
<view class="il elep">
<text class="label">品牌：</text>
<text>Rice Lake Weighing</text>
</view>
<view class="ir">
<text class="label">ECCN：</text>
<text>ERA3006</text>
</view>
</view>
<view class="itemone row bothSide">
<view class="il elep">
<text class="label">供应商：</text>
<text>Mouser</text>
</view>
<view class="ir">
<text class="label">递增量：</text>
<text>66666</text>
</view>
</view> </view>
<view class="popcons">
<view class="itemone row bothSide"> <view class="infobox">
<view class="il elep"> <view class="itemone row bothSide">
<text class="label">封装：</text> <view class="il elep">
<text>asdad</text> <text class="label">品牌：</text>
</view> <text>Rice Lake Weighing</text>
<view class="ir"> </view>
<text class="label">起订量：</text> <view class="ir">
<text>500</text> <text class="label">ECCN：</text>
</view> <text>ERA3006</text>
</view> </view>
<view class="itemone row bothSide">
<view class="il elep">
<text class="label">包装：</text>
<text>Cut Tape</text>
</view>
<view class="ir">
<text class="label">库存：</text>
<text class="kcty">654564654</text>
</view>
</view>
<view class="itemone row bothSide">
<view class="il elep">
<text class="label">类别：</text>
<text>Cut Tape</text>
</view>
</view>
</view>
<view class="pricebox">
<view class="pricet row">
<view class="pl row">
<text class="label">交期：</text>
<view class="row hqitem">
<text class="checkbox checked"><text class="icon iconfont icon-xzs"></text></text>
<text>大陆3-5日</text>
</view> </view>
<view class="row hqitem"> <view class="itemone row bothSide">
<text class="checkbox"></text> <view class="il elep">
<text>香港3-5日</text> <text class="label">供应商：</text>
<text>Mouser</text>
</view>
<view class="ir">
<text class="label">递增量：</text>
<text>66666</text>
</view>
</view>
<view class="itemone row bothSide">
<view class="il elep">
<text class="label">封装：</text>
<text>asdad</text>
</view>
<view class="ir">
<text class="label">起订量：</text>
<text>500</text>
</view>
</view>
<view class="itemone row bothSide">
<view class="il elep">
<text class="label">包装：</text>
<text>Cut Tape</text>
</view>
<view class="ir">
<text class="label">库存：</text>
<text class="kcty">654564654</text>
</view>
</view>
<view class="itemone row bothSide">
<view class="il elep">
<text class="label">类别：</text>
<text>Cut Tape</text>
</view>
</view> </view>
</view> </view>
<view class="pr row " > <view class="pricebox">
<text>-</text> <view class="pricet row">
<input type="number" /> <view class="pl row">
<text>+</text> <text class="label">交期：</text>
</view> <view class="row hqitem">
</view> <text class="checkbox checked"><text class="icon iconfont icon-xzs"></text></text>
<view class="priceb"> <text>大陆3-5日</text>
<view class="pitem titso row"> </view>
<view class="pi1">阶梯</view> <view class="row hqitem">
<view class="pi2">大陆交货(含税)</view> <text class="checkbox"></text>
<view class="pi3">香港交货</view> <text>香港3-5日</text>
</view> </view>
<view class="pitem row " > </view>
<view class="pi1">50000+:</view> <view class="pr row " >
<view class="pi2 row"><text class="w140">￥130.856</text><text class="hxj">￥130.856</text></view> <text>-</text>
<view class="pi3 row"> <text class="w120">$130.856</text><text class="hxj">$130.856</text></view> <input type="number" />
</view> <text>+</text>
<view class="pitem row " > </view>
<view class="pi1">50000+:</view> </view>
<view class="pi2 row"><text class="w140">￥130.856</text><text class="hxj">￥130.856</text></view> <view class="priceb">
<view class="pi3 row"> <text class="w120">$130.856</text><text class="hxj">$130.856</text></view> <view class="pitem titso row">
</view> <view class="pi1">阶梯</view>
<view class="pitem row act" > <view class="pi2">大陆交货(含税)</view>
<view class="pi1">50000+:</view> <view class="pi3">香港交货</view>
<view class="pi2 row"><text class="w140">￥130.856</text><text class="hxj">￥130.856</text></view> </view>
<view class="pi3 row"> <text class="w120">$130.856</text><text class="hxj">$130.856</text></view> <view class="pitem row " >
<view class="pi1">50000+:</view>
<view class="pi2 row"><text class="w140">￥130.856</text><text class="hxj">￥130.856</text></view>
<view class="pi3 row"> <text class="w120">$130.856</text><text class="hxj">$130.856</text></view>
</view>
<view class="pitem row " >
<view class="pi1">50000+:</view>
<view class="pi2 row"><text class="w140">￥130.856</text><text class="hxj">￥130.856</text></view>
<view class="pi3 row"> <text class="w120">$130.856</text><text class="hxj">$130.856</text></view>
</view>
<view class="pitem row act" >
<view class="pi1">50000+:</view>
<view class="pi2 row"><text class="w140">￥130.856</text><text class="hxj">￥130.856</text></view>
<view class="pi3 row"> <text class="w120">$130.856</text><text class="hxj">$130.856</text></view>
</view>
<view class="noprice" style="display:none;">
<text class="icon iconfont icon-sanjiaoji"></text>
暂无阶梯价格
</view>
</view>
</view> </view>
<view class="noprice" style="display:none;"> <view class="btnbox">
<text class="icon iconfont icon-sanjiaoji"></text> <view class="totalpricebox row bothSide" >
暂无阶梯价格 <view class="hej">合计：<text class="tje">¥3235.6856</text></view>
<view class="addcarbtn">加入购物车</view>
</view>
<a class="kfbtn row verCenter rowCenter" href="#" target="_blank" style="display:none">
<text class="icon iconfont icon-qq"></text>
联系客服
</a>
</view> </view>
</view> </view>
</view> </view>
<view class="btnbox">
<view class="totalpricebox row bothSide" >
<view class="hej">合计：<text class="tje">¥3235.6856</text></view>
<view class="addcarbtn">加入购物车</view>
</view>
<view class="kfbtn" style="display:none">
<text class="icon iconfont icon-qq"></text>
联系客服
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </uni-popup>
</view> </view>
</template> </template>
<script> <script>
...@@ -137,24 +142,28 @@ ...@@ -137,24 +142,28 @@
}, },
data() { data() {
return { return {
popIsShow:false
} }
}, },
onLoad: function() { onLoad: function() {
}, },
methods: { methods: {
open() {
this.$refs.popup.open('bottom');
},
close() {
this.$refs.popup.close();
},
addcarpopfunc(goods_id){ addcarpopfunc(goods_id){
if(goods_id){ if(goods_id){
this.popIsShow=!this.popIsShow;
this.getData(goods_id) this.getData(goods_id)
} }
}, },
getData:function(goods_id){ getData:function(goods_id){
this.request(Api_Url + "/goods/detail", 'POST', {id:goods_id},true,true).then(res => { this.request(Api_Url + "/goods/detail", 'POST', {id:goods_id},true,true).then(res => {
if (res.err_code == 0) {
if (res.error_code == 0) { this.open()
}else{ }else{
} }
......
components/drag-button-follow/drag-button-follow.vue
...@@ -76,7 +76,9 @@ ...@@ -76,7 +76,9 @@
} }
} }
}, },
mounted() { mounted() {
const systemInfo = uni.getSystemInfoSync() || {} const systemInfo = uni.getSystemInfoSync() || {}
this.$options.safeArea = { this.$options.safeArea = {
left: 0, left: 0,
......
pages/detail/detail.vue
<template> <template>
<view class="detailpage"> <view class="detailpage">
<drag-button-follow follow="left,right" className="drag-button" class="drag-button" :url="kfurl"></drag-button-follow>
<view class="detailhead row verCenter bothSide"> <view class="detailhead row verCenter bothSide">
<text v-back class="icon iconfont icon-arrleft"></text> <text v-back class="icon iconfont icon-arrleft"></text>
<view class="titlesp" >商品详情</view> <view class="titlesp" >商品详情</view>
...@@ -14,7 +15,7 @@ ...@@ -14,7 +15,7 @@
<text class="goodsName elep">lm358asda</text> <text class="goodsName elep">lm358asda</text>
<text class="actag">91折</text> <text class="actag">91折</text>
</view> </view>
<view class="tdbox row verCenter"> <view class="tdbox row verCenter" @click="open()">
<view class="round row verCenter rowCenter"><text class="icon iconfont icon-tdzty"></text></view> <view class="round row verCenter rowCenter"><text class="icon iconfont icon-tdzty"></text></view>
<text>可替代</text> <text>可替代</text>
</view> </view>
...@@ -135,6 +136,23 @@ ...@@ -135,6 +136,23 @@
</a> </a>
</view> </view>
</view> </view>
<!-- 筛选 -->
<uni-popup ref="popup" type="bottom">
<view class="layer-box">
<view class="title row verCenter bothSide">
<view class="left">共<text>3</text>个替代型号</view>
<view class="right"><text class="iconfont icon-xxx" @click="close()"></text></view>
</view>
<view class="cons">
<navigator url="/s?k=lm358" class="group row verCenter bothSide">
<text class="goods elep">lm358</text>
<text class="icon iconfont icon-jt"></text>
</navigator>
</view>
</view>
</uni-popup>
</view> </view>
</template> </template>
...@@ -143,11 +161,16 @@ ...@@ -143,11 +161,16 @@
export default { export default {
data() { data() {
return { return {
kfurl:"",
} }
}, },
methods: { methods: {
open() {
this.$refs.popup.open('bottom');
},
close() {
this.$refs.popup.close();
}
} }
} }
</script> </script>
......
pages/search/searchlist.vue
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
<view class="rank1 row ">综合</view> <view class="rank1 row ">综合</view>
<view class="rank2 row sjpx act top">库存</view> <view class="rank2 row sjpx act top">库存</view>
<view class="rank3 row sjpx act bot">价格</view> <view class="rank3 row sjpx act bot">价格</view>
<view class="sxbox row" @click="shiftPopShow=!shiftPopShow">筛选<text <view class="sxbox row" @click="opensx()">筛选<text class="icon iconfont icon-sxs"></text></view>
class="icon iconfont icon-sxs"></text></view>
</view> </view>
</view> </view>
<view class="cons"> <view class="cons">
...@@ -119,49 +118,53 @@ ...@@ -119,49 +118,53 @@
</view> </view>
</view> </view>
<view class="shift-pop" v-show="shiftPopShow">
<view class="shiftpopbox" @click="shiftPopShow=!shiftPopShow"> <uni-popup ref="popupsx" type="bottom">
<view class="cons" @click.stop="shiftPopShow=shiftPopShow"> <view class="shift-pop" >
<view class="pophead row bothSide"> <view class="shiftpopbox" >
<text class="tits">筛选</text> <view class="cons" >
<text class="icon iconfont icon-xxx" @click.stop="shiftPopShow=!shiftPopShow"></text> <view class="pophead row bothSide">
</view> <text class="tits">筛选</text>
<view class="popcons"> <text class="icon iconfont icon-xxx" @click="closesx()"></text>
<view class="tpt row bothSide">
<text>供应商</text>
<text class="cleartj">清除条件</text>
</view> </view>
<view class="tpo row"> <view class="popcons">
<view class="toitem act">TI</view> <view class="tpt row bothSide">
<view class="toitem">MOUSEKJLJL</view> <text>供应商</text>
<view class="toitem">国内现货</view> <text class="cleartj">清除条件</text>
<view class="toitem">TI</view> </view>
<view class="toitem">MOUSEKJLJL</view> <view class="tpo row">
<view class="toitem">国内现货</view> <view class="toitem act">TI</view>
<view class="toitem">MOUSEKJLJL</view>
<view class="toitem">国内现货</view>
<view class="toitem">TI</view>
<view class="toitem">MOUSEKJLJL</view>
<view class="toitem">国内现货</view>
</view>
</view> </view>
</view> <view class="popcons">
<view class="popcons"> <view class="tpt row bothSide">
<view class="tpt row bothSide"> <text>品牌</text>
<text>品牌</text> <text class="cleartj">清除条件</text>
<text class="cleartj">清除条件</text> </view>
<view class="tpo row">
<view class="toitem act">TI</view>
<view class="toitem">MOUSEKJLJL</view>
<view class="toitem">国内现货</view>
<view class="toitem">TI</view>
<view class="toitem">MOUSEKJLJL</view>
<view class="toitem">国内现货</view>
</view>
</view> </view>
<view class="tpo row"> <view class="foot row bothSide">
<view class="toitem act">TI</view> <view class="cz">重置</view>
<view class="toitem">MOUSEKJLJL</view> <view class="cx" @click.stop="searchgo">查询</view>
<view class="toitem">国内现货</view>
<view class="toitem">TI</view>
<view class="toitem">MOUSEKJLJL</view>
<view class="toitem">国内现货</view>
</view> </view>
</view> </view>
<view class="foot row bothSide">
<view class="cz">重置</view>
<view class="cx" @click.stop="searchgo">查询</view>
</view>
</view> </view>
</view> </view>
</view> </uni-popup>
<addCar ref="addCarPop" /> <addCar ref="addCarPop" />
</view> </view>
</template> </template>
...@@ -171,7 +174,6 @@ ...@@ -171,7 +174,6 @@
export default { export default {
data() { data() {
return { return {
shiftPopShow: false, //筛选弹窗状态
searchVal: "", //搜索值 searchVal: "", //搜索值
list: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] list: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
} }
...@@ -208,7 +210,13 @@ ...@@ -208,7 +210,13 @@
}, },
addcarpopfunc(goods_id) { addcarpopfunc(goods_id) {
this.$refs.addCarPop.addcarpopfunc(goods_id); this.$refs.addCarPop.addcarpopfunc(goods_id);
} },
opensx() {
this.$refs.popupsx.open('bottom');
},
closesx() {
this.$refs.popupsx.close();
},
}, },
components: { components: {
addCar addCar
......
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