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