Browse Source

[停车][修改][样式]

[砍价详情][修改][样式]
tags/河北版C.8.1.01
hurui 5 years ago
parent
commit
7de514ed6c
15 changed files with 696 additions and 566 deletions
  1. +509
    -509
      components/bargainDatail/index.js
  2. +5
    -2
      components/bargainDatail/index.wxml
  3. +16
    -11
      components/bargainDatail/index.wxss
  4. +1
    -0
      pages/bargain/bargainDatail/bargainDatail.js
  5. +5
    -2
      pages/bargain/bargainDatail/bargainDatail.wxml
  6. +16
    -11
      pages/bargain/bargainDatail/bargainDatail.wxss
  7. +29
    -12
      pages/coupon/detail/index.js
  8. +85
    -1
      pages/coupon/detail/index.wxml
  9. +1
    -0
      pages/passCar/choicecoupon/choicecoupon.js
  10. +2
    -2
      pages/passCar/choicecoupon/choicecoupon.wxml
  11. +16
    -14
      pages/passCar/choicecoupon/choicecoupon.wxss
  12. +1
    -0
      pages/user/myactivity/index.js
  13. +1
    -1
      pages/user/myactivity/index.wxml
  14. +1
    -1
      pages/user/myactivity/index.wxss
  15. +8
    -0
      utils/imgurl.js

+ 509
- 509
components/bargainDatail/index.js
File diff suppressed because it is too large
View File


+ 5
- 2
components/bargainDatail/index.wxml View File

@@ -37,7 +37,7 @@
</view>
<!-- <view class='help' wx:if="{{data.orderStatus != 7&&data.orderStatus != 1&&data.orderStatus != 9}}">还需邀请<text>{{data.pressLimitNum-data.orderPressList.length}}</text>位好友,帮忙砍至底价</view> -->
<view class="success" wx:if="{{data.orderStatus == 7||data.orderStatus == 1}}" hover-class="none" hover-stop-propagation="false">
<image src="{{wmsuccess01}}" mode="widthFix"></image>
<image src="{{successHr}}" mode="widthFix"></image>
<text class="" selectable="false" space="false" decode="false">
已砍至底价
</text>
@@ -51,7 +51,8 @@
<view class='title'>
砍价人数{{data.orderPressList.length}}/{{data.pressLimitNum}}人
</view>
<view class="clearfix person" wx:for="{{data.orderPressList}}" wx:key="index">
<view class='kjr'>
<view class="clearfix person" wx:for="{{data.orderPressList}}" wx:key="index">
<view class="head ">
<image class="headicon" src="{{item.avatarUrl}}" mode="widthFix" lazy-load="true" binderror="" bindload="" />
<!-- <text wx:if="{{item.first==1}}">发起人</text> -->
@@ -61,7 +62,9 @@
<text class="text02 fl"><text class="fl">砍掉</text><text class="fl">{{item.pressValue/100}}元</text></text>
<text class="text03 fr">{{item.createDate}}前</text>
</view>
</view>
</view>
</view>
</view>



+ 16
- 11
components/bargainDatail/index.wxss View File

