Commit 28727f51a757f4efd5ab30ac6e271d510de56a4e

Authored by vking
1 parent bed4bba2

运营接单

@@ -13,7 +13,10 @@ @@ -13,7 +13,10 @@
13 <view class="gray-deep-font font30r">用餐人数</view> 13 <view class="gray-deep-font font30r">用餐人数</view>
14 <view class="black-font font34r">{{bookInfo.pnum_str||bookInfo.pnum}}人</view> 14 <view class="black-font font34r">{{bookInfo.pnum_str||bookInfo.pnum}}人</view>
15 </view> 15 </view>
16 - <view class="reserve-status-tip" wx:if="{{bookInfo.status!=null}}"> 16 + <view class="reserve-status-tip" wx:if="{{bookInfo.status==0}}">
  17 + <view class="text">待处理</view>
  18 + </view>
  19 + <view class="reserve-status-tip" wx:else="">
17 <image src="http://qn.colorcun.com/custom/lite-yd/image/reserve-status-{{bookInfo.status}}.png"></image> 20 <image src="http://qn.colorcun.com/custom/lite-yd/image/reserve-status-{{bookInfo.status}}.png"></image>
18 </view> 21 </view>
19 <view class="flex-lr order-desk" wx:if="{{bookInfo.type==1}}"> 22 <view class="flex-lr order-desk" wx:if="{{bookInfo.type==1}}">
@@ -128,6 +128,16 @@ view{ @@ -128,6 +128,16 @@ view{
128 width: 82rpx; 128 width: 82rpx;
129 height: 52rpx; 129 height: 52rpx;
130 } 130 }
  131 +.reserve-status-tip .text{
  132 + font-weight: bold;
  133 + font-size: 32rpx;
  134 + color: #C51B41;
  135 + white-space : nowrap;
  136 + transform: rotate(-15deg);
  137 + border: solid 2rpx #C51B41;
  138 + padding: 5rpx;
  139 + width: 100rpx;
  140 +}
131 .reserve-status-tip image{ 141 .reserve-status-tip image{
132 width: 100%; 142 width: 100%;
133 height: 100%; 143 height: 100%;
@@ -36,6 +36,10 @@ Page({ @@ -36,6 +36,10 @@ Page({
36 indexOpt:null, 36 indexOpt:null,
37 YYYY:'YYYY', 37 YYYY:'YYYY',
38 onLoad:async function(opt){ 38 onLoad:async function(opt){
  39 + if(opt.rid){
  40 + this.reserveId=opt.rid
  41 + delete opt.rid
  42 + }
39 this.indexOpt=opt; 43 this.indexOpt=opt;
40 mta.Page.init({ 44 mta.Page.init({
41 "appID":"500667280", 45 "appID":"500667280",
@@ -57,11 +61,6 @@ Page({ @@ -57,11 +61,6 @@ Page({
57 }else{ 61 }else{
58 this.sellerid=util.cache('sellerid'); 62 this.sellerid=util.cache('sellerid');
59 } 63 }
60 - if(opt.rid){  
61 - return wx.navigateTo({  
62 - url:'./b_detail?id='+opt.rid  
63 - })  
64 - }  
65 //this.sellerid=opt.seller_id ? opt.seller_id : util.cache('sellerid'); 64 //this.sellerid=opt.seller_id ? opt.seller_id : util.cache('sellerid');
66 let timePickerArray= await bookOrder.getDayTimeSpace(); 65 let timePickerArray= await bookOrder.getDayTimeSpace();
67 let speciallist=[ 66 let speciallist=[
@@ -102,6 +101,13 @@ Page({ @@ -102,6 +101,13 @@ Page({
102 } 101 }
103 102
104 },1000); 103 },1000);
  104 + if(this.reserveId){
  105 + let url='./b_detail?id='+this.reserveId
  106 + this.reserveId=''
  107 + return wx.navigateTo({
  108 + url:url
  109 + })
  110 + }
105 }, 111 },
106 async getbooklist(isExport=false){ 112 async getbooklist(isExport=false){
107 let time=0; 113 let time=0;
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 "id": 0, 55 "id": 0,
56 "name": "预订本-商家1", 56 "name": "预订本-商家1",
57 "pathName": "pack-book/pages/book/b_index", 57 "pathName": "pack-book/pages/book/b_index",
58 - "query": "seller_id=689&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500", 58 + "query": "seller_id=689&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500&rid=33284",
59 "scene": 1001 59 "scene": 1001
60 }, 60 },
61 { 61 {