xt / xcx-book · Commits

Go to a project

Commit 9180092207ec67e1017695d8c6dfe8d8def67dec

Authored by vking
1 parent 90bff123
build: skipped

fix map page

Inline Side-by-side
Showing 7 changed files with 143 additions and 93 deletions
... ... @@ -2,7 +2,7 @@
<view class="mask" bindtap="hide" wx:if="{{disp}}" style="z-index: 99999">
<view class="boost {{animation}}" catchtap="catchtap" wx:if="{{animation}}">
<view class="header flex-vc" bindtap="hide">
<view class="title">操作指引</view>
<view class="title">联系客服</view>
</view>
<view class="content" bindtap="hide">
<button class="item flex-ll button-none" open-type="contact">
... ...
... ... @@ -8,6 +8,7 @@
"formids":"/components/formids/formids",
"ddate":"/components/reserve/invitation/ddate",
"a2l":"/components/tips/add-to-lite",
"userinfo-share": "/components/userinfo/share"
"userinfo-share": "/components/userinfo/share",
"service":"/components/tips/service"
}
}
\ No newline at end of file
... ...
<!--pages/customer/detail_owner.wxml-->
<import src="../tpl/invitation"></import>
<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome"></nav>
<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome">
<!--
<service class="flex-rr" style="display: flex;flex-direction: row;" catchtap="catchtap">
<view class="service-view flex-vc">
<view class="service-icon"></view>
</view>
</service>
-->
</nav>
<view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}">
<template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template>
<view class="opt-view flex-vc">
... ...
... ... @@ -136,4 +136,19 @@ image{
.opt-view-tip{
font-size: 30rpx;
color:#ccc;
}
.service-view{
width:88rpx;
height:64rpx;
background:rgba(0,0,0,0.15);
border-radius:50rpx;
border:1rpx solid rgba(255,255,255,0.25);
box-sizing: border-box;
margin-right: 20rpx;
}
.service-icon{
background-image: url("http://nosqn.colorcun.com/shead2.png");
background-size: 100% 100%;
width:36rpx;
height:36rpx;
}
\ No newline at end of file
... ...
... ... @@ -21,108 +21,127 @@
<movable-view direction="vertical" out-of-bounds
bindchange="movableChange"
class="movable-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>
<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>
</view>
</navigator>
<view class="transverse-search flex-ll">
<view
bindtap="caixiShow"
class="tags {{multiIndex[0]>0?'active':''}}"
>
<view class="picker flex-lr">
<view class="input">
<block wx:if="{{multiIndex[0]==0}}">菜系</block>
<block wx:else="">{{multiArray[0][multiIndex[0]]}}</block>
</navigator>
<view class="transverse-search flex-ll">
<view
bindtap="caixiShow"
class="tags {{multiIndex[0]>0?'active':''}}"
>
<view class="picker flex-lr">
<view class="input">
<block wx:if="{{multiIndex[0]==0}}">菜系</block>
<block wx:else="">{{multiArray[0][multiIndex[0]]}}</block>
</view>
<view class="more"></view>
</view>
<view class="more"></view>
</view>
<block wx:for="{{tags}}" wx:key="tagskey">
<view class="tags {{item.active?'active':''}}"
bindtap="tagsChange"
data-id="{{item.id}}">{{item.name}}</view>
</block>
<!--
<view class="fingSeller flex-ll" bindtap="findSeller">
<view class="icon"></view>
<view>查找餐厅</view>
</view>
-->
</view>
<block wx:for="{{tags}}" wx:key="tagskey">
<view class="tags {{item.active?'active':''}}"
bindtap="tagsChange"
data-id="{{item.id}}">{{item.name}}</view>
</block>
<!--
<view class="fingSeller flex-ll" bindtap="findSeller">
<view class="icon"></view>
<view>查找餐厅</view>
</view>
-->
</view>
<view class="transverse-list">
<swiper
indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
interval="2000" duration="500"
previous-margin="{{15}}px" next-margin="{{15}}px" style="height: 350rpx;"
current="{{current}}" bindchange="bindtransition" hidden="{{!hasSellers}}">
<block wx:for="{{markers}}" wx:key="markerskey" wx:if="{{item.id!='location' && item.id!='locationMe'}}">
<swiper-item bindtap="gotoDetail"
data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">
<view class="seller" id="seller-{{item.id}}">
<sb-tr seller="{{item.seller}}"
hasInSwiper bindevent="sbtrEvent"
hasActivityTags="{{false}}"
hasActivityShort="{{true}}"
hasBrand="true" hasActivityRed="true"
hasSuggestion="{{hasSuggestion}}"
hasSlogan="{{false}}"></sb-tr>
<view class="transverse-list" wx:if="{{hasGetSellersEnd}}">
<swiper wx:if="{{hasSellers || listMoreCount>0}}"
indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
interval="2000" duration="500"
previous-margin="{{15}}px" next-margin="{{15}}px" style="height: 350rpx;"
current="{{current}}" bindchange="bindtransition">
<block wx:for="{{markers}}" wx:key="markerskey" wx:if="{{item.id!='location' && item.id!='locationMe'}}">
<swiper-item bindtap="gotoDetail"
data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">
<view class="seller" id="seller-{{item.id}}">
<sb-tr seller="{{item.seller}}"
hasInSwiper bindevent="sbtrEvent"
hasActivityTags="{{false}}"
hasActivityShort="{{true}}"
hasBrand="true" hasActivityRed="true"
hasSuggestion="{{hasSuggestion}}"
hasSlogan="{{false}}"></sb-tr>
</view>
</swiper-item>
</block>
<swiper-item bindtap="gotoDetail2">
<view class="seller seller-last" id="seller-last">
<view class="empty">
<view class="info">
<view class="info-msg Semibold">缩放地图发现更多餐厅</view>
<view class="info-txt">往任意方向拖动地图，可搜索不同范围</view>
</view>
<view class="icon"></view>
</view>
</view>
</swiper-item>
</block>
<swiper-item bindtap="gotoDetail2" wx:if="{{hasGetSellersEnd}}">
<view class="seller seller-last" id="seller-last">
</swiper>
<view class="empty-txt flex-vc" wx:else="">
<view class="seller">
<view class="empty">
<view class="info">
<view class="info-msg Semibold">缩放地图发现更多餐厅</view>
<view class="info-txt">往任意方向拖动地图，可搜索不同范围</view>
<view class="info" wx:if="{{listMoreCount>0}}" bindtap="listShow">
<view class="info-msg Semibold" style="margin-top: 58rpx;">已扩大范围为你找到餐厅</view>
<view class="info-txt">当前范围没有找到符合条件的餐厅</view>
<view class="info-button flex-lr" style="display: flex;margin-top: 50rpx;margin-left: 0;">
<view>去挑选</view>
<view class="info-button-gt"></view>
</view>
</view>
<view class="icon"></view>
</view>
</view>
</swiper-item>
</swiper>
<view class="empty-txt flex-vc" wx:if="{{hasGetSellersEnd && markers.length<1}}">
<view class="seller" wx:if="{{hasGetSellersEnd}}">
<view class="empty">
<view class="info" wx:if="{{listMoreCount>0}}" bindtap="listShow">
<view class="info-msg Semibold" style="margin-top: 58rpx;">已扩大范围为你找到餐厅</view>
<view class="info-txt">当前范围没有找到符合条件的餐厅</view>
<view class="info-button flex-lr" style="display: flex;margin-top: 50rpx;margin-left: 0;">
<view>去挑选</view>
<view class="info-button-gt"></view>
<view class="info" wx:elif="{{hasSearchLimit}}">
<view class="info-msg Semibold" style="margin-top: 58rpx;">未找到符合要求的餐厅</view>
<view class="info-txt">修改或减少条件，获取更多餐厅</view>
<button class="button-none flex-lr info-button"
style="display: flex;margin-top: 50rpx;margin-left: 0;"
open-type="contact">
<view>人工帮订</view>
<view class="info-button-gt"></view>
</button>
</view>
</view>
<view class="info" wx:elif="{{hasSearchLimit}}">
<view class="info-msg Semibold" style="margin-top: 58rpx;">未找到符合要求的餐厅</view>
<view class="info-txt">修改或减少条件，获取更多餐厅</view>
<button class="button-none flex-lr info-button"
style="display: flex;margin-top: 50rpx;margin-left: 0;"
open-type="contact">
<view>人工帮订</view>
<view class="info-button-gt"></view>
</button>
</view>
<view class="info" wx:else="" bindtap="setTSLocal">
<view class="info-msg Semibold">你可以切换到其他城市看看</view>
<view class="info-button full flex-lr">
<view>唐山市</view>
<view class="info-button-gt"></view>
<view class="info" wx:else="" bindtap="setTSLocal">
<view class="info-msg Semibold">你可以切换到其他城市看看</view>
<view class="info-button full flex-lr">
<view>唐山市</view>
<view class="info-button-gt"></view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="transverse-list" wx:else="">
<swiper
indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
interval="2000" duration="500"
previous-margin="{{15}}px" next-margin="{{15}}px" style="height: 350rpx;"
current="{{current}}" bindchange="bindtransition">
<swiper-item bindtap="gotoDetail2" >
<view class="seller seller-last" id="seller-last">
<view class="empty">
<view class="info">
<view class="info-msg Semibold">缩放地图发现更多餐厅</view>
<view class="info-txt">往任意方向拖动地图，可搜索不同范围</view>
</view>
<view class="icon"></view>
</view>
</view>
</swiper-item>
</swiper>
</view>
</movable-view>
</movable-area>
</view>
... ...
... ... @@ -341,14 +341,14 @@ page{
}
.toast{
background-color: #000;
width: calc(100% - 272rpx);
width: 534rpx;
position: fixed;
bottom:calc(520rpx + var(--barHeight));
color: #fefefe;
height:60rpx;
font-size:26rpx;
line-height:60rpx;
left: 136rpx;
left: calc(50% - 267rpx);
text-align: center;
border-radius:30rpx;
opacity:0.64;
... ...
... ... @@ -687,6 +687,13 @@
"pathName": "pages/customer/welcome",
"query": "id=104544",
"scene": null
},
{
"id": -1,
"name": "smscode 进入 /pages/customer/index",
"pathName": "pages/customer/index",
"query": "sms_code=0819107064",
"scene": null
}
]
}
... ...