diff --git a/App.vue b/App.vue
index 37ecc9e..9f884c5 100644
--- a/App.vue
+++ b/App.vue
@@ -278,4 +278,5 @@
bottom: 0;
}
/*#endif*/
+
diff --git a/pages/activity/collect_coupons/index.vue b/pages/activity/collect_coupons/index.vue
index 1b3a4b7..cdd811d 100644
--- a/pages/activity/collect_coupons/index.vue
+++ b/pages/activity/collect_coupons/index.vue
@@ -136,8 +136,13 @@
limit: this.limit
}).then(res=>{
console.log(res)
- let couponGetList = res.data.list.filter(item=>{
- return !item.issue.coupon_id //未领取
+ let couponGetList =[]
+ couponGetList = res.data.list.filter(item=>{
+ // if(item.issue){
+ // return !item.issue.coupon_id //未领取
+ // }
+ return !item.issue
+
})
//couponGetList 未领取的数量
console.log(couponGetList)
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 665b0ac..af09a4b 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -264,6 +264,18 @@
+
+
+
+
+
+ 生成海报
+
+
+
@@ -398,7 +410,8 @@
share_point:0,
contribution:0,
huitong:0,
- }
+ },
+ show:false
}
},
@@ -431,10 +444,32 @@
this.showSkeleton = false
}, 500)
},
+ onShareAppMessage(res) {
+ console.log(this.userInfo)
+ //console.log('onShareAppMessage',res);
+ return {
+ title: '惠通商城',
+ path: '/pages/index/index?spread=' + this.userInfo.uid
+ }
+ },
methods: {
+
+ closeHandle(){
+ this.show = false
+ },
+ goPoster(){
+ uni.navigateTo({
+ url:'/pages/users/user_spread_code/index'
+ })
+ },
authTo(url){
+ console.log(url,"==")
if(this.isLogin){
+ if(url=='invite'){
+ this.show = true;
+ return
+ }
uni.navigateTo({
url
})
@@ -576,7 +611,7 @@
that.is_promoter = res.data.is_promoter;
that.extension_status = res.data.extension_status;
Object.keys(res.data.assets).forEach(item=>{
- that.$set(that.assets,item,res.data.assets[item])
+ that.$set(that.assets,item,Math.floor(res.data.assets[item]));
})
@@ -820,7 +855,7 @@
width: 25%;
text-align: center;
.num {
- font-size: 42rpx;
+ font-size: 38rpx;
font-weight: bold;
}
.txt {
@@ -1210,4 +1245,24 @@
font-size: 24rpx;
}
}
+ .popContent{
+ display: flex;
+ padding:30rpx 0;
+ .popItem{
+ flex:1;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ image{
+ width:100rpx;
+ height:100rpx;
+ }
+ text{
+ margin-top:20rpx;
+ font-size: 28rpx;
+ color: #333333;
+ }
+ }
+ }
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index cb509d2..35a15b0 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -322,6 +322,22 @@
+
+
+
+ 福利积分支付
+
+
+ 当前积分{{userInfo.assets.welfare}}
+ 使用了{{integral_count}}个积分，抵扣{{integral_price}}元
+
+
+
+
+
@@ -339,7 +355,7 @@
店铺优惠金额：
-￥{{coupon_price}}
-
+
平台优惠券
@@ -1512,10 +1528,12 @@
data.takes.push(el.mer_id)
}
})
- if (data.payType == 'balance' && parseFloat(that.userInfo.now_money) < parseFloat(that.totalPrice))
+ // if (data.payType == 'balance' && parseFloat(that.userInfo.now_money) < parseFloat(that.totalPrice))
+ if (data.payType == 'balance' && parseFloat(that.userInfo.assets.welfare) < parseFloat(that.totalPrice))
return that.$util
.Tips({
- title: '余额不足！'
+ // title: '余额不足！'
+ title: '积分不足！'
});
uni.showLoading({
title: '订单支付中',
@@ -2361,4 +2379,5 @@
height: 756rpx;
overflow-y: scroll;
}
+
diff --git a/static/images/v1.png b/static/images/v1.png
new file mode 100644
index 0000000..d6f0b17
Binary files /dev/null and b/static/images/v1.png differ
diff --git a/static/images/v2.png b/static/images/v2.png
new file mode 100644
index 0000000..ea98346
Binary files /dev/null and b/static/images/v2.png differ