Commit 9180092207ec67e1017695d8c6dfe8d8def67dec

Authored by vking
1 parent 90bff123

fix map page

@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <view class="mask" bindtap="hide" wx:if="{{disp}}" style="z-index: 99999"> 2 <view class="mask" bindtap="hide" wx:if="{{disp}}" style="z-index: 99999">
3 <view class="boost {{animation}}" catchtap="catchtap" wx:if="{{animation}}"> 3 <view class="boost {{animation}}" catchtap="catchtap" wx:if="{{animation}}">
4 <view class="header flex-vc" bindtap="hide"> 4 <view class="header flex-vc" bindtap="hide">
5 - <view class="title">操作指引</view> 5 + <view class="title">联系客服</view>
6 </view> 6 </view>
7 <view class="content" bindtap="hide"> 7 <view class="content" bindtap="hide">
8 <button class="item flex-ll button-none" open-type="contact"> 8 <button class="item flex-ll button-none" open-type="contact">
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 "formids":"/components/formids/formids", 8 "formids":"/components/formids/formids",
9 "ddate":"/components/reserve/invitation/ddate", 9 "ddate":"/components/reserve/invitation/ddate",
10 "a2l":"/components/tips/add-to-lite", 10 "a2l":"/components/tips/add-to-lite",
11 - "userinfo-share": "/components/userinfo/share" 11 + "userinfo-share": "/components/userinfo/share",
  12 + "service":"/components/tips/service"
12 } 13 }
13 } 14 }
1 <!--pages/customer/detail_owner.wxml--> 1 <!--pages/customer/detail_owner.wxml-->
2 <import src="../tpl/invitation"></import> 2 <import src="../tpl/invitation"></import>
3 -<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome"></nav> 3 +<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome">
  4 + <!--
  5 + <service class="flex-rr" style="display: flex;flex-direction: row;" catchtap="catchtap">
  6 + <view class="service-view flex-vc">
  7 + <view class="service-icon"></view>
  8 + </view>
  9 + </service>
  10 + -->
  11 +</nav>
