xt / xcx-book · Commits

Go to a project

Commit 1a1582c230c2c8a3ce21221749f98f683d4f6c72

Authored by vking
1 parent 71c9a4bf
build: skipped

boost + mapmenu

Inline Side-by-side
Showing 4 changed files with 36 additions and 37 deletions
@@ -125,27 +125,19 @@ @@ -125,27 +125,19 @@
125 "list": [ 125 "list": [
126 { 126 {
127 "pagePath": "pages/reserve/index", 127 "pagePath": "pages/reserve/index",
128 - "text": "订座",  
129 - "iconPath": "pages/image/tabicon1.png",  
130 - "selectedIconPath": "pages/image/tabicon1.active.png" 128 + "text": "订座"
131 }, 129 },
132 { 130 {
133 "pagePath": "pages/me/follow", 131 "pagePath": "pages/me/follow",
134 - "text": "关注",  
135 - "iconPath": "pages/image/follow.png",  
136 - "selectedIconPath": "pages/image/follow.active.png" 132 + "text": "关注"
137 }, 133 },
138 { 134 {
139 "pagePath": "pages/customer/list", 135 "pagePath": "pages/customer/list",
140 - "text": "日程",  
141 - "iconPath": "pages/image/tabicon3.png",  
142 - "selectedIconPath": "pages/image/tabicon3.active.png" 136 + "text": "日程"
143 }, 137 },
144 { 138 {
145 "pagePath": "pages/me/index", 139 "pagePath": "pages/me/index",
146 - "text": "我的",  
147 - "iconPath": "pages/image/tabicon4.png",  
148 - "selectedIconPath": "pages/image/tabicon4.active.png" 140 + "text": "我的"
149 } 141 }
150 ] 142 ]
151 }, 143 },
@@ -159,24 +159,23 @@ @@ -159,24 +159,23 @@
159 </view> 159 </view>
160 <view class="footer flex-lr"> 160 <view class="footer flex-lr">
161 <view class="left flex-cc"> 161 <view class="left flex-cc">
162 - <formids class="flex-tb" url="/pages/customer/index">  
163 - <image src="http://nosqn.colorcun.com/custom/lite-online/image/%E9%A6%96%E9%A1%B5.png"></image> 162 + <formids class="follow flex-tb" url="/pages/customer/index">
  163 + <image class="follow-img-index" src="http://nosqn.colorcun.com/custom/lite-online/image/%E9%A6%96%E9%A1%B5.png"></image>
164 <view class="text">首页</view> 164 <view class="text">首页</view>
165 </formids> 165 </formids>
166 <userinfo class="follow flex-tb" binduserinfo="follow"> 166 <userinfo class="follow flex-tb" binduserinfo="follow">
167 - <image src="http://nosqn.colorcun.com/custom/lite-online/image/%E6%94%B6%E8%97%8F.png" wx:if="{{!IsCollectionSeller}}"></image>  
168 - <image src="http://nosqn.colorcun.com/custom/lite-online/image/%E5%B7%B2%E6%94%B6%E8%97%8F.png" wx:else=""></image> 167 + <image class="follow-img-follow" src="http://nosqn.colorcun.com/custom/lite-online/image/%E6%94%B6%E8%97%8F.png" wx:if="{{!IsCollectionSeller}}"></image>
  168 + <image class="follow-img-follow" src="http://nosqn.colorcun.com/custom/lite-online/image/%E5%B7%B2%E6%94%B6%E8%97%8F.png" wx:else=""></image>
169 <view class="text">收藏</view> 169 <view class="text">收藏</view>
170 </userinfo> 170 </userinfo>
171 - </view>  
172 - <view class="reserve share flex-vc">  
173 - <userinfo class="flex-vc" style="width: 100%" binduserinfo="shareUserinfo"> 171 + <userinfo class="follow flex-tb" binduserinfo="shareUserinfo">
  172 + <image class="follow-img-share" src="http://nosqn.colorcun.com/mapmenu/seshare.png"></image>