@@ -50,7 +50,7 @@ page{
color: #fff;
height: 40rpx;
line-height: 40rpx;
padding-top: 20rpx;
padding-top: 40rpx;
}
.help{
display: block;
@@ -116,7 +116,7 @@ page{

.listitem {
width: 538rpx;
height: 624rpx;
/* height: 624rpx; */
position: relative;
padding: 60rpx 40rpx;
border-radius: 15rpx;
@@ -238,8 +238,8 @@ page{

.person{
/* border-bottom: 1px solid #F0CDB3; */
padding-bottom: 31rpx;
padding-top: 31rpx;
padding-bottom: 15rpx;
padding-top: 15rpx;
color: #fff;
}
.text02 text:nth-of-type(2){
@@ -249,13 +249,18 @@ page{
.people{
border-radius:16rpx;
padding:0 20rpx;
}
.kjr{
height: 300rpx;
overflow: auto;
}
.btns{
padding:33rpx;
position: fixed;
left: 0;
right: 0;
bottom: 100rpx;
bottom: 0;
z-index: 100;
/* background: #fff; */
}
@@ -310,7 +315,7 @@ page{
}
.helpDiscount::after{ border: none; }
.success{
margin-top: 50rpx;
margin-top: 15rpx;
}
.success image{
display: block;
@@ -321,9 +326,9 @@ page{
.success text{
display: block;
text-align: center;
font-size:30rpx;
line-height: 30rpx;
color:rgba(51,51,51,1);
font-size:24rpx;
line-height: 24rpx;
color:#FFFFFF;
}
.btns01{
position: fixed;
@@ -334,10 +339,10 @@ page{
}
.btns01 button{
color:rgba(254,254,254,1);
width:650rpx;
width:538rpx;
height:85rpx;
line-height: 85rpx;
background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32);
border-radius:43rpx;
}


+ 1
- 0
pages/bargain/bargainDatail/bargainDatail.js View File

@@ -14,6 +14,7 @@ Page({
wmhome: imgurl.wmhome.url,
wmhelp: imgurl.wmhelp.url,
wmsuccess01: imgurl.wmsuccess01.url,
successHr: imgurl.successHr.url,
fail: imgurl.fail.url,
data: null,
from: null,


+ 5
- 2
pages/bargain/bargainDatail/bargainDatail.wxml View File

@@ -37,7 +37,7 @@
</view>
<!-- <view class='help' wx:if="{{data.orderStatus != 7&&data.orderStatus != 1&&data.orderStatus != 9}}">还需邀请<text>{{data.pressLimitNum-data.orderPressList.length}}</text>位好友,帮忙砍至底价</view> -->
<view class="success" wx:if="{{data.orderStatus == 7||data.orderStatus == 1}}" hover-class="none" hover-stop-propagation="false">
<image src="{{wmsuccess01}}" mode="widthFix"></image>
<image src="{{successHr}}" mode="widthFix"></image>
<text class="" selectable="false" space="false" decode="false">
已砍至底价
</text>
@@ -51,7 +51,8 @@
<view class='title'>
砍价人数{{data.orderPressList.length}}/{{data.pressLimitNum}}人
</view>
<view class="clearfix person" wx:for="{{data.orderPressList}}" wx:key="index">
<view class='kjr'>
<view class="clearfix person" wx:for="{{data.orderPressList}}" wx:key="index">
<view class="head ">
<image class="headicon" src="{{item.avatarUrl}}" mode="widthFix" lazy-load="true" binderror="" bindload="" />
<!-- <text wx:if="{{item.first==1}}">发起人</text> -->
@@ -61,7 +62,9 @@
<text class="text02 fl"><text class="fl">砍掉</text><text class="fl">{{item.pressValue/100}}元</text></text>
<text class="text03 fr">{{item.createDate}}前</text>
</view>
</view>
</view>
</view>
</view>



+ 16
- 11
pages/bargain/bargainDatail/bargainDatail.wxss View File

@@ -50,7 +50,7 @@ page{
color: #fff;
height: 40rpx;
line-height: 40rpx;
padding-top: 20rpx;
padding-top: 40rpx;
}
.help{
display: block;
@@ -116,7 +116,7 @@ page{

.listitem {
width: 538rpx;
height: 624rpx;
/* height: 624rpx; */
position: relative;
padding: 60rpx 40rpx;
border-radius: 15rpx;
@@ -238,8 +238,8 @@ page{

.person{
/* border-bottom: 1px solid #F0CDB3; */
padding-bottom: 31rpx;
padding-top: 31rpx;
padding-bottom: 15rpx;
padding-top: 15rpx;
color: #fff;
}
.text02 text:nth-of-type(2){
@@ -249,13 +249,18 @@ page{
.people{
border-radius:16rpx;
padding:0 20rpx;
}
.kjr{
height: 300rpx;
overflow: auto;
}
.btns{
padding:33rpx;
position: fixed;
left: 0;
right: 0;
bottom: 100rpx;
bottom: 0;
z-index: 100;
/* background: #fff; */
}
@@ -310,7 +315,7 @@ page{
}
.helpDiscount::after{ border: none; }
.success{
margin-top: 50rpx;
margin-top: 15rpx;
}
.success image{
display: block;
@@ -321,9 +326,9 @@ page{
.success text{
display: block;
text-align: center;
font-size:30rpx;
line-height: 30rpx;
color:rgba(51,51,51,1);
font-size:24rpx;
line-height: 24rpx;
color:#FFFFFF;
}
.btns01{
position: fixed;
@@ -334,10 +339,10 @@ page{
}
.btns01 button{
color:rgba(254,254,254,1);
width:650rpx;
width:538rpx;
height:85rpx;
line-height: 85rpx;
background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32);
border-radius:43rpx;
}


+ 29
- 12
pages/coupon/detail/index.js View File

@@ -6,6 +6,7 @@ const imgurl = require("../../../utils/imgurl");
Page({
data: {
isshowposter:false,//是否显示分享弹框
isshowposter1:false,//是否显示分享弹框
fenxiangUrl: imgurl.fenxiang.url,
clockUrl: imgurl.clock.url,
teljpgUrl: imgurl.teljpg.url,
@@ -100,6 +101,22 @@ Page({
isshowposter: false,
})
},
/**
* 显示砍价弹框
*/
showshare1: function() {
this.setData({
isshowposter1: true,
})
},
/**
* 隐藏砍价弹框
*/
hidemodal1: function() {
this.setData({
isshowposter1: false,
})
},
/**
* 跳转到门店列表的详情页面
@@ -575,17 +592,17 @@ Page({
/**
* 邀请好友继续砍价
*/
// inviteFriend: function(e) {
// let that = this;
// let formId = e.detail.formId;
// that.setData({
// formId: formId
// })
// that.orderFunc("discount");
// that.setData({
// showbutton1: true
// })
// },
inviteFriend: function(e) {
let that = this;
let formId = e.detail.formId;
that.setData({
formId: formId
})
that.orderFunc("discount");
that.setData({
showbutton1: true
})
},
/**
* 支付订单更新
*/
@@ -921,7 +938,7 @@ Page({
success: function (res) {
if (res.confirm) {
wx.navigateTo({
url: `/components/bargainDatail/bargainDatail?orderId=${that.data.disOrderNumber}`,
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.disOrderNumber}`,
})
}
}


+ 85
- 1
pages/coupon/detail/index.wxml View File

@@ -219,5 +219,89 @@
</view>
</view>
</view>
<!-- 发起砍价 -->
<!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> -->
<view class="bargainDetail" hover-class="none" hover-stop-propagation="false" wx:if="{{isshowposter1}}" bindtap='hidemodal1'>
<view class='cancleH'>
<image src='{{cancelH}}' mode='aspectFit'></image>
<!-- <view class='line'></view> -->
</view>
<view class="listitem clearfix" hover-class="none" hover-stop-propagation="false">
<view class='top'>
<image src="{{data.coverImg}}" lazy-load="true" binderror="" bindload="" mode='aspectFill'></image>
<view class="fl ri" hover-class="none" hover-stop-propagation="false">
<text class="txt01">{{data.title}}</text>
<!-- <text class="txt02">{{data.subTitle}}</text> -->
<!-- <text class="txt03">{{data.price/100}}元</text> -->
<text class="txt04">可砍至<text class="money">{{data.salePrice/100}}</text>元</text>
</view>
</view>

<view class="progress" hover-class="none" hover-stop-propagation="false">
<view class="clearfix progesstext" wx:if="{{data.orderStatus !=8&&data.orderStatus!=1&&data.orderStatus!=9}}" hover-class="none" hover-stop-propagation="false">
<text class="fl">已砍 <text>{{already}}元</text></text>
<text class="fr" wx:if="{{data.pressCurrentValue/100!=0}}">还剩 <text>{{remain}}元</text></text>
</view>
<progress percent="{{((data.price-data.salePrice-data.pressCurrentValue)/(data.price-data.salePrice))*100}}" wx:if="{{data.orderStatus !=8&&data.orderStatus!=1&&data.orderStatus!=9}}" color="#FFB287" class="progressbar"border-radius="10px" backgroundColor="#FFF" stroke-width="10" />
<view class="time" hover-class="none" wx:if="{{data.orderStatus !=8&&data.orderStatus!=1&&data.orderStatus!=9&&data.orderStatus != 7}}" hover-stop-propagation="false">还剩 <text>{{day}}</text>天:<text>{{hour}}</text>:<text>{{min}}</text>:<text>{{sec}}</text> 结束</view>
<view class="fail" hover-class="none" hover-stop-propagation="false" wx:if="{{data.orderStatus==9}}">
砍价已取消
</view>
<view class="fail" hover-class="none" hover-stop-propagation="false" wx:if="{{todayDate>data.pressEndDate && discountStatus !=1}}">
好友的砍价已过期
</view>
<view class="fail" hover-class="none" hover-stop-propagation="false" wx:if="{{todayDate>data.pressEndDate && discountStatus ==1}}">
您的砍价已过期
</view>
<view class="status" hover-class="none" hover-stop-propagation="false" wx:if="{{discountStatus==3}}">
<button bindtap="barginAgain" data-couponChannelId="{{data.couponChannelId}}" data-couponId="{{data.productId}}" data-id="{{data.id}}">发起砍价</button>
<button bindtap="gotomore">更多砍价商品</button>
</view>
<!-- <view class='help' wx:if="{{data.orderStatus != 7&&data.orderStatus != 1&&data.orderStatus != 9}}">还需邀请<text>{{data.pressLimitNum-data.orderPressList.length}}</text>位好友,帮忙砍至底价</view> -->
<view class="success" wx:if="{{data.orderStatus == 7||data.orderStatus == 1}}" hover-class="none" hover-stop-propagation="false">
<image src="{{successHr}}" mode="widthFix"></image>
<text class="" selectable="false" space="false" decode="false">
已砍至底价
</text>
</view>
<view class='helpDiscount' wx:if="{{data.orderStatus == 6&&discountStatus == 2}}">
<image bindtap='helpDiscount' src='{{wmhelp}}' mode='widthFix'></image>
</view>
</view>

<view class="people" hover-class="none" hover-stop-propagation="false" wx:if="{{data.orderStatus!=9}}">
<view class='title'>
砍价人数{{data.orderPressList.length}}/{{data.pressLimitNum}}人
</view>
<view class='kjr'>
<view class="clearfix person" wx:for="{{data.orderPressList}}" wx:key="index">
<view class="head ">
<image class="headicon" src="{{item.avatarUrl}}" mode="widthFix" lazy-load="true" binderror="" bindload="" />
<!-- <text wx:if="{{item.first==1}}">发起人</text> -->
</view>
<view class="text fl clearfix">
<text class="text01 fl"><text>{{item.nickName}}</text></text>
<text class="text02 fl"><text class="fl">砍掉</text><text class="fl">{{item.pressValue/100}}元</text></text>
<text class="text03 fr">{{item.createDate}}前</text>
</view>
</view>
</view>
</view>
</view>

<form bindsubmit="submit" report-submit='true' >
<view class="btns clearfix" wx:if="{{data.orderStatus != 7&&discountStatus==1&&todayDate<=data.pressEndDate&&data.orderStatus!=1&&data.orderStatus != 9}}" hover-class="none" hover-stop-propagation="false">
<!-- <button class="fl" form-type="submit" bindtap='orderFunc1' data-couponChannelId="{{data.couponChannelId}}" data-price="{{data.price/100}}" data-couponId="{{data.productId}}" disabled='{{showButton}}' data-rushtobuy='rushtobuy'>
<text>{{data.price/100}}元</text>
<text>立即购买</text>
</button> -->
<button class='share user-motto' data-orderId='{{data.id}}' id="shareBtn" open-type="share" hover-class="other-button-hover">邀请好友砍价</button>
</view>
</form>
<view style='display:{{display}}' wx:if="{{data.orderStatus == 7&&discountStatus == 1}}" class="btns01 clearfix" hover-class="none" hover-stop-propagation="false">
<button bindtap='orderFunc' disabled='{{showButton1}}' data-orderId="{{data.id}}" data-salePrice="{{data.salePrice/100}}" hover-class="other-button-hover">{{data.salePrice/100}}元 底价购买</button>
</view>
</view>

</view>

+ 1
- 0
pages/passCar/choicecoupon/choicecoupon.js View File

@@ -6,6 +6,7 @@ const imgurl = require("../../../utils/imgurl");
Page({
data: {
couponUrl:imgurl.coupon.url,
gouHr: imgurl.gouHr.url,
gouUrl:imgurl.gou.url,
linessUrl:imgurl.liness.url,
loadingUrl:imgurl.loading.url,


+ 2
- 2
pages/passCar/choicecoupon/choicecoupon.wxml View File

@@ -12,7 +12,7 @@
<view class="res">温馨提示:请离场前使用优惠券</view>
<view class='section' wx:for='{{list}}' wx:key='{{index}}' bindtap="choicecoupon" data-title="{{item.title}}" data-id="{{item.id}}">
<view class='mms'>
<image class='gou' wx:if="{{item.id==quanid}}" mode='widthFix' src='{{gouUrl}}'></image>
<image class='gou' wx:if="{{item.id==quanid}}" mode='widthFix' src='{{gouHr}}'></image>
<view class='detail_msg'>
<view class='info'>
<view class='title'>
@@ -27,7 +27,7 @@
</view>
</view>
</view>
<image class="liness" src='{{linessUrl}}' mode="widthFix"></image>
<!-- <image class="liness" src='{{linessUrl}}' mode="widthFix"></image> -->
<view class='expiretime'>
<text class="txt1">有效期至:</text>
<text class="txt2">{{item.expiredTime}}</text>


+ 16
- 14
pages/passCar/choicecoupon/choicecoupon.wxss View File

@@ -27,10 +27,10 @@
.mms {
position: relative;
width: 690rpx;
background: #fff;
padding: 20rpx 0 0;
/* background: #fff; */
/* padding: 20rpx 0 0; */
margin: 0 auto 46rpx;
border-top: 8rpx solid #02b7ff;
/* border-top: 8rpx solid #02b7ff; */
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
}

@@ -46,7 +46,7 @@
height: 50rpx;
line-height: 50rpx;
font-size: 22rpx;
color: #999;
color: #A6A6A6;
letter-spacing: 0;
}

@@ -74,18 +74,20 @@
.info view:nth-child(1) {
display: flex;
justify-content: space-between;
padding: 0 2%;
padding: 2% 2%;
}

.info {
width: 100%;
height: 126rpx;
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
}

.info view:nth-child(1) text {
font-size: 32rpx;
line-height: 32rpx;
height: 32rpx;
color: #333;
color: #FFFFFF;
letter-spacing: 0;
width: 400rpx;
display: inline-block;
@@ -97,7 +99,7 @@
.info view:nth-child(2) {
padding-left: 2%;
font-size: 22rpx;
color: #333;
color: #FFFFFF;
letter-spacing: 0;
margin-top: 6rpx;
display: inline-block;
@@ -113,12 +115,12 @@

.btns {
position: absolute;
right: 57rpx;
top: 60rpx;
right: 120rpx;
top: 50rpx;
height: 48rpx;
line-height: 48rpx;
text-align: right;
color: #f96563;
color: #FFF;
font-size: 40rpx;
}

@@ -132,13 +134,13 @@
font-size:26rpx;
}
.yuan {
color: #333;
color: #FFF;
font-size: 26rpx;
}

.txt1 {
font-size: 22rpx;
color: #333;
color: #A6A6A6;
letter-spacing: 0;
}

@@ -211,7 +213,7 @@

.gou {
position: absolute;
top: -15rpx;
right: -10rpx;
top:45rpx;
right: 30rpx;
width: 60rpx;
}

+ 1
- 0
pages/user/myactivity/index.js View File

@@ -5,6 +5,7 @@ let app = getApp();
const imgurl = require("../../../utils/imgurl");
Page({
data: {
noCoupon: imgurl.noCoupon.url,
dingdanUrl: imgurl.dingdan.url,
loadingUrl: imgurl.loading.url,
wmhome: imgurl.wmhome.url,


+ 1
- 1
pages/user/myactivity/index.wxml View File

@@ -21,7 +21,7 @@
</view>
</view>
<view class="dingdan" wx:if="{{list.length==0}}">
<image src="{{dingdanUrl}}" mode="widthFix"></image>
<image src="{{noCoupon}}" mode="widthFix"></image>
<text>您还没有参加活动</text>
<button class='goback' bindtap='goback'>返回首页</button>
</view>


+ 1
- 1
pages/user/myactivity/index.wxss View File

@@ -266,7 +266,7 @@ button::after{ border: none; }
height:80rpx;
line-height: 80rpx;
border-radius:10rpx;
background: orange;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
color: #fff;
font-size: 32rpx;
margin-top: 20rpx;


+ 8
- 0
utils/imgurl.js View File

@@ -128,6 +128,10 @@ module.exports = {
'url': baseUrl + 'gou.png',
'name': ''
},
'gouHr': {
'url': baseUrl + 'gouHr.png',
'name': ''
},
'grade': {
'url': baseUrl + 'grade.png',
'name': ''
@@ -508,6 +512,10 @@ module.exports = {
'url': baseUrl + 'wmsuccess01.png',
'name': '帮好友砍价成功对勾'
},
'successHr': {
'url': baseUrl + 'successHr.png',
'name': '帮好友砍价成功对勾'
},
'pay_success': {
'url': baseUrl + 'pay-success.png',
'name': '消费卡付款成功'


Loading…
Cancel
Save