Showing
7 changed files
with
120 additions
and
163 deletions
| @@ -120,7 +120,7 @@ Page({ | @@ -120,7 +120,7 @@ Page({ | ||
| 120 | this.param={ | 120 | this.param={ |
| 121 | lat_extend:mapParam.lat, | 121 | lat_extend:mapParam.lat, |
| 122 | lng_extend:mapParam.lng, | 122 | lng_extend:mapParam.lng, |
| 123 | - keyword:mapParam.keyword.trim(), | 123 | + keyword:mapParam.keyword, |
| 124 | offset:this.offset, | 124 | offset:this.offset, |
| 125 | size:this.size, | 125 | size:this.size, |
| 126 | distance:500000, | 126 | distance:500000, |
| @@ -128,9 +128,6 @@ Page({ | @@ -128,9 +128,6 @@ Page({ | ||
| 128 | if(mapParam.lat){ | 128 | if(mapParam.lat){ |
| 129 | this.param.centre_pos=`${mapParam.lat},${mapParam.lng}` | 129 | this.param.centre_pos=`${mapParam.lat},${mapParam.lng}` |
| 130 | } | 130 | } |
| 131 | - if(mapParam.isopen_md){ | ||
| 132 | - this.param.isopen_md=1 | ||
| 133 | - } | ||
| 134 | }else{ | 131 | }else{ |
| 135 | //计算视窗中心 | 132 | //计算视窗中心 |
| 136 | let map=JSON.parse(mapParam.map); | 133 | let map=JSON.parse(mapParam.map); |
| 1 | <!--pages/reserve/indexList.wxml--> | 1 | <!--pages/reserve/indexList.wxml--> |
| 2 | <nav>周到安排</nav> | 2 | <nav>周到安排</nav> |
| 3 | <view class="header"> | 3 | <view class="header"> |
| 4 | - <!-- | ||
| 5 | <view class="searchAddrView" bindtap="dispalySearchHow"> | 4 | <view class="searchAddrView" bindtap="dispalySearchHow"> |
| 6 | <view class="searchAddr flex-ll"> | 5 | <view class="searchAddr flex-ll"> |
| 7 | - <image class="icon" src="http://nosqn.colorcun.com/reserve/images/find-black.png"></image> | 6 | + <image class="icon" src="http://qn.colorcun.com/reserve/images/find-black.png"></image> |
| 8 | <input style="width: 100%;" placeholder="{{placeholder}}" | 7 | <input style="width: 100%;" placeholder="{{placeholder}}" |
| 9 | type="text" disabled | 8 | type="text" disabled |
| 10 | value="{{keyword}}"/> | 9 | value="{{keyword}}"/> |
| 11 | </view> | 10 | </view> |
| 12 | </view> | 11 | </view> |
| 13 | - --> | ||
| 14 | - <view class="transverse-search flex-ll {{hasDisabled?'disabled':''}}"> | 12 | + <view class="transverse-search flex-lr {{hasDisabled?'disabled':''}}"> |
| 15 | <view | 13 | <view |
| 16 | bindtap="caixiShow" | 14 | bindtap="caixiShow" |
| 17 | class="tags {{multiIndex[0]>0?'active':''}}" | 15 | class="tags {{multiIndex[0]>0?'active':''}}" |
| 18 | > | 16 | > |
| 19 | - <view class="picker flex-lr"> | 17 | + <view class="picker flex-cc"> |
| 20 | <view class="input"> | 18 | <view class="input"> |
| 21 | <block wx:if="{{multiIndex[0]==0}}">菜系</block> | 19 | <block wx:if="{{multiIndex[0]==0}}">菜系</block> |
| 22 | <block wx:else="">{{multiArray[0][multiIndex[0]]}}</block> | 20 | <block wx:else="">{{multiArray[0][multiIndex[0]]}}</block> |
| @@ -34,7 +32,7 @@ | @@ -34,7 +32,7 @@ | ||
| 34 | <view class="pages"> | 32 | <view class="pages"> |
| 35 | <view class="flex-vc empty" wx:if="{{markers.length<1}}"> | 33 | <view class="flex-vc empty" wx:if="{{markers.length<1}}"> |
| 36 | <block wx:if="{{!hasFirstShow}}"> | 34 | <block wx:if="{{!hasFirstShow}}"> |
| 37 | - <image src="http://nosqn.colorcun.com/custom/lite-online/image/follow-empty.png"></image> | 35 | + <image src="http://qn.colorcun.com/custom/lite-online/image/follow-empty.png"></image> |
| 38 | <block wx:if="{{hasDisabled}}"> | 36 | <block wx:if="{{hasDisabled}}"> |
| 39 | <view>该地区没有可供预订的餐厅,努力开通中</view> | 37 | <view>该地区没有可供预订的餐厅,努力开通中</view> |
| 40 | </block> | 38 | </block> |
| @@ -55,7 +53,7 @@ | @@ -55,7 +53,7 @@ | ||
| 55 | <sb-tr seller="{{item}}" | 53 | <sb-tr seller="{{item}}" |
| 56 | hasActivityTags="{{false}}" | 54 | hasActivityTags="{{false}}" |
| 57 | hasActivityShort="{{true}}" | 55 | hasActivityShort="{{true}}" |
| 58 | - hasBrand="true" hasActivityRed="true" | 56 | + hasBrand="true" hasActivityTese="true" |
| 59 | hasSlogan="{{false}}" | 57 | hasSlogan="{{false}}" |
| 60 | hasSuggestion="{{hasSuggestion}}" | 58 | hasSuggestion="{{hasSuggestion}}" |
| 61 | sellerStyle="noborder noshadow noradius"></sb-tr> | 59 | sellerStyle="noborder noshadow noradius"></sb-tr> |
| @@ -13,36 +13,42 @@ | @@ -13,36 +13,42 @@ | ||
| 13 | width: 100%; | 13 | width: 100%; |
| 14 | margin: 0 auto; | 14 | margin: 0 auto; |
| 15 | font-size: 24rpx; | 15 | font-size: 24rpx; |
| 16 | - padding-left: 20rpx; | ||
| 17 | } | 16 | } |
| 18 | .transverse-search .tags{ | 17 | .transverse-search .tags{ |
| 19 | - height: 50rpx; | ||
| 20 | - line-height: 50rpx; | ||
| 21 | - background-color: #F0F0F9; | ||
| 22 | - border-radius: 4rpx; | ||
| 23 | - margin-right: 30rpx; | ||
| 24 | - padding: 0 16rpx; | 18 | + height: 30rpx; |
| 19 | + line-height: 30rpx; | ||
| 20 | + /*background-color: #F0F0F9;*/ | ||
| 21 | + /*border-radius: 4rpx;*/ | ||
| 22 | + padding: 0 22rpx; | ||
| 23 | + border-right:2rpx solid #E0E0E0; | ||
| 24 | + text-align: center; | ||
| 25 | + width: 25%; | ||
| 26 | + box-sizing: border-box; | ||
| 27 | +} | ||
| 28 | +.transverse-search .tags:first-child{ | ||
| 29 | + padding-left: 0; | ||
| 25 | } | 30 | } |
| 26 | .transverse-search .tags:last-child{ | 31 | .transverse-search .tags:last-child{ |
| 27 | margin-right: 0; | 32 | margin-right: 0; |
| 33 | + border-right-width:0; | ||
| 28 | } | 34 | } |
| 29 | .transverse-search .tags.active{ | 35 | .transverse-search .tags.active{ |
| 30 | - background-color: #F4DAB9; | ||
| 31 | - color:#8B5318; | 36 | + /*background-color: #F4DAB9;*/ |
| 37 | + color:#C0A369; | ||
| 32 | font-weight: 900; | 38 | font-weight: 900; |
| 33 | } | 39 | } |
| 34 | 40 | ||
| 35 | .picker{ | 41 | .picker{ |
| 36 | - height: 50rpx; | ||
| 37 | - line-height: 50rpx; | 42 | + height: 30rpx; |
| 43 | + line-height: 30rpx; | ||
| 38 | } | 44 | } |
| 39 | .picker .input{ | 45 | .picker .input{ |
| 40 | - height: 50rpx; | ||
| 41 | - line-height: 50rpx; | 46 | + height: 30rpx; |
| 47 | + line-height: 30rpx; | ||
| 42 | margin-right: 10rpx; | 48 | margin-right: 10rpx; |
| 43 | } | 49 | } |
| 44 | .picker .more{ | 50 | .picker .more{ |
| 45 | - background-image: url("http://nosqn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB.png"); | 51 | + background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB.png"); |
| 46 | width: 12rpx; | 52 | width: 12rpx; |
| 47 | height: 16rpx; | 53 | height: 16rpx; |
| 48 | min-width:12rpx; | 54 | min-width:12rpx; |
| @@ -51,14 +57,14 @@ | @@ -51,14 +57,14 @@ | ||
| 51 | color: #999; | 57 | color: #999; |
| 52 | } | 58 | } |
| 53 | .tags.active .picker .more{ | 59 | .tags.active .picker .more{ |
| 54 | - background-image: url("http://nosqn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png"); | 60 | + background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png"); |
| 55 | } | 61 | } |
| 56 | .disabled .picker .more{ | 62 | .disabled .picker .more{ |
| 57 | - background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190925174046.png"); | 63 | + background-image: url("http://qn.colorcun.com/custom/lite-yd/image/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190925174046.png"); |
| 58 | } | 64 | } |
| 59 | .pages{ | 65 | .pages{ |
| 60 | width: 100%; | 66 | width: 100%; |
| 61 | - margin: 81rpx auto 0; | 67 | + margin: 151rpx auto 0; |
| 62 | color:#fff; | 68 | color:#fff; |
| 63 | font-size: 28rpx; | 69 | font-size: 28rpx; |
| 64 | } | 70 | } |
| @@ -140,7 +146,7 @@ | @@ -140,7 +146,7 @@ | ||
| 140 | z-index: 99; | 146 | z-index: 99; |
| 141 | } | 147 | } |
| 142 | .line-push{ | 148 | .line-push{ |
| 143 | - background-image: url("http://nosqn.colorcun.com/reserve/images/line-push.png"); | 149 | + background-image: url("http://qn.colorcun.com/reserve/images/line-push.png"); |
| 144 | width: 328rpx; | 150 | width: 328rpx; |
| 145 | height: 42rpx; | 151 | height: 42rpx; |
| 146 | background-size: 100% 24rpx; | 152 | background-size: 100% 24rpx; |
| @@ -7,9 +7,7 @@ import reddot from '../../utils/reddot'; | @@ -7,9 +7,7 @@ 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 barHeight=50; | ||
| 11 | -const transverseViewHeight=253+barHeight; | ||
| 12 | - | 10 | +const transverseViewHeight=235; |
| 13 | const renNum=function(){ | 11 | const renNum=function(){ |
| 14 | let arr=[] | 12 | let arr=[] |
| 15 | for(let i=1;i<=30;i++){ | 13 | for(let i=1;i<=30;i++){ |
| @@ -52,7 +50,6 @@ Page({ | @@ -52,7 +50,6 @@ Page({ | ||
| 52 | ], | 50 | ], |
| 53 | listMoreCount:0, | 51 | listMoreCount:0, |
| 54 | hasSearchLimit:false, | 52 | hasSearchLimit:false, |
| 55 | - hasGetPos:false, | ||
| 56 | }, | 53 | }, |
| 57 | hasClickMoveToLocation:false,//点击回到我的位置 | 54 | hasClickMoveToLocation:false,//点击回到我的位置 |
| 58 | hasSellerConcat:hasSellerConcat, | 55 | hasSellerConcat:hasSellerConcat, |
| @@ -72,7 +69,6 @@ Page({ | @@ -72,7 +69,6 @@ Page({ | ||
| 72 | hasOnLoad:false, | 69 | hasOnLoad:false, |
| 73 | hasGetLocation:false,//定位信息 | 70 | hasGetLocation:false,//定位信息 |
| 74 | hasAppHide:false,//app切至后台 | 71 | hasAppHide:false,//app切至后台 |
| 75 | - param:{}, | ||
| 76 | onLoad: async function (options) { | 72 | onLoad: async function (options) { |
| 77 | this.reportTime=new Date() | 73 | this.reportTime=new Date() |
| 78 | 74 | ||
| @@ -149,13 +145,7 @@ Page({ | @@ -149,13 +145,7 @@ Page({ | ||
| 149 | /** | 145 | /** |
| 150 | * 生命周期函数--监听页面显示 | 146 | * 生命周期函数--监听页面显示 |
| 151 | */ | 147 | */ |
| 152 | - onShow: async function (e) { | ||
| 153 | - if (typeof this.getTabBar === 'function' && | ||
| 154 | - this.getTabBar()) { | ||
| 155 | - this.getTabBar().setData({ | ||
| 156 | - selected: 0 | ||
| 157 | - }) | ||
| 158 | - } | 148 | + onShow: async function () { |
| 159 | console.log({ | 149 | console.log({ |
| 160 | 'this.hasGetLocation':this.hasGetLocation, | 150 | 'this.hasGetLocation':this.hasGetLocation, |
| 161 | 'this.hasOnLoad':this.hasOnLoad, | 151 | 'this.hasOnLoad':this.hasOnLoad, |
| @@ -196,7 +186,7 @@ Page({ | @@ -196,7 +186,7 @@ Page({ | ||
| 196 | }) | 186 | }) |
| 197 | //this.getPos(systemInfo); | 187 | //this.getPos(systemInfo); |
| 198 | this.systemInfo=systemInfo | 188 | this.systemInfo=systemInfo |
| 199 | - //this.selectComponent('#getpos').getPos(); | 189 | + this.selectComponent('#getpos').getPos(); |
| 200 | if(!this.hasClickMoveToLocation){ | 190 | if(!this.hasClickMoveToLocation){ |
| 201 | //this.getMarkers(); | 191 | //this.getMarkers(); |
| 202 | //this.timeoutGetMarkers(); | 192 | //this.timeoutGetMarkers(); |
| @@ -207,8 +197,7 @@ Page({ | @@ -207,8 +197,7 @@ Page({ | ||
| 207 | /** | 197 | /** |
| 208 | * 生命周期函数--监听页面隐藏 | 198 | * 生命周期函数--监听页面隐藏 |
| 209 | */ | 199 | */ |
| 210 | - onHide: function (e) { | ||
| 211 | - util.elog(null,'离开地图页') | 200 | + onHide: function () { |
| 212 | }, | 201 | }, |
| 213 | 202 | ||
| 214 | /** | 203 | /** |
| @@ -395,10 +384,6 @@ Page({ | @@ -395,10 +384,6 @@ Page({ | ||
| 395 | m.callout.display='ALWAYS'; | 384 | m.callout.display='ALWAYS'; |
| 396 | } | 385 | } |
| 397 | hasCurrent=false | 386 | hasCurrent=false |
| 398 | - if("markertap"==e.type){ | ||
| 399 | - util.elog({id:m.seller.id,sellername:m.seller.sellername},'点击地图区域的店铺标记') | ||
| 400 | - } | ||
| 401 | - | ||
| 402 | } | 387 | } |
| 403 | if(m.display!='none' && hasCurrent){ | 388 | if(m.display!='none' && hasCurrent){ |
| 404 | current++ | 389 | current++ |
| @@ -486,10 +471,6 @@ Page({ | @@ -486,10 +471,6 @@ Page({ | ||
| 486 | } | 471 | } |
| 487 | if(param.lat){ | 472 | if(param.lat){ |
| 488 | param.centre_pos=`${param.lat},${param.lng}` | 473 | param.centre_pos=`${param.lat},${param.lng}` |
| 489 | - }else{ | ||
| 490 | - let lat=(this.mapData.region.southwest.latitude+this.mapData.region.northeast.latitude)/2 | ||
| 491 | - let lng=(this.mapData.region.southwest.longitude+this.mapData.region.northeast.longitude)/2 | ||
| 492 | - param.centre_pos=`${lat},${lng}` | ||
| 493 | } | 474 | } |
| 494 | if(this.data.hasSuggestion){ | 475 | if(this.data.hasSuggestion){ |
| 495 | param.centre_pos=`${this.data.suggestion.latitude},${this.data.suggestion.longitude}` | 476 | param.centre_pos=`${this.data.suggestion.latitude},${this.data.suggestion.longitude}` |
| @@ -528,7 +509,7 @@ Page({ | @@ -528,7 +509,7 @@ Page({ | ||
| 528 | } | 509 | } |
| 529 | let marker={ | 510 | let marker={ |
| 530 | id: seller.id, | 511 | id: seller.id, |
| 531 | - iconPath: "http://nosqn.colorcun.com/custom/lite-online/cates/circle1x5.png"+cates_version, | 512 | + iconPath: "http://qn.colorcun.com/custom/lite-online/cates/circle1x5.png"+cates_version, |
| 532 | latitude: seller.lat, | 513 | latitude: seller.lat, |
| 533 | longitude: seller.long, | 514 | longitude: seller.long, |
| 534 | width: 8, | 515 | width: 8, |
| @@ -554,7 +535,7 @@ Page({ | @@ -554,7 +535,7 @@ Page({ | ||
| 554 | if(seller.mode.length>0){ | 535 | if(seller.mode.length>0){ |
| 555 | seller.mode.forEach(x=>{ | 536 | seller.mode.forEach(x=>{ |
| 556 | if(x.id==1){//大图标 | 537 | if(x.id==1){//大图标 |
| 557 | - marker.iconPath="http://nosqn.colorcun.com/custom/lite-online/cates/其他菜品.png"; | 538 | + marker.iconPath="http://qn.colorcun.com/custom/lite-online/cates/其他菜品.png"; |
| 558 | if(seller.cate.length>0){ | 539 | if(seller.cate.length>0){ |
| 559 | marker.iconPath=seller.cate[0].icon | 540 | marker.iconPath=seller.cate[0].icon |
| 560 | } | 541 | } |
| @@ -709,7 +690,6 @@ Page({ | @@ -709,7 +690,6 @@ Page({ | ||
| 709 | return; | 690 | return; |
| 710 | } | 691 | } |
| 711 | let i=e.detail.current | 692 | let i=e.detail.current |
| 712 | - if(typeof this.data.markers[i]=='undefined') return; | ||
| 713 | this.activeSellerID=this.data.markers[i].id | 693 | this.activeSellerID=this.data.markers[i].id |
| 714 | console.log('bindtransition',this.sellersNow,e.detail.current,this.sellersNow[e.detail.current],this.activeSellerID); | 694 | console.log('bindtransition',this.sellersNow,e.detail.current,this.sellersNow[e.detail.current],this.activeSellerID); |
| 715 | // this.activeSellerID=this.sellersNow[i]; | 695 | // this.activeSellerID=this.sellersNow[i]; |
| @@ -724,7 +704,6 @@ Page({ | @@ -724,7 +704,6 @@ Page({ | ||
| 724 | wx.navigateTo({ | 704 | wx.navigateTo({ |
| 725 | url:'/pages/reserve/detail?id='+util.attr(e,'sid') | 705 | url:'/pages/reserve/detail?id='+util.attr(e,'sid') |
| 726 | }) | 706 | }) |
| 727 | - util.elog({sid:util.attr(e,'sid')},'点击橱窗中的商家,进入店铺详情') | ||
| 728 | }, | 707 | }, |
| 729 | IsSetActivity(){ | 708 | IsSetActivity(){ |
| 730 | let cmap=this.data.map; | 709 | let cmap=this.data.map; |
| @@ -794,7 +773,7 @@ Page({ | @@ -794,7 +773,7 @@ Page({ | ||
| 794 | map=this.data.suggestion | 773 | map=this.data.suggestion |
| 795 | mks.push({ | 774 | mks.push({ |
| 796 | id: 'location', | 775 | id: 'location', |
| 797 | - iconPath: "http://nosqn.colorcun.com/reserve/images/location.png"+cates_version, | 776 | + iconPath: "http://qn.colorcun.com/reserve/images/location.png"+cates_version, |
| 798 | latitude: map.latitude, | 777 | latitude: map.latitude, |
| 799 | longitude: map.longitude, | 778 | longitude: map.longitude, |
| 800 | width: 20, | 779 | width: 20, |
| @@ -803,7 +782,7 @@ Page({ | @@ -803,7 +782,7 @@ Page({ | ||
| 803 | } | 782 | } |
| 804 | mks.push({ | 783 | mks.push({ |
| 805 | id: 'locationMe', | 784 | id: 'locationMe', |
| 806 | - iconPath: "http://nosqn.colorcun.com/reserve/images/lme.png"+cates_version, | 785 | + iconPath: "http://qn.colorcun.com/reserve/images/lme.png"+cates_version, |
| 807 | latitude: this.user.latitude, | 786 | latitude: this.user.latitude, |
| 808 | longitude: this.user.longitude, | 787 | longitude: this.user.longitude, |
| 809 | width: 18, | 788 | width: 18, |
| @@ -927,16 +906,4 @@ Page({ | @@ -927,16 +906,4 @@ Page({ | ||
| 927 | } | 906 | } |
| 928 | }) | 907 | }) |
| 929 | }, | 908 | }, |
| 930 | - boostEvent(e){ | ||
| 931 | - util.elog(e.detail,'强提醒') | ||
| 932 | - if(e.detail.act=='hide'){ | ||
| 933 | - this.setData({ | ||
| 934 | - hasGetPos:true, | ||
| 935 | - }) | ||
| 936 | - this.selectComponent('#getpos').getPos(); | ||
| 937 | - } | ||
| 938 | - }, | ||
| 939 | - elog(e){ | ||
| 940 | - util.elog({attr:util.attr(e),detail:e.detail},util.attr(e,'ename')||'点击') | ||
| 941 | - } | ||
| 942 | }) | 909 | }) |
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | "getpos":"/components/userinfo/getpos", | 8 | "getpos":"/components/userinfo/getpos", |
| 9 | "sb-tr":"/components/reserve/seller-box-transverse/seller-box", | 9 | "sb-tr":"/components/reserve/seller-box-transverse/seller-box", |
| 10 | "a2l":"/components/tips/add-to-lite", | 10 | "a2l":"/components/tips/add-to-lite", |
| 11 | - "boost":"/components/tips/boost", | 11 | + "ds":"/components/tips/discount", |
| 12 | "caixi":"/components/reserve/caixi", | 12 | "caixi":"/components/reserve/caixi", |
| 13 | "list":"/components/reserve/seller-box-transverse-cview/list", | 13 | "list":"/components/reserve/seller-box-transverse-cview/list", |
| 14 | "activity-enter":"/components/activity/enter" | 14 | "activity-enter":"/components/activity/enter" |
| @@ -14,31 +14,31 @@ | @@ -14,31 +14,31 @@ | ||
| 14 | enable-scroll | 14 | enable-scroll |
| 15 | enable-rotate | 15 | enable-rotate |
| 16 | subkey="SDEBZ-I74W4-QLGUX-XXYXU-HIR23-3QFBJ" | 16 | subkey="SDEBZ-I74W4-QLGUX-XXYXU-HIR23-3QFBJ" |
| 17 | - layer-style="2" | ||
| 18 | - style="width: 100%; height: {{map.height}}px;"></map> | 17 | + style="width: 100%; height: {{map.height+60}}px;"></map> |
| 18 | + <formids url="/pages/reserve/search" style="position: fixed;"> | ||
| 19 | + <view | ||
| 20 | + class="flex-ll" | ||
| 21 | + style="position:fixed;top:{{statusBarHeight}}px;left:0;height: {{titleBarHeight}}px; line-height: {{titleBarHeight}}px;"> | ||
| 22 | + <view class="searchList flex-ll" catchtap="listShow"> | ||
| 23 | + <image class="icon" src="http://qn.colorcun.com/reserve/images/hasList3.png"></image> | ||
| 24 | + <view class="title">列表</view> | ||
| 25 | + </view> | ||
| 26 | + <view class="searchAddr flex-ll"> | ||
| 27 | + <image class="icon" src="http://qn.colorcun.com/custom/lite-online/image/search26.png"></image> | ||
| 28 | + <view class="title">{{hasSuggestion?suggestion.title:'输入餐厅名或地名,快速订包间'}}</view> | ||
| 29 | + </view> | ||
| 30 | + </view> | ||
| 31 | + </formids> | ||
| 19 | </view> | 32 | </view> |
| 20 | - <view class="seller-view"> | ||
| 21 | - <!-- | 33 | + <view class="seller-view {{(listMoreCount<1)?(hasSearchLimit?'disabled enabled':'disabled'):''}}"> |
| 34 | + <view class="toast" wx:if="{{hasGetSellersEnd && listMoreCount<1 && !hasSearchLimit && markers.length<2}}">该地区没有可供预订的餐厅哦!努力开通中</view> | ||
| 35 | + <view class="toast" wx:if="{{hasGetSellersEnd && markers.length<2 && listMoreCount>0}}">移动或缩放地图,获取更多餐厅</view> | ||
| 22 | <view class="flex-vc transverse-view-top" bindtap="listShow" wx:if="{{hasGetSellersEnd && listMoreCount>0}}"> | 36 | <view class="flex-vc transverse-view-top" bindtap="listShow" wx:if="{{hasGetSellersEnd && listMoreCount>0}}"> |
| 23 | <view class="line"></view> | 37 | <view class="line"></view> |
| 24 | <view class="text"> | 38 | <view class="text"> |
| 25 | <view>{{hasSellers?'查看其它':'已扩大范围为你找到'}}{{listMoreCount}}家餐厅</view> | 39 | <view>{{hasSellers?'查看其它':'已扩大范围为你找到'}}{{listMoreCount}}家餐厅</view> |
| 26 | </view> | 40 | </view> |
| 27 | </view> | 41 | </view> |
| 28 | - --> | ||
| 29 | - <navigator url="./search" | ||
| 30 | - bindtap="elog" data-ename="点击搜索框" hover-class="navigator-hover"> | ||
| 31 | - <view class="flex-ll transverse-view-search"> | ||
| 32 | - <view class="searchAddr flex-ll"> | ||
| 33 | - <image class="icon" src="http://nosqn.colorcun.com/custom/lite-online/image/search26.png"></image> | ||
| 34 | - <view class="title">{{hasSuggestion?suggestion.title:'输入餐厅名或地名,快速订包间'}}</view> | ||
| 35 | - </view> | ||
| 36 | - <view class="searchList flex-tb" catchtap="listShow"> | ||
| 37 | - <image class="icon" src="http://nosqn.colorcun.com/mapmenu/maplist.png"></image> | ||
| 38 | - <view class="title">列表模式</view> | ||
| 39 | - </view> | ||
| 40 | - </view> | ||
| 41 | - </navigator> | ||
| 42 | <view class="transverse-search flex-ll"> | 42 | <view class="transverse-search flex-ll"> |
| 43 | <view | 43 | <view |
| 44 | bindtap="caixiShow" | 44 | bindtap="caixiShow" |
| @@ -52,17 +52,15 @@ | @@ -52,17 +52,15 @@ | ||
| 52 | <view class="more"></view> | 52 | <view class="more"></view> |
| 53 | </view> | 53 | </view> |
| 54 | </view> | 54 | </view> |
| 55 | - <block wx:for="{{tags}}" wx:key="tagskey"> | 55 | + <block wx:for="{{tags}}" wx:key="tags.key"> |
| 56 | <view class="tags {{item.active?'active':''}}" | 56 | <view class="tags {{item.active?'active':''}}" |
| 57 | bindtap="tagsChange" | 57 | bindtap="tagsChange" |
| 58 | data-id="{{item.id}}">{{item.name}}</view> | 58 | data-id="{{item.id}}">{{item.name}}</view> |
| 59 | </block> | 59 | </block> |
| 60 | - <!-- | ||
| 61 | <view class="fingSeller flex-ll" bindtap="findSeller"> | 60 | <view class="fingSeller flex-ll" bindtap="findSeller"> |
| 62 | <view class="icon"></view> | 61 | <view class="icon"></view> |
| 63 | <view>查找餐厅</view> | 62 | <view>查找餐厅</view> |
| 64 | </view> | 63 | </view> |
| 65 | - --> | ||
| 66 | </view> | 64 | </view> |
| 67 | <view class="transverse-list"> | 65 | <view class="transverse-list"> |
| 68 | <swiper | 66 | <swiper |
| @@ -70,13 +68,13 @@ | @@ -70,13 +68,13 @@ | ||
| 70 | interval="2000" duration="500" | 68 | interval="2000" duration="500" |
| 71 | previous-margin="{{15}}px" next-margin="{{15}}px" style="height: 350rpx;" | 69 | previous-margin="{{15}}px" next-margin="{{15}}px" style="height: 350rpx;" |
| 72 | current="{{current}}" bindchange="bindtransition" hidden="{{!hasSellers}}"> | 70 | current="{{current}}" bindchange="bindtransition" hidden="{{!hasSellers}}"> |
| 73 | - <block wx:for="{{markers}}" wx:key="markerskey" wx:if="{{item.id!='location' && item.id!='locationMe'}}"> | 71 | + <block wx:for="{{markers}}" wx:key="markers.key" wx:if="{{item.id!='location' && item.id!='locationMe'}}"> |
| 74 | <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}"> | 72 | <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}"> |
| 75 | <view class="seller" id="seller-{{item.id}}"> | 73 | <view class="seller" id="seller-{{item.id}}"> |
| 76 | <sb-tr seller="{{item.seller}}" | 74 | <sb-tr seller="{{item.seller}}" |
| 77 | hasActivityTags="{{false}}" | 75 | hasActivityTags="{{false}}" |
| 78 | hasActivityShort="{{true}}" | 76 | hasActivityShort="{{true}}" |
| 79 | - hasBrand="true" hasActivityRed="true" | 77 | + hasBrand="true" hasActivityTese="true" |
| 80 | hasSuggestion="{{hasSuggestion}}" | 78 | hasSuggestion="{{hasSuggestion}}" |
| 81 | hasSlogan="{{false}}"></sb-tr> | 79 | hasSlogan="{{false}}"></sb-tr> |
| 82 | </view> | 80 | </view> |
| @@ -129,18 +127,17 @@ | @@ -129,18 +127,17 @@ | ||
| 129 | </view> | 127 | </view> |
| 130 | </view> | 128 | </view> |
| 131 | <view bindtap="moveToLocation" class="moveToLocation"> | 129 | <view bindtap="moveToLocation" class="moveToLocation"> |
| 132 | - <image src="http://nosqn.colorcun.com/reserve/images/golocal.png"></image> | 130 | + <image src="http://qn.colorcun.com/reserve/images/golocal.png"></image> |
| 133 | </view> | 131 | </view> |
| 134 | -<view class="toast" wx:if="{{hasGetSellersEnd && listMoreCount<1 && !hasSearchLimit && markers.length<2}}">该地区没有可供预订的餐厅哦!努力开通中</view> | ||
| 135 | -<view class="toast" wx:if="{{hasGetSellersEnd && markers.length<2 && listMoreCount>0}}">移动或缩放地图,获取更多餐厅</view> | ||
| 136 | <getpos bindpos="onpos" id="getpos"></getpos> | 132 | <getpos bindpos="onpos" id="getpos"></getpos> |
| 137 | <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box> | 133 | <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box> |
| 138 | <cover-view class="tab-patch"></cover-view> | 134 | <cover-view class="tab-patch"></cover-view> |
| 135 | +<ds wx:if="{{hasSetActivity}}" map="{{map}}" id="ds"></ds> | ||
| 139 | <a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX"></a2l> | 136 | <a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX"></a2l> |
| 140 | <list id="list" bindevent="listEvent" | 137 | <list id="list" bindevent="listEvent" |
| 141 | multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" tags="{{tags}}"></list> | 138 | multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" tags="{{tags}}"></list> |
| 142 | <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" | 139 | <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" |
| 143 | bindactive="caixiActive" id="caixi" | 140 | bindactive="caixiActive" id="caixi" |
| 144 | ></caixi> | 141 | ></caixi> |
| 145 | -<activity-enter hasInHome wx:if="{{hasGetPos}}"></activity-enter> | ||
| 146 | -<boost bindevent="boostEvent"></boost> | ||
| 142 | +<fb></fb> | ||
| 143 | +<activity-enter hasInHome></activity-enter> |
| 1 | /* pages/reservr/index.wxss */ | 1 | /* pages/reservr/index.wxss */ |
| 2 | - | ||
| 3 | page{ | 2 | page{ |
| 4 | background-color: #efefef; | 3 | background-color: #efefef; |
| 5 | - --barHeight: calc(98rpx + env(safe-area-inset-bottom)); | ||
| 6 | } | 4 | } |
| 7 | .pages{ | 5 | .pages{ |
| 8 | width: 100%; | 6 | width: 100%; |
| @@ -21,7 +19,7 @@ page{ | @@ -21,7 +19,7 @@ page{ | ||
| 21 | } | 19 | } |
| 22 | .moveToLocation{ | 20 | .moveToLocation{ |
| 23 | position: fixed; | 21 | position: fixed; |
| 24 | - bottom: calc(520rpx + var(--barHeight)); | 22 | + bottom: 520rpx; |
| 25 | right: 20rpx; | 23 | right: 20rpx; |
| 26 | width: 62rpx; | 24 | width: 62rpx; |
| 27 | height: 62rpx; | 25 | height: 62rpx; |
| @@ -80,7 +78,7 @@ page{ | @@ -80,7 +78,7 @@ page{ | ||
| 80 | height: 40rpx; | 78 | height: 40rpx; |
| 81 | } | 79 | } |
| 82 | .seller .empty .icon{ | 80 | .seller .empty .icon{ |
| 83 | - background-image: url("http://nosqn.colorcun.com/reserve/images/hasClick.png"); | 81 | + background-image: url("http://qn.colorcun.com/reserve/images/hasClick.png"); |
| 84 | background-size: 100% 100%; | 82 | background-size: 100% 100%; |
| 85 | width: 54rpx; | 83 | width: 54rpx; |
| 86 | height: 56rpx; | 84 | height: 56rpx; |
| @@ -89,7 +87,7 @@ page{ | @@ -89,7 +87,7 @@ page{ | ||
| 89 | right:40rpx; | 87 | right:40rpx; |
| 90 | } | 88 | } |
| 91 | .seller-last .empty .icon{ | 89 | .seller-last .empty .icon{ |
| 92 | - background-image: url("http://nosqn.colorcun.com/reserve/images/%E7%BC%A9%E6%94%BE.png"); | 90 | + background-image: url("http://qn.colorcun.com/reserve/images/%E7%BC%A9%E6%94%BE.png"); |
| 93 | background-size: 100% 100%; | 91 | background-size: 100% 100%; |
| 94 | width: 98rpx; | 92 | width: 98rpx; |
| 95 | height: 76rpx; | 93 | height: 76rpx; |
| @@ -99,16 +97,16 @@ page{ | @@ -99,16 +97,16 @@ page{ | ||
| 99 | } | 97 | } |
| 100 | 98 | ||
| 101 | .picker{ | 99 | .picker{ |
| 102 | - height: 50rpx; | ||
| 103 | - line-height: 50rpx; | 100 | + height: 30rpx; |
| 101 | + line-height: 30rpx; | ||
| 104 | } | 102 | } |
| 105 | .picker .input{ | 103 | .picker .input{ |
| 106 | - height: 50rpx; | ||
| 107 | - line-height: 50rpx; | 104 | + height: 30rpx; |
| 105 | + line-height: 30rpx; | ||
| 108 | margin-right: 10rpx; | 106 | margin-right: 10rpx; |
| 109 | } | 107 | } |
| 110 | .picker .more{ | 108 | .picker .more{ |
| 111 | - background-image: url("http://nosqn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB.png"); | 109 | + background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB.png"); |
| 112 | width: 12rpx; | 110 | width: 12rpx; |
| 113 | height: 16rpx; | 111 | height: 16rpx; |
| 114 | min-width:12rpx; | 112 | min-width:12rpx; |
| @@ -136,7 +134,7 @@ page{ | @@ -136,7 +134,7 @@ page{ | ||
| 136 | right: 0; | 134 | right: 0; |
| 137 | bottom: 0; | 135 | bottom: 0; |
| 138 | left: 0; | 136 | left: 0; |
| 139 | - background: url('http://nosqn.colorcun.com/reserve/images/find-black.png'); | 137 | + background: url('http://qn.colorcun.com/reserve/images/find-black.png'); |
| 140 | background-size: 100% 100%; | 138 | background-size: 100% 100%; |
| 141 | opacity: 0.5; | 139 | opacity: 0.5; |
| 142 | } | 140 | } |
| @@ -154,7 +152,7 @@ page{ | @@ -154,7 +152,7 @@ page{ | ||
| 154 | width: 32rpx; | 152 | width: 32rpx; |
| 155 | height: 30rpx; | 153 | height: 30rpx; |
| 156 | margin-right: 6rpx; | 154 | margin-right: 6rpx; |
| 157 | - background-image: url("http://nosqn.colorcun.com/reserve/images/find.png"); | 155 | + background-image: url("http://qn.colorcun.com/reserve/images/find.png"); |
| 158 | background-size: 100% 100%; | 156 | background-size: 100% 100%; |
| 159 | } | 157 | } |
| 160 | .enabled .fingSeller .icon:after{ | 158 | .enabled .fingSeller .icon:after{ |
| @@ -163,34 +161,29 @@ page{ | @@ -163,34 +161,29 @@ page{ | ||
| 163 | } | 161 | } |
| 164 | 162 | ||
| 165 | .tags.active .picker .more{ | 163 | .tags.active .picker .more{ |
| 166 | - background-image: url("http://nosqn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png"); | 164 | + background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png"); |
| 167 | } | 165 | } |
| 168 | .disabled .picker .more{ | 166 | .disabled .picker .more{ |
| 169 | - background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190925174046.png"); | 167 | + background-image: url("http://qn.colorcun.com/custom/lite-yd/image/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190925174046.png"); |
| 170 | } | 168 | } |
| 171 | .enabled .picker .more{ | 169 | .enabled .picker .more{ |
| 172 | - background-image: url("http://nosqn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png"); | 170 | + background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png"); |
| 173 | } | 171 | } |
| 174 | .searchAddr { | 172 | .searchAddr { |
| 175 | margin-left: 15rpx; | 173 | margin-left: 15rpx; |
| 176 | width: 400rpx; | 174 | width: 400rpx; |
| 177 | - height: 64rpx; | 175 | + height: 60rpx; |
| 178 | background-color: #fefefe; | 176 | background-color: #fefefe; |
| 179 | - line-height: 64rpx; | ||
| 180 | - font-weight:400; | ||
| 181 | - color:rgba(153,153,153,1); | ||
| 182 | - font-size: 28rpx; | ||
| 183 | - | ||
| 184 | - border-radius:32rpx; | ||
| 185 | - border:2rpx solid rgba(204,204,204,1); | ||
| 186 | - width: 100%; | ||
| 187 | - box-sizing: border-box; | 177 | + border-radius: 30rpx; |
| 178 | + line-height: 60rpx; | ||
| 179 | + color:#999999; | ||
| 180 | + font-size: 24rpx; | ||
| 188 | } | 181 | } |
| 189 | .searchAddr .icon{ | 182 | .searchAddr .icon{ |
| 190 | min-width: 22rpx; | 183 | min-width: 22rpx; |
| 191 | width: 22rpx; | 184 | width: 22rpx; |
| 192 | height: 22rpx; | 185 | height: 22rpx; |
| 193 | - margin: 0 10rpx 0 40rpx; | 186 | + margin: 0 20rpx; |
| 194 | } | 187 | } |
| 195 | .searchAddr .title{ | 188 | .searchAddr .title{ |
| 196 | line-height: 60rpx; | 189 | line-height: 60rpx; |
| @@ -200,24 +193,27 @@ page{ | @@ -200,24 +193,27 @@ page{ | ||
| 200 | text-align: left; | 193 | text-align: left; |
| 201 | } | 194 | } |
| 202 | .searchList{ | 195 | .searchList{ |
| 203 | - margin-left: 30rpx; | ||
| 204 | - width:72rpx; | ||
| 205 | - min-width: 72rpx; | ||
| 206 | - align-items: center; | ||
| 207 | - | 196 | + margin-left: 26rpx; |
| 197 | + width: 100rpx; | ||
| 198 | + height: 60rpx; | ||
| 199 | + background-color: #fefefe; | ||
| 200 | + border-radius: 30rpx; | ||
| 201 | + line-height: 60rpx; | ||
| 202 | + color:#C28C56; | ||
| 203 | + font-size: 20rpx; | ||
| 208 | } | 204 | } |
| 209 | .searchList .icon{ | 205 | .searchList .icon{ |
| 210 | - width:40rpx; | ||
| 211 | - height:36rpx; | ||
| 212 | - margin-bottom: 4rpx; | 206 | + min-width: 24rpx; |
| 207 | + width: 24rpx; | ||
| 208 | + height: 24rpx; | ||
| 209 | + margin: 0 8rpx 0 14rpx; | ||
| 213 | } | 210 | } |
| 214 | .searchList .title{ | 211 | .searchList .title{ |
| 215 | - height:26rpx; | ||
| 216 | - font-size:18rpx; | ||
| 217 | - font-family:PingFangSC-Regular,PingFang SC; | ||
| 218 | - font-weight:400; | ||
| 219 | - color:rgba(192,163,105,1); | ||
| 220 | - line-height:26rpx; | 212 | + line-height: 60rpx; |
| 213 | + height: 60rpx; | ||
| 214 | + overflow: hidden; | ||
| 215 | + width: 100%; | ||
| 216 | + text-align: left; | ||
| 221 | } | 217 | } |
| 222 | .empty-txt{ | 218 | .empty-txt{ |
| 223 | height: 300rpx; | 219 | height: 300rpx; |
| @@ -228,7 +224,7 @@ page{ | @@ -228,7 +224,7 @@ page{ | ||
| 228 | 224 | ||
| 229 | } | 225 | } |
| 230 | .empty-txt .seller .empty{ | 226 | .empty-txt .seller .empty{ |
| 231 | - background-image: url("http://nosqn.colorcun.com/reserve/images/empty-seller.png"); | 227 | + background-image: url("http://qn.colorcun.com/reserve/images/empty-seller.png"); |
| 232 | background-size: 100% 100%; | 228 | background-size: 100% 100%; |
| 233 | border-left-width: 0; | 229 | border-left-width: 0; |
| 234 | margin: 0 auto; | 230 | margin: 0 auto; |
| @@ -261,7 +257,7 @@ page{ | @@ -261,7 +257,7 @@ page{ | ||
| 261 | box-sizing: border-box; | 257 | box-sizing: border-box; |
| 262 | } | 258 | } |
| 263 | .info-button-gt{ | 259 | .info-button-gt{ |
| 264 | - background-image: url("http://nosqn.colorcun.com/reserve/images/gt-cheng.png"); | 260 | + background-image: url("http://qn.colorcun.com/reserve/images/gt-cheng.png"); |
| 265 | background-size: 100% 100%; | 261 | background-size: 100% 100%; |
| 266 | width: 10rpx; | 262 | width: 10rpx; |
| 267 | height: 20rpx; | 263 | height: 20rpx; |
| @@ -272,38 +268,40 @@ page{ | @@ -272,38 +268,40 @@ page{ | ||
| 272 | color:#fefefe; | 268 | color:#fefefe; |
| 273 | } | 269 | } |
| 274 | .info-button.full .info-button-gt{ | 270 | .info-button.full .info-button-gt{ |
| 275 | - background-image: url("http://nosqn.colorcun.com/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190925175650.png"); | 271 | + background-image: url("http://qn.colorcun.com/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190925175650.png"); |
| 276 | } | 272 | } |
| 277 | .transverse-search .tags{ | 273 | .transverse-search .tags{ |
| 278 | - height: 50rpx; | ||
| 279 | - line-height: 50rpx; | ||
| 280 | - background-color: #F0F0F9; | ||
| 281 | - border-radius: 4rpx; | ||
| 282 | - margin-right: 30rpx; | ||
| 283 | - padding: 0 16rpx; | 274 | + height: 30rpx; |
| 275 | + line-height: 30rpx; | ||
| 276 | + /*background-color: #F0F0F9;*/ | ||
| 277 | + /*border-radius: 4rpx;*/ | ||
| 278 | + padding: 0 22rpx; | ||
| 279 | + border-right:2rpx solid #E0E0E0; | ||
| 280 | +} | ||
| 281 | +.transverse-search .tags:first-child{ | ||
| 282 | + padding-left: 0; | ||
| 284 | } | 283 | } |
| 285 | .transverse-search .tags:last-child{ | 284 | .transverse-search .tags:last-child{ |
| 286 | margin-right: 0; | 285 | margin-right: 0; |
| 286 | + border-right-width:0; | ||
| 287 | } | 287 | } |
| 288 | .transverse-search .tags.active{ | 288 | .transverse-search .tags.active{ |
| 289 | - background:linear-gradient(to bottom ,#F4DAB9,#E9BE94); | ||
| 290 | - color:#8B5318; | 289 | + /*background:linear-gradient(to bottom ,#F4DAB9,#E9BE94);*/ |
| 290 | + color:#C0A369; | ||
| 291 | font-weight: 900; | 291 | font-weight: 900; |
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | 294 | ||
| 295 | /* seller-view start*/ | 295 | /* seller-view start*/ |
| 296 | .seller-view{ | 296 | .seller-view{ |
| 297 | + height: 470rpx; | ||
| 297 | position:fixed; | 298 | position:fixed; |
| 298 | - bottom: calc(0rpx + var(--barHeight)); | 299 | + bottom: 0; |
| 299 | width: 100%; | 300 | width: 100%; |
| 300 | background-color: #fefefe; | 301 | background-color: #fefefe; |
| 301 | border-radius: 20rpx 20rpx 0 0; | 302 | border-radius: 20rpx 20rpx 0 0; |
| 302 | box-shadow: -4rpx 0 4rpx 2rpx #C5C1C1; | 303 | box-shadow: -4rpx 0 4rpx 2rpx #C5C1C1; |
| 303 | overflow: hidden; | 304 | overflow: hidden; |
| 304 | - padding: 30rpx 0 20rpx; | ||
| 305 | - height: 506rpx; | ||
| 306 | - box-sizing: border-box; | ||
| 307 | } | 305 | } |
| 308 | .seller-view.disabled{ | 306 | .seller-view.disabled{ |
| 309 | height: 410rpx; | 307 | height: 410rpx; |
| @@ -335,6 +333,7 @@ page{ | @@ -335,6 +333,7 @@ page{ | ||
| 335 | font-size: 24rpx; | 333 | font-size: 24rpx; |
| 336 | padding-left: 40rpx; | 334 | padding-left: 40rpx; |
| 337 | line-height: 90rpx; | 335 | line-height: 90rpx; |
| 336 | + padding-top: 58rpx; | ||
| 338 | } | 337 | } |
| 339 | .disabled .transverse-search{ | 338 | .disabled .transverse-search{ |
| 340 | padding-top: 0; | 339 | padding-top: 0; |
| @@ -343,7 +342,7 @@ page{ | @@ -343,7 +342,7 @@ page{ | ||
| 343 | background-color: #000; | 342 | background-color: #000; |
| 344 | width: calc(100% - 272rpx); | 343 | width: calc(100% - 272rpx); |
| 345 | position: fixed; | 344 | position: fixed; |
| 346 | - bottom:calc(520rpx + var(--barHeight)); | 345 | + bottom:490rpx; |
| 347 | color: #fefefe; | 346 | color: #fefefe; |
| 348 | height:60rpx; | 347 | height:60rpx; |
| 349 | font-size:26rpx; | 348 | font-size:26rpx; |
| @@ -357,7 +356,7 @@ page{ | @@ -357,7 +356,7 @@ page{ | ||
| 357 | background-color: #000; | 356 | background-color: #000; |
| 358 | width: calc(100% - 72rpx); | 357 | width: calc(100% - 72rpx); |
| 359 | position: fixed; | 358 | position: fixed; |
| 360 | - bottom:calc(430rpx + var(--barHeight)); | 359 | + bottom:430rpx; |
| 361 | color: #fefefe; | 360 | color: #fefefe; |
| 362 | height:60rpx; | 361 | height:60rpx; |
| 363 | font-size:26rpx; | 362 | font-size:26rpx; |
| @@ -367,10 +366,3 @@ page{ | @@ -367,10 +366,3 @@ page{ | ||
| 367 | border-radius:30rpx; | 366 | border-radius:30rpx; |
| 368 | opacity:0.64; | 367 | opacity:0.64; |
| 369 | } | 368 | } |
| 370 | -.transverse-view-search{ | ||
| 371 | - width:100%; | ||
| 372 | - height:66rpx; | ||
| 373 | - padding: 0 20rpx; | ||
| 374 | - background:rgba(254,254,254,1); | ||
| 375 | - box-sizing: border-box; | ||
| 376 | -} |
-
Please register or login to post a comment