瀏覽代碼

upload

newCard
HolyKnightIX 2 年之前
父節點
當前提交
7353f3f7cf
共有 9 個檔案被更改,包括 121 行新增99 行删除
  1. +2
    -2
      pages/cardorder/cardUse/cardUse.wxml
  2. +4
    -4
      pages/coupon/childDetail/childDetail.js
  3. +2
    -2
      pages/coupon/childDetail/childDetail.wxml
  4. +4
    -4
      pages/coupon/detail/index.js
  5. +2
    -2
      pages/coupon/detail/index.wxml
  6. +5
    -5
      pages/couponorder/detail/index.js
  7. +4
    -3
      pages/couponorder/detail/index.wxml
  8. +77
    -57
      pages/couponorder/detail/index.wxss
  9. +21
    -20
      pages/orderquanma/index.wxml

+ 2
- 2
pages/cardorder/cardUse/cardUse.wxml 查看文件

@@ -26,9 +26,9 @@
</view>
<view class="timevalidity" wx:if="{{data.validStatus == 0}}">
<text>有效期:</text>
<text>{{data.type==10?pickStartDate:validStartDate}}</text>
<text>{{data.type==10 ? validStartDate : soldStartTime}}</text>
<i>至</i>
<text>{{data.type==10?pickEndDate:validEndDate}}</text>
<text>{{data.type==10 ? validEndDate: soldEndTime}}</text>
</view>
<view></view>
<view wx:if="{{data.usePrice!=undefined}}" class="manjian">满{{data.usePrice/100}}元可用</view>


+ 4
- 4
pages/coupon/childDetail/childDetail.js 查看文件

