diff --git a/pages/my/promation/activities/index.js b/pages/my/promation/activities/index.js
index f841ee7..cb0babb 100644
--- a/pages/my/promation/activities/index.js
+++ b/pages/my/promation/activities/index.js
@@ -11,6 +11,9 @@ Page({
activityId:'',
detailLoading:false,
getting:true,
+ hasProduct:false,
+ reveivedSuccess:false,
+
isShowModal:false,
errorMsg:''
@@ -20,14 +23,14 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- const { miniProgram } = wx.getAccountInfoSync();
- const envVersion = miniProgram.envVersion;
- if(envVersion=='develop'){
- this.setData({
- activityId:2
- })
- return;
- }
+ // const { miniProgram } = wx.getAccountInfoSync();
+ // const envVersion = miniProgram.envVersion;
+ // if(envVersion=='develop'){
+ // this.setData({
+ // activityId:2
+ // })
+ // return;
+ // }
this.setData({
activityId:options.id
});
@@ -45,6 +48,7 @@ Page({
});
this.setData({
isShowModal:true,
+ reveivedSuccess:true,
errorMsg:'恭喜您已领取成功！'
})
}).catch((e)=>{
@@ -58,9 +62,15 @@ Page({
})
},
navToIndex(){
- wx.reLaunch({
- url: '/pages/help/index/index',
- })
+ if(this.data.hasProduct){
+ wx.reLaunch({
+ url: '/pages/my/coupon/index',
+ })
+ }else{
+ wx.reLaunch({
+ url: '/pages/help/index/index',
+ })
+ }
},
/**
* 生命周期函数--监听页面初次渲染完成
@@ -73,14 +83,17 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
+ //放在onshow里是因为去登录回来之后要继续执行这些操作
this.setData({
detailLoading:true
})
commonApi.activities.detail(this.data.activityId).then((data)=>{
+ const hasProduct = !!data.coupons.find((item)=>item.coupon_type=='PRODUCT');
this.setData({
detailLoading:false,
getting:false,
- detail:data
+ detail:data,
+ hasProduct
});
return userApi.coupon.check(this.data.activityId);
}).then((data)=>{
diff --git a/pages/my/promation/activities/index.wxml b/pages/my/promation/activities/index.wxml
index e5c6489..e18ff3c 100644
--- a/pages/my/promation/activities/index.wxml
+++ b/pages/my/promation/activities/index.wxml
@@ -28,5 +28,7 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/order/detail-group/index.wxml b/pages/order/detail-group/index.wxml
index ab1226b..f380d73 100644
--- a/pages/order/detail-group/index.wxml
+++ b/pages/order/detail-group/index.wxml
@@ -3,16 +3,13 @@
bindrefresherrefresh="getOrderDetail" refresher-triggered="{{refresherTriggered}}"
enhanced show-scrollbar="{{false}}">
{{merchantOrderStatusKV[orderDetail.order.status]}}
-
-
-
- {{orderDetail.product_name}}
-
- {{item}}
-
-
- {{orderDetail.order_amount}}
+
+
+ 自提点
+ 3月2日
+
+ {{orderDetail.merchant.address}}
@@ -21,7 +18,7 @@
-
+
送货地址
@@ -46,27 +43,38 @@
+
+ 商品信息
+
+
+
+
+
+ {{orderDetail.product.name}}
+ x {{orderDetail.order.qty}}
+
+ {{orderDetail.product.product_price}}
+
+
+
+
订单信息
- 交易订单
- {{orderDetail.order_id}}
+ 订单编号
+ {{orderDetail.order.order_id}}
复制
-
- 订单状态
- {{merchantOrderStatusKV[orderDetail.status]}}
-
-
- 交易方式
- 微信支付
-
下单时间
- {{orderDetail.create_time}}
+ {{orderDetail.order.create_time}}
+
+
+ 订单金额
+ {{orderDetail.order.order_amount}}
diff --git a/pages/order/detail-group/index.wxss b/pages/order/detail-group/index.wxss
index 47adc0a..b6927e2 100644
--- a/pages/order/detail-group/index.wxss
+++ b/pages/order/detail-group/index.wxss
@@ -27,43 +27,35 @@
font-size:32rpx;
display: flex;
align-items: center;
+ justify-content: space-between;
+}
+.page-container .title .time{
+ font-size: 30rpx;
+}
+.page-container .title .yellow{
+ color:#FF8C12;
}
.page-container .spliter{
margin:24rpx 0;
}
-.prd-info{
+.address-self{
padding:46rpx 40rpx;
}
-.prd-info .head{
- display: flex;
+.address-self .address{
+ color:#555;
+ line-height: 1.4;
}
-.prd-info .head .image{
- width:120rpx;height:120rpx;
+.address-self .qrcode{
+ width:300rpx;height:300rpx;
+ margin: 60rpx auto 0;
}
-.prd-info .head .center{
- flex: 1;
-}
-.prd-info .head .money{
- margin-top:10rpx;
-}
-.prd-info .head .tags{
- margin-top:22rpx;
-}
-.prd-info .spliter{
- margin:20rpx 0 30rpx 0;
-}
-.prd-info .qrcode{
- width:400rpx;height:400rpx;
- margin: 54rpx auto 0;
- background-color: #999;
-}
-.prd-info .qrcode .image{
+.address-self .qrcode .image{
width:100%;height:100%;
vertical-align: middle;
}
-.prd-info .code-tips{
- font-size: 30rpx;
- color: #999999;
+.address-self .code-tips{
+ font-size: 28rpx;
+ color: #555;
text-align: center;
margin-top:30rpx;
}
@@ -82,6 +74,7 @@
.merchant .info{
display: flex;
align-items: center;
+ padding-top:16rpx;
}
.merchant .avatar{
width:84rpx;height:84rpx;
@@ -111,25 +104,44 @@
padding:4rpx;
}
+.product .info{
+ display: flex;
+}
+.product .avatar{
+ width:150rpx;height:150rpx;
+ border-radius: 12rpx;
+}
+.product .center{
+ flex:1;
+ margin-left:20rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ height: 130rpx;
+ padding:10rpx 0;
+}
+.product .c-top{
+ display:flex;
+ justify-content: space-between;
+}
+.product .c-top .qty{
+ font-size: 36rpx;
+ color: #888;
+}
+
.order-info .kv{
display: flex;
align-items: center;
height:58rpx;
}
-.order-info .spliter{
- margin:28rpx 0 18rpx 0;
-}
.order-info .kv .key{
- font-size: 26rpx;
color: #888888;
}
.order-info .kv .value{
- font-size: 28rpx;
+ font-size: 32rpx;
margin-left:30rpx;
flex:1;
- display:flex;
- align-items: center;
}
.order-info .kv .copy-area{
padding:10rpx;
@@ -142,14 +154,8 @@
line-height: 36rpx;
padding:0 14rpx;
}
-.order-info .kv .tag{
- border: 1rpx solid #ff0000;
- color: #ff0000;
- font-size: 24rpx;
- border-radius: 8rpx;
- line-height: 40rpx;
- padding:0 10rpx;
- margin-left: 32rpx;
+.order-info .money{
+ font-size: 36rpx;
}
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index a2e9e16..d594373 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -6,7 +6,7 @@
原因：
+ class="order-tips right-arrow" wx:if="{{(orderDetail.status==orderStatus.received||orderDetail.status==orderStatus.delivering)&&orderDetail.order_additional_fee&&orderDetail.order_additional_fee.result=='PENDING'}}">
申请：
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index 2d9b504..4c7ef73 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -188,15 +188,15 @@ Page({
skip:this.data.pager.tab3.pageIndex*this.data.pager.tab3.limit,
limit:this.data.pager.tab3.limit
}).then((data)=>{
- data.map((item)=>{
+ data.items.map((item)=>{
if(item.product_tags){
item.product_tags = item.product_tags.split(',');
}
});
if(this.data.pager.tab3.pageIndex==0){
- this.data.couponList = data;
+ this.data.couponList = data.items;
}else{
- this.data.couponList = this.data.couponList.concat(data);
+ this.data.couponList = this.data.couponList.concat(data.items);
}
this.data.pager.tab3.loading = false;
this.data.pager.tab3.pageIndex++;
diff --git a/pages/shop/index/index.wxss b/pages/shop/index/index.wxss
index 04e4509..f4c84a7 100644
--- a/pages/shop/index/index.wxss
+++ b/pages/shop/index/index.wxss
@@ -2,6 +2,7 @@
display: flex;
align-items: center;
padding: 10rpx 0;
+ white-space: nowrap;
}
.choose-community .icon{
width:16rpx;height:10rpx;