174 <view class="text">分享</view> 173 <view class="text">分享</view>
175 </userinfo> 174 </userinfo>
176 </view> 175 </view>
177 <view class="reserve reserve-click flex-vc"> 176 <view class="reserve reserve-click flex-vc">
178 <formids class="flex-vc" bindclick="reserveEvent" id="reserve-button"> 177 <formids class="flex-vc" bindclick="reserveEvent" id="reserve-button">
179 - <view class="text">{{hasOnlineReserve?'订包间':'联系餐厅'}}</view> 178 + <view class="text">订包间</view>
180 </formids> 179 </formids>
181 </view> 180 </view>
182 181
@@ -165,17 +165,26 @@ @@ -165,17 +165,26 @@
165 background-color: #FFFFFF; 165 background-color: #FFFFFF;
166 } 166 }
167 .footer .left{ 167 .footer .left{
168 - width: 34%; 168 + width: 100%;
169 height: 100%; 169 height: 100%;
  170 + padding: 0 20rpx;
  171 + box-sizing: border-box;
170 } 172 }
171 .footer .left formids{ 173 .footer .left formids{
172 height: 70rpx; 174 height: 70rpx;
173 line-height: 34rpx; 175 line-height: 34rpx;
174 } 176 }
175 -.footer .left image{  
176 - width: 36rpx;  
177 - height: 34rpx;  
178 - line-height: 34rpx; 177 +.follow-img-index{
  178 + width:36rpx;
  179 + height:34rpx;
  180 +}
  181 +.follow-img-follow{
  182 + width:36rpx;
  183 + height:34rpx;
  184 +}
  185 +.follow-img-share{
  186 + width:32rpx;
  187 + height:32rpx;
179 } 188 }
180 .footer .left .text{ 189 .footer .left .text{
181 line-height: 28rpx; 190 line-height: 28rpx;
@@ -184,22 +193,19 @@ @@ -184,22 +193,19 @@
184 margin-top: 8rpx; 193 margin-top: 8rpx;
185 } 194 }
186 .footer .follow{ 195 .footer .follow{
187 - margin-left: 70rpx; 196 + width: 33%;
188 } 197 }
189 .footer .reserve{ 198 .footer .reserve{
190 - width: 33%; 199 + width: 350rpx;
  200 + min-width: 350rpx;
191 height: 100%; 201 height: 100%;
192 - background-color: #242320;  
193 -}  
194 -.footer .reserve.share{  
195 - background-color: #C0A369; 202 + background:linear-gradient(360deg,rgba(249,142,71,1) 0%,rgba(240,85,34,1) 100%);
196 } 203 }
197 .footer .reserve .text{ 204 .footer .reserve .text{
198 - line-height: 100rpx;  
199 - height: 100rpx;  
200 - font-size: 30rpx;  
201 - color:#ffffff;  
202 - width: 100%; 205 + font-size:36rpx;
  206 + font-family:PingFangSC-Semibold,PingFang SC;
  207 + font-weight:600;
  208 + color:rgba(255,255,255,1);
203 } 209 }
204 210
205 .baos{ 211 .baos{
@@ -7,7 +7,9 @@ import reddot from '../../utils/reddot'; @@ -7,7 +7,9 @@ import reddot from '../../utils/reddot';
7 import PubSub from '../../utils/PubSub' 7 import PubSub from '../../utils/PubSub'
8 const {regeneratorRuntime} = global 8 const {regeneratorRuntime} = global
9 const mapScale=15//18; 9 const mapScale=15//18;
10 -const transverseViewHeight=235; 10 +const barHeight=50;
  11 +const transverseViewHeight=235+barHeight;
  12 +
11 const renNum=function(){ 13 const renNum=function(){
12 let arr=[] 14 let arr=[]
13 for(let i=1;i<=30;i++){ 15 for(let i=1;i<=30;i++){