no message

pages/archives/add_archives.vue

@@ -18,10 +18,6 @@
 				<view class="title">联系电话:</view>
 				<input type="number" v-model="phone" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入联系电话"></input>
 			</view>
-			<view class="cu-form-group">
-				<view class="title">电子邮箱:</view>
-				<input v-model="email" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入电子邮箱"></input>
-			</view>
 			<view class="cu-form-group">
 				<view class="title">出生医院:</view>
 				<input v-model="birthhospital" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入出生医院"></input>
@@ -61,6 +57,10 @@
 				<view class="title">就诊人身份证:</view>
 				<input v-model="idcrad" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入就诊人身份证号"></input>
 			</view>
+			<view class="cu-form-group">
+				<view class="title">电子邮箱:</view>
+				<input v-model="email" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入电子邮箱"></input>
+			</view>
 			<view class="cu-form-group">
 				<view class="title">社保卡号:</view>
 				<input v-model="social" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入社保卡号"></input>
@@ -125,7 +125,7 @@
 				email: "",
 				phone: "",
 				jianhuname: "",
-				imgList: '',
+				imgList: ['https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/%E5%A4%B4%E5%83%8F.png'],
 				name: "",
 				list: [{
 						name: '男',
@@ -248,13 +248,13 @@
 					})
 					return false
 				}
-				if (!this.$util.isEmail(this.email)) {
-					uni.showToast({
-						title: "请填写正确的邮箱",
-						icon: "none"
-					})
-					return false
-				}
+				// if (!this.$util.isEmail(this.email)) {
+				// 	uni.showToast({
+				// 		title: "请填写正确的邮箱",
+				// 		icon: "none"
+				// 	})
+				// 	return false
+				// }
 				if (this.birthhospital == "") {
 					uni.showToast({
 						title: "请填写正确的医院",
@@ -352,13 +352,13 @@
 					})
 					return false
 				}
