xt / xcx-book · Commits

Go to a project

Commit d63a53ec19d65713a42eaff4b8180ba13bec19e8

Authored by vking
1 parent 13cc1ee8
build: skipped

new 2.0

Inline Side-by-side
Showing 13 changed files with 52 additions and 29 deletions
... ... @@ -37,7 +37,7 @@ page {
--oliveLight: #e8f4d9;
--greenLight: #d7f0db;
--cyanLight: #d2f1f0;
--blueLight: #cce6ff;
--blueLight: #E6F3FF;
--purpleLight: #e1d7f0;
--mauveLight: #ebd4ef;
--pinkLight: #f9d7ea;
... ... @@ -839,7 +839,7 @@ button.icon.lg {
position: absolute;
top: 0;
left: 0;
border: 1rpx solid currentColor;
border: 2rpx solid currentColor;
transform: scale(0.5);
transform-origin: 0 0;
box-sizing: border-box;
... ...
... ... @@ -5,7 +5,7 @@
bindtap="active" data-index="{{index}}"
wx:for="{{multiArray[0]}}" wx:key="multiArraykey">
{{item}}
<image class="number" wx:if="{{index>=1 && index<4}}" src="http://nosqn.colorcun.com/reserve/images/cx{{index}}.png"></image>
<view class="number" wx:if="{{index>=1 && index<4}}">{{index}}</view>
</view>
</view>
</view>
... ...
... ... @@ -7,14 +7,14 @@
width: calc(100% - 80rpx);
border-radius: 0rpx 0rpx 40rpx 40rpx;
padding: 0rpx 40rpx 30rpx;
color: #353535;
color: #666666;
margin-top: 20rpx;
}
.caixi-view{
}
.item{
background-color: #F0F0F9;
background-color: #F1F1F1;
width: 150rpx;
height: 70rpx;
overflow: hidden;
... ... @@ -34,12 +34,20 @@
.item.active{
background: #E6F3FF;
color:#42A5FF;
font-weight: 900;
font-weight: 400;
}
.item .number{
width: 30rpx;
height: 26rpx;
width: 28rpx;
height: 28rpx;
background: linear-gradient(180deg, #FFC140 0%, #FFA000 100%);
border-radius: 0px 0px 10rpx 0px;
position: absolute;
top:0;
left: 0;
}
\ No newline at end of file
height: 28rpx;
font-size: 20rpx;
font-weight: 600;
color: #FFFFFF;
line-height: 28rpx;
}
... ...
... ... @@ -13,8 +13,8 @@
cla="slider20"
minValue="0" maxValue="300" min="0" max="300"
step="10"
blockColor="#fefefe"
backgroundColor="#42A5FF"
blockColor="#ffffff"
backgroundColor="#D8D8D8"
selectedColor="#42A5FF"
bindevent="consumeEvent">
</consume>
... ...
... ... @@ -54,13 +54,13 @@
width: calc(calc(100% - 66rpx) / 4);
margin-right: 22rpx;
height: 84rpx;
background: #F0F0F9;
background: #F1F1F1;
border-radius: 6rpx;
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #353535;
color: #666666;
line-height: 84rpx;
text-align: center;
}
... ...
... ... @@ -24,6 +24,14 @@ Component({
methods: {
initSeller(){
let seller=this.data.seller
if(seller.cate && seller.cate.length>0){
seller.cateStr=[];
seller.cate.some(cate=>{
seller.cateStr.push(cate.name);
if(seller.cateStr.length>2){return true}
})
seller.cateStr=seller.cateStr.join('/')
}
this.setData({
seller:seller,
})
... ...
... ... @@ -8,14 +8,14 @@
</view>
<view class="view detail margin-left-sm flex-treble margin-top-sm text-cut">
<view class="view flex align-center justify-between" style="height: 52rpx;">
<view class="view title text-cut">{{seller.sellername}}</view>
<view class="view title text-bold text-cut">{{seller.sellername}}</view>
<view class="view text-gray" style="font-size: 26rpx;">{{util.distance(seller.distance||seller.distance_centre)}}</view>
</view>
<view class="view flex align-center text-gray margin-top-xs" style="height: 36rpx;">
<view class="caixi flex">
<view class="caixi-item" wx:for="{{seller.cate}}" wx:key="sellercatekey" wx:if="{{index<3}}">{{item.name}}</view>
<view class="view flex align-center justify-between text-gray margin-top-xs" style="height: 36rpx;">
<view class="view caixi text-cut">
<view class="view text-cut">{{seller.cateStr}}</view>
</view>
<view class="renjun flex margin-left-lg align-center">
<view class="view renjun flex margin-left-lg align-center" wx:if="{{seller.average>0}}">
<view class="text-22">¥</view>
<view class="text-26" style="margin: 0 4rpx;">{{seller.average}}</view>
<view class="text-22">/人</view>
... ... @@ -23,7 +23,9 @@
</view>
<view class="view flex align-center margin-top-xs active" style="height: 36rpx;">
<block wx:for="{{seller.activity}}" wx:key="selleractivitykey" wx:if="{{index<3}}">
<view class="cu-tag line-yellow text-orange view">{{item.title}}</view>
<view class="cu-tag line-yellow view">
<text class="text-orange">{{item.title}}</text>
</view>
</block>
</view>
</view>
... ...
... ... @@ -56,7 +56,7 @@
}
.button-view{
width: 144rpx;
height: 60rpx;
height: 56rpx;
position: relative;
}
.button-shadow{
... ... @@ -100,9 +100,6 @@
border-radius: 28rpx;
z-index: 1;
}
.caixi-item+.caixi-item:before{
content: "/";
}
.avatar-block{
height: 188rpx;
overflow: hidden;
... ...
... ... @@ -34,13 +34,13 @@
width: 60rpx;
height: 60rpx;
background: #FFFFFF;
box-shadow: 0px 4rpx 8rpx 0rpx #F4DAB9;
border: 2rpx solid #E9BE94;
box-shadow: 0px 4rpx 8rpx 0rpx #E6F3FF;
border: 2rpx solid #E6F3FF;
border-radius: 50%;
z-index: 2;
}
.slider20 .slider-item{
box-shadow: 0px 4prx 8rpx 0px #E6F3FF;
box-shadow: 0px 4prx 8rpx 0rpx #E6F3FF;
border: 2rpx solid #E6F3FF;
}
... ...
... ... @@ -30,7 +30,7 @@
color: #FFFFFF;
}
.home .icon{
width: 34rpx;
width: 40rpx;
height: 40rpx;
background-image: url("http://nosqn.colorcun.com/2.0/home%20%287%29.png");
}
... ...
... ... @@ -11,6 +11,7 @@ Page({
data:{
map:{},
height:1000,
meTop:20,
hasLoading:true,
activeSellerID:'',//高亮商家
scrollSellerID:'',//滚动到商家
... ... @@ -42,6 +43,12 @@ Page({
*/
onShow: function () {
PubSub.emit('custom-tab-bar')
if(wx.getMenuButtonBoundingClientRect){
let rect=wx.getMenuButtonBoundingClientRect()
this.setData({
meTop:rect.top-5,
})
}
},
/**
... ...
... ... @@ -77,7 +77,8 @@
<image class="moveToLocation-image" src="http://nosqn.colorcun.com/2.0/home%20%2811%29.png"></image>
</view>
<navigator url="/pages/me/index" hover-class="navigator-hover">
<view class="me view flex flex-direction align-center justify-center bg-white round">
<view style="top:{{meTop}}px;"
class="me view flex flex-direction align-center justify-center bg-white round">
<view class="icon view"></view>
<view class="text">我的</view>
</view>
... ...
... ... @@ -2,7 +2,7 @@
@import "/colorui/main.wxss";
page{
background-color: #efefef;
--barHeight: calc(98rpx + env(safe-area-inset-bottom));
/*--barHeight: calc(98rpx + env(safe-area-inset-bottom));*/
}
.moveToLocation{
position: fixed;
... ...