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 @@
"pages/reserve/reserve",
"pages/tcads/cmyy",
"pages/pinglun/video",
"pages/customer/detail_owner_invitation_new"
"pages/customer/detail_owner_invitation_new"
],
"requiredPrivateInfos":[
"getLocation",
... ...
... ... @@ -116,7 +116,6 @@ Page({
if (regions.indexOf('t.rname') == -1) {
regions.push(t.rname);
}
})
let reserev = RS.reserve(res.data)
let dateSmart
... ...
... ... @@ -18,7 +18,7 @@
<view class="infoRight">
<view class="begin">
<view>尊敬的贵宾，您好！</view>
<view>非常感谢您选择{{reserve.seller_name?reserve.seller_name:seller.name}}！</view>
<view>非常感谢您选择{{seller.name?seller.name:reserve.seller_name}}！</view>
</view>
<view class="flex-11">
<view class="label">【日期】</view>
... ... @@ -51,7 +51,7 @@
<view class="welcome">
欢迎垂询，恭候光临！
</view>
<block wx:if="{{detail.sid!='677' && reserve.manager_phone && manager_wechat}}">
<block wx:if="{{detail.sid!='677' && reserve.manager_phone && reserve.manager_wechat}}">
<view class="handleInfo">
<image src="{{reserve.manager_image}}" class="headerimg" mode="aspectFill"></image>
<view class="handle">
... ... @@ -69,7 +69,7 @@
<view class="positioning" bindtap="looklocation">
<image src="https://qn.colorcun.com/1541679628682_.pic.jpg" mode="" />
<view class="name">
<text>{{reserve.seller_name?reserve.seller_name:detail.seller.sellername}}</text>
<text>{{seller.name?seller.name:reserve.seller_name}}</text>
<text>{{reserve.address?reserve.address:detail.seller.map_address}}</text>
</view>
</view>
... ... @@ -93,7 +93,7 @@
<view class="englishText">Introduce</view>
<view class="chefText">品牌介绍</view>
<view class="shopName">
{{store .seller_name}}
{{seller.name?seller.name:reserve .seller_name}}
</view>
<view class="labelBox">
<view class="line">
... ... @@ -112,7 +112,7 @@
<view class="englishText">Introduce</view>
<view class="chefText">品牌介绍</view>
<view class="shopName styleShopName">
{{store .seller_name}}
{{seller.name?seller.name:reserve .seller_name}}
</view>
<view class="labelBox">
<view class="line">
... ... @@ -241,12 +241,12 @@
点击了解更多会员优惠政策
</view> -->
<view class="text">
{{reserve.seller_name?reserve.seller_name:seller.name}}
{{seller.name?seller.name:reserve.seller_name}}
</view>
</view>
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr'}}">
<!-- <view wx:if="{{marketing.is_online}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订
<!-- <view wx:if="{{marketing.is_online=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订
</view> -->
<!-- <view wx:if="{{marketing.is_arrival}}" class="book-item-font second-book-button flex-cc font30r centerBtn" bindtap="secondbook" style="position: relative;">确认赴约
</view> -->
... ...
... ... @@ -136,9 +136,12 @@ Page({
})
}
let sid=res.data.sid
console.log(sid,'sidsidsidsidsidsidsidsidsid');
console.log(res.data.openid,'resdataopenidopenidopenidopenid');
console.log(opt.hasInvitation,'hasInvitation');
console.log(opt.openid,'optopenidoptopenidopt.openid');
if (!res.data.openid) {//无预订人
url = '/pages/customer/detail_owner';
console.log(sid,'sidsidsidsidsidsidsidsidsid');
if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) {
url = '/pages/customer/detail_owner_invitation_new';
}else{
... ... @@ -146,7 +149,9 @@ Page({
}
} else {
url = '/pages/customer/detail_customer';
if (opt.hasInvitation == 1) {
if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) {
url = '/pages/customer/detail_owner_invitation_new';
}else{
url = '/pages/customer/detail_invitation';
}
if (res.data.openid == opt.openid) {
... ...