Commit afc1d2e6728dfa07d7ede91c66042b74d41a6e9c

Authored by vking
1 parent 0dda5719

blue ui other

@@ -24,15 +24,87 @@ @@ -24,15 +24,87 @@
24 24
25 <detail-status detail="{{detail}}" ></detail-status> 25 <detail-status detail="{{detail}}" ></detail-status>
26 <detail-card detail="{{detail}}"></detail-card> 26 <detail-card detail="{{detail}}"></detail-card>
27 - <view class="flex padding justify-end align-center">  
28 - 27 + <view class="flex padding justify-end align-center margin-top">
  28 + <navigator url="/pages/reserve/reserve?id={{detail.sid}}&activeTab=reserve"
  29 + wx:if="{{detail.hasCancel || detail.status==6}}"
  30 + hover-class="navigator-hover">
  31 + <view class="min-but flex align-center justify-center txt-30-h solid">再次预订</view>
  32 + </navigator>
  33 + <navigator url="./cancel?id={{detail.id}}"
  34 + wx:if="{{(detail.hasRunning || detail.status==0) && checkout.status!=3}}"
  35 + hover-class="navigator-hover">
  36 + <view class="min-but flex align-center justify-center txt-30-h solid">取消预订</view>
  37 + </navigator>
  38 + <navigator url="/pages/customer/detail_owner_invitation?id={{detail.id}}&hasInvitation=1&hasSellerShare=1&tplid=1"
  39 + wx:if="{{detail.hasRunning}}"
  40 + class="share-but-view">
  41 + <view class="min-but flex align-center justify-center txt-30-h solid line-blue">通知好友</view>
  42 + </navigator>
  43 + <navigator url="/pages/pinglun/create?sid={{detail.seller.id}}&oid={{detail.id}}&sellername={{detail.seller.sellername}}"
  44 + wx:if="{{detail.hasFinished && hasComment}}"
  45 + hover-class="navigator-hover">
  46 + <view class="min-but flex align-center justify-center txt-30-h solid line-blue">评价</view>
  47 + </navigator>
  48 + </view>
  49 + <view class="margin-lr-lg padding-tb-lg view solid-top" wx:if="{{true || detail.customers.length>1}}">
  50 + <navigator url="./detail_owner_part?id={{detail.id}}" hover-class="navigator-hover" wx:if="{{detail.customers.length>0}}">
  51 + <view class="flex-lr customers_view">
  52 + <view class="customers flex-ll">
  53 + <block wx:for="{{detail.customers}}" wx:key="detail.customers.key">
  54 + <image src="{{item.headimgurl}}" class="avatar" mode="aspectFill" wx:if="{{index<3}}"></image>
  55 + </block>
  56 + <view style="margin-left: 12rpx;">等{{detail.customers.length}}人已参加</view>
  57 + </view>
  58 + <image src="http://nosqn.colorcun.com/custom/lite-yd/image/click.png" class="more"></image>
  59 + </view>
  60 + </navigator>
29 </view> 61 </view>
30 - <view class="fixed-buttons flex justify-center align-center"> 62 + <view class="fixed-buttons flex justify-between align-center padding-lg view bg-white">
  63 + <view wx:if="{{detail.hasRunning && detail.seller.is_open_order==1}}"
  64 + class="view flex-treble big-but flex align-center justify-center txt-34-h solid line-blue round">
  65 + <userinfo
  66 + binduserinfo="cookbook"
  67 + bindshare="share"
  68 + share="{{detail}}"
  69 + share-act="invitation">
  70 + <view wx:if="{{detail.order && detail.order.cookbooklist.length>0}}">
  71 + 查看菜品
  72 + </view>
  73 + <view wx:else="">提前点餐</view>
  74 + </userinfo>
  75 + </view>
  76 + <block wx:if="{{detail.status==6}}">
  77 + <view bindtap="gotoList"
  78 + class="view flex-treble big-but flex align-center justify-center txt-34-h solid line-blue round">
  79 + 帮我推荐餐厅
  80 + </view>
  81 + <chatbot class="big-but view flex-treble align-center justify-center" params="{{chatbotParams}}">
  82 + <view class="view flex-treble big-but flex align-center justify-center txt-34-h solid line-blue round">
  83 + 帮我
  84 + <image src="http://nosqn.colorcun.com/detail/qiang-2%403x.png"
  85 + style="width: 56rpx;height: 56rpx; margin: 0 6rpx;"></image>
  86 + 订
  87 + </view>
  88 + </chatbot>
  89 + </block>