@@ -692,8 +692,8 @@ Page({
if (res.data.type == 10) {
that.setData({
salePriceStr: res.data.salePriceStr,
pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"),
pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"),
validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"),
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
priceStr: res.data.priceStr,
tailPriceStr: res.data.tailPriceStr,
origPriceStr: res.data.origPriceStr
@@ -701,10 +701,10 @@ Page({
}
if (res.data.validType == 1) {
that.setData({
soldStartTime: util.formatTime(res.data.soldStartTime, "yyyy-MM-dd"),
soldEndTime: util.formatTime(res.data.soldEndTime, "yyyy-MM-dd"),
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"),
pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"),
pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"),
});
} else {
if (res.data.validDays) {


+ 2
- 2
pages/coupon/childDetail/childDetail.wxml 查看文件

@@ -58,9 +58,9 @@
<view class="earnestNum">¥ {{tailPriceStr}}</view>
<view class="original">{{origPriceStr}}</view>
</view>
<view class="earnestTime time" wx:if="{{data.type==10}}"> 预购时间:{{validStartDate}}至{{validEndDate}}</view>
<view class="earnestTime time" wx:if="{{data.type==10}}"> 预购时间:{{soldStartTime}}至{{soldEndTime}}</view>

<view class="finalTime time" wx:if="{{data.type==10}}">提货时间:{{pickStartDate}}至{{pickEndDate}}</view>
<view class="finalTime time" wx:if="{{data.type==10}}">提货时间:{{validStartDate}}至{{validEndDate}}</view>
<!-- 预售 -->

<view class='salePriceStr clearfix' wx:if="{{data.type!=10}}">


+ 4
- 4
pages/coupon/detail/index.js 查看文件

@@ -765,8 +765,8 @@ Page({
if (res.data.type == 10) {
that.setData({
salePriceStr: res.data.salePriceStr,
pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"),
pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"),
validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"),
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
priceStr: res.data.priceStr,
tailPriceStr: res.data.tailPriceStr,
origPriceStr: res.data.origPriceStr
@@ -774,10 +774,10 @@ Page({
}
if (res.data.validType == 1) {
that.setData({
soldStartTime: util.formatTime(res.data.soldStartTime, "yyyy-MM-dd"),
soldEndTime: util.formatTime(res.data.soldEndTime, "yyyy-MM-dd"),
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"),
pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"),
pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"),
});
} else {
if (res.data.validDays) {


+ 2
- 2
pages/coupon/detail/index.wxml 查看文件

@@ -58,9 +58,9 @@
<view class="earnestNum">¥ {{tailPriceStr}}</view>
<view class="original">{{origPriceStr}}</view>
</view>
<view class="earnestTime time" wx:if="{{data.type==10}}"> 预购时间:{{validStartDate}}至{{validEndDate}}</view>
<view class="earnestTime time" wx:if="{{data.type==10}}"> 预购时间:{{soldStartTime}}至{{soldEndTime}}</view>

<view class="finalTime time" wx:if="{{data.type==10}}">提货时间:{{pickStartDate}}至{{pickEndDate}}</view>
<view class="finalTime time" wx:if="{{data.type==10}}">提货时间:{{validStartDate}}至{{validEndDate}}</view>
<!-- 预售 -->

<view class='salePriceStr clearfix' wx:if="{{data.type!=10}}">


+ 5
- 5
pages/couponorder/detail/index.js 查看文件

@@ -245,12 +245,12 @@ Page({
updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dd hh:mm:ss"),
createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dd hh:mm:ss")
});
if (that.data.data.validStartDate && that.data.data.validEndDate) {
if (that.data.data.soldStartTime && that.data.data.soldEndTime) {
that.setData({
validStartDate: util.formatTime(that.data.data.validStartDate, "yyyy-MM-dd hh:mm:ss"),
validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss"),
pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd hh:mm:ss"),
pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd hh:mm:ss"),
soldStartTime: util.formatTime(that.data.data.soldStartTime, "yyyy-MM-dd hh:mm:ss"),
soldEndTime: util.formatTime(that.data.data.soldEndTime, "yyyy-MM-dd hh:mm:ss"),
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd hh:mm:ss"),
validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd hh:mm:ss"),
})
}



+ 4
- 3
pages/couponorder/detail/index.wxml 查看文件

@@ -26,9 +26,9 @@
</view>
<view class="timevalidity" wx:if="{{data.validStatus == 0}}">
<text>有效期:</text>
<text>{{data.type==10?pickStartDate:validStartDate}}</text>
<text>{{data.type==10?validStartDate:soldStartTime}}</text>
<i>至</i>
<text>{{data.type==10?pickEndDate:validEndDate}}</text>
<text>{{data.type==10?validEndDate:soldEndTime}}</text>
</view>
<view></view>
<view wx:if="{{data.usePrice!=undefined}}" class="manjian">满{{data.usePrice/100}}元可用</view>
@@ -59,7 +59,8 @@

<view class="barnum">
<view class="barnumtext">{{showIdFalg?code:codeS}}</view>
<image class="barnumImg" src="../../../assets/images/password.png" bindtap="showId"></image>
<image wx:if="{{!showIdFalg}}" class="barnumImg" src="../../../assets/images/password-show.png" bindtap="showId"></image>
<image wx:if="{{showIdFalg}}" class="barnumImg" src="../../../assets/images/password-close.png" bindtap="showId"></image>
</view>
</view>
</view>


+ 77
- 57
pages/couponorder/detail/index.wxss 查看文件

@@ -1,8 +1,8 @@

.box{
.box {
height: 100%;
background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
background: linear-gradient(180deg, rgba(253, 131, 45, 1) 0%, rgba(254, 74, 22, 1) 100%);
}

.container {
background: #fff;
width: 92%;
@@ -10,20 +10,25 @@
border-radius: 16rpx;

}
.coedTiem{

.coedTiem {
text-align: center;
color: rgba(253,131,45,1);
color: rgba(253, 131, 45, 1);
margin-bottom: 10rpx;
}

page {
background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
background: linear-gradient(180deg, rgba(253, 131, 45, 1) 0%, rgba(254, 74, 22, 1) 100%);
height: auto !important;
}
.zhuangtai{

.zhuangtai {
margin-bottom: 20rpx;
}
.panel, .zhuangtai image {

.panel,
.zhuangtai image {
position: relative;
width: 600rpx;
display: block;
@@ -32,9 +37,11 @@ page {
padding: 0;
z-index: 10000;
}
.panel{

.panel {
position: relative;
}

.pane2 {
background: #fff;
opacity: 0.6;
@@ -62,37 +69,42 @@ page {
margin: 0 auto;
}

.barnum{
background: #fff;
height: 88rpx;
width: 600rpx;
margin: 0 auto;
line-height: 88rpx;
border: 2rpx solid #ccc;
border-radius: 10px;
font-size: 36rpx;
color: #333;
letter-spacing: 0;
text-align: center;
overflow: hidden;
}
.barnumtext{
float: left;
margin-left: 20rpx;
font-size: 30rpx;
}
.barnumImg{
float: left;
height: 40rpx;
width: 40rpx !important;
margin: 24rpx 20rpx !important;
}
.barnumtext::before{
content: "优惠券码:";
font-size: 24rpx;
color: #999;
}
.barcode > canvas {
.barnum {
background: #fff;
height: 88rpx;
width: 600rpx;
margin: 0 auto;
line-height: 88rpx;
border: 2rpx solid #ccc;
border-radius: 10px;
font-size: 36rpx;
color: #333;
letter-spacing: 0;
text-align: center;
overflow: hidden;
}

.barnumtext {
float: left;
margin-left: 20rpx;
font-size: 30rpx;
}

.barnumImg {
float: left;
height: 40rpx;
width: 40rpx !important;
margin: 24rpx 20rpx !important;
z-index: 999;
}

.barnumtext::before {
content: "优惠券码:";
font-size: 24rpx;
color: #999;
}

.barcode>canvas {
width: 510rpx;
height: 100rpx;
}
@@ -108,7 +120,7 @@ page {
margin: 0 auto;
}

.qrcode > canvas {
.qrcode>canvas {
width: 350rpx;
height: 350rpx;
}
@@ -207,6 +219,7 @@ page {
letter-spacing: 0;
text-align: left;
}

.timevalidity text:nth-of-type(3) {
font-size: 22rpx;
color: #999;
@@ -244,7 +257,7 @@ page {
flex-direction: column;
}

.notes view:nth-child(2) > text {
.notes view:nth-child(2)>text {
font-size: 24rpx;
color: #333;
letter-spacing: 0;
@@ -284,7 +297,7 @@ page {

.manjian {
margin-left: 26rpx;
color: #999!important;
color: #999 !important;
font-size: 26rpx !important;
text-align: center;
}
@@ -297,56 +310,63 @@ page {
}


.game-entry{
.game-entry {
width: 690rpx;
height: 140rpx;
margin: 10rpx auto 0;
}
.gameimg{

.gameimg {
display: block;
width: 100%;
height: 140rpx;
}
.refund{

.refund {
display: inline-block;
font-size: 26rpx!important;
color: red!important;
font-size: 26rpx !important;
color: red !important;
border: 1px solid red;
padding: 3rpx;
}

.closeRq{
.closeRq {
position: absolute;
width: 420rpx;
width: 420rpx;
height: 420rpx;
line-height: 420rpx;
text-align: center;
background-color: rgba(0, 0, 0, 0.8);
left: 50%; top: 42%;
transform: translate(-50%, -50%); /* 50%为自身尺寸的一半 */
left: 50%;
top: 42%;
transform: translate(-50%, -50%);
/* 50%为自身尺寸的一半 */
z-index: 10000000;
color: #fff;
font-size: 38rpx;
}
.updataRqCode{

.updataRqCode {
width: 80rpx !important;
height: 80rpx;
margin-top: calc(50%-80rpx) !important;
margin-left: calc(50%-80rpx) !important;
display: inline-block !important;
}
.upDataRq{

.upDataRq {
position: absolute;
width: 100%;
text-align: center;
height: 80rpx;
color: #fff ;
color: #fff;
top: 20%;
left: 0;
}

/* .upDataRqImg{
width: 40rpx !important;
height: 40rpx;
float: left;
margin: 20rpx 0 0 20rpx !important;
} */
} */

+ 21
- 20
pages/orderquanma/index.wxml 查看文件

@@ -1,11 +1,11 @@
<navbar home back text="兑换码" background="#fff"></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<view class='couponBox' >
<view class='couponBox'>
<view class="couponbg">
<view class="title">{{title}}</view>
<!-- <view class="subtitle">{{subtitle}}</view> -->
<image class='line' src='{{topLineUrl}}' mode="widthFix"></image>
<!--
couponorderstatus
0 未使用
@@ -14,27 +14,28 @@
3 已经退款
-->

<view class="zhuangtai">
<view class="zhuangtai">
<image wx:if="{{couponorderstatus==1}}" src="{{wm01Url}}" mode='widthFix'></image>
<image wx:if="{{couponorderstatus==2}}" src="{{wm02Url}}" mode='widthFix'></image>
<image wx:if="{{couponorderstatus==3}}" src="{{wm03Url}}" mode='widthFix'></image>
<image wx:if="{{couponorderstatus==0&&validStatus==0}}" src="{{wm04Url}}" mode='widthFix'></image>
<view class="panel" wx:if="{{couponorderstatus==0&&validStatus!=0}}">
<view class="canWrap">
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" />
</view>
<image src="{{tempFilePath}}" mode="aspectFit" />
<view class="closeRq" wx:if="{{showhieRq}}" bindtap="setRq">
<image class="updataRqCode" mode='widthFix' src="{{upDataRqUrlF}}"></image>
<view class="upDataRq">点一点刷新二维码</view>
</view>
<view class="coedTiem" wx:if="{{!showhieRq&&expiredSeconds>1}}">二维码在
<text style="color:red">{{expiredSeconds}}s</text>
后失效
</view>
<view class="barnum">
<view class="barnumtext">{{showIdFalg?code:codeS}}</view>
<image class="barnumImg" src="../../assets/images/password.png" bindtap="showId"></image>
<view class="canWrap">
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" />
</view>
<image src="{{tempFilePath}}" mode="aspectFit" />
<view class="closeRq" wx:if="{{showhieRq}}" bindtap="setRq">
<image class="updataRqCode" mode='widthFix' src="{{upDataRqUrlF}}"></image>
<view class="upDataRq">点一点刷新二维码</view>
</view>
<view class="coedTiem" wx:if="{{!showhieRq&&expiredSeconds>1}}">二维码在
<text style="color:red">{{expiredSeconds}}s</text>
后失效
</view>
<view class="barnum">
<view class="barnumtext">{{showIdFalg?code:codeS}}</view>
<image wx:if="{{!showIdFalg}}" class="barnumImg" src="../../assets/images/password-show.png" bindtap="showId"></image>
<image wx:if="{{showIdFalg}}" class="barnumImg" src="../../assets/images/password-close.png" bindtap="showId"></image>
</view>
</view>
</view>
@@ -56,10 +57,10 @@
</view>
</view>
<view class='game' bindtap="gotogame" wx-if="{{showIf}}">
<view class='game-entry'>
<view class='game-entry'>
<image src="{{staticGamedata.imgUrl}}" class='gameimg' mode='widthFix'></image>
<text>用户专享神秘礼物</text>
<text>独家福利,抢完即止</text>
</view>
</view>
</view>
</view>

Loading…
取消
儲存