diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 00b2ae1..981114e 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -334,7 +334,7 @@ Page({
} else {
that.setData({
clock02: "00",
- day02: "00",
+ day02: "0",
hour02: "00",
min02: "00",
sec02: "00",
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 6f0317e..07df23f 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -43,7 +43,7 @@
剩余{{data.remainInventory}}件
- 砍价活动将于{{day02+'天'+hour02+':'+min02+':'+sec02}}后准时开始
+ 砍价活动将于{{day02+'天'+hour02+':'+min02+':'+sec02}}后准时开始
有效期:自领取之日起
{{validDays}}天内有效(请在有效期内使用)
有效期:
diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js
index 96fad3c..b22df07 100644
--- a/pages/joinFrDpell/index.js
+++ b/pages/joinFrDpell/index.js
@@ -9,6 +9,7 @@ Page({
*/
data: {
teljpgUrl: imgurl.teljpg.url,
+ home: imgurl.home.url,
couponChannelId: '',
couponId: '',
data: [],
@@ -37,6 +38,11 @@ Page({
})
this.checkUser(options);
},
+ gotoIndex(){
+ wx.reLaunch({
+ url: '/pages/index/index',
+ })
+ },
/**
* 判断用户是否已经在团中
*/
@@ -225,7 +231,13 @@ Page({
})
.then(res => {
wx.hideLoading()
- _this.goToOrderGroup(orderId, res.data.orderGroupId, _this)
+ if (!orderGroupId) {
+ wx.navigateTo({
+ url: '/pages/order/detail/index?orderId=' + res.data.id,
+ })
+ } else {
+ _this.goToOrderGroup(orderId, res.data.orderGroupId, _this)
+ }
})
.catch(err => {
console.log(err);
diff --git a/pages/joinFrDpell/index.wxml b/pages/joinFrDpell/index.wxml
index 3f805ba..b20c802 100644
--- a/pages/joinFrDpell/index.wxml
+++ b/pages/joinFrDpell/index.wxml
@@ -33,8 +33,17 @@
去拼团
-->
+ 有效期:
+ {{data.validStartDate}}至{{data.validEndDate}}(请在有效期内使用)
+
+
+ 限购条件:
+ 每人{{data.useLimitQuantity}}张
+ (支持过期自动退款)
+ (不支持过期自动退款)
+
- 商品详情:
+ 购买须知:
{{data.remark}}
@@ -51,6 +60,7 @@
+
{{data.price}}
diff --git a/pages/joinFrDpell/index.wxss b/pages/joinFrDpell/index.wxss
index f005301..a0a9fe6 100644
--- a/pages/joinFrDpell/index.wxss
+++ b/pages/joinFrDpell/index.wxss
@@ -161,7 +161,7 @@
}
.edit-left{
float: left;
- width: 330rpx;
+ width: 269rpx;
height: 95rpx;
background:rgba(255,169,2,1);
box-shadow:0px 8rpx 8rpx 1rpx rgba(255,169,2,0.32);
@@ -169,7 +169,7 @@
}
.edit-right{
float: right;
- width: 330rpx;
+ width: 269rpx;
height: 95rpx;
line-height: 46rpx;
background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
@@ -338,4 +338,77 @@
font-weight:500;
color:rgba(255,53,53,1);
line-height: 44rpx;
+}
+.goback {
+ float:left;
+ width:122rpx!important;
+ height:95rpx;
+ background:rgba(255,255,255,1);
+ line-height:95rpx;
+ border:1rpx solid rgba(227,227,227,1);
+ box-shadow:0px 8px 8px 1px rgba(189,189,189,0.32);
+ border-radius:48rpx;
+ margin-right:25rpx;
+}
+.goback image{
+ position:absolute;
+ width:60rpx;
+ left:0;
+ right:0;
+ top:0;
+ bottom:0;
+ margin:auto;
+ height: 80rpx;
+}
+.rest {
+ font-size: 24rpx;
+ color: #919191;
+ letter-spacing: 0;
+ height: 70rpx;
+ line-height: 70rpx;
+ /* border-bottom: 1px solid #eee; */
+ border-bottom: 1px solid #f9f9f9;
+}
+
+.restNum {
+ font-size: 24rpx;
+ color: #999;
+ letter-spacing: 1.16rpx;
+ text-align: right;
+}
+
+.time {
+ font-size: 24rpx;
+ color: #333;
+ letter-spacing: 0;
+ line-height: 33rpx;
+ display: inline-block;
+}
+
+.txt01 {
+ font-size: 24rpx;
+ color: #919191;
+ letter-spacing: 0;
+}
+
+.times {
+ display: inline-block;
+ color: #ff4949;
+ font-weight: bold;
+ font-size: 26rpx;
+ text-align: center;
+}
+
+.times text {
+ display: inline-block;
+ margin: 6rpx;
+ width: 46rpx;
+ height: 56rpx;
+ text-align: center;
+ font-size: 28rpx;
+ line-height: 60rpx;
+ border-radius: 12rpx;
+ color: #fff;
+ font-weight: bold;
+ background: #ff4949;
}
\ No newline at end of file
diff --git a/pages/spellDetail/index.js b/pages/spellDetail/index.js
index c1de2f7..1d25f61 100644
--- a/pages/spellDetail/index.js
+++ b/pages/spellDetail/index.js
@@ -232,14 +232,16 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
-
+ this.getUserInfo()
+ this.getDetail(this.data.paramData);
+ this.checkUser(this.data.paramData)
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
-
+
},
/**
* 用户点击右上角分享
diff --git a/pages/spellDetail/index.json b/pages/spellDetail/index.json
index 3aa8b3c..b88162e 100644
--- a/pages/spellDetail/index.json
+++ b/pages/spellDetail/index.json
@@ -1,5 +1,6 @@
{
"navigationBarTitleText": "拼团详情",
"usingComponents": {},
- "navigationBarBackgroundColor": "#F13C42"
+ "navigationBarBackgroundColor": "#F13C42",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/spellDetail/index.wxss b/pages/spellDetail/index.wxss
index efc908c..696f5cf 100644
--- a/pages/spellDetail/index.wxss
+++ b/pages/spellDetail/index.wxss
@@ -7,6 +7,9 @@ page {
background-size: cover;
background-repeat: no-repeat;
}
+.container{
+ margin-bottom:40rpx;
+}
.status{
width: 690rpx;
padding:0 28rpx;
diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js
index eb45621..66f93c3 100644
--- a/pages/spellGroup/mySpellGroup/index.js
+++ b/pages/spellGroup/mySpellGroup/index.js
@@ -2,6 +2,7 @@
var config = require("../../../config/config.js");
const Http = require("../../../utils/HttpBasics");
const imgurl = require("../../../utils/imgurl");
+const utils = require("../../../utils/util.js")
Page({
/**
@@ -152,7 +153,9 @@ Page({
}).then(res => {
let data = res.data;
data.price = (data.price / 100).toFixed(2)
- data.salePrice = (data.salePrice / 100).toFixed(2)
+ data.salePrice = (data.salePrice / 100).toFixed(2);
+ data.validStartDate = utils.formatTime(data.validStartDate,'yyyy-MM-dd')
+ data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd')
that.setData({
data
});
@@ -187,6 +190,7 @@ Page({
* 支付订单更新
*/
payOrderUpdate: (orderId, payOrderId, status, reason, _this, orderGroupId) => {
+ console.log(orderGroupId,7777)
let that = this;
// 支付成功
Http.post({
@@ -200,7 +204,13 @@ Page({
})
.then(res => {
wx.hideLoading()
- _this.goToOrderGroup(orderId, res.data.orderGroupId, _this)
+ if (!orderGroupId){
+ wx.navigateTo({
+ url: '/pages/order/detail/index?orderId='+res.data.id,
+ })
+ }else{
+ _this.goToOrderGroup(orderId, res.data.orderGroupId, _this)
+ }
})
.catch(err => {
console.log(err);
diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml
index 9e261f8..77e7b47 100644
--- a/pages/spellGroup/mySpellGroup/index.wxml
+++ b/pages/spellGroup/mySpellGroup/index.wxml
@@ -10,6 +10,15 @@
【拼团购】{{data.pressLimitNum}}人拼团成功,单价仅需
{{data.salePriceStr}}元
+ 有效期:
+ {{data.validStartDate}}至{{data.validEndDate}}(请在有效期内使用)
+
+
+ 限购条件:
+ 每人{{data.useLimitQuantity}}张
+ (支持过期自动退款)
+ (不支持过期自动退款)
+
@@ -25,7 +34,7 @@
- 商品详情:
+ 购买须知:
{{data.remark}}
diff --git a/pages/spellGroup/mySpellGroup/index.wxss b/pages/spellGroup/mySpellGroup/index.wxss
index 21b7d6c..28b654b 100644
--- a/pages/spellGroup/mySpellGroup/index.wxss
+++ b/pages/spellGroup/mySpellGroup/index.wxss
@@ -316,4 +316,56 @@
margin: auto;
width: 50rpx;
height: 50rpx;
+}
+.rest {
+ font-size: 24rpx;
+ color: #919191;
+ letter-spacing: 0;
+ height: 70rpx;
+ line-height: 70rpx;
+ /* border-bottom: 1px solid #eee; */
+ border-bottom: 1px solid #f9f9f9;
+}
+
+.restNum {
+ font-size: 24rpx;
+ color: #999;
+ letter-spacing: 1.16rpx;
+ text-align: right;
+}
+
+.time {
+ font-size: 24rpx;
+ color: #333;
+ letter-spacing: 0;
+ line-height: 33rpx;
+ display: inline-block;
+}
+
+.txt01 {
+ font-size: 24rpx;
+ color: #919191;
+ letter-spacing: 0;
+}
+
+.times {
+ display: inline-block;
+ color: #ff4949;
+ font-weight: bold;
+ font-size: 26rpx;
+ text-align: center;
+}
+
+.times text {
+ display: inline-block;
+ margin: 6rpx;
+ width: 46rpx;
+ height: 56rpx;
+ text-align: center;
+ font-size: 28rpx;
+ line-height: 60rpx;
+ border-radius: 12rpx;
+ color: #fff;
+ font-weight: bold;
+ background: #ff4949;
}
\ No newline at end of file