疫苗，儿保更新

App.vue

@@ -38,6 +38,9 @@
 		},
 		onHide: function() {
 			console.log('App Hide')
+		},
+		globalData : {
+		    imService : null
 		}
 	}
 </script>

common/env.js

@@ -1,3 +1,3 @@
 export const envHost = 'https://t5.9026.com'; //开发环境
 // export const imgHost='https://www.juyinzhengxin.com/';
-export const imgHost = 'https://zhengda.oss-cn-chengdu.aliyuncs.com/juyin';
+export const imgHost = 'https://t5.9026.com/upload/';

pages/childcare/child_care.vue

@@ -9,6 +9,25 @@
 					<text class="text-grey text-sm">{{value}}</text>
 				</view>
 			</view>
+			<view class="cu-item arrow" @click="xuanzefuwu">
+				<view class="content">
+					<text class="text-grey">服务机构</text>
+				</view>
+				<view class="action">
+					<text class="text-grey text-sm">{{servicejigou}}</text>
+				</view>
+			</view>
+			<view class="padding-sm bg-white" v-if="doctor!=''">
+				<scroll-view scroll-x="true" enable-flex="true" style="display: flex;height: 145rpx;">
+					<view class="flex flex-direction align-center justify-center" @click="gotodoctorinfo(item.id)" style="width: 120rpx;height: 130rpx;"
+					 v-for="(item,index) in doctor.docter" :key="index">
+						<u-avatar :src="item.avatar" mode="circle"></u-avatar>
+						<view class="">
+							{{item.name}}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
 			<view class="cu-item arrow" @click="vaccinesList">
 				<view class="content">
 					<text class="text-grey">儿保项目</text>
@@ -26,25 +45,6 @@
 					<text class="text-grey text-sm">{{yuyuevalue}}</text>
 				</view>
 			</view>
-			<view class="cu-item arrow" @click="xuanzefuwu">
-				<view class="content">
-					<text class="text-grey">服务机构</text>
-				</view>
-				<view class="action">
-					<text class="text-grey text-sm">{{servicejigou}}</text>
-				</view>
-			</view>
-		</view>
-		<view class="padding-sm bg-white" v-if="doctor.docter.length!=0">
-			<scroll-view scroll-x="true" enable-flex="true" style="display: flex;height: 145rpx;">
-				<view class="flex flex-direction align-center justify-center" @click="gotodoctorinfo(item.id)" style="width: 120rpx;height: 130rpx;"
-				 v-for="(item,index) in doctor.docter" :key="index">
-					<u-avatar :src="item.avatar" mode="circle"></u-avatar>
-					<view class="">
-						{{item.name}}
-					</view>
-				</view>
-			</scroll-view>
 		</view>
 		<u-picker mode="multiSelector" @confirm="callbacktime" v-model="show" :default-selector='[0, 1]' range-key="start_time_period"
 		 :range="multiSelector"></u-picker>
@@ -101,7 +101,7 @@
 			})
 		},
 		onLoad() {
-			this.gettime()
+
 		},
 		onShow() {
 			let price = 0
@@ -113,9 +113,11 @@
 				this.childcare.forEach(item => {
 					price += item.price / 100
 				})
-				this.yimiao = price
+				this.yimiao = price.toFixed(2)
 			}
 			this.getarchives()
+			this.multiSelector = []
+			this.gettime()
 		},
 		onHide() {
 			this.yimiao = ""
@@ -156,7 +158,12 @@
 				}
 			},
 			gettime: async function() {
-				let res = await this.$request.post("/api/v1/docter/timePeriodList")
+				if (this.doctor == '') {
+					return false
+				}
+				let res = await this.$request.post("/api/v1/docter/timePeriodList", {
+					organization_id: this.doctor.id
+				})
 				console.log(res)
 				if (res.status == 0) {
 					res.data.list.forEach(item => {
@@ -183,11 +190,25 @@
 				})
 			},
 			vaccinesList() {
+				if (this.doctor == '') {
+					uni.showToast({
+						title: "请先选择机构",
+						icon: "none"
+					})
+					return false
+				}
 				uni.navigateTo({
-					url: "child_careList"
+					url: "child_careList?id=" + this.doctor.id
 				})
 			},
 			yuyuetime() {
+				if (this.doctor == '') {
+					uni.showToast({
+						title: "请先选择机构",
+						icon: "none"
+					})
+					return false
+				}
 				this.show = true
 			},
 			gotopay: async function() {
@@ -198,23 +219,23 @@
 					})
 					return false
 				}
