xt / xcx-book · Commits

Go to a project

Commit 5e765def241d4844c40f3e922979ab0230174b3a

Authored by vking
1 parent a287e59e
build: skipped

share

Inline Side-by-side
Showing 6 changed files with 76 additions and 11 deletions
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;"></nav> 3 +<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome"></nav>
4 <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}"> 4 <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> 5 <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template>
6 <view class="opt-view flex-vc"> 6 <view class="opt-view flex-vc">
@@ -13,6 +13,10 @@ @@ -13,6 +13,10 @@
13 </view> 13 </view>
14 <view class="opt-button flex-vc"> 14 <view class="opt-button flex-vc">
15 <view class="opt flex-cc"> 15 <view class="opt flex-cc">
  16 + <view bindtap="gotoHome" class="dingbaojian flex-vc">
  17 + <image src="http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20191114105901.png" class="icon"></image>
  18 + <view class="text">订包间</view>
  19 + </view>
16 <formids class="button-none flex-vc" bindclick="lookLocation"> 20 <formids class="button-none flex-vc" bindclick="lookLocation">
17 <view class="opt-text flex-cc"> 21 <view class="opt-text flex-cc">
18 <image class="buts-dh" src="http://qn.colorcun.com/manager-invitation/wx2/%E4%B8%80%E9%94%AE%E5%AF%BC%E8%88%AA.png"></image> 22 <image class="buts-dh" src="http://qn.colorcun.com/manager-invitation/wx2/%E4%B8%80%E9%94%AE%E5%AF%BC%E8%88%AA.png"></image>
@@ -55,4 +55,26 @@ image{ @@ -55,4 +55,26 @@ image{
55 width: 344rpx; 55 width: 344rpx;
56 height: 198rpx; 56 height: 198rpx;
57 background-image: url("http://qn.colorcun.com/manager-invitation/wx/%E9%82%80%E8%AF%B7%E5%87%BD.png"); 57 background-image: url("http://qn.colorcun.com/manager-invitation/wx/%E9%82%80%E8%AF%B7%E5%87%BD.png");
  58 +}
  59 +
  60 +.opt-button .dingbaojian{
  61 + background-color: #262628;
  62 + color: #ECD9B7;
  63 + min-width: 160rpx;
  64 + height: 90rpx;
  65 + line-height: 90rpx;
  66 + border-top: 2rpx solid #ECD9B7;
  67 + box-sizing: border-box;
  68 + min-height: 90rpx;
  69 +}
  70 +.opt-button .dingbaojian .icon{
  71 + width: 30rpx;
  72 + height: 30rpx;
  73 +}
  74 +.opt-button .dingbaojian .text{
  75 + height:34rpx;
  76 + font-size:24rpx;
  77 + color:rgba(236,217,183,1);
  78 + line-height:34rpx;
  79 + margin-top: 8rpx;
58 } 80 }
@@ -283,4 +283,9 @@ Page({ @@ -283,4 +283,9 @@ Page({
283 console.log(e.detail.ddate) 283 console.log(e.detail.ddate)
284 this.getDetail(true) 284 this.getDetail(true)
285 }, 285 },
  286 + gotoHome(){
  287 + wx.switchTab({
  288 + url: '/pages/reserve/index'
  289 + })
  290 + },
286 }) 291 })
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;"></nav> 3 +<nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome"></nav>
4 <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}"> 4 <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> 5 <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template>
6 <view class="opt-view flex-vc"> 6 <view class="opt-view flex-vc">
@@ -17,11 +17,18 @@ @@ -17,11 +17,18 @@
17 </block> 17 </block>
18 </view> 18 </view>
19 </view> 19 </view>
20 -<view class="bottom flex-lr" wx:if="{{!detail.hasOvered && !detail.hasCancel}}">  
21 - <formids bindclick="sendmsg" class="sendmsg" style="{{detail.seller.is_open_order!=1 && detail.seller.is_open_wine!=1?'width:100%;':''}}">  
22 - 短信通知 20 +<view class="bottom flex-lr" wx:if="{{true || !detail.hasOvered && !detail.hasCancel}}">
  21 + <view bindtap="gotoHome" class="dingbaojian flex-vc">
  22 + <image src="http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20191114105901.png" class="icon"></image>
  23 + <view class="text">订包间</view>
  24 + </view>
  25 + <formids bindclick="sendmsg" class="diancan" style="{{detail.seller.is_open_order!=1 && detail.seller.is_open_wine!=1?'width:100%;':''}}">
  26 + <view class="buts-text flex-cc">
  27 + <image src="http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911141059011.png" class="icon"></image>
  28 + 短信通知
  29 + </view>