-				if (!this.$util.isEmail(this.email)) {
-					uni.showToast({
-						title: "请填写正确的邮箱",
-						icon: "none"
-					})
-					return false
-				}
+				// if (!this.$util.isEmail(this.email)) {
+				// 	uni.showToast({
+				// 		title: "请填写正确的邮箱",
+				// 		icon: "none"
+				// 	})
+				// 	return false
+				// }
 				if (this.birthhospital == "") {
 					uni.showToast({
 						title: "请填写正确的医院",

pages/childcare/child_care.vue

@@ -3,7 +3,7 @@
 		<view class="cu-list menu">
 			<view class="cu-item arrow" @click="showpeople=true">
 				<view class="content">
-					<text class="text-grey">接种用户</text>
+					<text class="text-grey">儿保用户</text>
 				</view>
 				<view class="action">
 					<text class="text-grey text-sm">{{value}}</text>
@@ -124,7 +124,7 @@
 			return {
 				showpeople: false,
 				huanzheID: "",
-				value: "请选择接种用户",
+				value: "请选择儿保用户",
 				patientList: [],
 				show: false,
 				yuyuevalue: "请选择预约时间",

pages/doctor_related/doctor_info.vue

@@ -8,7 +8,8 @@
 						<view class="m-flex overflow mr10">
 							<view class="flex align-center">
 								<text class="dpb fb f16">{{doctor.name||''}}</text>
-								<text class="dpb f14 m-gray-small ml5" v-for="(itm,index) in doctor.label" :key="index">{{itm||''}}</text>
+								<text class="dpb f14 m-gray-small ml5" v-for="(itm,index) in doctor.label_texts" :key="index">{{itm.label_name||''}}</text>
+								
 							</view>
 							<view class="dpb m-flex margin-top-sm">科室：{{doctor.office.name||'暂无'}} {{doctor.qualification.name||'暂无'}}</view>
 							<view class="m-xend mt12">

pages/doctor_related/select_doctor.vue

@@ -32,7 +32,7 @@
 										<view class="content_right">
 											<view class="" style="display: flex;align-items: center;">
 												<text style="font-size: 32rpx; font-weight: bold;">{{item.name}}</text>
-												<text class="text_style" v-for="(itm,index) in item.label" :key="index">{{itm}}</text>
+												<text class="text_style" v-for="(itm,index) in item.label_texts" :key="index">{{itm.label_name}}</text>
 											</view>
 											<view class="m_gray_small">
 												科室：{{item.office.name||'暂无'}} {{item.qualification.name||'暂无'}}

pages/index/index.vue

@@ -104,7 +104,7 @@
 								<view class="content_right">
 									<view class="" style="display: flex;align-items: center;">
 										<text style="font-size: 32rpx; font-weight: bold;">{{item.name}}</text>
-										<text class="text_style" v-for="(itm,index) in item.label" :key="index">{{itm}}</text>
+										<text class="text_style" v-for="(itm,index) in item.label_texts" :key="index">{{itm.label_name}}</text>
 									</view>
 									<view class="m_gray_small">
 										科室：<text style="color:#333333;">{{item.office.name||'暂无'}} {{item.qualification.name||'暂无'}}</text>

pages/login/login.vue

@@ -53,7 +53,7 @@
 			<view class="footer">
 				<view class="flex align-center" @click="isqueren">
 					<image :src="imgitem.name" mode="" style="width: 30rpx;height: 30rpx;"></image>
-					<text style="color: #0B73B9;">《超级宝妈宝》</text>
+					<text style="color: #0B73B9;">《熙宝HMO》</text>
 					<text style="color: #999999;">服务协议</text>
 				</view>
 			</view>

pages/order/order.vue

@@ -53,6 +53,9 @@
 				// 产品类型
 				product_type: ''
 			}
+		},
+		mounted() {
+
 		},
 		methods: {
 			gotoindex() {
@@ -71,9 +74,16 @@
 				})
 			},
 			gotoservice() {
-				uni.navigateTo({
-					url: "../service_box/box_details"
+				uni.requestSubscribeMessage({
+					tmplIds: ['3F_-_C-y0g8cdKhhf-3vR7eid_4cbTd9h6QKVW4EG3Q'],
+					success: (res) => {
+						console.log(res)
+						uni.navigateTo({
+							url: "../service_box/box_details"
+						})
+					}
 				})
+
 			}
 		},
 		onShow() {

pages/service_packs/choicepacks.vue

@@ -11,7 +11,9 @@
 						<view class="tc_right">
 							<view style="width: 100%;">
 								<view class="text">{{item.intro}}</view>
-								<view class="text">{{item.desc}}</view>
+								<view class="text">
+									<text class="margin-right-sm text_style" v-for="(itm,idx) in item.label_texts" :key="idx">{{itm.name}}</text>
+								</view>
 								<view class="text">
 									<text style="text-align: left;">时长:{{item.effective_days}}天</text>
 									<text style="float: right;color: #FF4F61;font-weight: bold;">¥{{item.price/100}}</text>
@@ -84,7 +86,20 @@
 			filter: drop-shadow(0rpx 2rpx 12rpx 0rpx rgba(0, 0, 0, 0.04));
 		}
 	}
-
+	.text_style{
+		// display: flex;
+		// justify-content: center;
+		// align-items: center;
+		text-align: center;
+		display: inline-block;
+		font-weight: 400;
+		background-color: #E5F5FF;
+		color: #0B73B9;
+		width: 100rpx;
+		height: 28rpx;
+		font-size: 20rpx;
+		border-radius: 10rpx;
+	}
 	.tc_left {
 		display: flex;
 

pages/service_packs/introduce.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="footer">
 			<view class="cu-bar bg-white tabbar border shop" style="width: 100%;">
-				<button class="action" open-type="contact" style="width: 33%;">
+				<button class="action" @click="show = true" style="width: 33%;">
 					<view class="cuIcon-service text-green">
 					</view>
 					客服
@@ -13,6 +13,10 @@
 				<view class="submit" @click="next" style="background-color: #0B73B9; color: #FFFFFF;">选购服务包</view>
 			</view>
 		</view>
+		<u-popup v-model="show" mode="bottom" border-radius="14"  height="300rpx">
+			<u-button open-type="contact" :custom-style="customStyle">会话客服</u-button>
+			<u-button @click="playphone" :custom-style="customStyle">电话客服</u-button>
+		</u-popup>
 	</view>
 </template>
 
@@ -32,7 +36,11 @@
 		},
 		data() {
 			return {
-
+				show: false,
+				customStyle:{
+					width:'600rpx',
+					marginTop:"35rpx"
+				}
 			}
 		},
 		methods: {
@@ -54,7 +62,12 @@
 						}
 					})
 				}
