boost + mapmenu

vking
1 parent 1a1582c2
Showing 3 changed files with 48 additions and 39 deletions
pages/reserve/index.js
pages/reserve/index.wxml
pages/reserve/index.wxss
--- a/pages/reserve/index.js
View file @8e9b85e
+++ b/pages/reserve/index.js
View file @8e9b85e
@@ -8,7 +8,7 @@ import PubSub from '../../utils/PubSub'
 const {regeneratorRuntime} = global
 const mapScale=15//18;
 const barHeight=50;
-const transverseViewHeight=235+barHeight;
+const transverseViewHeight=253+barHeight;
 const renNum=function(){
   let arr=[]
--- a/pages/reserve/index.wxml
View file @8e9b85e
+++ b/pages/reserve/index.wxml
View file @8e9b85e
@@ -15,31 +15,32 @@
              enable-rotate
              subkey="SDEBZ-I74W4-QLGUX-XXYXU-HIR23-3QFBJ"
              layer-style="2"
-             style="width: 100%; height: {{map.height+60}}px;"></map>
-        <formids url="/pages/reserve/search" style="position: fixed;" >
-            <view bindtap="elog" data-ename="点击搜索框"
-                    class="flex-ll"
-                    style="position:fixed;top:{{statusBarHeight}}px;left:0;height: {{titleBarHeight}}px; line-height: {{titleBarHeight}}px;">
-                <view class="searchList flex-ll" catchtap="listShow">
-                    <image class="icon" src="http://nosqn.colorcun.com/reserve/images/hasList3.png"></image>
-                    <view class="title">列表</view>
-                </view>
-                <view class="searchAddr flex-ll">
-                    <image class="icon" src="http://nosqn.colorcun.com/custom/lite-online/image/search26.png"></image>
-                    <view class="title">{{hasSuggestion?suggestion.title:'输入餐厅名或地名，快速订包间'}}</view>
-                </view>
-            </view>
-        </formids>
+             style="width: 100%; height: {{map.height}}px;"></map>
     </view>
-    <view class="seller-view {{(listMoreCount<1)?(hasSearchLimit?'disabled enabled':'disabled'):''}}">
+    <view class="seller-view">
         <view class="toast" wx:if="{{hasGetSellersEnd && listMoreCount<1 && !hasSearchLimit && markers.length<2}}">该地区没有可供预订的餐厅哦！努力开通中</view>
         <view class="toast" wx:if="{{hasGetSellersEnd && markers.length<2 && listMoreCount>0}}">移动或缩放地图，获取更多餐厅</view>
+        <!--
         <view class="flex-vc transverse-view-top" bindtap="listShow" wx:if="{{hasGetSellersEnd && listMoreCount>0}}">
             <view class="line"></view>
             <view class="text">
                 <view>{{hasSellers?'查看其它':'已扩大范围为你找到'}}{{listMoreCount}}家餐厅</view>
             </view>
         </view>
+        -->
+        <navigator url="./search"
+                   bindtap="elog" data-ename="点击搜索框" hover-class="navigator-hover">
+            <view class="flex-ll transverse-view-search">
+                <view class="searchAddr flex-ll">
+                    <image class="icon" src="http://nosqn.colorcun.com/custom/lite-online/image/search26.png"></image>
+                    <view class="title">{{hasSuggestion?suggestion.title:'输入餐厅名或地名，快速订包间'}}</view>
+                </view>
+                <view class="searchList flex-tb" catchtap="listShow">
+                    <image class="icon" src="http://nosqn.colorcun.com/mapmenu/maplist.png"></image>
+                    <view class="title">列表模式</view>
+                </view>
+            </view>
+        </navigator>
         <view class="transverse-search flex-ll">
             <view
                     bindtap="caixiShow"
--- a/pages/reserve/index.wxss
View file @8e9b85e
+++ b/pages/reserve/index.wxss
View file @8e9b85e
@@ -174,12 +174,15 @@ page{
 .searchAddr {
   margin-left: 15rpx;
   width: 400rpx;
-  height: 60rpx;
+  height: 64rpx;
   background-color: #fefefe;
-  border-radius: 30rpx;
-  line-height: 60rpx;
+  line-height: 64rpx;
   color:#999999;
   font-size: 24rpx;
+
+  border-radius:32rpx;
+  border:2rpx solid rgba(204,204,204,1);
+  width: 100%;
 }
 .searchAddr .icon{
   min-width: 22rpx;
@@ -195,27 +198,24 @@ page{
   text-align: left;
 }
 .searchList{
-  margin-left: 26rpx;
-  width: 100rpx;
-  height: 60rpx;
-  background-color: #fefefe;
-  border-radius: 30rpx;
-  line-height: 60rpx;
-  color:#C28C56;
-  font-size: 20rpx;
+  margin-left: 30rpx;
+  width:72rpx;
+  min-width: 72rpx;
+  align-items: center;
+
 }
 .searchList .icon{
-  min-width: 24rpx;
-  width: 24rpx;
-  height: 24rpx;
-  margin: 0 8rpx 0 14rpx;
+  width:40rpx;
+  height:36rpx;
+  margin-bottom: 4rpx;
 }
 .searchList .title{
-  line-height: 60rpx;
-  height: 60rpx;
-  overflow: hidden;
-  width: 100%;
-  text-align: left;
+  height:26rpx;
+  font-size:18rpx;
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-weight:400;
+  color:rgba(192,163,105,1);
+  line-height:26rpx;
 }
 .empty-txt{
   height: 300rpx;
@@ -292,7 +292,6 @@ page{
   /* seller-view start*/
 .seller-view{
-  height: 470rpx;
   position:fixed;
   bottom: calc(0rpx + var(--barHeight));
   width: 100%;
@@ -300,6 +299,9 @@ page{
   border-radius: 20rpx 20rpx 0 0;
   box-shadow: -4rpx 0 4rpx 2rpx #C5C1C1;
   overflow: hidden;
+  padding: 30rpx 0 20rpx;
+  height: 506rpx;
+  box-sizing: border-box;
 }
 .seller-view.disabled{
   height: 410rpx;
@@ -331,7 +333,6 @@ page{
   font-size: 24rpx;
   padding-left: 40rpx;
   line-height: 90rpx;
-  padding-top: 58rpx;
 }
 .disabled .transverse-search{
   padding-top: 0;
@@ -364,3 +365,10 @@ page{
   border-radius:30rpx;
   opacity:0.64;
 }
+.transverse-view-search{
+  width:100%;
+  height:66rpx;
+  padding: 0 20rpx;
+  background:rgba(254,254,254,1);
+  box-sizing: border-box;
+}