-				if (this.yimiao == "") {
+				if (this.doctor == "") {
 					uni.showToast({
-						title: "请先选择儿保项目",
+						title: "请先选择机构",
 						icon: "none"
 					})
 					return false
 				}
-				if (this.timehour == "") {
+				if (this.yimiao == "") {
 					uni.showToast({
-						title: "请先选择预约时间",
+						title: "请先选择儿保项目",
 						icon: "none"
 					})
 					return false
 				}
-				if (this.doctor == "") {
+				if (this.timehour == "") {
 					uni.showToast({
-						title: "请先选择机构",
+						title: "请先选择预约时间",
 						icon: "none"
 					})
 					return false

pages/childcare/child_careList.vue

@@ -50,7 +50,8 @@
 
 <script>
 	export default {
-		onLoad() {
+		onLoad(options) {
+			this.org_id = options.id
 			this.getvaccinesList()
 		},
 		onShow() {
@@ -58,6 +59,7 @@
 		},
 		data() {
 			return {
+				org_id: "",
 				vaccineList: [],
 				keyword: "",
 				value: 0, //种类
@@ -122,7 +124,8 @@
 					page: this.pageindex,
 					name: this.keyword,
 					type: this.value,
-					sort_type: this.recommend
+					sort_type: this.recommend,
+					organization_id: this.org_id
 				})
 				if (res.status == 0) {
 					this.vaccineList = res.data.data
@@ -130,11 +133,11 @@
 						item.checked = false
 					})
 					console.log(this.vaccineList)
-					if (this.vaccineList.length == 0) {
-						this.show = true
-					} else {
-						this.show = false
-					}
+				}
+				if (this.vaccineList.length == 0) {
+					this.show = true
+				} else {
+					this.show = false
 				}
 			},
 			checkboxGroupChange(e) {},

pages/common_tools/home_doctor.vue

@@ -1,33 +1,33 @@
 <template>
 	<view style="height: 100%;width: 100%; padding: 20rpx 30rpx;">
-		<view class="list" v-for="item,index in doctorList" :key='index' @click.stop="clicklist" :data-id="item.docter.id"
+		<view class="list" v-for="item,index in doctorList" :key='index' @click.stop="clicklist" :data-id="item.id"
 		 :data-index="index">
 			<!-- 头像 -->
 			<view class="portrait">
 				<view style="padding-top: 20rpx;">
-					<image class="img" :src="item.docter.avatar"></image>
-					<view class="bun_true" @click.stop="follow" :data-index="index" :data-id="item.docter.id" v-if="item.docter.is_collect==0">关注</view>
-					<view class="bun_false" @click.stop="follow" :data-index="index" :data-id="item.docter.id" v-else>已关注</view>
+					<image class="img" :src="item.avatar"></image>
+					<view class="bun_true" @click.stop="follow" :data-index="index" :data-id="item.id" v-if="item.is_collect==0">关注</view>
+					<view class="bun_false" @click.stop="follow" :data-index="index" :data-id="item.id" v-else>已关注</view>
 				</view>
 			</view>
 			<!-- 文字 -->
 			<view class="text">
 				<!-- 名字+标签 -->
 				<view class="name">
-					<view style="margin-right: 15rpx;">{{item.docter.name}}</view>
-					<view class="label" v-for="(itm,idx) in item.docter.label" :key="index">{{itm}}</view>
+					<view style="margin-right: 15rpx;">{{item.name}}</view>
+					<view class="label" v-for="(itm,idx) in item.label_texts" :key="index">{{itm.label_name}}</view>
 				</view>
 				<!-- 科室 -->
 				<view class="department">
 					<text>科室:</text>
-					<text style="color: #333333;">{{item.docter.office.name}}</text>
-					<text style="color: #333333;">{{item.docter.qualification.name}}</text>
+					<text style="color: #333333;">{{item.office.name||'暂无'}}</text>
+					<text style="color: #333333;">{{item.qualification.name||'暂无'}}</text>
 				</view>
 				<!-- 选项 -->
 				<view class="option">
-					<view v-if="item.docter.is_chat==1">图文</view>
-					<view v-if="item.docter.is_phone==1">电话</view>
-					<view v-if="item.docter.is_appoint==1">门诊</view>
+					<view v-if="item.is_chat==1">图文</view>
+					<view v-if="item.is_phone==1">电话</view>
+					<view v-if="item.is_appoint==1">门诊</view>
 				</view>
 			</view>
 		</view>
@@ -93,8 +93,9 @@
 				}
 			},
 			gethome_doctor: async function() {
-				let res = await this.$request.post("/api/v1/user/familyDocterList", {
-					page: this.pageindex
+				let res = await this.$request.post("/api/v1/docter/docterList", {
+					page: this.pageindex,
+					is_pack_docter:1
 				})
 				console.log(res)
 				if (res.status == 0) {
@@ -113,6 +114,7 @@
 				} else {
 					this.show = false
 				}
+				console.log(this.doctorList)
 			},
 			clicklist(e) {
 				uni.navigateTo({

pages/common_tools/me_order/me_order.vue

@@ -34,10 +34,27 @@
 		methods: {
 			//关注
 			list(item) {
-				uni.navigateTo({
-					url: '/pages/common_tools/me_order/order_details?data=' + JSON.stringify(item)
-					// url: '/pages/customer/customer-datails?n=' + n
+				uni.showLoading({
+					title: "加载中，请等待"
 				})
+				uni.downloadFile({
+					url: item.order_pack.insurance_img_url,
+					success(res) {
+						console.log(res)
+						let data = res.tempFilePath;
+						uni.openDocument({
+							filePath: data,
+							fileType: 'pdf',
+							success: (res) => {
+								uni.hideLoading()
+							}
+						})
+					}
+				})
+				// uni.navigateTo({
+				// 	url: '/pages/common_tools/me_order/order_details?data=' + JSON.stringify(item)
+				// 	// url: '/pages/customer/customer-datails?n=' + n
+				// })
 			},
 			getInsurance: async function() {
 				let res = await this.$request.post("/api/v1/order/orderList", {

pages/common_tools/my_consulting/my_appointment.vue

@@ -26,7 +26,7 @@
 						<u-avatar v-else :src="item.organization.docter[0].avatar" mode="circle"></u-avatar>
 						<text v-if="item.product_type==3" class="margin-left-sm">{{item.docter.name}}</text>
 						<text v-else class="margin-left-sm">{{item.organization.docter[0].name}}</text>
-						<text class="text_style" v-for="(itm,idx) in item.docter.label" :key="index">{{itm}}</text>
+						<text class="text_style" v-for="(itm,idx) in item.docter.label_texts" :key="index">{{itm.label_name}}</text>
 					</view>
 					<view class="textstyle margin-top-xs flex align-center justify-between">
 						<text style="color: #333333;" v-if="item.product_type==3">科室：{{item.docter.office.name||'暂无'}} {{item.docter.qualification.name||'暂无'}}</text>

pages/common_tools/my_consulting/my_consulting.vue

@@ -24,7 +24,7 @@
 					<view class="nametaile flex align-center">
 						<u-avatar :src="item.docter.avatar" mode="circle"></u-avatar>
 						<text class="margin-left-sm">{{item.docter.name}}</text>
-						<text class="text_style" v-for="(itm,idx) in item.docter.label" :key="index">{{itm}}</text>
+						<text class="text_style" v-for="(itm,idx) in item.docter.label_texts" :key="index">{{itm.label_name}}</text>
 					</view>
 					<view class="textstyle margin-top-xs flex align-center justify-between">
 						<text style="color: #333333;">科室：{{item.docter.office.name||'暂无'}} {{item.docter.qualification.name||'暂无'}}</text>

pages/doctor_related/info_write.vue

@@ -81,7 +81,7 @@
 					<text class="text-grey text-sm">查看范例</text>
 				</view>
 			</view>
-			<textarea v-if="type==2" v-model="zhengzhuang" value="" class="textareasty" placeholder="我有病,我还病得不轻" />
+			<textarea v-if="type==2" v-model="zhengzhuang" value="" class="textareasty" placeholder="请填写您的病症描述" />
 			</view>
 			<view class="" v-if="type==2">
 				<view class="cu-bar bg-white margin-top">
@@ -317,8 +317,7 @@
 						patient_id:this.huanzheID,
 						total_amount:this.price/100,
 						phone:this.phonenum,
-						phone_minutes:this.doctor.phone_minutes,
-						payment_type:2
+						phone_minutes:this.doctor.phone_minutes
 					}
 					if((this.price/100) == 0){
 						let res = await this.$request.post("/api/v1/order/consultPlaceOrder", {
@@ -327,8 +326,7 @@
 							patient_id: obj.patient_id,
 							total_amount: obj.total_amount*100,
 							phone: obj.phone,
-							phone_minutes: obj.phone_minutes,
-							payment_type: obj.payment_type,
+							phone_minutes: obj.phone_minutes
 						})
 						if (res.status == 0) {
 							uni.showToast({
@@ -379,7 +377,6 @@
 							total_amount:this.price/100,
 							symptoms:this.zhengzhuang,
 							medical_imgs:JSON.stringify(this.upimg),
-							payment_type:2
 						}
 						if((this.price/100) == 0){
 							let res = await this.$request.post("/api/v1/order/consultPlaceOrder", {
@@ -389,7 +386,6 @@
 								total_amount: obj.total_amount*100,
 								symptoms: obj.symptoms,
 								medical_imgs: obj.medical_imgs,
-								payment_type: obj.payment_type,
 							})
 							if (res.status == 0) {
 								uni.showToast({
@@ -417,9 +413,9 @@
 						})
 						return false
 					}
-					if(this.idcrad == ""){
+					if(this.idcrad == ""&&this.$util.isIdCard(this.idcrad)){
 						uni.showToast({
-							title:"请填写身份证号",
+							title:"请填写正确身份证号",
 							icon:"none"
 						})
 						return false
@@ -433,7 +429,6 @@
 							organization_id:this.jigouid,
 							schedule_date:this.year,
 							time_period_id:this.yearid,
-							payment_type:2
 						}
 						if((this.price/100) == 0){
 							let res = await this.$request.post("/api/v1/order/appointPlaceOrder", {
@@ -444,7 +439,6 @@
 								organization_id: obj.organization_id,
 								schedule_date:obj.schedule_date,
 								time_period_id: obj.time_period_id,
-								payment_type: obj.payment_type,
 							})
 							if (res.status == 0) {
 								uni.showToast({
@@ -524,7 +518,8 @@
 		border: 1px solid #efefef;
 		border-radius: 16rpx;
 		padding: 15rpx;
-		margin: 15rpx auto;
+		margin: 15rpx 15rpx;
+		width: 100%;
 	}
 
 	.popup_title_text {

pages/doctor_related/select_doctor.vue

@@ -123,7 +123,7 @@
 			}
 		},
 		onShow() {
-			this.gettime()
+			// this.gettime()
 			this.getDoctorList()
 			this.getareaList()
 		},

pages/order/payment.vue

@@ -1,6 +1,38 @@
 <template>
 	<view>
 		<!-- 弹窗  v-model双向绑定值 mode弹出位置 border-radius弹出层圆角-->
+		<u-popup v-model="showservice" mode="bottom" border-radius="14" :closeable="true" :mask-close-able="false"
+		 :safe-area-inset-bottom="true">
+			<view class="header-Discount">
+				选择服务包
+			</view>
+			<scroll-view scroll-y="true" style="height: 650rpx;">
+				<view v-for="(item,index) in serviceList" :key="index">
+					<view class="card flex justify-center">
+						<view class="taocan" :data-id="item.order_pack.id" @click="details(item.order_pack)">
+							<view class="tc_left">
+								<text>{{item.order_pack.pack_name}}</text>
+							</view>
+							<view class="tc_right">
+								<view style="width: 100%;">
+									<view class="text">{{item.order_pack.pack_intro}}</view>
+									<!-- <view class="text">{{item.desc}}</view> -->
+									<view class="text">
+										<text style="text-align: left;">时长:{{item.order_pack.effective_days}}天</text>
+										<text style="float: right;color: #FF4F61;font-weight: bold;">¥{{item.order_pack.pack_price/100}}</text>
+									</view>
+								</view>
+								<view class="margin-top-xs">
+									剩余时长：
+									<u-count-down color="#EEAA3F" separator="zh" :timestamp="item.order_pack.end_time-miao"></u-count-down>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="cu-tabbar-height"></view>
+			</scroll-view>
+		</u-popup>
 		<u-popup v-model="discountshow" mode="bottom" border-radius="14" safe-area-inset-bottom="true">
 			<view class="header-Discount">
 				优惠卷
@@ -98,8 +130,8 @@
 				<view slot="header" style="font-size: 28rpx; font-weight: 500;color: #666666;">支付方式</view>
 			</uni-list-item>
 			<!-- 加一个单选 -->
-			<u-radio-group v-model="value" v-for="(item, index) in paymenMethod">
-				<uni-list-item :border="false" @click="value=item.name" :clickable="true">
+			<u-radio-group v-model="value" v-for="(item, index) in paymenMethod" :key="index">
+				<uni-list-item :border="false" @click="setmode(item)" :clickable="true">
 					<view slot="header">
 						<text style="font-size: 28rpx;font-weight: 400;color: #333333;">{{item.name}}</text>
 					</view>
@@ -131,15 +163,27 @@
 		onLoad(op) {
 			this.infodata = JSON.parse(op.data)
 			this.norderAmount = this.infodata.total_amount
+			if (this.infodata.product_type != 6) {
+				this.paymenMethod.push({
+					name: '服务包抵扣',
+					disabled: false
+				})
+			}
 			console.log(this.infodata)
 		},
 		onShow() {
 			this.orderAmount = this.norderAmount + "元"
 			this.getUserInfo()
 			this.getcoupon()
+			this.getserviceList()
+			this.miao = parseInt(new Date().getTime() / 1000)
 		},
 		data() {
 			return {
+				//秒数
+				miao: "",
+				//服务包弹窗
+				showservice: false,
 				//医生名称
 				doctorName: '',
 				ndoctorName: '渣渣宝',
@@ -165,10 +209,41 @@
 				password: "",
 				discountshow: false,
 				list: [],
-				couponid: ""
+				couponid: "",
+				pageindex: 1,
+				pageservice: 1,
+				serviceList: [],
+				paytype: 2,
+				serviceid: ""
 			}
 		},
 		methods: {
+			details(item) {
+				this.serviceid = item.id
+				this.showservice = false
+				console.log(item)
+			},
+			getserviceList: async function() {
+				let res = await this.$request.post("/api/v1/order/orderList", {
+					page: this.pageservice,
+					list_type: 1,
+					product_type: 6,
+					is_pack_expire: 2
+				})
+				console.log(res)
+				if (res.status == 0) {
+					if (this.pageservice > res.data.last_page) {
+						uni.showToast({
+							title: "没有更多了",
+							icon: "none"
+						})
+					} else {
+						this.serviceList = this.serviceList.concat(res.data.data)
+						this.pageservice++
+					}
+				}
+
+			},
 			getcoupon: async function() {
 				let res = await this.$request.post("/api/v1/coupon/userCouponList", {
 					page: this.pageindex
@@ -208,6 +283,15 @@
 			click(e) {
 				console.log(e)
 			},
+			setmode(item) {
+				this.value = item.name
+				if (this.value == '服务包抵扣') {
+					this.paytype = 3
+					this.showservice = true
+				} else if (this.value == '钱包余额支付') {
+					this.paytype = 2
+				}
+			},
 			collectCoupons(item, index) {
 				if (item.type == 1) {
 					if (item.max_reduce_amount > this.infodata.total_amount * 100) {
@@ -260,9 +344,10 @@
 					organization_id: this.infodata.organization_id,
 					schedule_date: this.infodata.schedule_date,
 					time_period_id: this.infodata.time_period_id,
-					payment_type: this.infodata.payment_type,
+					payment_type: this.paytype,
 					pay_password: this.password,
-					user_coupon_id: this.couponid
+					user_coupon_id: this.couponid,
+					order_pack_id: this.serviceid
 				})
 				if (res.status == 0) {
 					this.popupShow = false
@@ -310,6 +395,20 @@
 								}
 							},
 						})
+					} else {
+						uni.showModal({
+							title: "提示",
+							content: res.message,
+							confirmText: "确定",
+							showCancel: false,
+							success: (rr) => {
+								if (rr.confirm) {
+									this.popupShow = false
+									this.show = false
+									this.password = ""
+								}
+							}
+						})
 					}
 				}
 			},
@@ -372,6 +471,20 @@
 								}
 							},
 						})
+					} else {
+						uni.showModal({
+							title: "提示",
+							content: res.message,
+							confirmText: "确定",
+							showCancel: false,
+							success: (rr) => {
+								if (rr.confirm) {
+									this.popupShow = false
+									this.show = false
+									this.password = ""
+								}
+							}
+						})
 					}
 				}
 			},
@@ -383,9 +496,10 @@
 					total_amount: this.infodata.total_amount * 100,
 					phone: this.infodata.phone,
 					phone_minutes: this.infodata.phone_minutes,
-					payment_type: 2,
+					payment_type: this.paytype,
 					pay_password: this.password,
-					user_coupon_id: this.couponid
+					user_coupon_id: this.couponid,
+					order_pack_id: this.serviceid
 				})
 				if (res.status == 0) {
 					this.popupShow = false
@@ -433,6 +547,20 @@
 								}
 							},
 						})
+					} else {
+						uni.showModal({
+							title: "提示",
+							content: res.message,
+							confirmText: "确定",
+							showCancel: false,
+							success: (rr) => {
+								if (rr.confirm) {
+									this.popupShow = false
+									this.show = false
+									this.password = ""
+								}
+							}
+						})
 					}
 				}
 			},
@@ -444,9 +572,10 @@
 					total_amount: this.infodata.total_amount * 100,
 					symptoms: this.infodata.symptoms,
 					medical_imgs: JSON.stringify(this.infodata.medical_imgs),
-					payment_type: 2,
+					payment_type: this.paytype,
 					pay_password: this.password,
-					user_coupon_id: this.couponid
+					user_coupon_id: this.couponid,
+					order_pack_id: this.serviceid
 				})
 				if (res.status == 0) {
 					this.popupShow = false
@@ -494,6 +623,20 @@
 								}
 							},
 						})