31 90
  91 + <view class="view flex-treble big-but flex align-center justify-center txt-34-h solid line-blue round"
  92 + wx:if="{{detail.hasRunning && detail.seller.isopen_md==1}}">
  93 + <userinfo
  94 + binduserinfo="checkout"
  95 + share="{{detail}}"
  96 + share-act="invitation">
  97 + <view style="position: relative;">
  98 + 在线买单
  99 + <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
  100 + cla="money-tips detail_owner"></seller-discount>
  101 + </view>
  102 + </userinfo>
  103 + </view>
32 </view> 104 </view>
33 </block> 105 </block>
34 106
35 - 107 + <!--
36 <view class="page"> 108 <view class="page">
37 <view class="flex-vc success" wx:if="{{hasCancel}}"> 109 <view class="flex-vc success" wx:if="{{hasCancel}}">
38 <view class="icon"> 110 <view class="icon">
@@ -286,6 +358,7 @@ @@ -286,6 +358,7 @@
286 </block> 358 </block>
287 <view style="height: 50rpx;"></view> 359 <view style="height: 50rpx;"></view>
288 </view> 360 </view>
  361 + -->
289 </page> 362 </page>
290 363
291 <manager manager="{{detail}}" id="manager"></manager> 364 <manager manager="{{detail}}" id="manager"></manager>
@@ -4,9 +4,28 @@ @@ -4,9 +4,28 @@
4 position: fixed; 4 position: fixed;
5 bottom: 0; 5 bottom: 0;
6 left: 0; 6 left: 0;
  7 + width: 100%;
  8 + z-index: 9;
7 } 9 }
8 .close-x:after{left:-20rpx;} 10 .close-x:after{left:-20rpx;}
9 - 11 +.min-but{
  12 + padding: 10rpx 20rpx;
  13 + min-width: 160rpx;
  14 + box-sizing: border-box;
  15 + height: 62rpx;
  16 +}
  17 +.min-but:after{
  18 + border-radius: 20rpx;
  19 +}
  20 +.min-but+.min-but{
  21 + margin-left: 40rpx;
  22 +}
  23 +.big-but{
  24 + height: 84rpx;
  25 +}
  26 +.big-but+.big-but{
  27 + margin-left: 50rpx;
  28 +}
10 .page{ 29 .page{
11 width: 90%; 30 width: 90%;
12 margin: 0 5%; 31 margin: 0 5%;
@@ -229,11 +248,13 @@ @@ -229,11 +248,13 @@
229 margin-right: 10rpx; 248 margin-right: 10rpx;
230 } 249 }
231 .subscribe-close{ 250 .subscribe-close{
232 - width:21rpx;  
233 - height:22rpx;  
234 - background-size: 100% 100%; 251 + width:31rpx;
  252 + height:32rpx;
  253 + background-size: 21rpx 22rpx;
235 background-image: url("http://nosqn.colorcun.com/subscribe/close.png"); 254 background-image: url("http://nosqn.colorcun.com/subscribe/close.png");
236 - background-color: #8dc63f; 255 + background-color: #FF7A0055;
  256 + background-repeat: no-repeat;
  257 + background-position: center;
237 } 258 }
238 .subscribe-yd{ 259 .subscribe-yd{
239 position: fixed; 260 position: fixed;
@@ -224,8 +224,8 @@ Page({ @@ -224,8 +224,8 @@ Page({
224 this.param={ 224 this.param={
225 offset:this.offset, 225 offset:this.offset,
226 size:this.size, 226 size:this.size,
227 - code:this.city.code,  
228 - pid:this.city.pid, 227 + code:this.city?this.city.code:'',
  228 + pid:this.city?this.city.pid:'',
229 keyword:this.options.keyword||'', 229 keyword:this.options.keyword||'',
230 ...this.findSellerData.paramObj, 230 ...this.findSellerData.paramObj,
231 } 231 }