4 <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}"> 12 <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}">
5 <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template> 13 <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template>
6 <view class="opt-view flex-vc"> 14 <view class="opt-view flex-vc">
@@ -136,4 +136,19 @@ image{ @@ -136,4 +136,19 @@ image{
136 .opt-view-tip{ 136 .opt-view-tip{
137 font-size: 30rpx; 137 font-size: 30rpx;
138 color:#ccc; 138 color:#ccc;
  139 +}
  140 +.service-view{
  141 + width:88rpx;
  142 + height:64rpx;
  143 + background:rgba(0,0,0,0.15);
  144 + border-radius:50rpx;
  145 + border:1rpx solid rgba(255,255,255,0.25);
  146 + box-sizing: border-box;
  147 + margin-right: 20rpx;
  148 +}
  149 +.service-icon{
  150 + background-image: url("http://nosqn.colorcun.com/shead2.png");
  151 + background-size: 100% 100%;
  152 + width:36rpx;
  153 + height:36rpx;
139 } 154 }
@@ -21,108 +21,127 @@ @@ -21,108 +21,127 @@
21 <movable-view direction="vertical" out-of-bounds 21 <movable-view direction="vertical" out-of-bounds
22 bindchange="movableChange" 22 bindchange="movableChange"
23 class="movable-view"> 23 class="movable-view">
24 - <navigator url="./search"  
25 - bindtap="elog" data-ename="点击搜索框" hover-class="navigator-hover">  
26 - <view class="flex-ll transverse-view-search">  
27 - <view class="searchAddr flex-ll">  
28 - <image class="icon" src="http://nosqn.colorcun.com/custom/lite-online/image/search26.png"></image>  
29 - <view class="title">{{hasSuggestion?suggestion.title:'搜索餐厅/位置'}}</view>  
30 - </view>  
31 - <view class="searchList flex-tb" catchtap="listShow">  
32 - <image class="icon" src="http://nosqn.colorcun.com/mapmenu/maplist.png"></image>  
33 - <view class="title">列表模式</view> 24 + <navigator url="./search"
  25 + bindtap="elog" data-ename="点击搜索框" hover-class="navigator-hover">
  26 + <view class="flex-ll transverse-view-search">
  27 + <view class="searchAddr flex-ll">
  28 + <image class="icon" src="http://nosqn.colorcun.com/custom/lite-online/image/search26.png"></image>
  29 + <view class="title">{{hasSuggestion?suggestion.title:'搜索餐厅/位置'}}</view>
  30 + </view>
  31 + <view class="searchList flex-tb" catchtap="listShow">
  32 + <image class="icon" src="http://nosqn.colorcun.com/mapmenu/maplist.png"></image>
  33 + <view class="title">列表模式</view>
  34 + </view>
34 </view> 35 </view>
35 - </view>  
36 - </navigator>  
37 - <view class="transverse-search flex-ll">  
38 - <view  
39 - bindtap="caixiShow"  
40 - class="tags {{multiIndex[0]>0?'active':''}}"  
41 - >  
42 - <view class="picker flex-lr">  
43 - <view class="input">  
44 - <block wx:if="{{multiIndex[0]==0}}">菜系</block>  
45 - <block wx:else="">{{multiArray[0][multiIndex[0]]}}</block> 36 + </navigator>
  37 + <view class="transverse-search flex-ll">
  38 + <view
  39 + bindtap="caixiShow"
  40 + class="tags {{multiIndex[0]>0?'active':''}}"
  41 + >
  42 + <view class="picker flex-lr">
  43 + <view class="input">
  44 + <block wx:if="{{multiIndex[0]==0}}">菜系</block>
  45 + <block wx:else="">{{multiArray[0][multiIndex[0]]}}</block>
  46 + </view>
  47 + <view class="more"></view>
46 </view> 48 </view>
47 - <view class="more"></view>  
48 </view> 49 </view>
  50 + <block wx:for="{{tags}}" wx:key="tagskey">
  51 + <view class="tags {{item.active?'active':''}}"
  52 + bindtap="tagsChange"
  53 + data-id="{{item.id}}">{{item.name}}</view>
  54 + </block>
  55 + <!--
  56 + <view class="fingSeller flex-ll" bindtap="findSeller">
  57 + <view class="icon"></view>
  58 + <view>查找餐厅</view>
  59 + </view>
  60 + -->
49 </view> 61 </view>
50 - <block wx:for="{{tags}}" wx:key="tagskey">  
51 - <view class="tags {{item.active?'active':''}}"  
52 - bindtap="tagsChange"  
53 - data-id="{{item.id}}">{{item.name}}</view>  
54 - </block>  
55 - <!--  
56 - <view class="fingSeller flex-ll" bindtap="findSeller">  
57 - <view class="icon"></view>  
58 - <view>查找餐厅</view>  
59 - </view>  
60 - -->  
61 - </view>  
62 - <view class="transverse-list">  
63 - <swiper  
64 - indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"  
65 - interval="2000" duration="500"  
66 - previous-margin="{{15}}px" next-margin="{{15}}px" style="height: 350rpx;"  
67 - current="{{current}}" bindchange="bindtransition" hidden="{{!hasSellers}}">  
68 - <block wx:for="{{markers}}" wx:key="markerskey" wx:if="{{item.id!='location' && item.id!='locationMe'}}">  
69 - <swiper-item bindtap="gotoDetail"  
70 - data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">  
71 - <view class="seller" id="seller-{{item.id}}">  
72 - <sb-tr seller="{{item.seller}}"  
73 - hasInSwiper bindevent="sbtrEvent"  
74 - hasActivityTags="{{false}}"  
75 - hasActivityShort="{{true}}"  
76 - hasBrand="true" hasActivityRed="true"  
77 - hasSuggestion="{{hasSuggestion}}"  
78 - hasSlogan="{{false}}"></sb-tr> 62 + <view class="transverse-list" wx:if="{{hasGetSellersEnd}}">
  63 + <swiper wx:if="{{hasSellers || listMoreCount>0}}"
  64 + indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
  65 + interval="2000" duration="500"
  66 + previous-margin="{{15}}px" next-margin="{{15}}px" style="height: 350rpx;"
  67 + current="{{current}}" bindchange="bindtransition">
  68 + <block wx:for="{{markers}}" wx:key="markerskey" wx:if="{{item.id!='location' && item.id!='locationMe'}}">
  69 + <swiper-item bindtap="gotoDetail"
  70 + data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">
  71 + <view class="seller" id="seller-{{item.id}}">
  72 + <sb-tr seller="{{item.seller}}"
  73 + hasInSwiper bindevent="sbtrEvent"
  74 + hasActivityTags="{{false}}"
  75 + hasActivityShort="{{true}}"
  76 + hasBrand="true" hasActivityRed="true"
  77 + hasSuggestion="{{hasSuggestion}}"
  78 + hasSlogan="{{false}}"></sb-tr>
  79 + </view>
  80 + </swiper-item>
  81 + </block>
  82 + <swiper-item bindtap="gotoDetail2">
  83 + <view class="seller seller-last" id="seller-last">
  84 + <view class="empty">
  85 + <view class="info">
  86 + <view class="info-msg Semibold">缩放地图发现更多餐厅</view>
  87 + <view class="info-txt">往任意方向拖动地图,可搜索不同范围</view>
  88 + </view>
  89 + <view class="icon"></view>
  90 + </view>
79 </view> 91 </view>
80 </swiper-item> 92 </swiper-item>
81 - </block>  
82 - <swiper-item bindtap="gotoDetail2" wx:if="{{hasGetSellersEnd}}">  
83 - <view class="seller seller-last" id="seller-last"> 93 + </swiper>
  94 + <view class="empty-txt flex-vc" wx:else="">
  95 + <view class="seller">
84 <view class="empty"> 96 <view class="empty">
85 - <view class="info">  
86 - <view class="info-msg Semibold">缩放地图发现更多餐厅</view>  
87 - <view class="info-txt">往任意方向拖动地图,可搜索不同范围</view> 97 + <view class="info" wx:if="{{listMoreCount>0}}" bindtap="listShow">
  98 + <view class="info-msg Semibold" style="margin-top: 58rpx;">已扩大范围为你找到餐厅</view>
  99 + <view class="info-txt">当前范围没有找到符合条件的餐厅</view>
  100 + <view class="info-button flex-lr" style="display: flex;margin-top: 50rpx;margin-left: 0;">
  101 + <view>去挑选</view>
  102 + <view class="info-button-gt"></view>
  103 + </view>
88 </view> 104 </view>
89 - <view class="icon"></view>  
90 - </view>  
91 - </view>  
92 - </swiper-item>  
93 - </swiper>  
94 - <view class="empty-txt flex-vc" wx:if="{{hasGetSellersEnd && markers.length<1}}">  
95 - <view class="seller" wx:if="{{hasGetSellersEnd}}">  
96 - <view class="empty">  
97 - <view class="info" wx:if="{{listMoreCount>0}}" bindtap="listShow">  
98 - <view class="info-msg Semibold" style="margin-top: 58rpx;">已扩大范围为你找到餐厅</view>  
99 - <view class="info-txt">当前范围没有找到符合条件的餐厅</view>  
100 - <view class="info-button flex-lr" style="display: flex;margin-top: 50rpx;margin-left: 0;">  
101 - <view>去挑选</view>  
102 - <view class="info-button-gt"></view> 105 + <view class="info" wx:elif="{{hasSearchLimit}}">
  106 + <view class="info-msg Semibold" style="margin-top: 58rpx;">未找到符合要求的餐厅</view>
  107 + <view class="info-txt">修改或减少条件,获取更多餐厅</view>
  108 + <button class="button-none flex-lr info-button"
  109 + style="display: flex;margin-top: 50rpx;margin-left: 0;"
  110 + open-type="contact">
  111 + <view>人工帮订</view>
  112 + <view class="info-button-gt"></view>
  113 + </button>
103 </view> 114 </view>
104 - </view>  
105 - <view class="info" wx:elif="{{hasSearchLimit}}">  
106 - <view class="info-msg Semibold" style="margin-top: 58rpx;">未找到符合要求的餐厅</view>  
107 - <view class="info-txt">修改或减少条件,获取更多餐厅</view>  
108 - <button class="button-none flex-lr info-button"  
109 - style="display: flex;margin-top: 50rpx;margin-left: 0;"  
110 - open-type="contact">  
111 - <view>人工帮订</view>  
112 - <view class="info-button-gt"></view>  
113 - </button>  
114 - </view>  
115 - <view class="info" wx:else="" bindtap="setTSLocal">  
116 - <view class="info-msg Semibold">你可以切换到其他城市看看</view>  
117 - <view class="info-button full flex-lr">  
118 - <view>唐山市</view>  
119 - <view class="info-button-gt"></view> 115 + <view class="info" wx:else="" bindtap="setTSLocal">
  116 + <view class="info-msg Semibold">你可以切换到其他城市看看</view>
  117 + <view class="info-button full flex-lr">
  118 + <view>唐山市</view>
  119 + <view class="info-button-gt"></view>
  120 + </view>
120 </view> 121 </view>
121 </view> 122 </view>
122 </view> 123 </view>
123 </view> 124 </view>
124 </view> 125 </view>
125 - </view> 126 + <view class="transverse-list" wx:else="">
  127 + <swiper
  128 + indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
  129 + interval="2000" duration="500"
  130 + previous-margin="{{15}}px" next-margin="{{15}}px" style="height: 350rpx;"
  131 + current="{{current}}" bindchange="bindtransition">
  132 + <swiper-item bindtap="gotoDetail2" >
  133 + <view class="seller seller-last" id="seller-last">
  134 + <view class="empty">
  135 + <view class="info">
  136 + <view class="info-msg Semibold">缩放地图发现更多餐厅</view>
  137 + <view class="info-txt">往任意方向拖动地图,可搜索不同范围</view>
  138 + </view>
  139 + <view class="icon"></view>
  140 + </view>
  141 + </view>
  142 + </swiper-item>
  143 + </swiper>
  144 + </view>
126 </movable-view> 145 </movable-view>
127 </movable-area> 146 </movable-area>
128 </view> 147 </view>
@@ -341,14 +341,14 @@ page{ @@ -341,14 +341,14 @@ page{
341 } 341 }
342 .toast{ 342 .toast{
343 background-color: #000; 343 background-color: #000;
344 - width: calc(100% - 272rpx); 344 + width: 534rpx;
345 position: fixed; 345 position: fixed;
346 bottom:calc(520rpx + var(--barHeight)); 346 bottom:calc(520rpx + var(--barHeight));
347 color: #fefefe; 347 color: #fefefe;
348 height:60rpx; 348 height:60rpx;
349 font-size:26rpx; 349 font-size:26rpx;
350 line-height:60rpx; 350 line-height:60rpx;
351 - left: 136rpx; 351 + left: calc(50% - 267rpx);
352 text-align: center; 352 text-align: center;
353 border-radius:30rpx; 353 border-radius:30rpx;
354 opacity:0.64; 354 opacity:0.64;
@@ -687,6 +687,13 @@ @@ -687,6 +687,13 @@
687 "pathName": "pages/customer/welcome", 687 "pathName": "pages/customer/welcome",
688 "query": "id=104544", 688 "query": "id=104544",
689 "scene": null 689 "scene": null
  690 + },
  691 + {
  692 + "id": -1,
  693 + "name": "smscode 进入 /pages/customer/index",
  694 + "pathName": "pages/customer/index",
  695 + "query": "sms_code=0819107064",
  696 + "scene": null
690 } 697 }
691 ] 698 ]
692 } 699 }