1

App.vue

@@ -278,4 +278,5 @@
 		bottom: 0;
 	}
 	/*#endif*/
+
 </style>

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)

pages/user/index.vue

@@ -264,6 +264,18 @@
 				</view>
 			</view>
 		</view>
+		<u-popup :show="show" mode="bottom"  @close="closeHandle">
+			<view class="popContent">
+				<button open-type="share" class="popItem">
+					<image src="/static/images/v1.png" mode=""></image>
+					<text>发送给朋友</text>
+				</button>
+				<view class="popItem" @click="goPoster">
+					<image src="/static/images/v2.png" mode=""></image>
+					<text>生成海报</text>
+				</view>
+			</view>
+		</u-popup>
 		
 	</view>
 </template>
@@ -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;
+			}
+		}
+	}
 </style>

pages/users/order_confirm/index.vue

@@ -322,6 +322,22 @@
 							</view>
 							
 						</view>
+						<view class='payItem item acea-row row-between-wrapper' style="padding:0;" v-if="open_integral && userInfo.integral>0 && order_type == 0">
+							<view class="name" style="display: flex;align-items: center;width:auto;">
+								<view class='iconfont animated icon-icon-test'></view>
+								福利积分支付
+							</view>
+							<view class='money' style="margin-right: -4px;font-size: 26rpx;color: #aaa;">
+								<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.assets.welfare}}</text></text>
+								<text v-else>使用了{{integral_count}}个积分，抵扣<text
+										class="pColor">{{integral_price}}元</text></text>
+								<checkbox-group class="checkbox integral_checked" name="isDefault" @change="changeIntegral">
+									<label>
+										<checkbox  style="transform:scale(0.7);border-radius: 50%;" :checked="use_integral ? true : false" />
+									</label>
+								</checkbox-group>
+							</view>
+						</view>
 						<!-- #endif -->
 					</view>
 				</view>
@@ -339,7 +355,7 @@
 					<view>店铺优惠金额：</view>
 					<view class='money'>-￥{{coupon_price}}</view>
 				</view>
-				<view class='item acea-row row-between-wrapper' v-if="open_integral && userInfo.integral>0 && order_type == 0">
+			<!-- 	<view class='item acea-row row-between-wrapper' v-if="open_integral && userInfo.integral>0 && order_type == 0">
 					<view>积分抵扣：</view>
 					<view class='money'>
 						<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.assets.welfare}}</text></text>
@@ -351,7 +367,7 @@
 							</label>
 						</checkbox-group>
 					</view>
-				</view>
+				</view> -->
 				<view class='item acea-row row-between-wrapper'
 					v-if="!seckillId && order_type != 3 && order_type != 4 && enabledPlatformCoupon">
 					<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
@@ -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;
 	}
+	
 </style>