+					} else {
+						uni.showModal({
+							title: "提示",
+							content: res.message,
+							confirmText: "确定",
+							showCancel: false,
+							success: (rr) => {
+								if (rr.confirm) {
+									this.popupShow = false
+									this.show = false
+									this.password = ""
+								}
+							}
+						})
 					}
 				}
 			},
@@ -506,9 +649,10 @@
 					schedule_date: this.infodata.schedule_date,
 					time_period_id: this.infodata.time_period_id,
 					vaccine_id: this.infodata.vaccine_id,
-					payment_type: this.infodata.payment_type,
+					payment_type: this.paytype,
 					pay_password: this.password,
-					user_coupon_id: this.couponid
+					user_coupon_id: this.couponid,
+					order_pack_id: this.serviceid
 				})
 				if (res.status == 0) {
 					this.popupShow = false
@@ -556,6 +700,20 @@
 								}
 							},
 						})
+					} else {
+						uni.showModal({
+							title: "提示",
+							content: res.message,
+							confirmText: "确定",
+							showCancel: false,
+							success: (rr) => {
+								if (rr.confirm) {
+									this.popupShow = false
+									this.show = false
+									this.password = ""
+								}
+							}
+						})
 					}
 				}
 			},
@@ -569,9 +727,10 @@
 					schedule_date: this.infodata.schedule_date,
 					time_period_id: this.infodata.time_period_id,
 					nurse_ids: JSON.stringify(this.infodata.nurse_ids),