23 </formids> 30 </formids>
24 - <userinfo binduserinfo="cookbook" class="diancan" wx:if="{{detail.seller.is_open_order==1}}"> 31 + <userinfo binduserinfo="cookbook" class="diancan left-border" wx:if="{{detail.seller.is_open_order==1}}">
25 <view class="buts-text flex-cc"> 32 <view class="buts-text flex-cc">
26 <image src="http://qn.colorcun.com/manager-invitation/wx2/%E6%8F%90%E5%89%8D%E7%82%B9%E9%A4%90.png" class="icon"></image> 33 <image src="http://qn.colorcun.com/manager-invitation/wx2/%E6%8F%90%E5%89%8D%E7%82%B9%E9%A4%90.png" class="icon"></image>
27 提前点餐 34 提前点餐
@@ -60,10 +60,30 @@ image{ @@ -60,10 +60,30 @@ image{
60 bottom: 0; 60 bottom: 0;
61 height: 90rpx; 61 height: 90rpx;
62 line-height: 90rpx; 62 line-height: 90rpx;
63 - border-top: 2rpx solid #ECD9B7;  
64 background-color: #ECD9B7; 63 background-color: #ECD9B7;
65 width: 100%; 64 width: 100%;
66 font-size: 30rpx; 65 font-size: 30rpx;
  66 + box-sizing: border-box;
  67 +}
  68 +.bottom .dingbaojian{
  69 + background-color: #262628;
  70 + color: #ECD9B7;
  71 + min-width: 160rpx;
  72 + height: 90rpx;
  73 + line-height: 90rpx;
  74 + border-top: 2rpx solid #ECD9B7;
  75 + box-sizing: border-box;
  76 +}
  77 +.bottom .dingbaojian .icon{
  78 + width: 30rpx;
  79 + height: 30rpx;
  80 +}
  81 +.bottom .dingbaojian .text{
  82 + height:34rpx;
  83 + font-size:24rpx;
  84 + color:rgba(236,217,183,1);
  85 + line-height:34rpx;
  86 + margin-top: 8rpx;
67 } 87 }
68 .bottom .sendmsg{ 88 .bottom .sendmsg{
69 background-color: #262628; 89 background-color: #262628;
@@ -73,10 +93,17 @@ image{ @@ -73,10 +93,17 @@ image{
73 .bottom .diancan{ 93 .bottom .diancan{
74 text-align: center; 94 text-align: center;
75 color: #794F28; 95 color: #794F28;
76 - height: 90rpx;  
77 - line-height: 90rpx; 96 + height: 66rpx;
  97 + line-height: 66rpx;
78 min-width: 33%; 98 min-width: 33%;
79 - width: 70%; 99 + width: 100%;
  100 +}
  101 +.bottom .diancan .buts-text{
  102 + height: 66rpx;
  103 + line-height: 66rpx;
  104 +}
  105 +.bottom .diancan.left-border{
  106 + border-left: 2rpx solid #D3BF9C;
80 } 107 }
81 .bottom .jiushui{ 108 .bottom .jiushui{
82 text-align: center; 109 text-align: center;
@@ -352,7 +352,7 @@ @@ -352,7 +352,7 @@
352 "id": 39, 352 "id": 39,
353 "name": "pages/reserve/detail 在线订座 ", 353 "name": "pages/reserve/detail 在线订座 ",
354 "pathName": "pages/reserve/detail", 354 "pathName": "pages/reserve/detail",
355 - "query": "id=80&fromid=&activeTab=", 355 + "query": "id=1009&fromid=&activeTab=",
356 "scene": null 356 "scene": null
357 }, 357 },
358 { 358 {