Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master

pages/business/center/center.vue

@@ -166,6 +166,10 @@
 									url += `&rand=${result.rand}`;
 									url += `&time=${result.time}`;
 									this.$url(url);
+								}else if(result.u_id && result.a_id){
+									this.activityJoin(result);
+								}else if(result.u_id && result.no){
+									this.orderSelf(result);
 								}
 							}else{
 								this.$msg('不是有效的支付码');
@@ -185,6 +189,35 @@
 					new_data = str;
 				}
 				return new_data;
+			},
+			// 核销活动
+			activityJoin(result){
+				this.$http.post({
+					api: 'api/supplier/activity/join',
+					data: {
+						user_id: result.u_id,
+						activity_id: result.a_id
+					},
+					header: {
+						token: this.token
+					}
+				}).then(res => {
+					this.$msg(res.data.message || '核销失败');
+				})
+			},
+			// 自提
+			orderSelf(result){
+				this.$http.post({
+					api: `api/supplier/order/self/${result.no}`,
+					data: {
+						user_id: result.u_id
+					},
+					header: {
+						token: this.token
+					}
+				}).then(res => {
+					this.$msg(res.data.message || '自提核销成功');
+				})
 			}
 		}
 	}