Browse Source

Merge branch 'dev' of https://git.youlane.cn/weapp/C into dev

tags/河北版C.8.1.01
meo 5 years ago
parent
commit
b1e7163471
53 changed files with 682 additions and 448 deletions
  1. +3
    -3
      components/coupons/index.wxss
  2. +15
    -7
      components/hot/index.js
  3. +1
    -1
      components/hot/index.wxml
  4. +2
    -1
      pages/addPark/addPark.json
  5. +22
    -15
      pages/addPark/addPark.wxss
  6. +1
    -1
      pages/bargain/bargain.wxss
  7. +1
    -0
      pages/cardorder/index/index.js
  8. +1
    -1
      pages/cardorder/index/index.wxml
  9. +6
    -5
      pages/coupon/detail/index.wxml
  10. +27
    -16
      pages/coupon/detail/index.wxss
  11. +2
    -0
      pages/couponorder/detail/index.js
  12. +101
    -98
      pages/couponorder/detail/index.wxml
  13. +8
    -3
      pages/couponorder/detail/index.wxss
  14. +2
    -1
      pages/discountCardList/discountCardList.json
  15. +7
    -3
      pages/discountCardList/discountCardList.wxml
  16. +31
    -16
      pages/discountCardList/discountCardList.wxss
  17. +2
    -0
      pages/index/searchbar/detail/index.js
  18. +7
    -5
      pages/index/searchbar/detail/index.wxml
  19. +29
    -8
      pages/index/searchbar/detail/index.wxss
  20. +3
    -33
      pages/integralmall/index.js
  21. +3
    -3
      pages/integralmall/index.wxml
  22. +8
    -4
      pages/integralmall/index.wxss
  23. +6
    -0
      pages/main/index.js
  24. +2
    -2
      pages/main/index.wxml
  25. +5
    -5
      pages/order/detail/index.wxml
  26. +5
    -3
      pages/order/detail/index.wxss
  27. +8
    -0
      pages/order/index/index.js
  28. +1
    -1
      pages/order/index/index.wxml
  29. +3
    -3
      pages/order/index/index.wxss
  30. +10
    -8
      pages/orderquanma/index.wxml
  31. +5
    -2
      pages/orderquanma/index.wxss
  32. +2
    -1
      pages/passCar/couponList/couponList.json
  33. +1
    -1
      pages/passCar/couponList/couponList.wxml
  34. +25
    -20
      pages/passCar/couponList/couponList.wxss
  35. +1
    -1
      pages/passCar/passCar.json
  36. +11
    -11
      pages/ques/ques.wxml
  37. +25
    -7
      pages/ques/ques.wxss
  38. +3
    -3
      pages/specialcourtesy/specialcourtesy.wxss
  39. +4
    -0
      pages/spellDetail/index.js
  40. +2
    -2
      pages/spellDetail/index.json
  41. +20
    -5
      pages/spellDetail/index.wxml
  42. +62
    -34
      pages/spellDetail/index.wxss
  43. +2
    -0
      pages/spellGroup/mySpellGroup/index.js
  44. +11
    -5
      pages/spellGroup/mySpellGroup/index.wxml
  45. +69
    -36
      pages/spellGroup/mySpellGroup/index.wxss
  46. +1
    -0
      pages/spellGroup/paySpellGroup/index.js
  47. +0
    -1
      pages/spellGroup/paySpellGroup/index.json
  48. +1
    -0
      pages/spellGroup/paySpellGroup/index.wxml
  49. +25
    -10
      pages/spellGroup/paySpellGroup/index.wxss
  50. +2
    -2
      pages/spellGroup/spellGroup.json
  51. +12
    -12
      pages/spellGroup/spellGroup.wxml
  52. +68
    -49
      pages/spellGroup/spellGroup.wxss
  53. +8
    -0
      utils/imgurl.js

+ 3
- 3
components/coupons/index.wxss View File

