Commit a6662a3bf038cf44ea0bf61480c9074a00144847

Authored by pengye
1 parent 9977ede3

新版样式页面、样式调整2

... ... @@ -17,45 +17,45 @@
</view>
<view wx:if="{{type=='2'}}" class="coupon">
<form catchsubmit="formSubmit">
<view class="page-section">
<view class="page-section-title font32r">您的姓名</view>
<view class="page-section text1">
<view class="page-section-title font28r">您的姓名</view>
<view class="weui-cells weui-cell__bd" style="margin: 30rpx 0">
<input class="weui-input name-input" value="{{name}}" data-params="name" placeholder="点击输入您的姓名" placeholder-style="color:#999;" bindinput="bindKeyNameInput"/>
<input class="weui-input name-input" value="{{name}}" data-params="name" placeholder="点击输入您的姓名" placeholder-style="color:#CBCBCB;" bindinput="bindKeyNameInput"/>
</view>
<picker mode="selector" value="{{indexs}}" range-key="sex" data-sex='{{sexList[indexs].sex}}' range="{{sexList}}" bindchange="bind_Changesex" class="pickerSex">
<text class="sexText">{{sexList[indexs].sex}}</text>
<image src="https://qn.colorcun.com/WechatIMG695.png" mode="" class="imgs"/>
<image src="https://qn.colorcun.com/arrowBottom.png" mode="" class="imgs"/>
</picker>
</view>
<view class="page-section">
<view class="page-section-title font32r">联系电话</view>
<view class="page-section-title font28r">联系电话</view>
<view class="weui-cells weui-cell__bd" style="margin: 30rpx 0">
<input class="weui-input" type="number" name="phone" value="{{phone}}" data-params="phone" maxlength="11" placeholder="点击输入您的电话" placeholder-style="color:#999;" bindinput="bindKeyPhoneInput" style="color: #999" />
<input class="weui-input" type="number" name="phone" value="{{phone}}" data-params="phone" maxlength="11" placeholder="点击输入您的电话" placeholder-style="color:#CBCBCB;" bindinput="bindKeyPhoneInput" style="color: #000" />
</view>
</view>
<view class="page-section page-section1">
<view class="page-section-title font32r">您的生日</view>
<view class="weui-cells weui-cell__bd">
<view class="page-section-title font28r">您的生日</view>
<view class="weui-cells weui-cell__bd text2">
<picker mode="date" value="{{date}}" bindchange="bind_ChangeDate" class="pickerBox">
<view class="colorSty">{{date?date:'点击输入您的生日'}}</view>
<view class="{{date ? 'colorSty' : 'color1'}} font28r">{{date?date:'点击输入您的生日'}}</view>
</picker>
<view class="more"></view>
</view>
<view class="more"></view>
</view>
<view class="page-section">
<view class="page-section-title font32r">充值金额</view>
<view class="page-section-title font28r">充值金额</view>
<view class="weui-cells weui-cell__bd sum colorSty">
{{opt.detail.recharge_money}}元
</view>
</view>
<view class="page-section">
<view class="page-section-title font32r">支付剩余时间 </view>
<view class="page-section-title font28r">支付剩余时间 </view>
<view class="weui-cells weui-cell__bd sum colorSty">
{{countdown}}
</view>
</view>
<view wx:if="{{type=='2'}}" class="fixed_box">
<button class="font32r btns" formType="submit">确认支付
<button class="font28r btns" formType="submit">确认支付
</button>
</view>
</form>
... ...
/* pack-activity/pack/confirmPayment.wxss */
page {
background: #F5F5F5;
}
.box_wrap {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
justify-content: center;
background: #fff;
border-radius: 10rpx;
margin: 12rpx;
}
.box {
... ... @@ -60,8 +68,10 @@
width: 100%;
margin: 0;
border-radius: 42rpx;
color: #fff;
background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
color: #fff;
height: 72rpx;
line-height: 72rpx;
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
}
#payModal {
... ... @@ -90,8 +100,10 @@
.coupon {
width: 100%;
padding-left: 32rpx;
box-sizing: border-box;
box-sizing: border-box;
padding: 0 40rpx;
border-radius: 10rpx;
background: #fff;
}
.page-section {
... ... @@ -102,15 +114,19 @@
}
.page-section1 .more {
margin-right: 32rpx;
margin-right: 32rpx;
margin-top: 8rpx;
}
.weui-cells {
flex: 1;
flex: 1;
display: flex;
justify-content: flex-end;
align-items: center;
}
.page-section-title {
color: #515151;
color: #000;
font-family: PingFang SC;
margin-right: 32rpx;
}
... ... @@ -118,11 +134,12 @@
.weui-input {
text-align: right;
margin-right: 30rpx;
font-size: 32rpx;
font-size: 28rpx;
}
.name-input{
margin-right: 0;
text-align: left;
text-align: left;
flex: 1;
}
... ... @@ -151,14 +168,16 @@
}
.colorSty{
color: #999999;
font-size: 32rpx;
color: #000;
}
.color1 {
color: #CBCBCB;
}
.pickerSex image{
width: 48rpx;
height: 48rpx;
margin-right: 30rpx;
width: 24rpx;
height: 24rpx;
}
.sexText{
position: relative;
... ... @@ -188,4 +207,10 @@
display: flex;
align-items: center;
padding: 20rpx 0;
}
.text1 picker {
display: flex;
align-items: center;
padding-top: 20rpx;
}
\ No newline at end of file
... ...
... ... @@ -42,7 +42,7 @@ Page({
id: options.id || obj.id,
sid: options.sid || obj.sid,
oid: options.oid,
types: options.types || obj.types, //1是邀请函过来的(邀请函的券或者点击意见反馈买券) 2是提前点餐 3是商家APP分享的或者短信的链接 4好友赠送的券
types: options.types || obj.types, //1是邀请函过来的(邀请函的券或者点击意见反馈买券) 2是提前点餐 3是商家APP分享的或者短信的链接 4好友赠送的券 5充值赠送的券,不显示按钮
rid: options.rid ? options.rid : '',
activity_id:options.activity_id || '',
}
... ...
... ... @@ -18,7 +18,7 @@
<text class="font20r" wx:else>¥<text class="priceText font36r">{{detail.price}}</text></text>
{{detail.desc}}
</view>
<view class="operation">
<view class="operation" wx:if="{{opt.types!='5'}}">
<image class="countimgs" src="https://qn.colorcun.com/WechatIMG699.png" bindtap="subtraction" />
<input type="number" model:value="{{num}}" bindinput="bindKeyNameInput" />
<image class="countimgs" src="https://qn.colorcun.com/WechatIMG698.png" bindtap="addition" mode="" />
... ... @@ -147,7 +147,7 @@
</view>
</view>
</view>
<view class="sharewidth {{detail.is_type != '3'?'sharewidth1':''}}" wx:if="{{resultCoupon == '0' || detail.arule.is_share_lose == '1'}}">
<view class="sharewidth {{detail.is_type != '3'?'sharewidth1':''}}" wx:if="{{opt.types!='5' && (resultCoupon == '0' || detail.arule.is_share_lose == '1')}}">
<block wx:if="{{detail.is_type == '3'}}">
<button wx:if="{{detail.arule.is_share_lose == '1'}}" class="shareBtn" open-type="share">
<image src="https://qn.colorcun.com/voucherIcon2.png" mode="" />
... ...
... ... @@ -80,7 +80,7 @@ Page({
getCouponDetail(e){
const item= e.currentTarget.dataset['item'];
wx.navigateTo({
url: `./seeRecharge?id=${item.id}&name=${this.data.opt.name}`,
url: `./receiveCoupon?id=${item.id}&name=${this.data.opt.name}&types=5&sid=${this.data.opt.sid}`,
})
},
submitOrder(){
... ...
... ... @@ -3,15 +3,15 @@
<nav>{{opt.name}}</nav>
<view class="wrapBox">
<view class="info">
<view class="info_left font32r">
<view class="info_left font28r">
活动名称
</view>
<view class="info_right text_info font32r">
<view class="info_right text_info font28r">
{{detail.rname}}
</view>
</view>
<view class="info">
<view class="info_left font32r">
<view class="info text1">
<view class="info_left font28r">
充值满
</view>
<view class="info_right text_info font32r">
... ... @@ -19,90 +19,90 @@
</view>
</view>
<view class="favourable_box">
<view class="about font32r">
<view class="about font28r">
优惠活动
</view>
<view class="bundle" wx:if="{{recharge_list.is_price=='1'}}">
<view class="bundle_left font30r">
<view class="bundle_left font28r">
赠送
</view>
<view class="bundle_right font30r">
<view class="bundle_right font28r">
{{recharge_list.price+'元余额'}}
</view>
</view>
<view class="bundle" wx:if="{{recharge_list.is_score=='1'}}">
<view class="bundle_left font30r">
<view class="bundle_left font28r">
赠送
</view>
<view class="bundle_right font30r">
<view class="bundle_right font28r">
{{recharge_list.score+'积分'}}
</view>
</view>
<view class="bundle" wx:if="{{recharge_list.is_coupons=='1'}}">
<view class="bundle_left font30r">
<view class="bundle_left font28r">
赠送
</view>
<view class="bundle_right font30r">
<view class="bundle_right font28r">
优惠券
</view>
</view>
</view>
<view class="list">
<view class="item font32r" wx:for="{{recharge_list.coupons}}" wx:key="{{item.id}}" bindtap="getCouponDetail" data-item="{{item}}">
<view class="item font28r" wx:for="{{recharge_list.coupons}}" wx:key="{{item.id}}" bindtap="getCouponDetail" data-item="{{item}}">
{{item.aname}}
</view>
</view>
<view class="week" wx:if="{{exp_date.is_week=='1' || exp_date.is_week===true}}">
<view class="week_top">
<view class="week_left font32r">
<view class="week_left font28r">
充值日期限制:
</view>
<view class="texts font32r">
<view class="texts font28r">
每周指定日期可用
</view>
</view>
<view class="dateList texts font32r">
<view class="dateList texts font28r">
{{exp_date.week_date_show}}
</view>
</view>
<view class="week" wx:if="{{exp_date.is_birthday=='1' || exp_date.is_birthday===true}}">
<view class="week_top">
<view class="week_left font32r">
<view class="week_left font28r">
充值日期限制:
</view>
<view class="texts font32r">
<view class="texts font28r">
会员生日当天
</view>
</view>
</view>
<view class="week" wx:if="{{exp_date.is_fix=='1' || exp_date.is_fix===true}}">
<view class="week_top">
<view class="week_left font32r">
<view class="week_left font28r">
充值日期限制:
</view>
<view class="texts font32r">
<view class="texts font28r">
无
</view>
</view>
</view>
<view class="week" wx:if="{{exp_date.is_fix=='1' || exp_date.is_fix===true}}">
<view class="week_top">
<view class="week_left font32r">
<view class="week_left font28r">
有效期:
</view>
<view class="texts font32r">
<view class="texts font28r">
{{util.unixtoTime(detail.stime,'YYYY-MM-DD')+'至'+util.unixtoTime(detail.etime,'YYYY-MM-DD')}}
</view>
</view>
</view>
<view class="info">
<view class="info_left font32r">
<view class="info text2">
<view class="info_left font28r">
备注
</view>
</view>
<text class="explain_news">{{detail.explain}}</text>
</view>
<view class="fixed_box">
<button class="font32r btns" bindtap="submitOrder">提交充值
<button class="font28r btns" bindtap="submitOrder">提交充值
</button>
</view>
\ No newline at end of file
... ...
/* pack-activity/pack/vipRecharge.wxss */
page {
background-color: #fff;
background-color: #F5F5F5;
}
.wrapBox{
padding-bottom: 180rpx;
background: #fff;
margin: 12rpx;
border-radius: 10rpx;
}
.info {
padding: 28rpx 32rpx 28rpx 0;
margin: 0 40rpx;
padding: 28rpx 0;
box-sizing: border-box;
display: flex;
justify-content: space-between;
margin-left: 32rpx;
border-bottom: 2rpx solid #E7E7E7;
border-bottom: 2rpx solid #F7F7F7;
}
.text1 {
align-items: center;
}
.text2 {
border: none;
}
.text1 .text_info {
padding: 10rpx 0;
}
.info1 {
... ... @@ -26,7 +40,7 @@ page {
.info_left {
flex-shrink: 0;
margin-right: 20rpx;
color: #515151;
color: #696969;
font-family: PingFang SC;
}
... ... @@ -39,11 +53,12 @@ page {
.text_info {
color: #000;
font-family: PingFang SC;
font-family: PingFang SC;
font-weight: 600;
}
.explain_news {
padding: 24rpx 32rpx;
padding: 24rpx 40rpx;
color: #999999;
font-family: PingFang SC;
font-size: 24rpx;
... ... @@ -74,8 +89,10 @@ page {
margin: 0;
border-radius: 42rpx;
width: 100%;
color: #fff;
background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
color: #fff;
height: 72rpx;
line-height: 72rpx;
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
}
.favourable_box {
... ... @@ -83,7 +100,7 @@ page {
}
.about {
color: #515151;
color: #696969;
font-family: PingFang SC;
line-height: 48rpx;
height: 48rpx;
... ... @@ -99,13 +116,14 @@ page {
}
.bundle_left {
color: #515151;
color: #696969;
font-family: PingFang SC;
}
.bundle_right {
color: #999;
font-family: PingFang SC;
color: #000;
font-family: PingFang SC;
font-weight: 600;
}
.list {
... ... @@ -114,18 +132,21 @@ page {
align-items: center;
flex-wrap: wrap;
border-bottom: 2rpx solid #dbdbdb;
padding-left: 32rpx;
padding-left: 32rpx;
justify-content: flex-end;
}
.item {
color: #0143a3;
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
font-family: PingFang SC;
margin-right: 18rpx;
padding-bottom: 24rpx;
}
.week {
padding: 0 32rpx;
margin: 0 40rpx;
border-bottom: 2rpx solid #E7E7E7;
}
... ... @@ -142,8 +163,9 @@ page {
}
.texts {
color: #999;
font-family: PingFang SC;
color: #000;
font-family: PingFang SC;
font-weight: 600;
}
.dateList {
... ...
... ... @@ -4,21 +4,21 @@
<view class="box" wx:if="{{list.length>0}}">
<view wx:for="{{list}}" class="single" bindtap="gogoSingle" data-id="{{item.id}}">
<view class="topBox">
<view class="name font32r">
{{item.rname}}
<view class="name font20r">
¥<text>{{item.recharge_money}}</text>
</view>
<view class="texts info font24r" wx:if="{{item.priceInfo}}">
{{item.priceInfo}}{{(item.recharge_lists.is_coupons=='0' && item.recharge_lists.is_score=='0')?'。':';'}}
</view>
<view class="texts info font24r" wx:if="{{item.scoreInfo}}">
{{item.scoreInfo}}{{item.recharge_lists.is_coupons=='0'?'。':';'}}
</view>
<view class="texts info font24r" wx:if="{{item.recharge_lists.is_coupons=='1'}}">
{{item.recharge_lists.is_coupons=='1'?'会员充值满'+item.recharge_money+'元赠送'+item.certificate:''}}。
</view>
</view>
<view class="texts time font24r">
有效期限:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}}至{{util.unixtoTime(item.etime,'YYYY-MM-DD')}}
<view class="mainBox">
<view class="texts info font24r" wx:if="{{item.priceInfo}}">
{{item.priceInfo}}{{(item.recharge_lists.is_coupons=='0' && item.recharge_lists.is_score=='0')?'。':';'}}
</view>
<view class="texts info font24r" wx:if="{{item.scoreInfo}}">
{{item.scoreInfo}}{{item.recharge_lists.is_coupons=='0'?'。':';'}}
</view>
<view class="texts info font24r" wx:if="{{item.recharge_lists.is_coupons=='1'}}">
{{item.recharge_lists.is_coupons=='1'?'会员充值满'+item.recharge_money+'元赠送'+item.certificate:''}}。
</view>
</view>
<view class="btn font24r">充值</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -3,42 +3,55 @@ page{
background: #F3F3F3;
}
.box{
padding: 32rpx 40rpx;
padding: 32rpx 40rpx;
}
.single{
width: 100%;
border-radius: 16rpx;
background-color: #FFFFFF;
box-shadow: 0rpx 8rpx 8rpx #00000040;
background: linear-gradient(180deg, #ffefd0 0%, #ffdc9b 100%);
margin-bottom: 32rpx;
}
.topBox{
width: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
display: flex;
align-items: center;
justify-content: space-between;
padding: 20rpx 0;
}
.name{
background-color: #0143A3;
height: 37%;
line-height: 60rpx;
padding-left: 40rpx;
color: #ffffff;
padding-left: 12rpx;
color: #F6231B;
font-family: PingFang SC;
font-weight: 500;
border-top-left-radius: 10rpx;
border-top-right-radius: 10rpx;
}
.texts{
padding-left: 40rpx;
color: #999999;
font-family: PingFang SC;
line-height: 50rpx;
.name text {
font-size: 48rpx;
font-weight: 600;
}
.topBox{
height: 68%;
border-bottom: 2rpx dashed #bfc4d4;
.mainBox {
border-left: 2rpx dashed #f6231b;
padding-left: 18rpx;
margin-left: 18rpx;
}
.btn {
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
border-radius: 198rpx;
width: 120rpx;
height: 40rpx;
line-height: 40rpx;
color: #fff;
flex-shrink: 0;
text-align: center;
margin: 0 24rpx 0 10rpx;
}
.time{
line-height: 70rpx;
.texts {
color: #C36607;
}
\ No newline at end of file
... ...
... ... @@ -2,11 +2,12 @@
<nav bindNavEvent="backFun" class="navhome" place="{{true}}">店铺信息</nav>
<view class="main">
<view class="imgs">
<image src="https://qn.colorcun.com/collectSeller.png" mode="" />
<image src="https://qn.colorcun.com/bookSuccess.png" mode="" />
<text class="font32r">提交成功</text>
</view>
<view class="texts">
<text>感谢您的信任!</text>
<text>我们已经记录了您的信息。客服人员会在第一时间联系您,处理相关事宜。</text>
<view class="texts font28r">
<text>感谢您的信任!我们已经记录了您的信息。</text>
<text>客服人员会在第一时间联系您,处理相关事宜。</text>
</view>
<view class="btnBox">
<button class="btn" bindtap="backFun">朕知道了</button>
... ...
/* pages/customer/collectSeller.wxss */
page {
background: #F5F5F5;
}
.main {
display: flex;
flex-direction: column;
align-items: center;
align-items: center;
background: #fff;
border-radius: 10rpx;
margin: 12rpx;
padding: 120rpx 0;
}
.imgs {
margin: 120rpx 0 20rpx 0;
border: 4rpx solid #0143a3;
margin-bottom: 20rpx;
border-radius: 50%;
width: 140rpx;
height: 140rpx;
display: flex;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.imgs image {
width: 140rpx;
height: 140rpx;
width: 88rpx;
height: 88rpx;
}
.imgs text {
font-weight: 600;
margin: 16rpx 0 32rpx 0;
color: #000;
}
.texts {
... ... @@ -27,20 +39,29 @@
margin: 0 40rpx;
color: #000000;
font-family: PingFang SC;
font-size: 32rpx;
}
.btnBox {
width: 100%;
margin-top: 120rpx;
background: #FAFAFA;
padding: 24rpx 0 50rpx 0;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background: #fff;
height: 200rpx;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 40rpx;
box-sizing: border-box;
}
.btn {
width: 75%;
width: 90%;
color: #fff;
font-size: 32rpx;
border-radius: 40rpx;
background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
border-radius: 40rpx;
height: 72rpx;
line-height: 72rpx;
position: relative;
top: -20rpx;
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
}
\ No newline at end of file
... ...
<!--pages/customer/joinSeller.wxml-->
<nav class="navhome" place="{{true}}">店铺信息</nav>
<view class="main">
<view class="topBox">在开始之前,请告诉我们关于您的一些信息,以方便专属客服给您提供周到的服务。</view>
<view class="topBox font28r">在开始之前,请告诉我们关于您的一些信息,以方便专属客服给您提供周到的服务。</view>
<view class="items">
<view class="left">店铺名称:</view>
<input type="text" class="right" model:value="{{sellername}}" placeholder="点击输入店铺名称" />
<view class="left font28r">店铺名称</view>
<input type="text" class="right font28r" model:value="{{sellername}}" placeholder="请输入您的店铺名称" />
</view>
<view class="items">
<view class="left">城市选择:</view>
<picker mode="region" bindchange="bindRegionChange" value="{{region}}" style="flex:1;">
<view class="left font28r">城市选择</view>
<picker mode="region font28r" bindchange="bindRegionChange" value="{{region}}" style="flex:1;">
<view class="picker {{region.length>0 ? 'black-font' : 'gray-font'}}"> {{region.length>0?region[0]+region[1]+region[2]:'请选择城市'}}</view>
</picker>
</view>
<view class="items">
<view class="left">店铺地址:</view>
<view type="text" value="{{map_address}}" class="infoInput {{map_address=='' ? 'gray-font' : 'black-font'}} smooth" bindtap="chooselocation" name="map_address" placeholder="点击设置您的地址">{{map_address==''?'点这里,选择店铺地图位置' : map_address}}</view>
<view class="left font28r">店铺地址</view>
<view type="text" value="{{map_address}}" class="infoInput {{map_address=='' ? 'gray-font' : 'black-font'}} smooth font28r" bindtap="chooselocation" name="map_address" placeholder="点击设置您的地址">{{map_address==''?'点击选择店铺位置' : map_address}}</view>
</view>
<view class="items">
<view class="left">联系电话:</view>
<input type="text" class="right" model:value="{{phone}}" placeholder="点击输入您的电话号码" />
<view class="left font28r">联系电话</view>
<input type="text" class="right font28r" model:value="{{phone}}" placeholder="请输入您的手机号码" />
</view>
<view class="items">
<view class="left">验证码:</view>
<input type="text" class="right" model:value="{{verifyCode}}" placeholder="点击输入验证码" />
<button class="verifyBox" bindtap='deliver' wx:if="{{ verifySend }}">获取验证码</button>
<button class='verifyBox verifyBoxDis' wx:else>重新获取({{ countDown }})</button>
<view class="left font28r">验证码</view>
<input type="text" class="right font28r" model:value="{{verifyCode}}" placeholder="点击输入验证码" />
<button class="verifyBox font28r" bindtap='deliver' wx:if="{{ verifySend }}">获取验证码</button>
<button class='verifyBox verifyBoxDis font28r' wx:else>{{ countDown }}</button>
</view>
<view class="items">
<view class="left">联系人:</view>
<input class="right" type="text" model:value="{{rname}}" placeholder="点击输入您的姓名" />
<view class="left font28r">联系人</view>
<input class="right font28r" type="text" model:value="{{rname}}" placeholder="请输入您的姓名" />
</view>
<view class="info">
<view class="font28r">注:</view>
... ... @@ -36,6 +36,6 @@
<view class="font28r">2、如果您需要预订餐厅包间,请直接联系商家。</view>
</view>
<view class="btnBox">
<button class="btn" bindtap="submitInfo">提交店铺注册信息</button>
<button class="btn font28r" bindtap="submitInfo">提交店铺注册信息</button>
</view>
</view>
\ No newline at end of file
... ...
/* pages/customer/joinSeller.wxss */
page {
background: #F5F5F5;
}
.main {
background: #fff;
border-radius: 10rpx;
margin: 12rpx;
padding: 40rpx;
}
.topBox {
margin: 40rpx 80rpx 40rpx 40rpx;
color: #000000;
color: #000000;
margin-bottom: 40rpx;
font-family: PingFang SC;
font-size: 32rpx;
}
.items {
display: flex;
justify-content: space-between;
margin-left: 32rpx;
border-bottom: 2rpx solid #E7E7E7;
padding: 24rpx 32rpx 24rpx 0;
padding: 32rpx 0;
align-items: center;
}
... ... @@ -38,23 +47,37 @@ input::-webkit-input-placeholder {
}
.info {
margin-top: 100rpx;
padding: 0 40rpx;
margin-top: 40rpx;
line-height: 48rpx;
}
.info text {
font-weight: 400;
}
.btnBox {
margin: 0 40rpx;
background: #FAFAFA;
padding: 24rpx 0 50rpx 0;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background: #fff;
height: 200rpx;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 40rpx;
box-sizing: border-box;
}
.btn {
width: 75%;
width: 90%;
color: #fff;
font-size: 32rpx;
border-radius: 40rpx;
background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
border-radius: 40rpx;
height: 72rpx;
line-height: 72rpx;
position: relative;
top: -20rpx;
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
}
.picker {
... ... @@ -65,12 +88,16 @@ input::-webkit-input-placeholder {
margin-left: 10rpx;
height: 50rpx;
line-height: 50rpx;
border-radius: 6rpx;
color: #fff;
border-radius: 198rpx;
font-size: 24rpx;
background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
border: 2rpx solid #fe6806;
}
.verifyBoxDis{
background: #999;
border: 2rpx solid #CBCBCB;
color: #CBCBCB;
-webkit-text-fill-color:#CBCBCB;
}
\ No newline at end of file
... ...
... ... @@ -164,19 +164,93 @@ Page({
id
}).then(res => {
if (res.data.length > 0) {
let couponData = res.data[0]
couponData.use = couponData.use ? util.determine(couponData.use) : '';
couponData.exp_date = couponData.exp_date ? util.determine(couponData.exp_date) : '';
if ((couponData.use && (!couponData.use.is_cash || couponData.use.is_cash == '1'))) {
let cash = couponData.use.cash * 1;
let price = couponData.price * 1;
couponData.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
let detail = res.data[0]
let data = detail.expiration_date ? util.determine(detail.expiration_date) : '';
detail.use = detail.use ? util.determine(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
if ((detail.use && (!detail.use.is_cash || detail.use.is_cash == '1'))) {
let cash = detail.use.cash * 1;
let price = detail.price * 1;
detail.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
}
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.arule = detail.arule ? util.determine(detail.arule) : '';
detail.expiration_date = detail.expiration_date ? util.determine(detail.expiration_date) : '';
detail.aexpiration = detail.aexpiration ? util.determine(detail.aexpiration) : '';
if ((detail.use && (!detail.use.is_cash || detail.use.is_cash == '1'))) {
let cash = detail.use.cash * 1;
let price = detail.price * 1;
detail.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
}
let num = detail.grant_num*1-detail.grant_last*1;
if (num > 0) {
detail.receiveNumText = ''
if (num >= 0 && num <= 100) {
detail.receiveNumText = num.toString();
} else if (num >= 101 && num <= 199) {
detail.receiveNumText = '100+';
} else if (num >= 200 && num <= 299) {
detail.receiveNumText = '200+';
} else {
detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
}
}
if(num == 0){
let str = detail.grant_num*1
detail.receiveNumText = ''
if (str >= 0 && str <= 100) {
detail.receiveNumText = str.toString();
} else if (str >= 101 && str <= 199) {
detail.receiveNumText = '100+';
} else if (str >= 200 && str <= 299) {
detail.receiveNumText = '200+';
} else {
detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐:' + mor
if (noon) noon = '午餐:' + noon
if (nig) nig = '晚餐:' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
detail.resultCoupon = '1'; // 显示已领取
detail.cdate = detail.cdate * 1;
detail.useStime = '';
detail.useEtime = '';
let condition = detail.aexpiration
if (condition.valid_forever === '0' && condition.stime && condition.etime) {
detail.useStime = util.unixtoTime(condition.stime, 'YYYY-MM-DD');
detail.useEtime = util.unixtoTime(condition.etime, 'YYYY-MM-DD');
}
if (condition.valid_forever === '1') {
detail.foreverText = '永久有效';
}
if (condition.valid_forever === '0' && condition.today) {
let obj = this.setTimeRange(detail.cdate, 0, parseInt(condition.today) - 1);
detail.useStime = obj.useStime;
detail.useEtime = obj.useEtime;
}
if (condition.valid_forever === '0' && condition.tomorrow) {
let obj = this.setTimeRange(detail.cdate, 1, condition.tomorrow * 1);
detail.useStime = obj.useStime;
detail.useEtime = obj.useEtime;
}
if (condition.valid_forever === '0' && condition.sday && condition.eday) {
let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1);
detail.useStime = obj.useStime;
detail.useEtime = obj.useEtime;
}
// showCoupon 代表赠送的券没过有效期 && 是开启状态
couponData.showCoupon = (this.data.dataStr<(couponData.etime*1) && couponData.is_open=='1') ? '1' : '0';
console.log('邀请函--------------------评价赠送的优惠券',couponData);
detail.showCoupon = (((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && detail.is_open == '1') ? '1' : '0';
console.log('邀请函--------------------评价赠送的优惠券',detail);
this.setData({
couponData:res.data[0]
couponData:detail
})
}
})
... ...
... ... @@ -3,109 +3,133 @@
<nav id='nav'>商家有礼</nav>
<view class="box" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}">
<view class="title" wx:if="{{options.form == '1'}}">
<view class="sign"></view><text class="font32r">专属优惠券</text>
<view class="sign"></view><text class="font28r">专属优惠券</text>
</view>
<block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
<navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
<view class="couponWrap">
<view class="itemLeft">
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">¥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
<view class="itemLeft">
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">¥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?','+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
无限制{{item.desc?','+item.desc+'。':'。'}}
</view>
<view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">
会员生日当天可用{{item.desc?','+item.desc+'。':'。'}}
</view>
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期:{{item.foreverText?item.foreverText : ''}}</view>
<view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期:</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
<view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
<view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
<view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>
</block>
</view>
<view class="btnBox" wx:if="{{item.is_type == '3'}}" >
<view class="font24r orderingFood orderingFood1">已领取</view>
<view class="grantNum" wx:if="{{item.receiveNumText}}">
<view class="font24r">已被领取</view>
<view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?','+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
无限制{{item.desc?','+item.desc+'。':'。'}}
</view>
<view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">
会员生日当天可用{{item.desc?','+item.desc+'。':'。'}}
</view>
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期:{{item.foreverText?item.foreverText : ''}}</view>
<view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期:</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
<view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
<view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
<view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>
</block>
</view>
<view class="btnBox" wx:if="{{item.is_type == '3'}}" >
<view class="font24r orderingFood orderingFood1">已领取</view>
<view class="grantNum" wx:if="{{item.receiveNumText}}">
<view class="font24r">已被领取</view>
<view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
</view>
<view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood">
立即抢购
</view>
</view>
<view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood orderingFood2">
抢购
</view>
</view>
</view>
</navigator>
</block>
</view>
<view class="box" wx:if="{{options.form == '1' && hasValueRecharge && recharge_data && recharge_data.id}}">
<view class="title">
<view class="sign"></view><text class="font32r">会员充值优惠</text>
<view class="sign"></view><text class="font28r">会员充值优惠</text>
</view>
<navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
<view class="rechargeItems">
<view class="couponWrap">
<view class="itemLeft">
<view class="itemTop font36r">
{{recharge_data.rname}}
<view class="priceText" wx:if="{{recharge_data.recharge_money}}">
<view class="icons font24r">¥</view><text class="font48r">{{recharge_data.recharge_money}}</text>
</view>
<view class="itemBottom font24r" wx:if="{{priceInfo}}">
{{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}
</view>
<view class="bottom font24r" wx:if="{{scoreInfo}}">
{{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<view class="bottom font24r" wx:if="{{priceInfo}}">
{{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}
</view>
<view class="bottom font24r" wx:if="{{scoreInfo}}">
{{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}
</view>
<view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">
{{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。
</view>
</view>
<view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">
{{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。
<view class="font24r orderingFood orderingFood2">
充值
</view>
</view>
<view class="font24r orderingFood">
充值
</view>
</view>
</navigator>
</view>
<!-- 启用评价 && 是否评价过 && 评价赠送优惠券 && 赠送的优惠券有数据-->
<view class="box" wx:if="{{options.form == '1' && is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1' && couponData && couponData.showCoupon =='1'}}">
<view class="title">
<view class="sign"></view><text class="font32r">反馈有礼</text>
<view class="sign"></view><text class="font28r">反馈有礼</text>
</view>
<view class="preferentialItems" bindtap="evaluateFun">
<view class="couponWrap" bindtap="evaluateFun">
<view class="itemLeft">
<text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text>
<view class="discountText1 font20r {{couponData.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{couponData.is_type == '3'}}">{{couponData.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{couponData.price}}">
<text class="icons font40r">¥</text><text>{{couponData.price}}</text>
<view class="icons font24r">¥</view><text class="font48r">{{couponData.price}}</text>
</view>
<view class="icons font20r" wx:if="{{couponData.is_type == '3' && couponData.desc!='0'}}">消费满{{couponData.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{couponData.aname}}</text>
<view class="font24r orderingFood">
领取
</view>
</view>
<text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="bottom font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}{{couponData.desc?','+couponData.desc+'。':'。'}}</text>
<view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">
无限制{{couponData.desc?','+couponData.desc+'。':'。'}}
<text class="font32r anameText">{{couponData.aname}}</text>
<block wx:if="{{couponData.is_type == '1' || couponData.is_type == '2'}}">
<text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="bottom font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}{{couponData.desc?','+couponData.desc+'。':'。'}}</text>
<view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">
无限制{{couponData.desc?','+couponData.desc+'。':'。'}}
</view>
<view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">
会员生日当天可用{{couponData.desc?','+couponData.desc+'。':'。'}}
</view>
</block>
<block wx:if="{{couponData.is_type == '3' || couponData.is_type == '4'}}">
<view wx:if="{{(couponData.useStime && couponData.useEtime) || couponData.foreverText}}" class="bottom font24r">有效期:{{couponData.foreverText?couponData.foreverText : ''}}</view>
<view wx:if="{{couponData.useStime && couponData.useEtime}}" class="bottom font24r nodate">{{couponData.useStime}} 至 {{couponData.useEtime}}</view>
<view wx:if="{{couponData.morText || couponData.noonText || couponData.noonText}}" class="bottom font24r">不可用日期:</view>
<view wx:if="{{couponData.morText}}" class="bottom font24r nodate">{{couponData.morText}}</view>
<view wx:if="{{couponData.noonText}}" class="bottom font24r nodate">{{couponData.noonText}}</view>
<view wx:if="{{couponData.nigText}}" class="bottom font24r nodate">{{couponData.nigText}}</view>
<view wx:if="{{couponData.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
<view wx:if="{{couponData.is_type == '4' && couponData.desc!='0'}}" class="bottom font24r">消费满{{couponData.desc}}元可用</view>
</block>
</view>
<view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">
会员生日当天可用{{couponData.desc?','+couponData.desc+'。':'。'}}
<view class="btnBox" wx:if="{{couponData.is_type == '3'}}" >
<view class="font24r orderingFood">免费领取</view>
<view class="grantNum" wx:if="{{couponData.receiveNumText}}">
<view class="font24r">已被领取</view>
<view class="font24r"><text>{{couponData.receiveNumText}}</text>张</view>
</view>
</view>
</view>
</view>
... ...
... ... @@ -4,31 +4,32 @@ page {
}
.box {
margin: 24rpx;
margin: 12rpx;
border-radius: 10rpx;
background: #fff;
padding: 40rpx 20rpx;
padding: 12rpx;
margin-bottom: 24rpx;
}
.title {
display: flex;
align-items: center;
border-bottom: 2rpx solid #dbdbdb;
padding: 0 0 12rpx 24rpx;
margin-bottom: 30rpx;
}
.sign {
width: 6rpx;
height: 30rpx;
border-radius: 16rpx;
background: #0143a3;
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
}
.title text {
margin-left: 10rpx;
color: #000;
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
font-weight: 600;
}
.couponWrap .nodate{
... ... @@ -50,7 +51,6 @@ page {
min-height: 160rpx;
padding-bottom: 10rpx;
border-radius: 20rpx;
border: 2rpx solid #ff7e06;
}
... ... @@ -93,7 +93,10 @@ page {
height: 44rpx;
width: max-content;
flex-shrink: 0;
background: linear-gradient(94.4deg, #f41919 2.72%, #ff7426 122.17%);
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
}
.orderingFood2 {
width: 74rpx !important;
}
.couponWrap .icons {
color: #F6231B !important;
... ... @@ -252,7 +255,7 @@ page {
border-radius: 20rpx;
line-height: 44rpx;
height: 44rpx;
background: linear-gradient(95.61deg, #2186e2 0.55%, #054baa 130.76%);
background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
width: max-content;
flex-shrink: 0;
}
... ...