Commit 927f387a276a6019c6fa6faca35f395a32581f84

Authored by “pengye”
1 parent 14dc2753

邀请函、商家详情弹框领券样式调整

Showing 25 changed files with 97 additions and 71 deletions
... ... @@ -322,7 +322,7 @@
</view>
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -798,8 +798,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -830,6 +831,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -842,6 +844,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -854,7 +857,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -938,6 +941,6 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
\ No newline at end of file
... ...
... ... @@ -483,7 +483,7 @@
</view>
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -896,8 +896,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -928,6 +929,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -940,6 +942,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -952,7 +955,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -1036,8 +1039,8 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
/* 商务宴会 */
... ...
... ... @@ -456,7 +456,7 @@
</view>
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -950,8 +950,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -982,6 +983,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -994,6 +996,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -1006,7 +1009,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -1090,8 +1093,8 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
/* 商务宴会 */
... ...
... ... @@ -350,7 +350,7 @@
</view>
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -810,8 +810,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -842,6 +843,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -854,6 +856,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -866,7 +869,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -950,8 +953,8 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
/* 深中国红 */
... ...
... ... @@ -355,7 +355,7 @@
</view>
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -842,8 +842,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -874,6 +875,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -886,6 +888,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -898,7 +901,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -982,8 +985,8 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
/* 深中国红 */
... ...
... ... @@ -338,7 +338,7 @@
</view>
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -832,8 +832,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -864,6 +865,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -876,6 +878,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -888,7 +891,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -972,8 +975,8 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
/* 深中国红 */
... ...
... ... @@ -337,7 +337,7 @@
</view>
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -831,8 +831,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -863,6 +864,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -875,6 +877,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -887,7 +890,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -971,8 +974,8 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
/* 深中国红 */
... ...
... ... @@ -325,7 +325,7 @@
</view>
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -981,8 +981,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -1013,6 +1014,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -1025,6 +1027,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -1037,7 +1040,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -1121,8 +1124,8 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
.arrivalBox{
... ...
... ... @@ -350,7 +350,7 @@
</view>
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -830,8 +830,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -862,6 +863,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -874,6 +876,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -886,7 +889,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -970,8 +973,8 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
/* 深中国红 */
... ...
... ... @@ -349,7 +349,7 @@
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -830,8 +830,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -862,6 +863,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -874,6 +876,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -886,7 +889,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -970,8 +973,8 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
/* 深中国红 */
... ...
... ... @@ -348,7 +348,7 @@
</view>
</my-modal>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -946,8 +946,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -978,6 +979,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -990,6 +992,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -1002,7 +1005,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -1086,8 +1089,8 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
/* 模板9 */
... ...
... ... @@ -199,7 +199,6 @@ Page({
reserve,
marketing,
coupon,
couponList,
StyleType,
titleType,
couponList,
... ... @@ -211,16 +210,7 @@ Page({
if (marketing && marketing.is_recharge == '1' && marketing.recharge_data) {
this.getRechargeDetail(marketing.recharge_data.id)
}
this.setData({
chef,
reserve,
signboard,
store,
home,
marketing,
StyleType,
titleType,
})
this.setData({...obj})
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
... ...
... ... @@ -232,7 +232,7 @@
</view>
</view>
<my-modal id="couponModal" fadeStyle="slideUp" height="240px">
<view slot="modalName" class="titleModal titleModal2">
<view slot="modalName" class="titleModal">
<image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
<view class="nameInfo">{{seller.sellName}}</view>
<view class="couponTotal" wx:if="{{totalPrice}}">
... ...
... ... @@ -480,8 +480,9 @@
}
#couponModal .titleModal {
margin-top: 30%;
margin-top: 60%;
position: relative;
width: 100%;
}
#couponModal .titleModal2 {
... ... @@ -512,6 +513,7 @@
color: #fff;
margin-bottom: 40rpx;
padding-top: 60rpx;
text-align: center;
}
.couponTotal {
... ... @@ -524,6 +526,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 20% 0 10% 0;
}
.counterText {
... ... @@ -536,7 +539,7 @@
.couponInfo {
color: #DFDFDF;
text-align: center;
margin-bottom: 30rpx;
margin-bottom: 40rpx;
}
.couponBox {
... ... @@ -620,6 +623,6 @@
width: 60rpx;
height: 60rpx;
position: absolute;
right: 0;
top: 0;
right: 5%;
top: -10%;
}
\ No newline at end of file
... ...