From 0f787e399b926b6d47a49cb161f3a79f695bcf53 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 6 Mar 2023 16:11:59 +0800
Subject: [PATCH] upup

---
 config.js                                     |  8 +--
 .../pages/shopDetail/shopDetail.vue           | 12 ++--
 .../pages/commonService/serviceDetail.vue     | 10 +--
 pages/active/detail.vue                       | 72 ++++++++++++++++---
 4 files changed, 81 insertions(+), 21 deletions(-)

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/packages/packageBuy/pages/shopDetail/shopDetail.vue b/packages/packageBuy/pages/shopDetail/shopDetail.vue
index 0d69d18..1230f9b 100644
--- a/packages/packageBuy/pages/shopDetail/shopDetail.vue
+++ b/packages/packageBuy/pages/shopDetail/shopDetail.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view :class="showPop?'noscroll content':'content'">
 		<view class="detailTop">
 			<image class="banner" mode="scaleToFill" :src="info.poster"></image>
 		</view>
@@ -646,7 +646,6 @@
 			},
 			toBuy() {
 				let user_info = weixin.getUserInfoCache();
-
 				if (weixin.isNull(user_info.user_info.phone)) {
 					this.showPhone = true;
 					return false;
@@ -695,7 +694,7 @@
 					api: '/api/member/order-add',
 					method: 'POST',
 					data: this.form,
-					utilSuccess: r => {
+					utilSuccess: r => {
 						if (parseFloat(r.data.total) == 0) {
 							uni.redirectTo({
 								url: '../buyMemberSuccess/buyMemberSuccess?id=' +
@@ -747,7 +746,7 @@
 							})
 						}
 					},
-					utilFail: r => {
+					utilFail: r => {
 						uni.showModal({
 							title: '',
 							content: r,
@@ -828,7 +827,10 @@
 	button::after {
 		border: none
 	}
-
+	.noscroll{
+		overflow: hidden;
+		position: fixed;
+	}
 	.userBoxBottomPass {
 		font-size: 28rpx;
 		text-align: center;
diff --git a/packages/packageCarecenter/pages/commonService/serviceDetail.vue b/packages/packageCarecenter/pages/commonService/serviceDetail.vue
index 1a14981..bc64c66 100644
--- a/packages/packageCarecenter/pages/commonService/serviceDetail.vue
+++ b/packages/packageCarecenter/pages/commonService/serviceDetail.vue
@@ -12,12 +12,12 @@
 				</swiper>
 
 				<view class="service-show-btn">
-					<view class="service-show-btn-img" @click="showFlag = 1">
+					<view class="service-show-btn-img" @click="clickFlag(1)">
 						<image src="../../static/pic.png">
 						</image>
 						<view class="service-show-btn-img__num">{{detail.picture.length}}</view>
 					</view>
-					<view class="service-show-btn-video" v-if="detail.video_file" @click="showFlag = 0">
+					<view class="service-show-btn-video" v-if="detail.video_file" @click="clickFlag(0)">
 						<image src="../../static/video.png">
 						</image>
 						<view class="service-show-btn-img__num">1</view>
@@ -137,7 +137,7 @@
 				</view>
 
 				<view class="service-product-detail">
-					<view v-for="(item,index) in detail.confinement_product" :key="index"
+					<view v-for="(item,index) in detail.product" :key="index"
 						class="service-product-detail-item" @click="toProduct(item.id)">
 						<u-image :src="item.cover_picture" width="330" height="360" border-radius="20rpx 20rpx 0 0 "
 							@load="$u.debounce(init,500)">
@@ -315,7 +315,9 @@
 					scrollTop: item.height
 				})
 			},
-
+			clickFlag(type){
+				this.showFlag = type
+			},
 			featuredLabelSplit(res) {
 				if (res) {
 					return res.split(",")
diff --git a/pages/active/detail.vue b/pages/active/detail.vue
index eda8c0d..e0df07e 100644
--- a/pages/active/detail.vue
+++ b/pages/active/detail.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view :class="showPop?'noscroll content':'content'">
 		<view class="detailTop">
 			<image class="banner" mode="scaleToFill" :src="info.active_playbill || '/static/750x500.jpg'"></image>
 		</view>
@@ -228,18 +228,48 @@
 							</radio-group>
 						</view>
 					</view>
+					<view class="formCol">
+						<view>宝宝生日/预产期<text style="color:red">*</text></view>
+						<view class="formRight">
+							<picker mode="date" :value="form.budget_date" @change="bindDateChange">
+								<view class="uni-input">{{form.budget_date}}</view>
+							</picker>
+						</view>
+					</view>
+					
+					<view class="formCol">
+						<view>所属区域<text style="color:red">*</text></view>
+						<view class="formRight">
+							<picker :value="rindex" @change="bindRegionChange" :range="arrRegion">
+								<view class="uni-input">{{arrRegion[rindex]}}</view>
+							</picker>
+							<!-- <input type="text" v-if="rindex!=0" v-model="form.address" style="margin-top: 10rpx;"
+								placeholder="请输入具体街道/地址"> -->
+						</view>
+					</view>
 					<view class="formCol">
 						<view>地址<text style="color:red">*</text></view>
 						<view class="formRight"><input type="text" v-model="form.address" placeholder="地址"></view>
 					</view>
 					<view class="formCol">
-						<view>宝宝生日/预产期<text style="color:red">*</text></view>
+						<view>建卡医院<text style="color:red">*</text></view>
 						<view class="formRight">
-							<picker mode="date" :value="form.budget_date" @change="bindDateChange">
-								<view class="uni-input">{{form.budget_date}}</view>
+							<picker :value="hindex" @change="bindHospitalChange" :range="arrHospital">
+								<view class="uni-input">{{arrHospital[hindex]}}</view>
 							</picker>
+					
+							<input type="text" v-if="arrHospital[hindex]=='其他'" v-model="info.hospital"
+								style="margin-top: 10rpx;" placeholder="请输入具体建卡医院">
 						</view>
 					</view>
+					
+					<view class="formCol">
+						<view>备注信息</view>
+						<view class="formRight">
+							<u-input v-model="form.member_comment" border="true" type="textarea" placeholder="备注信息" />
+						</view>
+					</view>
+					
 				</scroll-view>
 				<view class="payBtn" @click="toBuy">立即参加</view>
 			</view>
@@ -326,10 +356,16 @@
 					budget_date: '',
 					address: ''
 				},
-				isOrder:false,
-				isOrderText:"",
+				
+				arrHospital: ["请选择建卡医院", "市立医院", "苏大附一院", "苏大附二院", "中医院", "第五人民医院", "苏州市第七人民医院", "明基医院", "九龙医院", "娄葑医院",
+					"吴中人民医院", "甪直人民医院", "相城人民医院", "相城区第二人民医院", "吴江第一人民医院", "吴江第二人民医院", "盛泽医院", "其他"
+				],
+				arrRegion: ["请选择区域", "吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
 				rindex: 0,
 				hindex: 0,
+				
+				isOrder:false,
+				isOrderText:"",
 				openid: "",
 				showPop: false,
 
@@ -503,7 +539,16 @@
 					})
 				}
 			},
-
+			bindRegionChange: function(e) {
+				this.rindex = e.target.value;
+				this.form.area = this.arrRegion[e.target.value];
+			},
+			bindHospitalChange: function(e) {
+				this.hindex = e.target.value;
+				if (this.arrHospital[e.target.value] != '其他') {
+					this.form.hospital = this.arrHospital[e.target.value];
+				}
+			},
 			getPoster: function() {
 				var that = this;
 				uni.getImageInfo({
@@ -765,6 +810,14 @@
 						this.alert('请输入会员姓名')
 						return
 					}
+					if (weixin.isNull(this.form.area)) {
+						this.alert('请选择区域')
+						return
+					}
+					if (weixin.isNull(this.form.hospital)) {
+						this.alert('请选择建卡医院')
+						return
+					}
 					if (weixin.isNull(this.form.budget_date)) {
 						this.alert('请选择预产日期')
 						return
@@ -887,7 +940,10 @@
 	button::after {
 		border: none
 	}
-
+	.noscroll{
+		overflow: hidden;
+		position: fixed;
+	}
 	.userBoxBottomPass {
 		font-size: 28rpx;
 		text-align: center;