@@ -66,9 +66,9 @@
font-family: PingFang-SC-Bold;
font-weight: bold;
color: #FD782D;
/* line-height: 44rpx; */
line-height: 44rpx;
margin-left: 16rpx;
/* padding-top: 16rpx; */
padding-top: 16rpx;
}
.rmb{
font-size: 24rpx!important;
@@ -132,7 +132,7 @@

.coupons-btn-gms {
background: #b9b9b9 !important;
border-radius: 10px 0px 5px 0px !important;
border-radius: 10px!important;
opacity: 0.6;
margin: 0 !important;
padding: 0 !important;


+ 15
- 7
components/hot/index.js View File

@@ -23,7 +23,9 @@ Component({
wangmeimeibargin: imgurl.wangmeimeibargin.url,
list: [],
pintuanList:[],
total: ''
total: '',
flag:false,
page:1,
},
/**
* 组件的方法列表
@@ -35,8 +37,8 @@ Component({
Http.get({
url: config.api.couponChannelList,
data: {
pageNum: 1,
pageSize: 5,
pageNum: this.data.page++,
pageSize: 1,
targetAd: 6
}
}).then(res => {
@@ -60,14 +62,15 @@ Component({
Http.get({
url: config.api.couponChannelList,
data: {
pageNum: 1,
pageSize: 4,
pageNum: this.data.page++,
pageSize: 1,
targetAd: 7
}
},
}).then(res => {
this.setData({
pintuanList: res.data.list,
total: res.data.total
total: res.data.total,
flag: true
});
console.log(this.data.pintuanList)
})
@@ -79,6 +82,11 @@ Component({
mask: false
});
})
},
// //换一换
getChange(){
},
//跳转砍价详情
gotokjdetail: function (e) {


+ 1
- 1
components/hot/index.wxml View File

@@ -5,7 +5,7 @@
<view class='sql' style='background:{{sql}}'></view>
<text>爆款专区</text>
</view>
<view class='titleR'>
<view class='titleR' bindtap='getList' >
<text style='color:{{txt}}'>换一换</text>
<view>
<image src='{{change}}' bindtap='' mode='aspectFill'></image>


+ 2
- 1
pages/addPark/addPark.json View File

@@ -1,3 +1,4 @@
{
"navigationBarTitleText": "添加车辆"
"navigationBarTitleText": "添加车辆",
"navigationBarBackgroundColor": "#F4F5F9"
}

+ 22
- 15
pages/addPark/addPark.wxss View File

@@ -1,5 +1,7 @@
/* pages/park/addPark/addPark.wxss */

page{
background: #F4F5F9;
}
.addpark-title {
margin-top: 48rpx;
text-align: center;
@@ -18,9 +20,8 @@
.addpark-num-head {
display: flex;
width: 164rpx;
background: #58abfa;
border-radius: 10rpx;
color: #fff;
color: #3C3C3C;
text-align: center;
align-items: center;
}
@@ -29,13 +30,17 @@
width: 88rpx;
height: 82rpx;
line-height: 82rpx;
margin: 0 auto;
border: 2rpx solid #E1E1E1;
border-radius: 10rpx;
background: #FFFFFF;
}

.addpark-num-center {
display: flex;
margin-left: 20rpx;
width: 392rpx;
border: 2rpx solid #58abfa;
/* border: 2rpx solid #E1E1E1; */
border-radius: 10rpx;
text-align: center;
align-items: center;
@@ -46,7 +51,7 @@
}

.addpark-num-center-border {
border-left: 2rpx solid #58abfa;
border-left: 2rpx solid #E1E1E1;
}

.addpark-num-new {
@@ -55,10 +60,12 @@
text-align: center;
align-items: center;
margin-left: 20rpx;
border: 2rpx solid #12c67a;
border: 2rpx dashed #2C8DFF;
border-radius: 10rpx;
}

.addpark-num-new view {
border:none!important;
}
.newsource {
font-size: 16rpx;
position: absolute;
@@ -66,9 +73,9 @@
left: 670rpx;
height: 30rpx;
width: 60rpx;
background: #11c67b;
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
color: #fff;
border: 1px solid #11c67b;
/* border: 1px solid #11c67b; */
border-radius: 14rpx;
text-align: center;
line-height: 30rpx;
@@ -78,7 +85,7 @@
width: 672rpx;
margin: 34rpx auto;
height: 440rpx;
border: 2rpx solid #58abfa;
border: 2rpx solid #FD832D;
border-radius: 16rpx;
padding: 30rpx 15rpx;
}
@@ -91,7 +98,7 @@
.addpark-choose-font {
width: 80rpx;
height: 77rpx;
background: #f8f8f8;
background: #FEFFFE;
text-align: center;
line-height: 77rpx;
border: 1 px solid #f8f8f8;
@@ -114,24 +121,24 @@
width: 672rpx;
margin: 34rpx auto;
height: 510rpx;
border: 2rpx solid #58abfa;
border: 2rpx solid #FD832D;
border-radius: 16rpx;
padding: 30rpx 15rpx;
}

.choose {
color: #58abfa;
color: #FD832D;
}

.choose-title {
border: 6rpx solid #ffd255;
border: 2rpx solid #FD832D;
}

.addpark-button-submit {
width: 670rpx;
height: 94rpx;
margin: 0 auto;
background: #60b4fc;
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
color: #fff;
border-radius: 60rpx;
line-height: 94rpx;


+ 1
- 1
pages/bargain/bargain.wxss View File

@@ -82,7 +82,7 @@ page{
font-size: 18rpx;
position: absolute;
right: 0;
top: 18rpx;
top: 22rpx;
}
.money{
display: inline-block!important;


+ 1
- 0
pages/cardorder/index/index.js View File

@@ -5,6 +5,7 @@ let app = getApp();
const imgurl = require("../../../utils/imgurl");
Page({
data: {
noCoupon: imgurl.noCoupon.url,
couponUrl: imgurl.coupon.url,
linessUrl: imgurl.liness.url,
wmhome: imgurl.wmhome.url,


+ 1
- 1
pages/cardorder/index/index.wxml View File

@@ -6,7 +6,7 @@
</i-tabs>
<view style='padding-top:120rpx;'>
<view class="nocoupon" wx:if="{{list.length==0}}">
<image src="{{couponUrl}}" mode="widthFix" />
<image src="{{noCoupon}}" mode="widthFix" />
<text class="txt001">请您敬请期待</text>
<text class='txt002'>我们正在筹备一大波优惠活动</text>
<navigator class='nav' url="/pages/main/index" open-type="switchTab" hover-class="other-navigator-hover">


+ 6
- 5
pages/coupon/detail/index.wxml View File

@@ -45,11 +45,12 @@
<text class='title'>{{data.title}}<text class="elecard" wx:if="{{data.type==100}}">电子卡</text></text>
<text class="subTitle">{{data.subTitle}}</text>
<view class='salePriceStr clearfix'>
<view class="fl" wx:if="{{data.type!=8}}">售价:
<text class='rmb'>¥</text>
<view class="fl" wx:if="{{data.type!=8}}">
<text class="pri01" wx:if="{{data.type!=50&&data.type!=51}}">{{data.salePriceStr}}</text>
<text class="pri01" wx:if="{{data.type==50||data.type==51}}">{{data.creditPrice}}积分</text>
<text class="yuan" wx:if="{{data.type!=50&&data.type!=51}}">元</text>
<text class='throgh' wx:if="{{data.unit==0&&data.type!=50&&data.type!=51}}">{{data.priceStr}}元</text>
<!-- <text class="yuan" wx:if="{{data.type!=50&&data.type!=51}}">元</text> -->
<!-- <text class='throgh' wx:if="{{data.unit==0&&data.type马上!=50&&data.type!=51}}">{{data.priceStr}}元</text> -->
<text wx:if="{{data.unit==1&&data.type!=50&&data.type!=51}}">{{data.priceStr}}小时</text>
<text class='rest' wx:if="{{data.autoRefund == 1}}">
<text class='time refound'><text class="use">过期不退款</text></text>
@@ -130,7 +131,7 @@
<text class='txt'>{{data.salePriceStr}}元</text>马上购买</button>
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type!=8&&data.type!=50&&data.type!=51&&data.salePriceStr==0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button>
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type==51&&data.remainInventory!=0||data.type==50&&data.remainInventory!=0}}">马上兑换</button>
<button class='buy' disabled='true' wx:if="{{data.remainInventory==0&&endtime!='活动已结束'||data.remainInventory==0&&data.type==8}}">已售罄</button>
<button class='buy buyHr' disabled='true' wx:if="{{data.remainInventory==0&&endtime!='活动已结束'||data.remainInventory==0&&data.type==8}}">已售罄</button>
<button class='buy' disabled='true' wx:if="{{data.remainInventory==0&&data.type==50||data.remainInventory==0&&data.type==51}}">已兑完</button>
<button class='buy' disabled='true' wx:if="{{endtime=='活动已结束'&&data.activityStatus!=0}}">活动已结束</button>
<button class='buy' disabled='true' wx:if="{{total_micro_second<=0&&data.activityStatus!=0}}">活动已结束</button>
@@ -146,7 +147,7 @@
</button>
<form bindsubmit="gotopay" report-submit='true' class="fl">
<button form-type="submit" style='background:transparent;color:#fff;' data-discount='discount1' disabled='{{showbutton}}'>
<text>{{data.priceStr}}</text>
<text>{{data.priceStr}}</text>
<text>立即购买</text>
</button>
</form>


+ 27
- 16
pages/coupon/detail/index.wxss View File

@@ -112,7 +112,7 @@ button::after {
display: block;
font-weight: bold;
font-size: 32rpx;
color: #000;
color: #3C3C3C;
letter-spacing: 1.09rpx;
line-height: 45rpx;
width: 542rpx;
@@ -139,8 +139,8 @@ button::after {
font-size: 24rpx;
color: #919191;
letter-spacing: 0;
height: 70rpx;
line-height: 70rpx;
height: 50rpx;
line-height: 50rpx;
/* border-bottom: 1px solid #eee; */
border-bottom: 1px solid #f9f9f9;
}
@@ -177,7 +177,11 @@ button::after {
color: #999;
letter-spacing: 0;
}

.salePriceStr .rmb{
color: #FD782D;
font-size: 24rpx;
float: left;
}
.salePriceStr .pri01 {
font-size: 40rpx;
color: #FD782D;
@@ -334,7 +338,7 @@ button::after {
}

.buy-view {
background: #fff;
/* background: #fff; */
height: 92rpx;
bottom: 0;
left: 0;
@@ -345,7 +349,7 @@ button::after {

.buy {
position: relative;
background: #af6e34;
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
height: 94rpx;
width: 560rpx;
margin: 0 auto 30rpx;
@@ -354,7 +358,9 @@ button::after {
line-height: 94rpx;
border-radius: 61rpx;
}

.buyHr{
background: #CECECE!important;
}
.goback {
position: relative;
float: left;
@@ -373,8 +379,8 @@ button::after {
left: 0;
right: 0;
top: 0;
bottom: 50rpx;
margin: auto;
bottom:0;
margin:10rpx auto;
}

.tel {
@@ -570,15 +576,20 @@ button::after {
left: 0;
right: 0;
bottom: 0;
padding-bottom: 37rpx;
padding-top: 37rpx;
padding-bottom: 22rpx;
padding-top: 22rpx;
z-index: 12;
/* background: #fff; */
}
.btnTxt{
/* margin-top: 30rpx; */
width: 50rpx;
height: 30rpx;
line-height: 50rpx;
color: #FD782D;
font-size: 20rpx;
position: absolute;
right:42rpx ;
bottom: 15rpx;
}

.btns .fr,.btns .fl {
@@ -591,8 +602,8 @@ button::after {
.btns .fl {
margin-left: 20rpx;
color: #fff;
background: rgba(255, 169, 2, 1);
box-shadow: 0px 8px 8px 1px rgba(255, 169, 2, 0.32);
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
/* box-shadow: 0px 8px 8px 1px rgba(255, 169, 2, 0.32); */
}

.btns .fl text {
@@ -610,8 +621,8 @@ button::after {
color: #fff;
margin-right: 20rpx;
line-height: 95rpx;
background: rgba(236, 59, 45, 1);
box-shadow: 0px 8px 8px 1px rgba(246, 93, 51, 0.32);
background: linear-gradient(90deg,rgba(40,179,255,1) 0%,rgba(48,103,255,1) 100%);
/* box-shadow: 0px 8px 8px 1px rgba(246, 93, 51, 0.32); */
}

.support-tansfer {


+ 2
- 0
pages/couponorder/detail/index.js View File

@@ -8,6 +8,8 @@ const QR = require("../../../utils/memberqrcode.js");
Page({
data: {
code: "",
topLine: imgurl.topLine.url,
btomLine: imgurl.btomLine.url,
lineUrl: imgurl.line.url,
wm01Url: imgurl.wm01.url,
wm02Url: imgurl.wm02.url,


+ 101
- 98
pages/couponorder/detail/index.wxml View File

@@ -1,113 +1,116 @@
<view class="container page">
<view class="coupon_detail clearfix">
<view class="fl wmfl">
<image src="{{data.coverImg}}" mode='aspectFill' />
</view>
<view class="fr">
<text class="title">{{data.title}}</text>
<view class="time">{{data.subTitle}}</view>
<view class="money">
<text wx:if="{{data.type == 8&&data.price == data.couponPrice}}">¥{{data.couponPrice/100}}</text>
<text wx:if="{{data.type == 8&&data.price != data.couponPrice}}">¥{{data.salePrice/100}}</text>
<text wx:if="{{data.type != 8}}">¥{{data.salePrice/100}}</text>
<del>¥{{data.price/100}}</del>
<text class="refund" wx:if="{{data.autoRefund == 1}}">
<text>过期不退款</text>
</text>

<view class='box'>
<view class="container page">
<view class="coupon_detail clearfix">
<view class="fl wmfl">
<image src="{{data.coverImg}}" mode='aspectFill' />
</view>
</view>
</view>
<view class="timevalidity" wx:if="{{data.validStatus != 0}}">
<text>有效期至:</text>
<text>{{expiredTime}}</text>
</view>
<view class="timevalidity" wx:if="{{data.validStatus == 0}}">
<text>有效期:</text>
<text>{{validStartDate}}</text>
<i>至</i>
<text>{{validEndDate}}</text>
</view>
<view wx:if="{{data.usePrice!=undefined}}" class="manjian">满{{data.usePrice/100}}元可用</view>
<view wx:if="{{data.usePrice==undefined}}" class="manjian">仅限本店使用</view>
<image class='line' mode="widthFix" src="{{lineUrl}}"></image>
<view class="zhuangtai">
<image wx:if="{{data.couponOrderStatus==1}}" src="{{wm01Url}}" mode='widthFix'></image>
<image wx:if="{{data.couponOrderStatus==2}}" src="{{wm02Url}}" mode='widthFix'></image>
<image wx:if="{{data.couponOrderStatus==3}}" src="{{wm03Url}}" mode='widthFix'></image>
<image wx:if="{{data.couponOrderStatus==0&&data.validStatus==0}}" src="{{wm04Url}}" mode='widthFix'></image>
<view class="panel" wx:if="{{data.couponOrderStatus==0&&data.validStatus!=0}}">
<!-- <view class="qrcode">
<canvas canvas-id="qrcode" />
</view> -->
<view class="canWrap">
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" />
<view class="fr">
<text class="title">{{data.title}}</text>
<view class="time">{{data.subTitle}}</view>
<view class="money">
<text wx:if="{{data.type == 8&&data.price == data.couponPrice}}">¥{{data.couponPrice/100}}</text>
<text wx:if="{{data.type == 8&&data.price != data.couponPrice}}">¥{{data.salePrice/100}}</text>
<text wx:if="{{data.type != 8}}">¥{{data.salePrice/100}}</text>
<del>¥{{data.price/100}}</del>
<text class="refund" wx:if="{{data.autoRefund == 1}}">
<text>过期不退款</text>
</text>
</view>
</view>
<image src="{{tempFilePath}}" mode="aspectFit" />
<view class="barnum buy">
<text>优惠券码:</text>{{code}}</view>
</view>
</view>

<view class="posi">
<view class="tit">
适用门店
<view class="timevalidity" wx:if="{{data.validStatus != 0}}">
<text>有效期至:</text>
<text>{{expiredTime}}</text>
</view>
<view wx:for="{{data.merchantVoList}}" wx:key="{{index}}">
<view class='posi_logo'>
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<image src='{{item.merchantImgUrl}}'></image>
</view>
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<text>{{item.merchantName}}</text>
<text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text>
</view>
<view wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}'>
<image class="tel" src="{{teljpgUrl}}" mode="widthFix" />
<view class="timevalidity" wx:if="{{data.validStatus == 0}}">
<text>有效期:</text>
<text>{{validStartDate}}</text>
<i>至</i>
<text>{{validEndDate}}</text>
</view>
<view wx:if="{{data.usePrice!=undefined}}" class="manjian">满{{data.usePrice/100}}元可用</view>
<view wx:if="{{data.usePrice==undefined}}" class="manjian">仅限本店使用</view>
<image class='line' mode="widthFix" src="{{topLine}}"></image>
<view class="zhuangtai">
<image wx:if="{{data.couponOrderStatus==1}}" src="{{wm01Url}}" mode='widthFix'></image>
<image wx:if="{{data.couponOrderStatus==2}}" src="{{wm02Url}}" mode='widthFix'></image>
<image wx:if="{{data.couponOrderStatus==3}}" src="{{wm03Url}}" mode='widthFix'></image>
<image wx:if="{{data.couponOrderStatus==0&&data.validStatus==0}}" src="{{wm04Url}}" mode='widthFix'></image>
<view class="panel" wx:if="{{data.couponOrderStatus==0&&data.validStatus!=0}}">
<!-- <view class="qrcode">
<canvas canvas-id="qrcode" />
</view> -->
<view class="canWrap">
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" />
</view>
<image src="{{tempFilePath}}" mode="aspectFit" />
<view class="barnum buy">
<text>优惠券码:</text>{{code}}</view>
</view>
</view>
</view>

<image class='line' mode="widthFix" src="{{lineUrl}}"></image>
<view class='note'>
<view style='height:60rpx;line-height:60rpx;'>
<text class="shiji">实付金额:</text>
<text class='moneys'>{{data.couponPrice/100}}</text>
<text style='font-size:24rpx;text-align:right;color: #FF4949;'>元</text>
</view>
<view wx:if="{{data.couponOrderStatus==0}}">
<text>下单时间:</text>
<text>{{createDate}}</text>
</view>
<view wx:if="{{data.couponOrderStatus==1}}">
<text>核销时间:</text>
<text>{{updateDate}}</text>
</view>
<view wx:if="{{data.couponOrderStatus==2}}">
<text>过期时间:</text>
<text>{{updateDate}}</text>
<view class="posi">
<view class="tit">
适用门店
</view>
<view wx:for="{{data.merchantVoList}}" wx:key="{{index}}">
<view class='posi_logo'>
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<image src='{{item.merchantImgUrl}}'></image>
</view>
<view bindtap='gotoDetail' data-id='{{item.id}}'>
<text>{{item.merchantName}}</text>
<text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text>
</view>
<view wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}'>
<image class="tel" src="{{teljpgUrl}}" mode="widthFix" />
</view>
</view>
</view>
</view>
<view wx:if="{{data.couponOrderStatus==3}}">
<text>退款时间:</text>
<text>{{updateDate}}</text>

<image class='line' mode="widthFix" src="{{btomLine}}"></image>
<view class='note'>
<view style='height:60rpx;line-height:60rpx;'>
<text class="shiji">实付金额:</text>
<text class='moneys'>{{data.couponPrice/100}}</text>
<text style='font-size:24rpx;text-align:right;color: #FF4949;'>元</text>
</view>
<view wx:if="{{data.couponOrderStatus==0}}">
<text>下单时间:</text>
<text>{{createDate}}</text>
</view>
<view wx:if="{{data.couponOrderStatus==1}}">
<text>核销时间:</text>
<text>{{updateDate}}</text>
</view>
<view wx:if="{{data.couponOrderStatus==2}}">
<text>过期时间:</text>
<text>{{updateDate}}</text>
</view>
<view wx:if="{{data.couponOrderStatus==3}}">
<text>退款时间:</text>
<text>{{updateDate}}</text>
</view>
<view>
<text>订单编号:</text>
<text>{{data.orderId}}</text>
</view>
<!-- <view><text>手机号</text><text>2018.05.25</text></view> -->
</view>
<view>
<text>订单编号:</text>
<text>{{data.orderId}}</text>
<view class='notes' style="border-bottom:0">
<view>
<text>购买须知</text>
</view>
<view>
<text><text class='spot'></text>{{data.remark}}</text>
</view>
</view>
<!-- <view><text>手机号</text><text>2018.05.25</text></view> -->
</view>
<view class='notes' style="border-bottom:0">
<view>
<text>购买须知</text>
</view>
<view>
<text><text class='spot'></text>{{data.remark}}</text>
<view class='game' bindtap="gotogame" wx-if="{{showIf}}">
<view class='game-entry'>
<image src="{{newUrl}}" class='gameimg' mode='widthFix'></image>
</view>
</view>
</view>
<view class='game' bindtap="gotogame" wx-if="{{showIf}}">
<view class='game-entry'>
<image src="{{newUrl}}" class='gameimg' mode='widthFix'></image>
</view>
</view>

+ 8
- 3
pages/couponorder/detail/index.wxss View File

@@ -1,14 +1,19 @@

.box{
height: 100%;
background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
}
.container {
background: #fff;
width: 92%;
margin: 8% auto 6%;
border-radius: 16rpx;
}

page {
background: #02c0ff;
/* background: #02c0ff; */
background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
height: auto !important;
padding-bottom: 20rpx;
/* padding-bottom: 20rpx; */
}

.panel, .zhuangtai image {


+ 2
- 1
pages/discountCardList/discountCardList.json View File

@@ -3,5 +3,6 @@
"i-tab": "../../../dist/tab/index",
"i-tabs": "../../../dist/tabs/index"
},
"navigationBarTitleText": "消费卡"
"navigationBarTitleText": "消费卡",
"navigationBarBackgroundColor": "#F4F5F9"
}

+ 7
- 3
pages/discountCardList/discountCardList.wxml View File

@@ -3,8 +3,8 @@
<view class='content'>
<view class="market clearfix">
<view class='tabss'>
<i-tabs current="{{current_scroll}}" scroll bindchange="handleChangeScroll">
<i-tab wx:for="{{tabData}}" wx:key="unique" key="{{item.id}}" title="{{item.title}}"></i-tab>
<i-tabs current="{{current_scroll}}" scroll bindchange="handleChangeScroll">
<i-tab wx:for="{{tabData}}" wx:key="unique" key="{{item.id}}" title="{{item.title}}"></i-tab>
</i-tabs>
</view>
<view class='cards clearfix'>
@@ -24,7 +24,11 @@
<text>{{item.title}}</text>
</view>
<view class='buycardbtn'>
<button>{{item.salePriceStr}}元 <text>购买</text></button>
<view>
<text class='rmb'>¥</text>
<text class='price'>{{item.salePriceStr}}</text>
</view>
<view>购买</view>
</view>
</view>
</view>


+ 31
- 16
pages/discountCardList/discountCardList.wxss View File

@@ -1,5 +1,6 @@
page{
height: auto!important;
background: #F4F5F9;
}
.header image{
width: 100%;
@@ -22,6 +23,8 @@ page{
display: inline-block;
}



.section {
position: relative;
width: 48%;
@@ -41,7 +44,7 @@ page{
}
.mms {
background: #fff;
padding: 0;
padding: 20rpx;
border-radius: 16rpx;
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
}
@@ -69,21 +72,20 @@ page{
.detail_msg image {
display: block;
width: 100%;
height: 200rpx!important;
height: 176rpx!important;
border-radius: 16rpx;
}
.detail_msg text{
display: block;
font-size:28rpx;
height: 65rpx;
line-height: 65rpx;
color: #333;
text-align: center;
font-size:30rpx;
height: 40rpx;
line-height: 40rpx;
color: #3C3C3C;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
width: 320rpx;
margin: 0 auto;
margin-top: 24rpx;
}
.info view:nth-child(1) {
display: flex;
@@ -140,16 +142,29 @@ page{
}
.buycardbtn{
display: flex;
flex: 2;
justify-content: space-between;
margin: 10rpx 0 0 0;
}
.buycardbtn .rmb{
font-size: 24rpx;
}
.buycardbtn .price{
font-size: 40rpx;
}
.buycardbtn button{
flex: 1;
.buycardbtn view:nth-child(1){
color: #FD782D;
}
.buycardbtn view:nth-child(2){
width: 88rpx;
height: 52rpx;
line-height: 52rpx;
font-size: 28rpx;
color:#FF3535!important;
background: none;
border-top:1px solid #eee;
border-radius: 0!important;
color:#FFF!important;
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius: 20rpx!important;
text-align: center;
}

button::after{ border: none; }
.buycardbtn button text{
margin-left: 10rpx;
@@ -233,7 +248,7 @@ button::after{ border: none; }
}
.cards{
margin-top: 30rpx;
padding: 0 40rpx;
padding: 0 20rpx;
}
.cantransferred{
position: absolute;


+ 2
- 0
pages/index/searchbar/detail/index.js View File

@@ -9,6 +9,8 @@ Page({
* 页面的初始数据
*/
data: {
noMerchant: imgurl.noMerchant.url,
noCoupon: imgurl.noCoupon.url,
poterbg: imgurl.poterbg.url,
teljpgUrl: imgurl.teljpg.url,
fenxiang: imgurl.fenxiang.url,


+ 7
- 5
pages/index/searchbar/detail/index.wxml View File

@@ -22,7 +22,6 @@
<text>{{data.merchantName}}</text>
<text class='title'>{{data.title}}</text>
</view>

<view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'>
<image class="fenxiang" src='{{fenxiang}}' mode="widthFix"></image>
<text class='gift'>分享有礼</text>
@@ -71,11 +70,13 @@
<!-- 商户简介 -->
<view class='merchant-phones'>
<view class="swiper-tab">
<view class="swiper-tab-item {{currentTab==0?'active-tab':''}}" data-current="0" bindtap="clickTab">
<view class="swiper-tab-item " data-current="0" bindtap="clickTab">
优惠信息
<view class="{{currentTab==0?'active-tab':''}}"></view>
</view>
<view class="swiper-tab-item {{currentTab==1?'active-tab':''}}" data-current="1" bindtap="clickTab">
<view class="swiper-tab-item" data-current="1" bindtap="clickTab">
商家简介
<view class="{{currentTab==1?'active-tab':''}}"></view>
</view>
</view>
<view class='swiperactive'>
@@ -85,7 +86,7 @@
<c-coupons wx:if="{{couponList.length!=0}}" wx:for="{{couponList}}" from="fromMerchant" paramAtoB="{{loading}}" wx:key="unique" data="{{item}}" list="{{couponList}}" />
</view>
<view class='dingdan' wx:if="{{couponList.length==0}}">
<image src="{{actUrl}}" mode="widthFix"></image>
<image src="{{noCoupon}}" mode="widthFix"></image>
<text>请您敬请期待</text>
<text>我们正在筹备一大波优惠活动</text>
</view>
@@ -97,8 +98,9 @@
</view>
<!-- 商户简介 -->
<view wx:elif="{{currentTab==1}}">
<image src="{{noMerchant}}" mode="widthFix"></image>
<text wx:if="{{data.introduction}}">{{data.introduction}}</text>
<text wx:else>信息完善中,敬请期待</text>
<text wx:else>信息完善中,敬请期待~</text>
</view>
</view>
<view class='merchant-info'>


+ 29
- 8
pages/index/searchbar/detail/index.wxss View File

@@ -175,11 +175,11 @@

.merchants text {
display: block;
text-align: left;
/* text-align: left; */
font-size: 26rpx;
margin-bottom: 6rpx;
height: 26rpx;
line-height: 26rpx;
/* height: 26rpx; */
line-height: 24rpx;
color: #A6A6A6;
}

@@ -230,25 +230,35 @@

.swiper-tab {
text-align: left;
width: 100%;
width: 70%;
display: flex;
flex-flow: row;
justify-content: space-around;
height: 88rpx;
line-height: 88rpx;
margin-bottom: 30rpx;
padding: 0 15%;
}

.swiper-tab-item {
color: #434343;
font-size: 30rpx;
margin-right: 50rpx;
position: relative;
}

.active-tab {
color: #af6e34;
border-bottom: 6rpx solid #af6e34;
color: #FD782D;
display: block;
width: 72%;
height: 8rpx;
background: 0 0;
position: absolute;
bottom: 0;
left: 15%;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius: 100px;
}

.fenxiang {
position: absolute;
right: 0;
@@ -318,7 +328,17 @@
min-height: 400rpx;
padding-bottom: 44rpx;
}

.swiperactive image{
display: block;
width: 300rpx;
margin: 30rpx auto 0;
}
.swiperactive text{
/* margin: 30rpx auto 0; */
display:block;
text-align:center;
color: #A6A6A6;
}
.modal {
width: 100%;
height: 100%;
@@ -399,6 +419,7 @@
width: 300rpx;
margin: 30rpx auto 0;
}

button::after{ border: none; }
.goback{
position: fixed;


+ 3
- 33
pages/integralmall/index.js View File

@@ -69,9 +69,12 @@ Page({
showEdit: true
})
}
console.log(res.data,22222222222)
that.setData({
score: res.data.score,
levelName: res.data.levelName,
upgradePercent: res.data.upgradePercent,
upgradeScore: res.data.upgradeScore
})
if (res.data.nickName) {
that.setData({
@@ -124,39 +127,6 @@ Page({
url: '/pages/integralmall/integraHistory/index',
})
},
getmemberId: function (token) {
let that = this;
Http.get({
url: config.api.getScore,
data: {
token: token
}
}).then(res => {
that.setData({
levelName: res.data.levelName,
upgradePercent: res.data.upgradePercent,
upgradeScore: res.data.upgradeScore,
credit: res.data.credit ? res.data.credit : 0,
score: res.data.score
})
if (res.data.nickName) {
that.setData({
ismember: true,
memberId: res.data.id
})
var initUrl = JSON.stringify({
flagid: res.data.id
});
}
})
.catch(err => {
wx.showModal({
title: '提示',
content: err.message,
showCancel: false
})
})
},
getList(pageNum) {
var that = this;
console.log(pageNum)


+ 3
- 3
pages/integralmall/index.wxml View File

@@ -13,17 +13,17 @@
<text class='chengzhang '>{{levelName}}</text>
</view>
<view class="view">
<!-- 成长值<text class="score">{{score}}</text> -->
<progress percent="{{upgradePercent}}" stroke-width="6" activeColor="#FFB287" />
</view>
</view>
<view class='msg'>还需{{upgradeScore}}成长值升级</view>
</view>
<view class='topbg-btom'>
<view class='topbg-btom'bindtap='gotojifen' mode='widthFix'>
<view class='btoml'>
<view class='score'>{{creditAmount}}</view>
<view class='jifen'>
<text>可用积分</text>>
<text>积分详情</text>>
<image src="{{rightHr}}" class='right' mode='widthFix'></image>
</view>
</view>
<!-- 二维码 -->


+ 8
- 4
pages/integralmall/index.wxss View File

@@ -41,7 +41,7 @@
margin:0 20rpx;
}
.usre_level{
/* width:70rpx; */
width:70rpx;
height:32rpx;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:9px 9px 9px 0px;
@@ -102,6 +102,10 @@ progress{
top: 176rpx;
left:70rpx;
}
.jifen image{
width: 10rpx;
height: 22rpx;
}
.topbg .score{
font-size: 40rpx;
font-weight: 500;
@@ -205,7 +209,7 @@ image{
width: 40%;
height: 100%;
float: left;
margin-left: 20rpx;
/* margin-left: 20rpx; */
color: #A6A6A6;
overflow: hidden;
text-overflow:ellipsis;
@@ -311,9 +315,9 @@ image{
font-weight:500;
text-align: center;
color:rgba(255,255,255,1);
line-height:44rpx;
line-height:52rpx;
margin: 88rpx 24rpx 0 0;
margin-top: 110rpx;
margin-top: 90rpx;
}
.right-text{
font-size:22rpx;


+ 6
- 0
pages/main/index.js View File

@@ -141,6 +141,12 @@ Page({
url: '/pages/spellGroup/spellGroup',
})
},
//跳往显示抢购
gotoRushList: function () {
wx.navigateTo({
url: '/pages/rushToBuy/index',
})
},
//搜索门店
// searchbar:function(){
// wx.switchTab({


+ 2
- 2
pages/main/index.wxml View File

@@ -57,8 +57,8 @@
<text>积分商城</text>
</view>
</view>
<!-- 每日头条 -->
<view class='toutiao'>
<!-- 每日头条 限时抢购 -->
<view class='toutiao' bindtap='gotoRushList'>
<view class='imgBox'>
<image src='{{toutiao}}' mode='aspectFill'></image>
</view>


+ 5
- 5
pages/order/detail/index.wxml View File

@@ -2,18 +2,18 @@
<view wx:if="{{order.orderStatus==1}}" class='tips'>
<image class='success' src='{{succUrl}}' mode='widthFix'></image>
<view wx:if="{{order.salePrice/100==0}}" class='msg' >
<text>领取成功</text>
<text>请尽快到门店使用,有效期至{{}}</text>
<text>交易成功</text>
<!-- <text>请尽快到门店使用,有效期至{{}}</text> -->
</view>
<view wx:if="{{order.salePrice/100!=0}}" class='msg'>
<text>付款成功</text>
<text>请尽快到门店使用,有效期至{{}}</text>
<!-- <text>请尽快到门店使用,有效期至{{}}</text> -->
</view>
</view>
<view class='section'>
<view class='sectionTit'>
<text>{{order.title}}</text>
<view>
<!-- <view>
<text>{{item.title}}</text>
<text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text>
<text class='wait' wx:if="{{item.orderStatus==10}}">拼团中</text>
@@ -32,7 +32,7 @@
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&item.type!=50&&item.type!=51}}">免费领取</text>
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&(item.type==50||item.type==51)}}">积分兑换</text>
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text>
</view>
</view> -->
</view>
<view class='detail_msg'>
<view class='logo'>


+ 5
- 3
pages/order/detail/index.wxss View File

@@ -19,7 +19,7 @@ page {

.tips {
width: 92%;
height: 100rpx;
height: 70rpx;
background: #2C8DFF;
color: #fff;
padding: 20rpx 4% 0;
@@ -92,9 +92,11 @@ page {
color: #3C3C3C;
}
.info view:nth-child(1) {
display: flex;
justify-content: space-between;
padding: 0 4%;
width: 80%;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
}

.info {


+ 8
- 0
pages/order/index/index.js View File

@@ -56,6 +56,14 @@ Page({
url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}&flag='pay'`
})
},
//再次购买
gotopayAgain: function (e) {
wx.navigateTo({
url: `/pages/coupon/detail/index?couponChannelId=${
e.currentTarget.dataset.couponchannelid
}&couponId=${e.currentTarget.dataset.couponid}`
});
},
// gotoSpellPay(e) {
// console.log(e, 333)
// let data = e.currentTarget.dataset.data


+ 1
- 1
pages/order/index/index.wxml View File

@@ -68,7 +68,7 @@
<view wx:if="{{item.orderStatus==5}}" style="background:#999;opacity: .6;" class="btn">
<text>退款失败</text>
</view>
<view wx:if="{{item.orderStatus==2}}" class="btnGm" data-id="{{item.id}}" bindtap="">
<view wx:if="{{item.orderStatus==2}}" class="btnGm" data-id="{{item.id}}" bindtap="gotopayAgain" data-couponId="{{item.couponId}}" data-couponChannelId="{{item.id}}" data-targetAd="{{item.targetAd}}" >
<text class='txGm'>再次购买</text>
</view>
</view>


+ 3
- 3
pages/order/index/index.wxss View File

@@ -235,14 +235,14 @@
bottom: 0;
margin: auto;
right: 20rpx;
width: 140rpx;
width: 118rpx;
height: 52rpx;
line-height: 52rpx;
text-align: center;
color: #fff;
float: right;
font-size: 28rpx;
border: 2rpx solid #02c0ff;
border: 2rpx solid #2C8DFF;
border-radius: 30rpx;
}
@@ -251,7 +251,7 @@
color: #FFFFFF;
}
.txGm{
font-size: 24rpx;
font-size: 26rpx!important;
color: #2C8DFF!important;
}
.dingdan {


+ 10
- 8
pages/orderquanma/index.wxml View File

@@ -1,4 +1,5 @@
<view class="couponbg">
<view class='couponBox'>
<view class="couponbg">
<view class="title">{{title}}</view>
<!-- <view class="subtitle">{{subtitle}}</view> -->
<image class='line' src='{{topLineUrl}}' mode="widthFix"></image>
@@ -37,11 +38,12 @@
<text><text class='spot'></text>{{remark}}</text>
</view>
</view>
</view>
<view class='game' bindtap="gotogame" wx-if="{{showIf}}">
<view class='game-entry'>
<image src="{{staticGamedata.imgUrl}}" class='gameimg' mode='widthFix'></image>
<text>用户专享神秘礼物</text>
<text>独家福利,抢完即止</text>
</view>
</view>
<view class='game' bindtap="gotogame" wx-if="{{showIf}}">
<view class='game-entry'>
<image src="{{staticGamedata.imgUrl}}" class='gameimg' mode='widthFix'></image>
<text>用户专享神秘礼物</text>
<text>独家福利,抢完即止</text>
</view>
</view>
</view>

+ 5
- 2
pages/orderquanma/index.wxss View File

@@ -1,14 +1,17 @@
@import "../../app.wxss";
page {
}
.couponBox{
height: 100%;
background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
}

.couponbg {
position: relative;
background: #fff;
overflow: hidden;
width: 92%;
margin: 8% auto 6%;
margin: 0 auto 6%;
border-radius: 16rpx;
}



+ 2
- 1
pages/passCar/couponList/couponList.json View File

@@ -3,5 +3,6 @@
"i-tab": "../../../dist/tab/index",
"i-tabs": "../../../dist/tabs/index"
},
"navigationBarTitleText": "停车券"
"navigationBarTitleText": "停车券",
"navigationBarBackgroundColor": "#F4F5F9"
}

+ 1
- 1
pages/passCar/couponList/couponList.wxml View File

@@ -30,7 +30,7 @@
<view hover-class='active' wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</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>


+ 25
- 20
pages/passCar/couponList/couponList.wxss View File

@@ -1,7 +1,7 @@
.market {
width: 100%;
height: 100%;
/* background: #f5f5f5; */
background: #F4F5F9;
}
.tabs {
@@ -13,6 +13,7 @@
left: 0;
right: 0;
z-index: 100000;
background: #FFF;
}
.i-tab {
@@ -26,29 +27,31 @@
.mms {
width: 690rpx;
height: 170rpx !important;
height: 180rpx !important;
background: #fff;
padding: 30rpx 0 0;
/* padding: 30rpx 0 0; */
margin: 0 auto 40rpx;
border-radius: 16rpx;
border-top: 8rpx solid #02b7ff;
/* border-radius: 16rpx; */
/* border-top: 8rpx solid #02b7ff; */
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
}
.detail_msg {
display: flex;
padding-bottom: 26rpx;
padding-top: 16rpx;
padding-bottom: 16rpx;
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
}
.expiretime {
display: block;
width: 100%;
text-align: left;
text-indent: 1em;
height: 40rpx;
line-height: 36rpx;
text-indent: 0.5em;
height: 54rpx;
line-height: 45rpx;
font-size: 22rpx;
color: #333;
color: #A6A6A6;
letter-spacing: 0;
}
@@ -60,10 +63,10 @@
.logo {
width: 60rpx;
height: 60rpx;
border: 1px solid #f8f8f8;
/* border: 1px solid #f8f8f8; */
border-radius: 50rpx;
display: block;
margin-left: 20rpx;
margin: 15rpx 20rpx 0 20rpx;
}
.logo image {
@@ -75,18 +78,20 @@
.info view:nth-child(1) {
display: flex;
justify-content: space-between;
padding: 0 2%;
padding: 0 4%;
margin-top: 15rpx;
}
.info {
width: 100%;
border-left: 1rpx #FFF dashed;
}
.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;
@@ -96,9 +101,9 @@
}
.info view:nth-child(2) {
padding-left: 2%;
padding-left: 4%;
font-size: 22rpx;
color: #333;
color: #FFFFFF;
letter-spacing: 0;
margin-top: 6rpx;
display: inline-block;
@@ -120,20 +125,20 @@
height: 48rpx;
line-height: 48rpx;
text-align: center;
border: 2rpx solid #02c0ff;
border: 2rpx solid #fff;
border-radius: 60rpx;
color: #02c0ff;
color: #fff;
font-size: 28rpx;
}
.active {
color: #fff;
background: #02c0ff;
/* background: #02c0ff; */
}
.txt1 {
font-size: 22rpx;
color: #333;
color: #A6A6A6;
letter-spacing: 0;
}


+ 1
- 1
pages/passCar/passCar.json View File

@@ -1,6 +1,6 @@
{
"component": true,
"usingComponents": {},
"navigationBarTitleText": "停车",
"navigationBarTitleText": "智能停车",
"enablePullDownRefresh": true
}

+ 11
- 11
pages/ques/ques.wxml View File

@@ -1,46 +1,46 @@
<view class='contain'>
<view class='content'>
<view class="tit">Q1.我怎么添加车牌呢?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>我怎么添加车牌呢?</view></view>
<view class='description'>首次使用“停车缴费”的用户需绑定车牌号,即可为车辆进行缴费 。您可以最多添加三张车牌。</view>
</view>
<view class='content'>
<view class="tit">Q2.有哪些方式可以支持停车费?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>有哪些方式可以支持停车费?</view></view>
<view class='description'>我们仅支持微信支付。您还可以使用停车券进行减免。注意哦您必须在抵达岗亭前完成支付。</view>
</view>
<view class='content'>
<view class="tit">Q3.如何获得停车券?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>如何获得停车券?</view></view>
<view class='description'>我们会不定期进行赠送停车券,您可以在支付停车费时使用,记得多多关注商场微信公众号以及商场信息哦。</view>
</view>
<view class='content'>
<view class="tit">Q4.每次可以使用几张停车券?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>每次可以使用几张停车券?</view></view>
<view class='description'>单次入场车辆仅限使用一张停车券,未离场再次支付时不再享有优惠哦。</view>
</view>
<view class='content'>
<view class="tit">Q5.支付完毕后我需要做什么吗?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>支付完毕后我需要做什么吗?</view></view>
<view class='description'>您在支付完毕的规定时间内可以驾着您的爱车直接离场。</view>
</view>
<view class='content'>
<view class="tit">Q6.支付完毕后未在规定时间内离场怎么办?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>支付完毕后未在规定时间内离场怎么办?</view></view>
<view class='description'>不用担心,重新扫描停车小程序二维码进行缴费就可以了。</view>
</view>
<view class='content'>
<view class="tit">Q7.哪些用户不能在线支付停车费呢?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>哪些用户不能在线支付停车费呢?</view></view>
<view class='description'>目前车牌号输入仅支持各省简称、无车牌用户、教练车、特殊车牌(军用、武警、警车等)暂不支持在线支付停车费,请进行线下支付。</view>
</view>
<view class='content'>
<view class="tit">Q8.我为什么绑定(解绑)不了车牌?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>我为什么绑定(解绑)不了车牌?</view></view>
<view class='description'>每位用户最多可同时绑定三张车牌。当您绑定的车牌在停车场内是无法解绑车牌的,支付离场后才可以进行变更哦!</view>
</view>
<view class='content'>
<view class="tit">Q9.每个用户可以绑定几个车牌?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>每个用户可以绑定几个车牌?</view></view>
<view class='description'>每个用户30天内最多绑定4次车牌。</view>
</view>
<view class='content'>
<view class="tit">Q10.停车券使用时间?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>停车券使用时间?</view></view>
<view class='description'>车辆离场前使用。</view>
</view>
<view class='content'>
<view class="tit">Q11.为什么我的车牌解绑不成功?</view>
<view class="tit"><view class='Q'>Q</view><view class='right'>为什么我的车牌解绑不成功?</view></view>
<view class='description'>请先确认车辆已离场。</view>
</view>
</view>

+ 25
- 7
pages/ques/ques.wxss View File

@@ -1,18 +1,36 @@
.content {
padding: 0 30rpx 30rpx 30rpx;
margin: 30rpx auto;
padding: 0 30rpx 20rpx 30rpx;
margin: 20rpx auto;
}

.tit {
font-size: 26rpx;
color: #02c0ff;
font-size: 30rpx;
color: #FD832D;
letter-spacing: 1.16rpx;
height: 68rpx;
line-height: 68rpx;
}
.right{
width: 85%;
height:42rpx;
/* margin-top: 5rpx; */
float: left;
margin-left: 15rpx;
}

.description {
margin-top: 15rpx;
margin-top: 12rpx;
font-size: 26rpx;
color: #333;
letter-spacing: 1.16rpx;
padding-left: 47rpx;
padding-left: 83rpx;
}
.Q{
width:68rpx;
height:68rpx;
border:2rpx solid #FD832D;
border-radius: 34rpx;
line-height: 68rpx;
text-align: center;
font-size: 32rpx;
float: left
}

+ 3
- 3
pages/specialcourtesy/specialcourtesy.wxss View File

@@ -156,10 +156,10 @@ Page {
}

.code {
width: 714rpx;
height: 794rpx;
width: 690rpx;
height: 740rpx;
background: #fff;
margin: 0 auto;
margin: 20rpx auto;
border-radius: 10rpx;
padding: 20rpx 0 40rpx;
}


+ 4
- 0
pages/spellDetail/index.js View File

@@ -9,6 +9,10 @@ Page({
* 页面的初始数据
*/
data: {
orangeImg: imgurl.orange.url,
blueImg: imgurl.blue.url,
grayImg: imgurl.gray.url,
tuanzhang: imgurl.tuanzhang.url,
tuanzhang: imgurl.tuanzhang.url,
spellBg: imgurl.spellBg.url,
position: imgurl.position.url,


+ 2
- 2
pages/spellDetail/index.json View File

@@ -1,7 +1,7 @@
{
"navigationBarTitleText": "拼团详情",
"usingComponents": {},
"navigationBarBackgroundColor": "#F13C42",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#F4F5F9",
"navigationBarTextStyle": "black",
"enablePullDownRefresh": true
}

+ 20
- 5
pages/spellDetail/index.wxml View File

@@ -14,20 +14,23 @@
<view class='des'>{{data.subTitle}}</view>
</view>
<view class='detail-top03'>
<view class='detail-p-price'>{{data.salePrice}}</view>
<view class='detail-p-name'>拼团价</view>
<view class='detail-p-price'>{{data.salePrice}}</view>
<view class='detail-p-name'>拼团价」¥</view>
</view>
</view>
<view class='detail-bottom' wx:if="{{isMyself==true}}">
<view class='b-unit'>元</view>
<view class='b-price'>{{data.salePrice}}</view>
<view class='b-unit'>¥</view>
<view class='b-name'>实付款</view>
</view>
<image class="frImg" wx:if="{{data.status == 10}}" src="{{orangeImg}}" mode="aspectFill" lazy-load="true"><text>{{data.statustext}}</text></image>
<image class="frImg" wx:if="{{data.status == 11}}" src="{{blueImg}}" mode="aspectFill" lazy-load="true"><text>{{data.statustext}}</text></image>
</view>

<!-- 拼团状态-拼团中,拼团成功 -->
<view class='status' wx:if="{{isMyself==true}}" style='margin-top:30rpx;'>
<view class='status-top'>
<!-- <view class='status-top'>
<view class='p-status'>{{data.statustext}}</view>
<view class='p-text' wx:if='{{data.status==10}}'>结束</view>
<view class='p-time' wx:if='{{data.status==10}}'>{{sec}}</view>
@@ -38,7 +41,7 @@
<view class='p-mao' wx:if='{{data.status==10}}'>天</view>
<view class='p-time' wx:if='{{data.status==10}}'>{{day}}</view>
<view class='p-text' wx:if='{{data.status==10}}'>剩余</view>
</view>
</view> -->
<view class='status-center' style='{{"width:"+(120*data.userList.length>634?634:120*data.userList.length)+"rpx;"+"margin:0 auto;"}}'>
<view class='status-lists'>
<view class='tuanzhang touxiangitems' wx:for="{{data.userList}}" wx:key="{{index}}">
@@ -63,6 +66,18 @@
</view>
</view> -->
</view>
<view class='status-top'>
<view class='p-text' wx:if='{{data.status==10}}'>结束</view>
<view class='p-time' wx:if='{{data.status==10}}'>{{sec}}</view>
<view class='p-mao' wx:if='{{data.status==10}}'>:</view>
<view class='p-time' wx:if='{{data.status==10}}'>{{min}}</view>
<view class='p-mao' wx:if='{{data.status==10}}'>:</view>
<view class='p-time' wx:if='{{data.status==10}}'>{{hour}}</view>
<view class='p-mao' wx:if='{{data.status==10}}'>天</view>
<view class='p-time' wx:if='{{data.status==10}}'>{{day}}</view>
<view class='p-text' wx:if='{{data.status==10}}'>剩余</view>
</view>
<!-- <view class='need' >还差 <text class='needNum'>{{data.remainPeople}}人</text>拼团成功,赶快邀人!</view> -->
</view>
<view class='status-bottom'>
<view class='position-icon'>


+ 62
- 34
pages/spellDetail/index.wxss View File

@@ -2,8 +2,8 @@
page {
height: auto;
overflow: auto;
background: #f89132;
background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png');
background: #F4F5F9;
/* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png'); */
background-size: cover;
background-repeat: no-repeat;
}
@@ -31,7 +31,7 @@ page {
font-size:32rpx;
font-family:PingFang-SC-Bold;
font-weight:bold;
color:rgba(243,69,58,1);
color:#FD782D;
line-height: 75rpx;
}
.p-time{
@@ -39,11 +39,11 @@ page {
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(243,69,58,1);
color:#FFF;
width: 38rpx;
height: 30rpx;
margin-top: 22rpx;
background:rgba(252,220,221,1);
background:#FD782D;
border-radius:10rpx;
line-height: 30rpx;
text-align: center;
@@ -54,7 +54,7 @@ page {
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(243,69,58,1);
color:#3C3C3C;
line-height: 75rpx;
}
.p-text{
@@ -72,6 +72,9 @@ page {
text-align: center;
border-bottom: 1rpx solid #F9F9F9;
}
.status-lists{
margin-top: 60rpx;
}
.tuanzhang{
float: left;
width: 120rpx;
@@ -94,8 +97,8 @@ page {
width: 80rpx;
height: 80rpx;
overflow: hidden;
background:rgba(252,220,221,1);
border:1rpx solid rgba(243,69,58,1);
background:#ECEEF3;
/* border:1rpx solid rgba(243,69,58,1); */
border-radius:50%;
box-sizing: border-box;
line-height: 78rpx;
@@ -103,7 +106,7 @@ page {
font-size:32rpx;
font-family:PingFang-SC-Regular;
font-weight:400;
color:rgba(243,69,58,1);
color:#CACACA;
margin: 0;
padding: 0;
}
@@ -141,7 +144,7 @@ page {
font-size:28rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(51,51,51,1);
color:#B8B8B8;
line-height: 72rpx;
}
.detail{
@@ -168,7 +171,8 @@ page {
.return-index{
position: fixed;
right: 50rpx;
top: 60rpx;
/* top: 60rpx; */
bottom: 60rpx;
width:100rpx!important;
height:100rpx;
z-index: 100;
@@ -194,11 +198,11 @@ page {
}
.detail-top01{
float: left;
width: 180rpx;
width: 120rpx;
}
.detail-top01 image{
width: 180rpx;
height: 180rpx;
width: 120rpx;
height: 120rpx;
margin-top: 33rpx;
}
.detail-top02{
@@ -228,8 +232,8 @@ page {
white-space:nowrap;
}
.detail-top03{
float: left;
padding-top: 180rpx;
float: right;
padding-top: 100rpx;
width: 230rpx;
}
.detail-p-name{
@@ -237,7 +241,7 @@ page {
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(134,134,134,1);
color:#3C3C3C;
line-height:44rpx;
}
.detail-p-price{
@@ -251,32 +255,31 @@ page {
border-top: 1rpx solid #F9F9F9;
width: 100%;
overflow: hidden;
height: 86rpx;
height: 60rpx;
}
.b-unit{
float: right;
font-size:24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(237,63,46,1);
margin-top: 36rpx;
color:#FD782D;
margin-top: 18rpx;
}
.b-price{
float: right;
font-size:40rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(237,63,46,1);
margin-top: 18rpx;
color:#FD782D;
}
.b-name{
float: right;
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(51,51,51,1);
color:#FD782D;
margin-right: 6rpx;
margin-top: 34rpx;
margin-top: 18rpx;
}
.order{
width: 690rpx;
@@ -287,31 +290,31 @@ page {
border-radius:15rpx;
}
.order-list{
height: 55rpx;
height: 98rpx;
line-height: 98rpx;
}
.order-title{
line-height: 55rpx;
line-height: 98rpx;
float: left;
font-size:26rpx;
font-size:28rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(51,51,51,1);
color:#A6A6A6;
}
.order-text{
float: right;
text-align: right;
line-height: 55rpx;
font-size:26rpx;
line-height: 98rpx;
font-size:32rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(134,134,134,1);
color:#3C3C3C;
}
.user-motto {
border: 0;
width:650rpx;
height:85rpx;
background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%);
box-shadow:0px 8rpx 8rpx 1rpx rgba(242,61,65,0.32);
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:43rpx;
font-size:36rpx;
font-family:PingFang-SC-Medium;
@@ -385,7 +388,32 @@ page {
.alert-button .share{
width:500rpx;
height:95rpx;
background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%);
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:47rpx;
margin-top: 79rpx;
}
.need{
font-size:24rpx;
font-family:PingFangSC-Regular;
font-weight:400;
color:rgba(60,60,60,1);
}
.needNum{
color: #FD782D;
}

.frImg{
height: 78rpx;
width: 78rpx;
position: absolute;
right: 0;
top: 0;
}
.frImg text{
transform: rotate(45deg);
color: #FFFFFF;
font-size: 16rpx;
position: absolute;
left: 14rpx;
top: 12rpx;
}

+ 2
- 0
pages/spellGroup/mySpellGroup/index.js View File

@@ -9,6 +9,8 @@ Page({
* 页面的初始数据
*/
data: {
fenxiang: imgurl.fenxiang.url,
homeSelectedO:imgurl.homeSelectedO.url,
isshowposter:false,//是否显示分享弹框
teljpgUrl: imgurl.teljpg.url,
wmhome: imgurl.wmhome.url,


+ 11
- 5
pages/spellGroup/mySpellGroup/index.wxml View File

@@ -13,17 +13,20 @@
<view class='text'>
<view class='remark'>{{data.subTitle}}</view>
<view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'>
<image class="fenxiang" src='{{share01}}' mode="widthFix"></image>
<image class="fenxiang" src='{{fenxiang}}' mode="widthFix"></image>
<text class='gift'>分享有礼</text>
</view>
<view class='des'>
<view class='des-peoplenum'>【拼团购】{{data.pressLimitNum}}人拼团成功,单价仅需</view>
<view class='des-saleprice'>{{data.salePriceStr}}</view>
<view class='des-peoplenum'>「拼团价」{{data.pressLimitNum}}人拼团成功,单价仅需</view>
<view class='des-saleprice'>{{data.salePriceStr}}</view>
</view>
<view class='rest' wx:if="{{data.validType==1}}">有效期:
<text class='time'>{{data.validStartDate}}至{{data.validEndDate}}<text class="use">(请在有效期内使用)</text></text>
</view>
<view class='rest'>
<text class='txt01'>限购条件:</text><text class='time'>每人限购{{data.useLimitQuantity}}张</text>
<!-- <text class='txt01'>限购条件:</text> -->
<view class='quan'></view>
<text class='time'>每人限购{{data.useLimitQuantity}}张</text>
<text class='timess' wx:if='{{limitCondition==1}}'>仅限新用户活动</text>
<text class='timess' wx:if='{{limitCondition==2&&(minLimit||minLimit==0)&&maxLimit}}'>({{minLimit}}-{{maxLimit}}成长值)</text>
<text class='timess' wx:if='{{limitCondition==2&&minLimit&&!maxLimit}}'>(大于{{minLimit}}成长值)</text>
@@ -68,7 +71,10 @@
<image mode='widthFix' wx:for="{{detailPicture}}" wx:key="{{index}}" wx:for-item="item" src='{{item}}'></image>
</view>
<view class='edit'>
<button class='goback' bindtap='gotoIndex'><image src='{{wmhome}}' mode="widthFix"></image></button>
<button class='goback' bindtap='gotoIndex'>
<image src='{{homeSelectedO}}' mode="widthFix"></image>
<text class='btnTxt'>首页</text>
</button>
<form bindsubmit='{{canBuyIf?"gotoBuy":""}}' report-submit='true' wx:if='{{data.id}}'>
<button class='edit-left' form-type="submit" >
<view class='edit-left-top'>


+ 69
- 36
pages/spellGroup/mySpellGroup/index.wxss View File

@@ -10,12 +10,11 @@
}
.goback {
float:left;
width:122rpx!important;
height:95rpx;
width:132rpx!important;
height:96rpx;
background:rgba(255,255,255,1);
line-height:95rpx;
border:1rpx solid rgba(227,227,227,1);
border-radius:48rpx;
line-height:96rpx;
border-radius:32rpx;
margin-right:25rpx;
}
.timess{
@@ -26,14 +25,14 @@
}
button::after{ border: none; }
.goback image{
position:absolute;
width:60rpx;
left:0;
right:0;
top:0;
position: absolute;
width:52rpx;
height: 50rpx;
left: 0;
right: 0;
top: 0;
bottom:0;
margin:auto;
height: 80rpx;
margin:10rpx auto;
}
.content-box{
box-sizing: content-box;
@@ -44,13 +43,13 @@ button::after{ border: none; }
position: relative;
width: 100%;
height: auto;
background: #fff;
background: #F4F5F9;
overflow: hidden;
padding-bottom: 130rpx;
}
.text{
position: relative;
padding: 0 30rpx;
/* padding: 0 30rpx; */
}
.title{
position: relative;
@@ -67,23 +66,27 @@ button::after{ border: none; }
box-sizing: border-box;
}
.remark{
background: #FFF;
font-size:24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(134,134,134,1);
line-height: 48rpx;
padding: 0 30rpx;
}
.des{
width: 100%;
height: auto;
padding-top: 6rpx;
background: #FFF;
padding: 0 30rpx;
color: #FD782D
}
.des-peoplenum{
display: inline;
font-size:24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(0,0,0,1);
line-height:44rpx;
margin-right: 15rpx;
}
@@ -92,7 +95,6 @@ button::after{ border: none; }
font-size:40rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(255,53,53,1);
}
.status{
width: 100%;
@@ -190,24 +192,32 @@ button::after{ border: none; }
left:0;
right:0;
padding:20rpx 22rpx;
background:#fff;
/* background:#fff; */
}
.edit-left{
float: left;
width: 269rpx;
height: 95rpx;
background:rgba(255,169,2,1);
box-shadow:0px 8rpx 8rpx 1rpx rgba(255,169,2,0.32);
border-radius:48rpx;
width: 268rpx;
height: 96rpx;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:32rpx;
}
.edit-right{
float: right;
width: 269rpx;
height: 95rpx;
width: 268rpx;
height: 96rpx;
line-height: 46rpx;
background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
box-shadow:0px 8rpx 8rpx 1rpx rgba(246,93,51,0.32);
border-radius:48rpx;
background:linear-gradient(90deg,rgba(40,179,255,1) 0%,rgba(48,103,255,1) 100%);
border-radius:32rpx;
}
.btnTxt{
width: 50rpx;
height: 30rpx;
line-height: 50rpx;
color: #FD782D;
font-size: 20rpx;
position: absolute;
right:42rpx ;
bottom: 15rpx;
}
.edit-left-top{
height: 46rpx;
@@ -267,6 +277,9 @@ button::after{ border: none; }
}
.posi {
position: relative;
background: #FFF;
margin-top: 18rpx;
padding: 15rpx 30rpx
}
.applyshop{
font-size:32rpx;
@@ -296,7 +309,6 @@ button::after{ border: none; }
width: 100%;
display: flex;
padding: 20rpx 0;
background: #fff;
height: 100rpx;
margin-bottom: 20rpx;
}
@@ -341,8 +353,8 @@ button::after{ border: none; }
top: 0;
bottom: 0;
margin: auto;
width: 50rpx;
height: 50rpx;
width: 76rpx;
height: 76rpx;
}
.rest {
font-size: 24rpx;
@@ -352,6 +364,8 @@ button::after{ border: none; }
line-height: 70rpx;
/* border-bottom: 1px solid #eee; */
border-bottom: 1px solid #f9f9f9;
background: #FFF;
padding: 0 30rpx;
}

.restNum {
@@ -405,12 +419,20 @@ button::after{ border: none; }
}

.fenxiang image {
width: 108rpx;
width:48rpx;
height: 48rpx;
position: absolute;
right: 16rpx;
top: 0;
right: 0;
z-index: 10;
}
.gift{
color: #3C3C3C;
font-size: 20rpx;
position: absolute;
top: 50rpx;
right: 0;
}
.user-motto {
width: 270rpx;
border: 0;
@@ -426,12 +448,14 @@ button::after{ border: none; }
.notes view:nth-child(1) {
height: 87rpx;
line-height: 87rpx;
background: #fff;
border-top: 1px solid #f9f9f9;
}

.notes {
margin: 0 auto;
margin-top: 18rpx;
background: #FFF;
width: calc(100vw-60rpx);
padding: 0 30rpx;
}

.notes view:nth-child(1) text {
@@ -495,8 +519,9 @@ button::after{ border: none; }
}

.detailImg {
width: 92%;
margin: 10rpx auto 0;
width: calc(100vw-60rpx);
background: #FFF;
padding: 0 30rpx;
}

.detailImg image {
@@ -964,4 +989,12 @@ height: 90rpx;
}
.b1 .wx-swiper-dots{
margin-bottom: 30rpx;
}
.quan{
float: left;
margin:28rpx 15rpx 0 0;
width: 12rpx;
height: 12rpx;
background: #E1E1E1;
border-radius: 50%;
}

+ 1
- 0
pages/spellGroup/paySpellGroup/index.js View File

@@ -9,6 +9,7 @@ Page({
* 页面的初始数据
*/
data: {
blueImg: imgurl.blue.url,
tuanzhang: imgurl.tuanzhang.url,
spellBg: imgurl.spellBg.url,
position: imgurl.position.url,


+ 0
- 1
pages/spellGroup/paySpellGroup/index.json View File

@@ -1,6 +1,5 @@
{
"navigationBarTitleText": "拼团详情",
"usingComponents": {},
"navigationBarBackgroundColor": "#F13C42",
"enablePullDownRefresh": true
}

+ 1
- 0
pages/spellGroup/paySpellGroup/index.wxml View File

@@ -18,6 +18,7 @@
<view class='detail-p-name'>拼团价</view>
</view>
</view>
<image class="frImg" wx:if="{{data.status == 0}}" src="{{blueImg}}" mode="aspectFill" lazy-load="true"><text>去支付</text></image>
</view>

<!-- 拼团订单信息 -->


+ 25
- 10
pages/spellGroup/paySpellGroup/index.wxss View File

@@ -2,8 +2,8 @@
page {
height: auto;
overflow: auto;
background: #f89132;
background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png');
background: #F4F5F9;
/* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png'); */
background-size: cover;
background-repeat: no-repeat;
}
@@ -175,7 +175,7 @@ page {
.return-index{
position: fixed;
right: 50rpx;
top: 60rpx;
bottom: 60rpx;
width:100rpx!important;
height:100rpx;
z-index: 100;
@@ -294,31 +294,31 @@ page {
border-radius:15rpx;
}
.order-list{
height: 55rpx;
height: 98rpx;
line-height: 98rpx;
}
.order-title{
line-height: 55rpx;
line-height: 98rpx;
float: left;
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(51,51,51,1);
color:#A6A6A6;
}
.order-text{
float: right;
text-align: right;
line-height: 55rpx;
line-height: 98rpx;
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(134,134,134,1);
color:#A6A6A6;
}
.user-motto {
border: 0;
width:650rpx;
height:85rpx;
background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%);
box-shadow:0px 8rpx 8rpx 1rpx rgba(242,61,65,0.32);
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:43rpx;
font-size:36rpx;
font-family:PingFang-SC-Medium;
@@ -443,4 +443,19 @@ page {
text-align: center;
line-height: 95rpx;
margin: 0 auto 43rpx;
}
.frImg{
height: 78rpx;
width: 78rpx;
position: absolute;
right: 0;
top: 0;
}
.frImg text{
transform: rotate(45deg);
color: #FFFFFF;
font-size: 16rpx;
position: absolute;
left: 14rpx;
top: 12rpx;
}

+ 2
- 2
pages/spellGroup/spellGroup.json View File

@@ -1,8 +1,8 @@
{
"navigationBarTitleText": "拼团专场",
"enablePullDownRefresh": true,
"navigationBarBackgroundColor":"#F13C42",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor":"#F4F5F9",
"navigationBarTextStyle": "black",
"usingComponents": {
"c-banner": "../../components/spellbanner/index",
"i-tab": "../../../dist/tab/index",


+ 12
- 12
pages/spellGroup/spellGroup.wxml View File

@@ -21,19 +21,19 @@
<view class='spell-center'>
<view class='tilte'>{{item.title}}</view>
<view class='remark'>{{item.subTitle}}</view>
<view class='spell-num'>{{item.pressLimitNum+'人团'}}</view>
<view class='numBox'>
<view class='spell-num'>{{item.pressLimitNum+'人团'}}</view>
<view class='right-text'>剩余{{item.remainInventory}}</view>
</view>
<view class='price'>
<view class='price01'>
<view class='price-unit'>¥</view>
<view class='price-num'>{{item.salePriceStr}}</view>
<view class='price-unit'>元</view>
</view>
<view class='price02'>{{item.priceStr}}</view>
<view class='price02'>¥{{item.priceStr}}</view>
<view class='right-button'>去拼团</view>
</view>
</view>
<view class='spell-right'>
<view class='right-button'>去拼团</view>
<view class='right-text'>剩余{{item.remainInventory}}</view>
</view>
</view>
<view class='sepll-list' wx:if='{{flag=="myspellList"}}' wx:for="{{lists}}" wx:key="{{index}}" style='position:relative;height:auto;'>
<view class='spell-top'>
@@ -54,15 +54,15 @@
<view class='spell-center' data-id='{{item.id}}' data-data='{{item}}' bindtap='{{((item.couponStatus==1&&item.orderStatus!=11)||(item.orderGroupId=="0"&&item.orderStatus!=15)||item.orderStatus==16)?"":item.orderStatus!=15?"gotoStatusDetail":"gotoPay"}}'>
<view class='tilte'>{{item.title}}</view>
<view class='remark'>{{item.subTitle}}</view>
<view class='price' style='margin-top:50rpx;'>
<view class='price'>
<view class='price01'>
<view class='price-text'style="display: inline;font-size: 24rpx;">拼团价</view>
<view class='price-num'>{{item.salePrice/100}}</view>
<view class='price-unit'>元</view>
<!-- <view class='price-unit'>元</view> -->
</view>
</view>
</view>
<view class='spell-right' data-id='{{item.id}}' data-data='{{item}}' style='position:absolute;width:auto;bottom:30rpx;right:20rpx;' bindtap='{{((item.couponStatus==1&&item.orderStatus!=11)||(item.orderGroupId=="0"&&item.orderStatus!=15)||item.orderStatus==16)?"":item.orderStatus!=15?"gotoStatusDetail":"gotoPay"}}'>
<view class='spell-right' data-id='{{item.id}}' data-data='{{item}}' style='position:absolute;width:auto;bottom:25rpx;right:10rpx;' bindtap='{{((item.couponStatus==1&&item.orderStatus!=11)||(item.orderGroupId=="0"&&item.orderStatus!=15)||item.orderStatus==16)?"":item.orderStatus!=15?"gotoStatusDetail":"gotoPay"}}'>
<!-- 继续邀请好友 -->
<button class='share user-motto right-button' wx:if='{{item.couponStatus!=1&&item.orderStatus==10&&item.orderGroupId!="0"}}' data-status='{{item.status}}' data-data='{{item}}' hover-class="other-button-hover" style="width:auto;display:inline-block;padding:0 8rpx;">{{item.statusText}}</button>
<!-- 去使用 -->
@@ -87,8 +87,8 @@
</view>
</view>
<view class='bottom'>
<view class='bottom-left' bindtap="getSpellList" style="background:{{flag=='spellList'?'#FF7250':'#F3453A'}}">拼团商品</view>
<view class='bottom-right' bindtap="getmyList" style="background:{{flag!='spellList'?'#FF7250':'#F3453A'}}">我的拼团</view>
<view class="{{flag=='spellList'?'bottom-left':'bottom-leftN'}}" bindtap="getSpellList">拼团商品</view>
<view class="{{flag=='spellList'?'bottom-leftN':'bottom-left'}}" bindtap="getmyList">我的拼团</view>
</view>
<view class="loading" wx:if="{{loading}}">
{{content}}


+ 68
- 49
pages/spellGroup/spellGroup.wxss View File

@@ -2,14 +2,15 @@
page {
height: auto;
overflow: auto;
background: #f89132;
background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spell-bg.png');
background: #F4F5F9;
/* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spell-bg.png'); */
background-size: cover;
background-repeat: no-repeat;
}
.content-box{
height: auto;
padding-bottom: 200rpx;
/* padding-bottom: 200rpx; */
padding: 0 16rpx 200rpx;
}
.loading {
text-align: center;
@@ -63,28 +64,36 @@ image{
border-radius: 16rpx;
overflow: hidden;
}

.content .sepll-list{
width: 690rpx;
height: 230rpx;
width: 346rpx;
height: 432rpx;
background: #fff;
border-radius: 30rpx;
margin: 30rpx auto 0;
margin-bottom: 20rpx;
}
.content .spell-left{
width: 230rpx;
height: 230rpx;
.content >view:nth-of-type(2n){
float: right;
}
.content>view:nth-of-type(2n+1){
float: left;
}
.content .spell-left{
width: 100%;
height: 196rpx;
}
.content .spell-left image{
width: 180rpx;
height: 180rpx;
margin: 25rpx;
width: 300rpx;
height: 176rpx;
margin: 20rpx;
}
.content .spell-center{
float: left;
padding: 0 20rpx;
width: 304rpx;
height: 100%;
}


.content .tilte{
font-size:30rpx;
font-family:PingFang-SC-Bold;
@@ -107,28 +116,34 @@ image{
text-overflow:ellipsis;
white-space: nowrap;
}
.content .numBox{
display: flex;
justify-content: space-between;
}
.content .spell-num{
width: 95rpx;
border:1px solid rgba(255,50,50,1);
width: 80rpx;
height: 32rpx;
border:1px solid #FD782D;
border-radius:10rpx;
font-size:24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(255,50,50,1);
line-height:30rpx;
color:#FD782D;
line-height:32rpx;
margin: 10rpx 0;
text-align: center;
}
.content .price{
overflow: hidden;
margin-top: 10rpx;
/* margin-top: 10rpx; */
margin-bottom: 20rpx;
}
.content .price01{
display: inline;
font-size:50rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(255,50,50,1);
color:#FD782D;
line-height:44rpx;
}
.content .price02{
@@ -141,29 +156,25 @@ image{
}
.content .price-num{
display: inline;
font-size: 40rpx;
}
.content .price-unit{
display: inline;
font-size:24rpx;
margin-right: 10rpx;
}
.content .spell-right{
float: left;
width: 156rpx;
/* margin-right:4rpx; */
}
.right-button{
width:120rpx;
height:48rpx;
font-size:26rpx;
background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
border-radius:24rpx;
width:100rpx;
height:50rpx;
font-size:24rpx;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:20rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
text-align: center;
color:rgba(255,255,255,1);
line-height:44rpx;
margin: 110rpx auto 0;
margin-top: 110rpx;
line-height:50rpx;
float: right;
}
.right-text{
font-size:22rpx;
@@ -174,39 +185,41 @@ image{
text-align: center;
}
.bottom{
width: 690rpx;
height: 85rpx;
position: fixed;
bottom: 26rpx;
left: 30rpx;
/* background:rgba(243,69,58,1); */
border:1px solid rgba(255, 222, 67, 1);
border-radius:40px;
color: #fff;
overflow: hidden;
width:100%;
height:100rpx;
position:fixed;
bottom:0;
left: 0;
color:#fff;
overflow:hidden;
}
.bottom-left{
width: 50%;
height: 100%;
float: left;
margin-left: -1rpx;
text-align: center;
line-height: 85rpx;
line-height: 100rpx;
font-size:30rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(255,253,245,1);
border-right:1px solid rgba(255, 222, 67, 1);
/* border-right:1px solid rgba(255, 222, 67, 1); */
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
opacity: 1;
}
.bottom-right{
.bottom-leftN{
width: 50%;
height: 100%;
float: left;
margin-left: -1rpx;
text-align: center;
line-height: 85rpx;
line-height: 100rpx;
font-size:30rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(255,253,245,1);
color:#3C3C3C;
background:#FFF;
opacity: 1;
}
.spell-bottom{
@@ -214,7 +227,7 @@ image{
}
.spell-top{
height: auto;
margin: 0 30rpx;
margin: 0 20rpx;
overflow: hidden;
box-sizing: border-box;
border-bottom: 1rpx solid #EEEEEE;
@@ -222,10 +235,16 @@ image{
.spell-top-left{
float: left;
width: 60%;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
.spell-top-right{
float: left;
float: right;
width: 40%;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
.top-title{
display: inline;


+ 8
- 0
utils/imgurl.js View File

@@ -653,5 +653,13 @@ module.exports = {
'url': baseUrl + "homeSelectedO.png",
'name': ''
},
'noMerchant': {
'url': baseUrl + "noMerchant.png",
'name': ''
},
'rightHr': {
'url': baseUrl + "rightHr.png",
'name': ''
},

}

Loading…
Cancel
Save