xt / xcx-book · Commits

Go to a project

Commit 5a32ba6200e93fd173f061ae1810020535a51e0f

Authored by yiren
1 parent 9d52ea64
build: skipped

”新邀请函”

Inline Side-by-side
Showing 3 changed files with 55 additions and 38 deletions
... ... @@ -88,7 +88,7 @@
<view class="introduce" wx:if="{{store && store.style=='1'}}">
<view class="IntroductionItems" wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="" />
<image src="{{item}}" mode="widthFix" />
<view class="IntroduceColor chief Introducepublic {{theme+'chief'}}" wx:if="{{arryIndex=='0'}}">
<view class="englishText">Introduce</view>
<view class="chefText">品牌介绍</view>
... ... @@ -98,8 +98,8 @@
<view class="labelBox">
<view class="line">
</view>
<view class="label">{{store.introduce}}
</view>
<text class="label">{{store.introduce}}
</text>
</view>
</view>
</view>
... ... @@ -117,11 +117,11 @@
<view class="labelBox">
<view class="line">
</view>
<view class="label styleLabel">{{store.introduce}}
</view>
<text class="label styleLabel">{{store.introduce}}
</text>
</view>
</view>
<image src="{{item}}" mode="" />
<image src="{{item}}" mode="aspectFill"/>
</view>
</view>
</view>
... ... @@ -129,7 +129,7 @@
<view class="introduce famousChefBox" wx:if="{{chef && chef.style=='1'}}">
<view class="IntroductionItems">
<view class="imgMask">
<image src="{{chef.image}}" mode="widthFix" />
<image src="{{chef.image}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic {{theme+'chief'}}">
<view class="englishText">Chief Cook</view>
<view class="chefText">知名主厨</view>
... ... @@ -137,8 +137,8 @@
{{chef.chef_name}}
</view>
<view class="labelBox labelBox1">
<view class="label">{{chef.introduce}}
</view>
<text class="label" >{{chef.introduce}}
</text>
<view class="line">
</view>
</view>
... ... @@ -158,18 +158,18 @@
<view class="labelBox labelBox1">
<view class="line">
</view>
<view class="label styleLabel">{{chef .introduce}}
</view>
<text class="label styleLabel">{{chef .introduce}}
</text>
</view>
</view>
<image src="{{chef.image}}" mode="" />
<image src="{{chef.image}}" mode="aspectFill" />
</view>
</view>
</view>
<view class="introduce vegetableBox" wx:if="{{signboard && signboard.swich=='1'}}">
<view class="IntroductionItems" wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
<view class="imgMask">
<image src="{{item}}" mode="widthFix" />
<image src="{{item}}" mode="aspectFill" />
<view class="IntroduceColor Introducepublic {{theme+'chief'}}" wx:if="{{arryIndex=='0'}}">
<view class="englishText">Favorites</view>
<view class="chefText">菜品展示</view>
... ... @@ -234,7 +234,7 @@
</view>
<view class="vips">
<image src="{{marketing.logo?marketing.logo:detail.seller.seller_image}}" mode="heightFix" />
<view class="news">
<view class="news" wx:if="{{marketing.wecomle}}">
{{marketing.wecomle}}
</view>
<!-- <view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy">
... ... @@ -243,6 +243,10 @@
<view class="text">
{{seller.name?seller.name:reserve.seller_name}}
</view>
<text style="color: #999; font-size: 26rpx;font-family: PingFang SC;">
\n
周到安排提供技术支持 400 000 9690
</text>
</view>
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">
... ...
... ... @@ -233,7 +233,10 @@
.imgMask {
position: relative;
}
.imgMask image{
height: calc(100vw * 353/430) !important;
margin-bottom: 18rpx;
}
.introduce .chief {
top: 0;
left: 0;
... ... @@ -267,6 +270,16 @@
color: #ffffff;
font-family: FangSong;
font-size: 20rpx;
height: 400rpx;
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
overflow: hidden;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 10;
}
.labelBox .styleLabel {
... ... @@ -290,9 +303,6 @@
display: block;
}
.IntroductionItems {
margin-bottom: 18rpx;
}
.famousChefBox {
position: relative;
... ... @@ -323,7 +333,9 @@
text-align: right;
box-sizing: border-box;
}
.famousChefBox .styleSeparate2 image{
width: 100%;
}
.vegetableBox .IntroduceColor {
top: 0;
right: 0;
... ...
... ... @@ -124,39 +124,40 @@ Page({
openid: opt.openid,
fromid: opt.fromid ? opt.fromid : ''
})
if(opt.uid && opt.uid!=''){
App.Activity.SetRelation({
uid:opt.uid,
})
App.Activity.SetIntegral({
uid:opt.uid,
type:0,
rid:opt.id,
openid:opt.openid
})
}
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(opt.uid && opt.uid!=''){
App.Activity.SetRelation({
uid:opt.uid,
})
App.Activity.SetIntegral({
uid:opt.uid,
type:0,
rid:opt.id,
openid:opt.openid
})
}
//is_new_template为1 显示新邀请函detail_owner_invitation_new 0显示旧邀请函detail_owner_invitation
let is_new=res.data.seller.is_new_template;
console.log(res.data.seller.is_new_template,'is_new_templateis_new_template');
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';
if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) {
if (opt.hasInvitation == 1 && is_new=='1') {
url = '/pages/customer/detail_owner_invitation_new';
}else{
url = '/pages/customer/detail_owner_invitation';
}
} else {
url = '/pages/customer/detail_customer';
if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) {
if (opt.hasInvitation == 1 && is_new=='1') {
url = '/pages/customer/detail_owner_invitation_new';
}else{
url = '/pages/customer/detail_invitation';
}
if (res.data.openid == opt.openid) {
url = '/pages/customer/detail_owner';
if (opt.hasInvitation == 1 && (sid=='677' || sid=='26' ||sid=='8' ||sid=='4352')) {
if (opt.hasInvitation == 1 && is_new=='1') {
url = '/pages/customer/detail_owner_invitation_new';
}else{
url = '/pages/customer/detail_owner_invitation';
... ...