From 7dff9aa57aa876cb6f52aa95d12a47ffd2841e8e Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 13 Apr 2023 17:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=AB=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                    |   8 +-
 pages/active/active copy.vue | 475 -----------------------------------
 pages/active/detail.vue      |  10 +-
 3 files changed, 11 insertions(+), 482 deletions(-)
 delete mode 100644 pages/active/active copy.vue

diff --git a/config.js b/config.js
index 76bbd47..2968860 100644
--- a/config.js
+++ b/config.js
@@ -3,11 +3,11 @@ export const appConfig = {
 	//appId:"wx3dc65ce9b588727a",//孕育咨询
 	//baseUrl: 'http://yunyubang.localhost.com',
 	
-	 baseUrl:'https://yunyubang.ali251.langye.net',// 'https://yunyubang2021.langye.net', //孕育邦
-	// baseUrl: 'https://yybtest.ali251.langye.net',
+	 // baseUrl:'https://yunyubang.ali251.langye.net',// 'https://yunyubang2021.langye.net', //孕育邦
+	baseUrl: 'https://yybtest.ali251.langye.net',
 	
-	 newBaseUrl: 'https://yunyubang.ali251.langye.net',
-	// newBaseUrl: 'http://yybtest.ali251.langye.net',
+	 // newBaseUrl: 'https://yunyubang.ali251.langye.net',
+	newBaseUrl: 'http://yybtest.ali251.langye.net',
 	
 	//baseUrl:'https://yybtest2021.langye.net',//孕育咨询
 	openidInfoKey: 'openid_info_yunyubang'
diff --git a/pages/active/active copy.vue b/pages/active/active copy.vue
deleted file mode 100644
index 1061ad6..0000000
--- a/pages/active/active copy.vue	
+++ /dev/null
@@ -1,475 +0,0 @@
-<template>
-	<view class="content">
-		<view class="activeTop">
-			<view class="searchBox">
-				<view class="searchCol">
-					<view class="iconfont icon-search1"></view>
-					<input type="text" placeholder="请输入">
-				</view>
-				<view class="iconfont icon-w_location-"></view>
-			</view>
-			<view class="album_swiper">
-				<swiper :autoplay="autoplay" :interval="interval" :duration="duration" :indicator-dots="true" indicator-active-color="rgba(255,255,255,0.5)" indicator-color="rgba(255,255,255,1)">
-					<swiper-item v-for="item in ads" :key="item.id">
-						<image :src="item.pic"></image>
-					</swiper-item>
-				</swiper>
-			</view>			
-		</view>
-		<view class="menuBox">
-			<block v-for="item in indexNav" :key="item.id">
-				<view class="menuCol" @click="toAction(item)" data-id="-1">
-					<image :src="item.icon"></image>
-					<view>{{item.name}}</view>
-				</view>
-			</block>
-		</view>
-		<!--为您精选活动-->
-		<view class="introBox">
-			<view class="normal_tit">为您精选</view>
-			<view class="intro_row">
-				<view class="row_col" v-for="item in activityList.slice(0,2)" :key="item.id" @tap="gotoDetail(item.id)">
-					<view class="imgOuter">
-						<image mode="aspectFill" :src="item.active_playbill"></image>
-						<view class="date">{{item.end_at}}</view>
-					</view>
-					<view class="title">{{item.active_name}}</view>
-					<view class="subTit">{{item.address}}</view>
-					<view class="price">
-						<text class="font_red">{{ Number(item.money) > 0 ? `￥${item.money}` : '免费' }}</text>
-						{{`${item.total+item.start_member_sum}人参与`}}
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="termBox">
-			<view class="termOuter">
-				<view class="termCol cur">综合排序<text class="iconfont icon-arrowbottom"></text></view>
-				<view class="termCol">距离最近<text class="iconfont icon-arrowbottom"></text></view>
-				<view class="termCol">优质商户<text class="iconfont icon-arrowbottom"></text></view>
-				<view class="termCol">筛选<text class="iconfont icon-filter"></text></view>
-			</view>
-		</view>
-		<!--为您推荐福利&&服务-->
-		<view class="introBox hasMenu">
-			<view class="normal_tit padding_20">为您推荐</view>
-			<view class="intro_column" v-for="item in activityList" :key="item.id" @tap="gotoDetail(item.id)">
-				<view class="imgOuter"><image mode="aspectFill" :src="item.active_playbill"></image><view class="i_intro">推荐</view></view>
-				<view class="columnInfo">
-					<view class="title">{{item.active_name}}</view>
-					<view class="tags">
-						<text v-for="(sub, subIdx) in item.active_tag" :key="subIdx">{{sub}}</text>
-					</view>
-					<view class="subInfo">{{item.start_date}}～{{item.end_date}}</view>
-					<view class="subInfo">{{item.address}}</view>
-					<view class="price">
-						<text class="font_red" v-if="Number(item.money) > 0">￥{{item.money}}</text>
-						<text class="free" v-else>免费</text>
-						<view class="shareMoney" v-if="Number(item.money) > 0">
-							<text>分享金</text>{{ Number(item.money) }}元
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>		
-	</view>
-</template>
-
-<script>
-	import {weixin, login} from '../../utils/weixin.js';
-	export default {
-		data() {
-			return {
-				indicatorDots: true,
-				autoplay: true,
-				interval: 4000,
-				activityList: [],
-				activitySelect:{
-				    page:1,
-					page_size:5,
-					myself:0
-				},
-				indexNav: [],
-				serviceList: [],
-				ads: [],
-				page: 1,
-			}
-		},
-		onLoad() {
-			// login()
-		},
-		onShow() {
-			this.getAdS()
-			this.getActivityList()
-			this.getNav()
-			// this.getServiceList()
-		},
-		onReachBottom() {
-			this.getActivityList()
-		},
-		methods: {
-			toAction: function(item) {
-				console.log(item)
-				if (item.link) {
-					uni.redirectTo({
-						url: item.link
-					})
-				} else {
-					uni.showToast({
-						icon: "none",
-						title: "建设中"
-					})
-				}
-			},
-			async getNav(code) {
-				await weixin.request({
-					newUrl: true,
-					api: '/api/member/applet-menu-first/index',
-					data: {
-						page: 1,
-						page_size: 8,
-						sort_name: "sort_number",
-						sort_type: "asc"
-					},
-					utilSuccess: (res) => {
-						this.indexNav = res.data;
-					}
-				})
-			},
-			getActivityList() {
-				weixin.request({
-					api:"/api/member/active-list",
-					data:this.activitySelect,
-					utilSuccess:res => {
-						if(res.data.length > 0){
-							this.activitySelect.page ++
-						}else{
-							uni.showToast({
-								icon:'none',
-								title:"没有更多了"
-							})
-						}
-						if(this.activitySelect.page === 1){
-							this.activityList = res.data
-						}else{
-							this.activityList.push(...res.data)
-						}
-						console.log(res);
-						
-					},
-					utilFail:err => {
-						console.log(err);
-					}
-				})
-			},
-			getServiceList() {
-				// weixin.request({
-				// 	api:"/api/member/active-list",
-				// 	data:{
-						
-				// 	},
-				// 	utilSuccess:res => {
-				// 		console.log(res);
-				// 	},
-				// 	utilFail:err => {
-				// 		console.log(err);
-				// 	}
-				// })
-			},
-			getAdS() {
-				this.ads = []
-				weixin.request({
-					newUrl: true,
-					api: '/api/member/other/advertisement',
-					data: {
-						origin_system: 1
-					},
-					utilSuccess: (res) => {
-						res.map(item => {
-							if (item.type === 0) {
-								this.ads.push({
-									id: item.id,
-									pic: item.pic,
-									action: item.action
-								})
-							}
-						})
-					},
-					utilFail: (err) => {
-						console.log(err, 'err');
-					}
-				})
-			},
-			gotoDetail(id) {
-				uni.navigateTo({
-					url: `/pages/active/detail?id=${id}`
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background-color: #F6F6F6;
-	}
-	
-</style>
-<style lang="scss" scoped>	
-
-	.activeTop{
-		width:100%;
-		height:342rpx;
-		background: linear-gradient(180deg, #FF578A 0%, rgba(255, 87, 138, 0) 100%);		
-	}
-	.searchBox{
-		padding:20rpx 30rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-	.searchCol{
-		width: 600rpx;
-		height:72rpx;
-		background-color: #fff;
-		border-radius:36rpx;
-		position: relative;
-		line-height:72rpx;
-		padding:0 30rpx;
-		box-sizing: border-box;
-	}
-	.searchCol .iconfont{
-		color:#999;
-		font-size:25rpx;
-	}
-	.searchCol input{
-		position: absolute;
-		width:100%;
-		height:100%;
-		top:0;
-		left:0;
-		background: translate;
-		padding:0 70rpx;
-		box-sizing: border-box;
-		font-size:24rpx;
-	}
-	.icon-w_location-{
-		font-size:50rpx;
-		color:#fff;
-	}
-	.album_swiper{
-		width:690rpx;
-		height:220rpx;
-		border-radius:20rpx;
-		margin: 0 auto;
-		swiper{
-			height:calc(690rpx/3.13);
-			border-radius:20rpx;
-			image{
-				height:100%;
-				border-radius:20rpx;
-			}
-		}		
-	}	
-	.menuBox{
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-evenly;
-		align-items: center;
-		width:690rpx;
-		margin:0 auto 10rpx auto;
-		box-sizing: border-box;
-		.menuCol{
-			width:25%;
-			text-align: center;
-			font-size:24rpx;
-			color:#333;
-			margin-top:34rpx;
-			image{
-				display: block;
-				width:94rpx;
-				height:94rpx;
-				margin: 0 auto 10rpx auto;
-			}
-		}
-	}
-	.introBox{
-		width:710rpx;
-		margin:20rpx auto 0 auto;
-		border-radius: 16rpx;
-		background: #fff;
-		padding:0 35rpx;
-		box-sizing: border-box;
-	}
-	.intro_row{
-		display: flex;
-		justify-content: space-between;
-		width:100%;
-	}
-	.row_col{
-		width:310rpx;
-		border-radius: 8rpx;
-		padding-bottom:20rpx;
-		.imgOuter{
-			width:310rpx;
-			height:230rpx;
-			position: relative;
-			image{
-				width:310rpx;
-				height:230rpx;
-				border-radius:8rpx 8rpx 0 0;
-			}	
-			.date{
-				background-color: rgba(0,0,0,0.3);
-				font-size:20rpx;
-				color:#fff;
-				line-height:32rrpx;
-				padding:0 8rpx;
-				border-radius: 5rpx;
-				position: absolute;
-				left: 20rpx;
-				bottom:20rpx;
-				font-weight:500;
-			}
-		}
-		.title{
-			width:100%;
-			font-size:28rpx;
-			color:#333;
-			font-weight:500;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			padding-top:20rpx;
-		}
-		.subTit{
-			width:100%;
-			font-size:22rpx;
-			color:#333;
-			font-weight:400;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			padding-top:10rpx;
-		}	
-		.price{
-			margin-top:20rpx;
-			font-size:22rpx;
-			color:#999;
-			text{
-				font-size:32rpx;
-				font-weight:400;
-				padding-right:15rpx;
-			}
-		}
-	}
-	.introBox .intro_column:last-child{border-bottom:none;}
-	.intro_column{
-		display: flex;
-		justify-content: flex-start;
-		padding:20rpx 0;
-		border-bottom:2rpx solid #EAEAEA;
-		.imgOuter{
-			width: 260rpx;
-			height:210rpx;
-			position: relative;
-			image{width:260rpx;height:210rpx;border-radius:5rpx;}
-			.i_intro{position: absolute;top:0;left:0;width: 68rpx;height: 32rpx;background: #FF578A;border-radius: 5rpx 0px 18rpx 5rpx;font-size: 22rpx;font-weight: 400;color: #FFFFFF;line-height: 32rpx;text-align: center;}	
-		}
-		.columnInfo{
-			width:360rpx;
-			margin-left:22rpx;
-			.title{
-				width:100%;
-				font-size:30rpx;
-				font-weight:bold;
-				color:#333;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;				
-			}
-			.tags text{
-				height: 28rpx;
-				background: rgba(255,177,62,0.1);
-				border-radius: 4rpx;
-				line-height:28rpx;
-				font-size:20rpx;
-				padding: 0 10rpx;
-				margin-right:10rpx;
-				color:#FF753E;
-			}
-			.subInfo{
-				width:100%;
-				font-size:24rpx;
-				color:#999;
-				font-weight:400;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				padding-top:5rpx;	
-				.font_red{margin-left:10rpx;}
-			}
-			.price{
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				align-content: center;
-				margin-top:8rpx;
-				text{margin-right:10rpx;}
-				.shareMoney{
-					height: 28rpx;
-					border:2rpx solid #FF578A;
-					border-radius: 4rpx;
-					line-height:28rpx;
-					font-size:20rpx;
-					margin-right:10rpx;
-					padding-right:10rpx;
-					color:#FF578A;
-					display: flex;
-					flex-direction: flex-start;
-					text{background: #FF578A;color:#fff;padding: 0 10rpx;}
-				}
-				.free{
-					height: 28rpx;
-					background: #FF753E;
-					border-radius: 4rpx;
-					line-height:28rpx;
-					font-size:20rpx;
-					padding: 0 10rpx;
-					margin-right:10rpx;
-					color:#fff;					
-				}
-			}
-			
-		}		
-	}
-	.termBox{
-		width: 750rpx;
-		height: 200rpx;
-		background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(255, 255, 255, 0.8) 70%, rgba(255, 255, 255, 0) 100%);
-		border-radius: 40rpx 40rpx 0px 0px;
-		margin-top:20rpx;
-		.termOuter{
-			display: flex;
-			align-items: center;
-			align-content: center;
-			justify-content: flex-start;
-			.termCol{
-				width:27%;
-				text-align:center;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #333333;	
-				padding-top:36rpx;
-				.iconfont{font-size: 24rpx;color: #666666;line-height:28rpx;margin-left:8rpx;}
-				
-			}
-			.termCol.cur{
-				color:#FF578A;
-				.iconfont{color: #FF578A;}
-			}
-			.termCol:last-child{width:19%;}
-			
-		}
-	}
-	.hasMenu{margin-top:-100rpx;}
-</style>
diff --git a/pages/active/detail.vue b/pages/active/detail.vue
index 3e09de4..2129bec 100644
--- a/pages/active/detail.vue
+++ b/pages/active/detail.vue
@@ -363,7 +363,8 @@
 					sex: "",
 					phone: "",
 					budget_date: '',
-					address: ''
+					address: '',
+					spread_member_id:''
 				},
 				
 				arrHospital: ["请选择建卡医院", "市立医院", "苏大附一院", "苏大附二院", "中医院", "第五人民医院", "苏州市第七人民医院", "明基医院", "九龙医院", "娄葑医院",
@@ -449,7 +450,7 @@
 				this.form.promotion = options.promotion_id;
 				uni.setStorageSync("base_promotion_id", options.promotion_id)
 			}
-
+			
 
 
 
@@ -852,8 +853,11 @@
 				this.form.merchant_id = this.info.shop_id
 				this.form.active_id = this.info.id
 				this.form.active_name = this.info.active_name
+				if(this.form.promotion){
+					this.form.spread_member_id = this.form.promotion
+				}
 				console.log(this.form)
-				return
+				// return
 				weixin.request({
 					method: 'POST',
 					api: "/api/member/active-apply",