-					payment_type: this.infodata.payment_type,
+					payment_type: this.paytype,
 					pay_password: this.password,
-					user_coupon_id: this.couponid
+					user_coupon_id: this.couponid,
+					order_pack_id: this.serviceid
 				})
 				console.log(res)
 				if (res.status == 0) {
@@ -620,6 +779,20 @@
 								}
 							},
 						})
+					} else {
+						uni.showModal({
+							title: "提示",
+							content: res.message,
+							confirmText: "确定",
+							showCancel: false,
+							success: (rr) => {
+								if (rr.confirm) {
+									this.popupShow = false
+									this.show = false
+									this.password = ""
+								}
+							}
+						})
 					}
 				}
 			},
@@ -669,7 +842,55 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.card {
+		width: 100%;
+		height: auto;
+		margin-top: 20rpx;
+
+		// background-image: url(../../static/服务包.png);
+		.taocan {
+			width: 710rpx;
+			height: 230rpx;
+			position: relative;
+			display: flex;
+			border-radius: 10rpx;
+			background: radial-gradient(circle at right top, transparent 15rpx, #fff 0) top left / 152rpx 51% no-repeat,
+				radial-gradient(circle at right bottom, transparent 15rpx, #fff 0) bottom left /152rpx 51% no-repeat,
+				radial-gradient(circle at left top, transparent 15rpx, #fff 0) top right /560rpx 51% no-repeat,
+				radial-gradient(circle at left bottom, transparent 15rpx, #fff 0) bottom right /560rpx 51% no-repeat;
+			filter: drop-shadow(0rpx 2rpx 12rpx 0rpx rgba(0, 0, 0, 0.04));
+			box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);
+		}
+	}
+
+	.tc_left {
+		display: flex;
+
+		justify-content: center;
+		align-items: center;
+		width: 152rpx;
+
+		text {
+			font-size: 30rpx;
+			font-weight: bold;
+		}
+	}
+
+	.tc_right {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		width: 550rpx;
+		padding: 0 20rpx;
+		font-size: 26rpx;
+
+		.text {
+			padding: 10rpx 0rpx;
+			width: 100%;
+		}
+	}
+
 	/* 支付文字 */
 	.paymentText {
 		height: 60rpx;

pages/personal/coupon/coupon.vue

@@ -16,7 +16,7 @@
 					<view class="margin-top-sm">
 						<view class="cu-list menu-avatar padding-tb-sm bg-white">
 							<view class="cu-item" v-for="(item,index) in notUsedList" :key="index" @click="gotoinfo(item)">
-								<view class="cu-avatar round lg" :style="'background-image:url('+item.icon+');background-color: #fff;'">
+								<view class="cu-avatar round lg" :style="'background-image:url('+imghost+item.icon+');background-color: #fff;'">
 								</view>
 								<view class="content">
 									<view class="text-grey">
@@ -41,7 +41,7 @@
 					<view class="margin-top-sm">
 						<view class="cu-list menu-avatar padding-tb-sm bg-white">
 							<view class="cu-item" v-for="(item,index) in usedList" :key="index">
-								<view class="cu-avatar round lg" :style="'background-image:url('+item.icon+');'">
+								<view class="cu-avatar round lg" :style="'background-image:url('+imghost+item.icon+');'">
 								</view>
 								<view class="content">
 									<view class="text-grey">
@@ -66,7 +66,7 @@
 					<view class="margin-top-sm">
 						<view class="cu-list menu-avatar padding-tb-sm bg-white">
 							<view class="cu-item" v-for="(item,index) in invalidList" :key="index">
-								<view class="cu-avatar round lg" :style="'background-image:url('+item.icon+');'">
+								<view class="cu-avatar round lg" :style="'background-image:url('+imghost+item.icon+');'">
 								</view>
 								<view class="content">
 									<view class="text-grey">
@@ -96,6 +96,7 @@
 	export default {
 		mounted() {
 			this.getCouponList()
+			this.imghost = this.$imgHost
 		},
 		data() {
 			return {
@@ -119,7 +120,8 @@
 				notUsedList: [],
 				usedList: [],
 				invalidList: [],
-				show: false
+				show: false,
+				imghost: ""
 			};
 		},
 		methods: {

pages/personal/coupon/couponList.vue

@@ -318,9 +318,9 @@
 	}
 
 	.closing-date {
-		padding-right: 68px;
+		/* padding-right: 68px; */
 		position: absolute;
-		left: 0;
+		left: -18rpx;
 		bottom: 0;
 		box-sizing: border-box;
 		width: 100%;

pages/service_box/choiceBox.vue

@@ -24,34 +24,36 @@
 					</view>
 					<view style="font-size: 28rpx;font-weight: bold;padding-top: 60rpx;">服务包绑定者</view>
 					<view style="font-size: 28rpx;font-weight: bold;">监护人：{{service.guardian_name}}</view>
-					<view style="font-size: 28rpx;font-weight: bold;padding-top: 48rpx;">{{packs.team.name}}</view>
-					<view class="list" v-for="(item,index) in packs.team.docter" :key="index">
-						<!-- 头像 -->
-						<view class="portrait">
-							<view style="padding-top: 20rpx;">
-								<image class="img" :src="item.avatar"></image>
-								<view class="bun_true" @click="submitCollect" :data-index="index" :data-id="item.id" v-if="item.is_collect==0">关注</view>
-								<view class="bun_false" @click="submitCollect" :data-index="index" :data-id="item.id" v-else>已关注</view>
+					<view class="" v-for="(item,index) in packs.team" :key="index">
+						<view style="font-size: 28rpx;font-weight: bold;padding-top: 48rpx;">{{item.name}}</view>
+						<view class="list" v-for="(ite,idx) in item.docter" :key="idx">
+							<!-- 头像 -->
+							<view class="portrait">
+								<view style="padding-top: 20rpx;">
+									<image class="img" :src="ite.avatar"></image>
+									<view class="bun_true" @click="submitCollect" :data-index="idx" :data-id="ite.id" v-if="ite.is_collect==0">关注</view>
+									<view class="bun_false" @click="submitCollect" :data-index="idx" :data-id="ite.id" v-else>已关注</view>
+								</view>
 							</view>
-						</view>
-						<!-- 文字 -->
-						<view class="text">
-							<!-- 名字+标签 -->
-							<view class="name">
-								<view style="margin-right: 15rpx;">{{item.name}}</view>
-								<view class="label" v-for="(itm,idx) in item.label">{{itm}}</view>
-							</view>
-							<!-- 科室 -->
-							<view class="department">
-								<text>科室:</text>
-								<text style="color: #333333;">{{item.office.name}}</text>
-								<text style="color: #333333;">{{item.qualification.name}}</text>
-							</view>
-							<!-- 选项 -->
-							<view class="option">
-								<view v-if="item.is_chat">图文</view>
-								<view v-if="item.is_phone">电话</view>
-								<view v-if="item.is_appoint">门诊</view>
+							<!-- 文字 -->
+							<view class="text">
+								<!-- 名字+标签 -->
+								<view class="name">
+									<view style="margin-right: 15rpx;">{{ite.name}}</view>
+									<view class="label" v-for="(itm,idex) in ite.label" :key="idex">{{itm}}</view>
+								</view>
+								<!-- 科室 -->
+								<view class="department">
+									<text>科室:</text>
+									<text style="color: #333333;">{{ite.office.name}}</text>
+									<text style="color: #333333;">{{ite.qualification.name}}</text>
+								</view>
+								<!-- 选项 -->
+								<view class="option">
+									<view v-if="ite.is_chat">图文</view>
+									<view v-if="ite.is_phone">电话</view>
+									<view v-if="ite.is_appoint">门诊</view>
+								</view>
 							</view>
 						</view>
 					</view>

pages/service_packs/packs_details.vue

@@ -17,34 +17,36 @@
 						<view style="padding: 27rpx 0 12rpx 0;">{{packs.intro}}</view>
 						<rich-text style="padding: 12rpx 0;" :nodes="packs.desc"></rich-text>
 					</view>
-					<view style="font-size: 28rpx;font-weight: bold;padding-top: 48rpx;">{{packs.team.name}}</view>
-					<view class="list" v-for="(item,index) in packs.team.docter" :key="index">
-						<!-- 头像 -->
-						<view class="portrait">
-							<view style="padding-top: 20rpx;">
-								<image class="img" :src="item.avatar"></image>
-								<view class="bun_true" @click="submitCollect" :data-index="index" :data-id="item.id" v-if="item.is_collect==0">关注</view>
-								<view class="bun_false" @click="submitCollect" :data-index="index" :data-id="item.id" v-else>已关注</view>
+					<view class="" v-for="(item,index) in packs.team" :key="index">
+						<view style="font-size: 28rpx;font-weight: bold;padding-top: 48rpx;">{{item.name}}</view>
+						<view class="list" v-for="(ite,idx) in item.docter" :key="idx">
+							<!-- 头像 -->
+							<view class="portrait">
+								<view style="padding-top: 20rpx;">
+									<image class="img" :src="ite.avatar"></image>
+									<view class="bun_true" @click="submitCollect" :data-index="idx" :data-id="ite.id" v-if="ite.is_collect==0">关注</view>
+									<view class="bun_false" @click="submitCollect" :data-index="idx" :data-id="ite.id" v-else>已关注</view>
+								</view>
 							</view>
-						</view>
-						<!-- 文字 -->
-						<view class="text">
-							<!-- 名字+标签 -->
-							<view class="name">
-								<view style="margin-right: 15rpx;">{{item.name}}</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>
-							</view>
-							<!-- 选项 -->
-							<view class="option">
-								<view v-if="item.is_chat">图文</view>
-								<view v-if="item.is_phone">电话</view>
-								<view v-if="item.is_appoint">门诊</view>
+							<!-- 文字 -->
+							<view class="text">
+								<!-- 名字+标签 -->
+								<view class="name">
+									<view style="margin-right: 15rpx;">{{ite.name}}</view>
+									<view class="label" v-for="(itm,idex) in ite.label_texts" :key="idex">{{itm.label_name}}</view>
+								</view>
+								<!-- 科室 -->
+								<view class="department">
+									<text>科室:</text>
+									<text style="color: #333333;">{{ite.office.name||'暂无'}}</text>
+									<text style="color: #333333;">{{ite.qualification.name||'暂无'}}</text>
+								</view>
+								<!-- 选项 -->
+								<view class="option">
+									<view v-if="ite.is_chat">图文</view>
+									<view v-if="ite.is_phone">电话</view>
+									<view v-if="ite.is_appoint">门诊</view>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -74,7 +76,7 @@
 				<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-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>
@@ -102,17 +104,17 @@
 				},
 				packs: {},
 				serviceid: "",
-				show:false,
-				customStyle:{
-					width:'600rpx',
-					marginTop:"35rpx"
+				show: false,
+				customStyle: {
+					width: '600rpx',
+					marginTop: "35rpx"
 				}
 			}
 		},
 		methods: {
-			playphone(){
+			playphone() {
 				uni.makePhoneCall({
-					phoneNumber:"123456"
+					phoneNumber: "123456"
 				})
 				this.show = false
 			},
@@ -167,11 +169,12 @@
 						title: '请先同意《协议》'
 					});
 				} else {
-					this.packs.label = []
-					this.packs.label_texts = []
-					console.log(this.packs)
+					let obj = {
+						id: this.packs.id,
+						price: this.packs.price
+					}
 					uni.navigateTo({
-						url: '/pages/service_packs/packs_information?data=' + JSON.stringify(this.packs)
+						url: '/pages/service_packs/packs_information?data=' + JSON.stringify(obj)
 					})
 				}
 			}

pages/service_packs/packs_information.vue

@@ -133,6 +133,7 @@
 							</view>
 						</uni-list-item>
 					</uni-list>
+					
 				</view>
 			</view>
 

pages/vaccines/vaccinesList.vue

@@ -46,7 +46,8 @@
 
 <script>
 	export default {
-		onLoad() {
+		onLoad(options) {
+			this.org_id = options.id
 			this.getvaccinesList()
 		},
 		onShow() {
@@ -54,6 +55,7 @@
 		},
 		data() {
 			return {
+				org_id: "",
 				vaccineList: [],
 				keyword: "",
 				value: 0, //种类
@@ -121,7 +123,8 @@
 					page: this.pageindex,
 					name: this.keyword,
 					type: this.value,
-					sort_type: this.recommend
+					sort_type: this.recommend,
+					organization_id: this.org_id
 				})
 				if (res.status == 0) {
 					if (this.pageindex > res.data.last_page) {

pages/vaccines/vaccines_info.vue

@@ -9,6 +9,25 @@
 					<text class="text-grey text-sm">{{value}}</text>
 				</view>
 			</view>
+			<view class="cu-item arrow" @click="xuanzefuwu">
+				<view class="content">
+					<text class="text-grey">服务机构</text>
+				</view>
+				<view class="action">
+					<text class="text-grey text-sm">{{servicejigou}}</text>
+				</view>
+			</view>
+			<view class="padding-sm bg-white" v-if="doctor!=''">
+				<scroll-view scroll-x="true" enable-flex="true" style="display: flex;height: 145rpx;">
+					<view class="flex flex-direction align-center justify-center" @click="gotodoctorinfo(item.id)" style="width: 120rpx;height: 130rpx;"
+					 v-for="(item,index) in doctor.docter" :key="index">
+						<u-avatar :src="item.avatar" mode="circle"></u-avatar>
+						<view class="">
+							{{item.name}}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
 			<view class="cu-item arrow" @click="vaccinesList">
 				<view class="content">
 					<text class="text-grey">接种疫苗</text>
@@ -25,25 +44,6 @@
 					<text class="text-grey text-sm">{{yuyuevalue}}</text>
 				</view>
 			</view>
-			<view class="cu-item arrow" @click="xuanzefuwu">
-				<view class="content">
-					<text class="text-grey">服务机构</text>
-				</view>
-				<view class="action">
-					<text class="text-grey text-sm">{{servicejigou}}</text>
-				</view>
-			</view>
-		</view>
-		<view class="padding-sm bg-white" v-if="doctor.docter.length!=0">
-			<scroll-view scroll-x="true" enable-flex="true" style="display: flex;height: 145rpx;">
-				<view class="flex flex-direction align-center justify-center" @click="gotodoctorinfo(item.id)" style="width: 120rpx;height: 130rpx;"
-				 v-for="(item,index) in doctor.docter" :key="index">
-					<u-avatar :src="item.avatar" mode="circle"></u-avatar>
-					<view class="">
-						{{item.name}}
-					</view>
-				</view>
-			</scroll-view>
 		</view>
 		<u-picker mode="multiSelector" @confirm="callbacktime" v-model="show" :default-selector='[0, 1]' range-key="start_time_period"
 		 :range="multiSelector"></u-picker>
@@ -88,7 +88,6 @@
 	var user = require('../../common/user.js');
 	export default {
 		onLoad() {
-			this.gettime()
 
 		},
 		onShow() {
@@ -100,6 +99,8 @@
 				this.yimiao = this.yimiaoInfo.name
 			}
 			this.getarchives()
+			this.multiSelector = []
+			this.gettime()
 		},
 		data() {
 			return {
@@ -136,7 +137,12 @@
 				}
 			},
 			gettime: async function() {
-				let res = await this.$request.post("/api/v1/docter/timePeriodList")
+				if (this.doctor == '') {
+					return false
+				}
+				let res = await this.$request.post("/api/v1/docter/timePeriodList", {
+					organization_id: this.doctor.id
+				})
 				console.log(res)
 				if (res.status == 0) {
 					res.data.list.forEach(item => {
@@ -163,11 +169,25 @@
 				})
 			},
 			vaccinesList() {
+				if (this.doctor == '') {
+					uni.showToast({
+						title: "请先选择机构",
+						icon: "none"
+					})
+					return false
+				}
 				uni.navigateTo({
-					url: "vaccinesList"
+					url: "vaccinesList?id=" + this.doctor.id
 				})
 			},
 			yuyuetime() {
+				if (this.doctor == '') {
+					uni.showToast({
+						title: "请先选择机构",
+						icon: "none"
+					})
+					return false
+				}
 				this.show = true
 			},
 			gotopay: async function() {
@@ -178,23 +198,23 @@
 					})
 					return false
 				}
-				if (this.yimiaoInfo == "") {
+				if (this.doctor == "") {
 					uni.showToast({
-						title: "请先选择疫苗",
+						title: "请先选择机构",
 						icon: "none"
 					})
 					return false
 				}
-				if (this.timehour == "") {
+				if (this.yimiaoInfo == "") {
 					uni.showToast({
-						title: "请先选择预约时间",
+						title: "请先选择疫苗",
 						icon: "none"
 					})
 					return false
 				}
-				if (this.doctor == "") {
+				if (this.timehour == "") {
 					uni.showToast({
-						title: "请先选择机构",
+						title: "请先选择预约时间",
 						icon: "none"
 					})
 					return false

unpackage/dist/build/mp-weixin/components/watch-input.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/common_tools/home_doctor.wxml

@@ -1 +1 @@
-<view style="height:100%;width:100%;padding:20rpx 30rpx;"><block wx:for="{{doctorList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list" data-id="{{item.docter.id}}" data-index="{{index}}" data-event-opts="{{[['tap',[['clicklist',['$event']]]]]}}" catchtap="__e"><view class="portrait"><view style="padding-top:20rpx;"><image class="img" src="{{item.docter.avatar}}"></image><block wx:if="{{item.docter.is_collect==0}}"><view class="bun_true" data-index="{{index}}" data-id="{{item.docter.id}}" data-event-opts="{{[['tap',[['follow',['$event']]]]]}}" catchtap="__e">关注</view></block><block wx:else><view class="bun_false" data-index="{{index}}" data-id="{{item.docter.id}}" data-event-opts="{{[['tap',[['follow',['$event']]]]]}}" catchtap="__e">已关注</view></block></view></view><view class="text"><view class="name"><view style="margin-right:15rpx;">{{item.docter.name}}</view><block wx:for="{{item.docter.label}}" wx:for-item="itm" wx:for-index="idx" wx:key="*this"><view class="label">{{itm}}</view></block></view><view class="department"><text>科室:</text><text style="color:#333333;">{{item.docter.office.name}}</text><text style="color:#333333;">{{item.docter.qualification.name}}</text></view><view class="option"><block wx:if="{{item.docter.is_chat==1}}"><view>图文</view></block><block wx:if="{{item.docter.is_phone==1}}"><view>电话</view></block><block wx:if="{{item.docter.is_appoint==1}}"><view>门诊</view></block></view></view></view></block><u-empty vue-id="6272f216-1" text="暂无数据" show="{{show}}" mode="order" margin-top="250" bind:__l="__l"></u-empty><u-no-network vue-id="6272f216-2" bind:__l="__l"></u-no-network><view class="cu-tabbar-height"></view><view class="cu-tabbar-height"></view></view>
+<view style="height:100%;width:100%;padding:20rpx 30rpx;"><block wx:for="{{doctorList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list" data-id="{{item.id}}" data-index="{{index}}" data-event-opts="{{[['tap',[['clicklist',['$event']]]]]}}" catchtap="__e"><view class="portrait"><view style="padding-top:20rpx;"><image class="img" src="{{item.avatar}}"></image><block wx:if="{{item.is_collect==0}}"><view class="bun_true" data-index="{{index}}" data-id="{{item.id}}" data-event-opts="{{[['tap',[['follow',['$event']]]]]}}" catchtap="__e">关注</view></block><block wx:else><view class="bun_false" data-index="{{index}}" data-id="{{item.id}}" data-event-opts="{{[['tap',[['follow',['$event']]]]]}}" catchtap="__e">已关注</view></block></view></view><view class="text"><view class="name"><view style="margin-right:15rpx;">{{item.name}}</view><block wx:for="{{item.label_texts}}" wx:for-item="itm" wx:for-index="idx" wx:key="*this"><view class="label">{{itm.label_name}}</view></block></view><view class="department"><text>科室:</text><text style="color:#333333;">{{item.office.name||'暂无'}}</text><text style="color:#333333;">{{item.qualification.name||'暂无'}}</text></view><view class="option"><block wx:if="{{item.is_chat==1}}"><view>图文</view></block><block wx:if="{{item.is_phone==1}}"><view>电话</view></block><block wx:if="{{item.is_appoint==1}}"><view>门诊</view></block></view></view></view></block><u-empty vue-id="6272f216-1" text="暂无数据" show="{{show}}" mode="order" margin-top="250" bind:__l="__l"></u-empty><u-no-network vue-id="6272f216-2" bind:__l="__l"></u-no-network><view class="cu-tabbar-height"></view><view class="cu-tabbar-height"></view></view>

unpackage/dist/build/mp-weixin/pages/order/order.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/order/order"],{"0cba":function(n,t,o){},"178c":function(n,t,o){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o={onLoad:function(n){this.product_type=n.type},data:function(){return{product_type:""}},methods:{gotoindex:function(){n.switchTab({url:"../index/index"})},gotoinfo:function(){n.navigateTo({url:"../common_tools/my_consulting/my_consulting"})},yuyueinfo:function(){n.navigateTo({url:"../common_tools/my_consulting/my_appointment"})},gotoservice:function(){n.navigateTo({url:"../service_box/box_details"})}},onShow:function(){}};t.default=o}).call(this,o("543d")["default"])},2904:function(n,t,o){"use strict";o.r(t);var u=o("178c"),e=o.n(u);for(var c in u)"default"!==c&&function(n){o.d(t,n,(function(){return u[n]}))}(c);t["default"]=e.a},ab96:function(n,t,o){"use strict";var u=o("0cba"),e=o.n(u);e.a},d18f:function(n,t,o){"use strict";o.d(t,"b",(function(){return e})),o.d(t,"c",(function(){return c})),o.d(t,"a",(function(){return u}));var u={uButton:function(){return o.e("uview-ui/components/u-button/u-button").then(o.bind(null,"9058"))}},e=function(){var n=this,t=n.$createElement;n._self._c},c=[]},e7c7:function(n,t,o){"use strict";(function(n){o("02cf");u(o("66fd"));var t=u(o("eaff"));function u(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,o("543d")["createPage"])},eaff:function(n,t,o){"use strict";o.r(t);var u=o("d18f"),e=o("2904");for(var c in e)"default"!==c&&function(n){o.d(t,n,(function(){return e[n]}))}(c);o("ab96");var i,r=o("f0c5"),a=Object(r["a"])(e["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],i);t["default"]=a.exports}},[["e7c7","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/order/order"],{"0cba":function(n,t,o){},"178c":function(n,t,o){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o={onLoad:function(n){this.product_type=n.type},data:function(){return{product_type:""}},mounted:function(){},methods:{gotoindex:function(){n.switchTab({url:"../index/index"})},gotoinfo:function(){n.navigateTo({url:"../common_tools/my_consulting/my_consulting"})},yuyueinfo:function(){n.navigateTo({url:"../common_tools/my_consulting/my_appointment"})},gotoservice:function(){n.requestSubscribeMessage({tmplIds:["3F_-_C-y0g8cdKhhf-3vR7eid_4cbTd9h6QKVW4EG3Q"],success:function(t){console.log(t),n.navigateTo({url:"../service_box/box_details"})}})}},onShow:function(){}};t.default=o}).call(this,o("543d")["default"])},2904:function(n,t,o){"use strict";o.r(t);var e=o("178c"),u=o.n(e);for(var c in e)"default"!==c&&function(n){o.d(t,n,(function(){return e[n]}))}(c);t["default"]=u.a},"9d2b":function(n,t,o){"use strict";o.d(t,"b",(function(){return u})),o.d(t,"c",(function(){return c})),o.d(t,"a",(function(){return e}));var e={uButton:function(){return o.e("uview-ui/components/u-button/u-button").then(o.bind(null,"9058"))}},u=function(){var n=this,t=n.$createElement;n._self._c},c=[]},ab96:function(n,t,o){"use strict";var e=o("0cba"),u=o.n(e);u.a},e7c7:function(n,t,o){"use strict";(function(n){o("02cf");e(o("66fd"));var t=e(o("eaff"));function e(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,o("543d")["createPage"])},eaff:function(n,t,o){"use strict";o.r(t);var e=o("9d2b"),u=o("2904");for(var c in u)"default"!==c&&function(n){o.d(t,n,(function(){return u[n]}))}(c);o("ab96");var i,r=o("f0c5"),a=Object(r["a"])(u["default"],e["b"],e["c"],!1,null,null,null,!1,e["a"],i);t["default"]=a.exports}},[["e7c7","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/order/payment.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "订单支付",
   "usingComponents": {
     "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-count-down": "/uview-ui/components/u-count-down/u-count-down",
     "u-message-input": "/uview-ui/components/u-message-input/u-message-input",
     "uni-list": "/components/uni-list/uni-list",
     "uni-list-item": "/components/uni-list-item/uni-list-item",

unpackage/dist/build/mp-weixin/pages/service_packs/choicepacks.wxml

@@ -1 +1 @@
-<view style="width:100vw;height:auto;padding:30rpx 20rpx;background-color:#f6f6f6;"><view style="width:100%;height:100%;"><text style="font-size:30rpx;font-weight:bold;">官方套餐</text><block wx:for="{{serviceList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><view class="card"><view class="taocan" data-id="{{item.id}}" data-event-opts="{{[['tap',[['details',['$event']]]]]}}" bindtap="__e"><view class="tc_left"><text>{{item.name}}</text></view><view class="tc_right"><view style="width:100%;"><view class="text">{{item.intro}}</view><view class="text">{{item.desc}}</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></view></view></view></view></view></view></block></view></view>
+<view style="width:100vw;height:auto;padding:30rpx 20rpx;background-color:#f6f6f6;"><view style="width:100%;height:100%;"><text style="font-size:30rpx;font-weight:bold;">官方套餐</text><block wx:for="{{serviceList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><view class="card"><view class="taocan" data-id="{{item.id}}" data-event-opts="{{[['tap',[['details',['$event']]]]]}}" bindtap="__e"><view class="tc_left"><text style="text-align:center;">{{item.name}}</text></view><view class="tc_right"><view style="width:100%;"><view class="text">{{item.intro}}</view><view class="text"><block wx:for="{{item.label_texts}}" wx:for-item="itm" wx:for-index="idx" wx:key="idx"><text class="margin-right-sm text_style">{{itm.name}}</text></block></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></view></view></view></view></view></view></block></view></view>

unpackage/dist/build/mp-weixin/pages/service_packs/choicepacks.wxss

@@ -1 +1 @@
-.card{width:100%;height:auto;margin-top:20rpx}.card .taocan{width:710rpx;height:230rpx;position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-border-radius:10rpx;border-radius:10rpx;background:-webkit-radial-gradient(right top,circle,transparent 15rpx,#fff 0) 0 0/152rpx 51% no-repeat,-webkit-radial-gradient(right bottom,circle,transparent 15rpx,#fff 0) 0 100%/152rpx 51% no-repeat,-webkit-radial-gradient(left top,circle,transparent 15rpx,#fff 0) 100% 0/560rpx 51% no-repeat,-webkit-radial-gradient(left bottom,circle,transparent 15rpx,#fff 0) 100% 100%/560rpx 51% no-repeat;background:radial-gradient(circle at right top,transparent 15rpx,#fff 0) 0 0/152rpx 51% no-repeat,radial-gradient(circle at right bottom,transparent 15rpx,#fff 0) 0 100%/152rpx 51% no-repeat,radial-gradient(circle at left top,transparent 15rpx,#fff 0) 100% 0/560rpx 51% no-repeat,radial-gradient(circle at left bottom,transparent 15rpx,#fff 0) 100% 100%/560rpx 51% no-repeat;-webkit-filter:drop-shadow(0rpx 2rpx 12rpx 0rpx rgba(0,0,0,.04));filter:drop-shadow(0rpx 2rpx 12rpx 0rpx rgba(0,0,0,.04))}.tc_left{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center;width:152rpx}.tc_left text{font-size:30rpx;font-weight:700}.tc_right{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;width:550rpx;padding:0 20rpx;font-size:26rpx}.tc_right .text{padding:10rpx 0rpx;width:100%}
+.card{width:100%;height:auto;margin-top:20rpx}.card .taocan{width:710rpx;height:230rpx;position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-border-radius:10rpx;border-radius:10rpx;background:-webkit-radial-gradient(right top,circle,transparent 15rpx,#fff 0) 0 0/152rpx 51% no-repeat,-webkit-radial-gradient(right bottom,circle,transparent 15rpx,#fff 0) 0 100%/152rpx 51% no-repeat,-webkit-radial-gradient(left top,circle,transparent 15rpx,#fff 0) 100% 0/560rpx 51% no-repeat,-webkit-radial-gradient(left bottom,circle,transparent 15rpx,#fff 0) 100% 100%/560rpx 51% no-repeat;background:radial-gradient(circle at right top,transparent 15rpx,#fff 0) 0 0/152rpx 51% no-repeat,radial-gradient(circle at right bottom,transparent 15rpx,#fff 0) 0 100%/152rpx 51% no-repeat,radial-gradient(circle at left top,transparent 15rpx,#fff 0) 100% 0/560rpx 51% no-repeat,radial-gradient(circle at left bottom,transparent 15rpx,#fff 0) 100% 100%/560rpx 51% no-repeat;-webkit-filter:drop-shadow(0rpx 2rpx 12rpx 0rpx rgba(0,0,0,.04));filter:drop-shadow(0rpx 2rpx 12rpx 0rpx rgba(0,0,0,.04))}.text_style{text-align:center;display:inline-block;font-weight:400;background-color:#e5f5ff;color:#0b73b9;width:100rpx;height:28rpx;font-size:20rpx;-webkit-border-radius:10rpx;border-radius:10rpx}.tc_left{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center;width:152rpx}.tc_left text{font-size:30rpx;font-weight:700}.tc_right{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;width:550rpx;padding:0 20rpx;font-size:26rpx}.tc_right .text{padding:10rpx 0rpx;width:100%}

unpackage/dist/build/mp-weixin/pages/service_packs/introduce.json

@@ -1,4 +1,7 @@
 {
   "navigationBarTitleText": "服务包",
-  "usingComponents": {}
+  "usingComponents": {
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-button": "/uview-ui/components/u-button/u-button"
+  }
 }

unpackage/dist/build/mp-weixin/pages/service_packs/introduce.wxml

@@ -1 +1 @@
-<view class="container"><view class="body"><image class="img" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/竖占位图.png"></image></view><view class="footer"><view class="cu-bar bg-white tabbar border shop" style="width:100%;"><button class="action" style="width:33%;" open-type="contact"><view class="cuIcon-service text-green"></view>客服</button><view data-event-opts="{{[['tap',[['next',['$event']]]]]}}" class="submit" style="background-color:#0B73B9;color:#FFFFFF;" bindtap="__e">选购服务包</view></view></view></view>
+<view class="container"><view class="body"><image class="img" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/竖占位图.png"></image></view><view class="footer"><view class="cu-bar bg-white tabbar border shop" style="width:100%;"><button data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="action" style="width:33%;" bindtap="__e"><view class="cuIcon-service text-green"></view>客服</button><view data-event-opts="{{[['tap',[['next',['$event']]]]]}}" class="submit" style="background-color:#0B73B9;color:#FFFFFF;" bindtap="__e">选购服务包</view></view></view><u-popup bind:input="__e" vue-id="847cdde2-1" mode="bottom" border-radius="14" height="300rpx" value="{{show}}" data-event-opts="{{[['^input',[['__set_model',['','show','$event',[]]]]]]}}" bind:__l="__l" vue-slots="{{['default']}}"><u-button vue-id="{{('847cdde2-2')+','+('847cdde2-1')}}" open-type="contact" custom-style="{{customStyle}}" bind:__l="__l" vue-slots="{{['default']}}">会话客服</u-button><u-button vue-id="{{('847cdde2-3')+','+('847cdde2-1')}}" custom-style="{{customStyle}}" data-event-opts="{{[['^click',[['playphone']]]]}}" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}">电话客服</u-button></u-popup></view>

unpackage/dist/build/mp-weixin/pages/service_packs/packs_details.json

@@ -1,4 +1,7 @@
 {
   "navigationBarTitleText": "服务包详情",
-  "usingComponents": {}
+  "usingComponents": {
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-button": "/uview-ui/components/u-button/u-button"
+  }
 }