-
+			},
+			playphone(){
+				uni.makePhoneCall({
+					phoneNumber:"123456"
+				})
+				this.show = false
 			}
 
 		}

pages/service_packs/packs_details.vue

@@ -32,13 +32,13 @@
 							<!-- 名字+标签 -->
 							<view class="name">
 								<view style="margin-right: 15rpx;">{{item.name}}</view>
-								<view class="label" v-for="(itm,idx) in item.label">{{itm}}</view>
+								<view class="label" v-for="(itm,idx) in item.label_texts" :key="idx">{{itm.label_name}}</view>
 							</view>
 							<!-- 科室 -->
 							<view class="department">
 								<text>科室:</text>
-								<text style="color: #333333;">{{item.office.name}}</text>
-								<text style="color: #333333;">{{item.qualification.name}}</text>
+								<text style="color: #333333;">{{item.office.name||'暂无'}}</text>
+								<text style="color: #333333;">{{item.qualification.name||'暂无'}}</text>
 							</view>
 							<!-- 选项 -->
 							<view class="option">
@@ -56,7 +56,7 @@
 			<view @click="isqueren" style="height: 35rpx;width: auto;font-size: 24rpx;margin-left: 30rpx;display: flex;align-items: center;">
 				<image :src="imgitem.name" mode="" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;"></image>
 				<text style="color: #999999;">已阅读并同意</text>
-				<text style="color: #0B73B9;">《超级宝妈宝》</text>
+				<text style="color: #0B73B9;">《熙宝HMO》</text>
 				<text style="color: #999999;">服务协议</text>
 			</view>
 		</view>
@@ -66,7 +66,7 @@
 		<!-- 底部按钮 -->
 		<view class="footer">
 			<view class="cu-bar bg-white tabbar border shop" style="width: 100%;">
-				<button class="action" open-type="contact" style="width: 33%;">
+				<button class="action" @click="show=true" style="width: 33%;">
 					<view class="cuIcon-service text-green">
 					</view>
 					客服
@@ -74,6 +74,10 @@
 				<view class="submit" @click="next" style="background-color: #0B73B9; color: #FFFFFF;">下一步</view>
 			</view>
 		</view>
+		<u-popup v-model="show" mode="bottom" border-radius="14"  height="300rpx">
+			<u-button open-type="contact" :custom-style="customStyle">会话客服</u-button>
+			<u-button @click="playphone" :custom-style="customStyle">电话客服</u-button>
+		</u-popup>
 	</view>
 </template>
 
@@ -97,10 +101,21 @@
 					name: "https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/xieyi.png"
 				},
 				packs: {},
-				serviceid: ""
+				serviceid: "",
+				show:false,
+				customStyle:{
+					width:'600rpx',
+					marginTop:"35rpx"
+				}
 			}
 		},
 		methods: {
+			playphone(){
+				uni.makePhoneCall({
+					phoneNumber:"123456"
+				})
+				this.show = false
+			},
 			//关注
 			submitCollect: async function(e) {
 				console.log(e)
@@ -152,6 +167,9 @@
 						title: '请先同意《协议》'
 					});
 				} else {
+					this.packs.label = []
+					this.packs.label_texts = []
+					console.log(this.packs)
 					uni.navigateTo({
 						url: '/pages/service_packs/packs_information?data=' + JSON.stringify(this.packs)
 					})