xt / xcx-book · Commits

Go to a project

Commit b279de9d1da25fa282923024cbffefc98cae5057

Authored by yiren
1 parent 0db3bd71
build: skipped

”新邀请函”

Inline Side-by-side
Showing 4 changed files with 15 additions and 11 deletions
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 "pages/reserve/reserve", 55 "pages/reserve/reserve",
56 "pages/tcads/cmyy", 56 "pages/tcads/cmyy",
57 "pages/pinglun/video", 57 "pages/pinglun/video",
58 - "pages/customer/detail_owner_invitation_new" 58 + "pages/customer/detail_owner_invitation_new"
59 ], 59 ],
60 "requiredPrivateInfos":[ 60 "requiredPrivateInfos":[
61 "getLocation", 61 "getLocation",
@@ -116,7 +116,6 @@ Page({ @@ -116,7 +116,6 @@ Page({
116 if (regions.indexOf('t.rname') == -1) { 116 if (regions.indexOf('t.rname') == -1) {
117 regions.push(t.rname); 117 regions.push(t.rname);
118 } 118 }
119 -  
120 }) 119 })
121 let reserev = RS.reserve(res.data) 120 let reserev = RS.reserve(res.data)
122 let dateSmart 121 let dateSmart
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <view class="infoRight"> 18 <view class="infoRight">
19 <view class="begin"> 19 <view class="begin">
20 <view>尊敬的贵宾，您好！</view> 20 <view>尊敬的贵宾，您好！</view>
21 - <view>非常感谢您选择{{reserve.seller_name?reserve.seller_name:seller.name}}！</view> 21 + <view>非常感谢您选择{{seller.name?seller.name:reserve.seller_name}}！</view>
22 </view> 22 </view>
23 <view class="flex-11"> 23 <view class="flex-11">
24 <view class="label">【日期】</view> 24 <view class="label">【日期】</view>
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <view class="welcome"> 51 <view class="welcome">
52 欢迎垂询，恭候光临！ 52 欢迎垂询，恭候光临！
53 </view> 53 </view>
54 - <block wx:if="{{detail.sid!='677' && reserve.manager_phone && manager_wechat}}"> 54 + <block wx:if="{{detail.sid!='677' && reserve.manager_phone && reserve.manager_wechat}}">
55 <view class="handleInfo"> 55 <view class="handleInfo">
56 <image src="{{reserve.manager_image}}" class="headerimg" mode="aspectFill"></image> 56 <image src="{{reserve.manager_image}}" class="headerimg" mode="aspectFill"></image>
57 <view class="handle"> 57 <view class="handle">
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 <view class="positioning" bindtap="looklocation"> 69 <view class="positioning" bindtap="looklocation">
70 <image src="https://qn.colorcun.com/1541679628682_.pic.jpg" mode="" /> 70 <image src="https://qn.colorcun.com/1541679628682_.pic.jpg" mode="" />
71 <view class="name"> 71 <view class="name">
72 - <text>{{reserve.seller_name?reserve.seller_name:detail.seller.sellername}}</text> 72 + <text>{{seller.name?seller.name:reserve.seller_name}}</text>
73 <text>{{reserve.address?reserve.address:detail.seller.map_address}}</text> 73 <text>{{reserve.address?reserve.address:detail.seller.map_address}}</text>
74 </view> 74 </view>
75 </view> 75 </view>
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 <view class="englishText">Introduce</view> 93 <view class="englishText">Introduce</view>
94 <view class="chefText">品牌介绍</view> 94 <view class="chefText">品牌介绍</view>
95 <view class="shopName"> 95 <view class="shopName">
96 - {{store .seller_name}} 96 + {{seller.name?seller.name:reserve .seller_name}}
97 </view> 97 </view>
98 <view class="labelBox"> 98 <view class="labelBox">
99 <view class="line"> 99 <view class="line">
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 <view class="englishText">Introduce</view> 112 <view class="englishText">Introduce</view>
113 <view class="chefText">品牌介绍</view> 113 <view class="chefText">品牌介绍</view>
114 <view class="shopName styleShopName"> 114 <view class="shopName styleShopName">
115 - {{store .seller_name}} 115 + {{seller.name?seller.name:reserve .seller_name}}
116 </view> 116 </view>
117 <view class="labelBox"> 117 <view class="labelBox">
118 <view class="line"> 118 <view class="line">
@@ -241,12 +241,12 @@ @@ -241,12 +241,12 @@
241 点击了解更多会员优惠政策 241 点击了解更多会员优惠政策
242 </view> --> 242 </view> -->
243 <view class="text"> 243 <view class="text">
244 - {{reserve.seller_name?reserve.seller_name:seller.name}} 244 + {{seller.name?seller.name:reserve.seller_name}}
245 </view> 245 </view>
246 </view> 246 </view>
247 </scroll-view> 247 </scroll-view>
248 <view wx:if="{{marketing.is_transpond=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr'}}"> 248 <view wx:if="{{marketing.is_transpond=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr'}}">
249 - <!-- <view wx:if="{{marketing.is_online}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订 249 + <!-- <view wx:if="{{marketing.is_online=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订
250 </view> --> 250 </view> -->
251 <!-- <view wx:if="{{marketing.is_arrival}}" class="book-item-font second-book-button flex-cc font30r centerBtn" bindtap="secondbook" style="position: relative;">确认赴约 251 <!-- <view wx:if="{{marketing.is_arrival}}" class="book-item-font second-book-button flex-cc font30r centerBtn" bindtap="secondbook" style="position: relative;">确认赴约
252 </view> --> 252 </view> -->
@@ -136,9 +136,12 @@ Page({ @@ -136,9 +136,12 @@ Page({
136 }) 136 })
137 } 137 }
138 let sid=res.data.sid 138 let sid=res.data.sid
  139 + console.log(sid,'sidsidsidsidsidsidsidsidsid');
  140 + console.log(res.data.openid,'resdataopenidopenidopenidopenid');
  141 + console.log(opt.hasInvitation,'hasInvitation');
  142 + console.log(opt.openid,'optopenidoptopenidopt.openid');
139 if (!res.data.openid) {//无预订人 143 if (!res.data.openid) {//无预订人
140 url = '/pages/customer/detail_owner'; 144 url = '/pages/customer/detail_owner';
141 - console.log(sid,'sidsidsidsidsidsidsidsidsid');  
142 if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) { 145 if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) {
143 url = '/pages/customer/detail_owner_invitation_new'; 146 url = '/pages/customer/detail_owner_invitation_new';
144 }else{ 147 }else{
@@ -146,7 +149,9 @@ Page({ @@ -146,7 +149,9 @@ Page({
146 } 149 }
147 } else { 150 } else {
148 url = '/pages/customer/detail_customer'; 151 url = '/pages/customer/detail_customer';
149 - if (opt.hasInvitation == 1) { 152 + if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) {
  153 + url = '/pages/customer/detail_owner_invitation_new';
  154 + }else{
150 url = '/pages/customer/detail_invitation'; 155 url = '/pages/customer/detail_invitation';
151 } 156 }
152 if (res.data.openid == opt.openid) { 157 if (res.data.openid == opt.openid) {