no message

App.vue

@@ -1,44 +1,40 @@
 <script>
 	export default {
 		onLaunch: function() {
-
-		},
-		methods: {
-			upDataApp: function() { //版本更新
-				console.log("进来了")
-				if (uni.canIUse('getUpdateManager')) { //判断当前微信版本是否支持版本更新
-					const updateManager = uni.getUpdateManager();
-					updateManager.onCheckForUpdate(function(res) {
-						if (res.hasUpdate) { // 请求完新版本信息的回调
-							updateManager.onUpdateReady(function() {
-								uni.showModal({
-									title: '更新提示',
-									content: '新版本已经准备好，是否重启应用？',
-									success: function(res) {
-										if (res.confirm) { // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-											updateManager.applyUpdate()
-										}
+			if (uni.canIUse('getUpdateManager')) {
+				const updateManager = uni.getUpdateManager()
+				updateManager.onCheckForUpdate(function(res) {
+					console.log('onCheckForUpdate====', res)
+					// 请求完新版本信息的回调
+					if (res.hasUpdate) {
+						console.log('res.hasUpdate====')
+						updateManager.onUpdateReady(function() {
+							uni.showModal({
+								title: '更新提示',
+								content: '新版本已经准备好，是否重启应用？',
+								success: function(res) {
+									console.log('success====', res)
+									// res: {errMsg: "showModal: ok", cancel: false, confirm: true}
+									if (res.confirm) {
+										// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+										updateManager.applyUpdate()
 									}
-								})
-							});
-							updateManager.onUpdateFailed(function() {
-								uni.showModal({ // 新的版本下载失败
-									title: '已经有新版本了哟~',
-									content: '新版本已经上线啦~，请您删除当前小程序，重新搜索打开哟~',
-								})
+								}
 							})
-						}
-					})
-				} else {
-					uni.showModal({ // 如果希望用户在最新版本的客户端上体验您的小程序，可以这样子提示
-						title: '提示',
-						content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
-					})
-				}
+						})
+						updateManager.onUpdateFailed(function() {
+							// 新的版本下载失败
+							uni.showModal({
+								title: '已经有新版本了哟~',
+								content: '新版本已经上线啦~，请您删除当前小程序，重新搜索打开哟~'
+							})
+						})
+					}
+				})
 			}
 		},
 		onShow: function() {
-			this.upDataApp()
+
 		},
 		onHide: function() {
 			console.log('App Hide')

pages/childcare/child_care.vue

@@ -101,7 +101,6 @@
 			})
 		},
 		onLoad() {
-			this.getarchives()
 			this.gettime()
 		},
 		onShow() {
@@ -116,6 +115,7 @@
 				})
 				this.yimiao = price
 			}
+			this.getarchives()
 		},
 		onHide() {
 			this.yimiao = ""
@@ -130,11 +130,11 @@
 				yuyuevalue: "请选择预约时间",
 				multiSelector: [],
 				timehour: "",
-				doctor: {},
+				doctor: "",
 				servicejigou: "请选择服务机构",
 				jigouID: "",
 				yimiao: "",
-				yimiaoInfo: {},
+				yimiaoInfo: "",
 				time: "",
 				childcare: []
 			}
@@ -191,28 +191,49 @@
 				this.show = true
 			},
 			gotopay() {
-				if (this.yimiaoInfo != null && this.doctor != null && this.huanzheID != "" && this.timehour != "") {
-					let obj = {
-						product_type: 5,
-						patient_id: this.huanzheID,
-						total_amount: this.yimiao,
-						organization_id: this.doctor.id,
-						schedule_date: this.time,
-						time_period_id: this.timehour,
-						nurse_ids: this.childcare.map(item => {
-							return item.id
-						}),
-						payment_type: 2
-					}
-					uni.navigateTo({
-						url: "../order/payment?data=" + JSON.stringify(obj)
+				if (this.huanzheID == "") {
+					uni.showToast({
+						title: "请先选择接种用户",
+						icon: "none"
+					})
+					return false
+				}
+				if (this.yimiaoInfo == "") {
+					uni.showToast({
+						title: "请先选择儿保项目",
+						icon: "none"
 					})
-				} else {
+					return false
+				}
+				if (this.timehour == "") {
+					uni.showToast({
+						title: "请先选择预约时间",
+						icon: "none"
+					})
+					return false
+				}
+				if (this.doctor == "") {
 					uni.showToast({
-						title: "请填写完整",
+						title: "请先选择机构",
 						icon: "none"
 					})
+					return false
+				}
+				let obj = {
+					product_type: 5,
+					patient_id: this.huanzheID,
+					total_amount: this.yimiao,
+					organization_id: this.doctor.id,
+					schedule_date: this.time,
+					time_period_id: this.timehour,
+					nurse_ids: this.childcare.map(item => {
+						return item.id
+					}),
+					payment_type: 2
 				}
+				uni.navigateTo({
+					url: "../order/payment?data=" + JSON.stringify(obj)
+				})
 			},
 			gotodoctorinfo(id) {
 				uni.navigateTo({

pages/common_tools/collection/collection.vue

@@ -3,7 +3,7 @@
 		<view class="list" v-for="item,index in listArray" :key='index' @click="open(item.article.id,item.article.title)">
 			<view class="text">
 				<view class="title">{{item.article.title}}</view>
-				<view class="type">{{item.article.type}}</view>
+				<view class="type">{{item.article.created_at}}</view>
 			</view>
 			<view class="img">
 				<image :src="item.article.banner_url" class="i" mode="aspectFit"></image>

pages/common_tools/my_consulting/conversation.vue

@@ -65,6 +65,12 @@
 			this.doctorstatus = op.doctorstatus
 			console.log(this.doctorstatus)
 			this.imService = getApp().globalData.imService;
+			if (!this.imService || !this.imService.currentUser) {
+				uni.navigateTo({
+					url: '../../login/login'
+				});
+				return
+			}
 			this.doctorInfo = JSON.parse(op.doctor)
 			//对话数据
 			this.friend = {
@@ -92,6 +98,15 @@
 			}
 
 		},
+		onShow() {
+			this.imService = getApp().globalData.imService;
+			if (!this.imService || !this.imService.currentUser) {
+				uni.navigateTo({
+					url: '../../login/login'
+				});
+				return
+			}
+		},
 		mounted() {
 
 		},

pages/common_tools/my_consulting/my_appointment.vue

@@ -29,8 +29,7 @@
 						<text class="text_style" v-for="(itm,idx) in item.docter.label" :key="index">{{itm}}</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>
+						<text style="color: #333333;" v-if="item.product_type==3">科室：{{item.docter.office.name}} {{item.docter.qualification.name}}</text>
 					</view>
 					<view class="textstyle margin-top-xs flex align-center justify-between">
 						<text style="color: #333333;">编号：{{item.order_sn}}</text>

pages/common_tools/my_consulting/my_consulting.vue

@@ -161,6 +161,7 @@
 					setTimeout(() => {
 						this.showpinjia = false
 					}, 500)
+					this.$forceUpdate()
 				}
 			},
 			concelpop() {

pages/doctor_related/doctor_info.vue

@@ -72,24 +72,24 @@
 					 :range="multiSelector"></u-picker>
 				</view>
 			</view>
-			<!-- <view v-if="isjigou" bindtap="goAdrPostion" class="pr pt10 pb10 margin-lr-sm margin-top-sm m-bg-white" style="border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
+			<view v-if="isjigou" bindtap="goAdrPostion" class="pr pt10 pb10 margin-lr-sm margin-top-sm m-bg-white" style="border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
 				<view class="pr pt15 pb15">
 					<view class="f18 fb plr15">机构地址</view>
 					<view class="pr m-xcenter plr15 mt15">
 						<image class="dpb" mode="scaleToFill" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAANCAYAAAB/9ZQ7AAABx0lEQVQoU2WSP2gTcRTHv+/dH4IdmkVcFAvSgihNLi1SRKE4uNhek4I6iNLY5AQnB93dpHNBMEltIbgUc5pUF0F0cDBIk2twKiJBBAWHVgOl5u5+TxrINeCbvnz5Pnh8vo8wMBPOE8NXx6YIcpKJfu74Ox/aa9n9foT6IrFYtVjjMkHOHO7TV6Ww6JVm3x94vXBy4fkombGPUMEwEW+oMPRY44QAs0TcDfzwUms1Xe+FrXztJURsIdz0inPPkgsv4t5aZjd5u3qDGGUiqjeK9nmauLo+rOLmDyJuNQr2VMrZWBJR90DacrMwc9/K1+qAmvQDjNB4rnJcg/aN2Kg2ClcyqTuvP0nYnWQ2vM3CjGU5tQpE5gPfP03T0+/036OdLwBinT19bCjmn2JCPoBa6SreHtJpWwTdzvf2WO/mRM7NaqQ/BeFN92949/Oe3z57xBgxTe0xgMuhCm9trWTKfXSUcmquKJUGUQBgF0AcIroQvfKKtg2QRJyt7PpRMmKbosITEWfW2vD3zzVXr/2KOEfFOO4FFu0tRJnE+h8odbFRmmv912DfSObcB8zGI5HgerOYqQy+Q3TGofmQE7nx9FZp3h0MHuh/o0mz0Kcr4U0AAAAASUVORK5CYII="
 						 style="width: 10px; height: 12px;"></image>
-						<view class="m-flex tl ml5">{{hospital}}</view>
+						<view class="m-flex tl ml5">{{hospital||'无'}}</view>
 					</view>
 					<view class="pr m-xcenter plr15 mt10">
-						<view class="m-flex tl m-gray-small f12 pl15 mr5">地址：{{address}}</view>
+						<view class="m-flex tl m-gray-small f12 pl15 mr5">地址：{{address||'无'}}</view>
 						<view class="pt2 pb2 plr10 f12 m-gray-small br-gray-letter bdr30" v-if="distance!='0'">
-							{{distance}}km
+							{{distance||'暂无距离'}}km
 						</view>
 						<view class="pt2 pb2 plr10 f12 m-gray-small br-gray-letter bdr30" wx:else>暂无距离</view>
 						<text class="dpb iconfont icon-arrow-right m-gray-letter f20"></text>
 					</view>
 				</view>
-			</view> -->
+			</view>
 			<view class="margin-lr-sm mt15 bg-white u-skeleton-fillet" style="border-radius: 16rpx; box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);"
 			 v-if="doctor.evaluate.length!=0">
 				<view class="f18 fb flex align-center plr15 pt15">患者评价 <text class="f12 m-gray-letter margin-left-xs">({{doctor.evaluate.length}})</text>
@@ -137,8 +137,24 @@
 	export default {
 		onLoad(options) {
 			this.doctorid = options.id
-			this.daytime = options.time
+			if (options.time != undefined) {
+				this.daytime = options.time
+			} else {
+				let date = new Date();
+				let nian = date.getFullYear()
+				let yue = date.getMonth() + 1
+				let ri = date.getDate() >= 10 ? date.getDate() : '0' + date.getDate()
+				let hour = date.getHours();
+				let minute = date.getMinutes() >= 10 ? date.getMinutes() : '0' + date.getMinutes();
+				this.daytime = nian + "-" + yue + "-" + ri + " " + hour + ':' + minute;
+			}
+
 			this.barindex = options.index
+			if (this.barindex == 3) {
+				this.isjigou = true
+			} else {
+				this.isjigou = false
+			}
 			console.log(options)
 		},
 		onShow() {
@@ -186,7 +202,7 @@
 				this.doctor = res
 				this.doctor.is_chat != 0 ? this.istuwen = false : this.istuwen = true,
 					this.doctor.is_phone != 0 ? this.isphone = false : this.isphone = true,
-					this.doctor.is_appoint != 0 && this.multiSelector.length != 0 ? this.ismenzhen = false : this.ismenzhen = true
+					this.doctor.is_appoint != 0 || this.multiSelector.length != 0 ? this.ismenzhen = false : this.ismenzhen = true
 
 			},
 			submitCollect: async function(e) {
@@ -212,11 +228,12 @@
 				}
 			},
 			gettime: async function() {
+				this.multiSelector = []
 				let res = await this.$request.post("/api/v1/docter/schedulePeriodList", {
 					docter_id: this.doctorid
 				})
-				let status = user.islogin(res)
-				if (status) {
+				if (res.status == 0) {
+					console.log(res)
 					if (res.data.data.length != 0) {
 						let nian = res.data.data.map(item => {
 							return item.schedule_date
@@ -228,19 +245,17 @@
 								}
 							})
 						})
-						console.log(time)
 						time[0].forEach(item => {
 							item.start_time_period = item.start_time_period + '-' + item.end_time_period
 						})
 						this.multiSelector.push(nian)
 						this.multiSelector.push(time[0])
-						console.log(this.multiSelector)
 					}
 				}
 			},
 			gotoxuanze(e) {
 				this.barindex = e.currentTarget.dataset.index
-				if (e.currentTarget.dataset.index == 3) {
+				if (this.barindex == 3) {
 					this.isjigou = true
 				} else {
 					this.isjigou = false

pages/doctor_related/info_write.vue

@@ -70,7 +70,7 @@
 					<text class="text-grey">身份证</text>
 				</view>
 				<view class="action">
-					<input type="text" v-model="idcrad" placeholder="请输入身份证号码" placeholder-style="text-align:right" />
+					<input type="text" v-model="idcrad" style="text-align: right;" placeholder="请输入身份证号码" placeholder-style="text-align:right" />
 				</view>
 			</view>
 			<view class="cu-item" v-if="type==2">

pages/doctor_related/select_doctor.vue

@@ -315,6 +315,7 @@
 				}
 			},
 			gettime: async function() {
+				this.multiSelector = []
 				let res = await this.$request.post("/api/v1/docter/timePeriodList")
 				console.log(res)
 				let status = user.islogin(res)

pages/index/editphone.vue

@@ -86,7 +86,7 @@
 					return false
 				}
 				if (this.$refs.newuCode.canGetCode) {
-					this.$refs.newuCode.start();
+					this.newstart()
 				} else {
 					uni.showToast({
 						title: "结束后再发送",
@@ -102,7 +102,6 @@
 					phone: this.info.phone,
 					type: 4
 				})
-
 			},
 			newend() {
 
@@ -112,6 +111,15 @@
 					phone: this.newphone,
 					type: 5
 				})
+				if (res.status == 0) {
+					
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon:"none"
+					})
+					this.$refs.newuCode.reset()
+				}
 			},
 			savephone: async function() {
 				if (this.value == "" || this.newphone == "" || this.newcode == "") {

pages/index/index.vue

@@ -109,9 +109,9 @@
 				<view class="base_item">
 					<view class="base_item_zi" @click.stop="gotoinfo" :data-id="item.id">
 						<view class="base_item_zi_items">
-							<view class="base_item_zi_content">
-								<u-image :fade="true" duration="450" width="120rpx" height="120rpx" :src="item.avatar" shape="circle">
-								</u-image>
+							<view class="base_item_zi_content" style="height: 225rpx;">
+								<image style="width: 120rpx;height: 120rpx;border-radius: 50%;" :src="item.avatar">
+								</image>
 								<view class="follow_style" @click.stop="submitCollect" :data-index="index" :data-id="item.id" v-if="item.is_collect==0">
 									关注
 								</view>
@@ -294,7 +294,7 @@
 			gotoinfo(e) {
 				if (this.hasLogin) {
 					uni.navigateTo({
-						url: "../doctor_related/doctor_info?id=" + e.currentTarget.dataset.id
+						url: "../doctor_related/doctor_info?id=" + e.currentTarget.dataset.id + "&index=1"
 					})
 				} else {
 					uni.showModal({

pages/login/login.vue

@@ -216,6 +216,12 @@
 										})
 									}, 1500)
 								}
+							} else {
+								uni.showToast({
+									title: res.message,
+									icon:"none"
+								})
+								_this.isRotate = false
 							}
 						}).catch(err => {
 

pages/order/payment.vue

@@ -12,23 +12,23 @@
 					</view> -->
 					<scroll-view scroll-y="true" style="height: 550rpx;">
 						<view class="couponList">
-							<view class="couponItem" v-for="(item,index) in 4" :key="index">
+							<view class="couponItem" v-for="(item,index) in list" :key="index">
 								<view class="couponItem-subject">
 									<view class="couponItem-subject-left">
 										<view class="couponItem-subject-price">
 											<text class="couponItem-subject-icon">¥</text>
-											<text class="couponItem-subject-price-min">39</text>
-											<view class="couponItem-subject-price-reduce">满88元可用</view>
+											<text class="couponItem-subject-price-min">{{item.money/100}}</text>
+											<view class="couponItem-subject-price-reduce">{{item.name}}</view>
 										</view>
 									</view>
 									<view class="couponItem-subject-right">
 										<view class="couponItem-subject-right-header">
-											<span class="couponItem-subject-right-header-icon">满减</span>
-											仅可购买本店铺商品
+											<span class="couponItem-subject-right-header-icon">{{item.type==1?'满减':'折扣'}}</span>
+											{{item.title}}
 										</view>
-										<button data-index="" @click="collectCoupons" class="couponItem-subject-right-btn">使用</button>
+										<button :data-index="index" @click="collectCoupons(item,index)" class="couponItem-subject-right-btn">使用</button>
 										<view class="closing-date">
-											11月2日 - 11月30日
+											{{item.start_time}} - {{item.end_time}}
 										</view>
 									</view>
 								</view>
@@ -136,7 +136,7 @@
 		onShow() {
 			this.orderAmount = this.norderAmount + "元"
 			this.getUserInfo()
-			this.getUserCoupon()
+			this.getcoupon()
 		},
 		data() {
 			return {
@@ -163,10 +163,33 @@
 				show: false,
 				maxnum: 6,
 				password: "",
-				discountshow: false
+				discountshow: false,
+				list: [],
+				couponid: ""
 			}
 		},
 		methods: {
+			getcoupon: async function() {
+				let res = await this.$request.post("/api/v1/coupon/userCouponList", {
+					page: this.pageindex
+				})
+				console.log(res)
+				if (res.status == 0) {
+					if (this.pageindex > res.data.last_page) {
+						uni.showToast({
+							title: "没有更多了",
+							icon: "none"
+						})
+					} else {
+						this.list = this.list.concat(res.data.data)
+						this.list.forEach(item => {
+							item.start_time = this.$util.formatDate(item.start_time)
+							item.end_time = this.$util.formatDate(item.end_time)
+						})
+						this.pageindex++
+					}
+				}
+			},
 			// 选中某个单选框时，由radio时触发
 			discount() {
 
@@ -185,6 +208,23 @@
 			click(e) {
 				console.log(e)
 			},
+			collectCoupons(item, index) {
+				if (item.type == 1) {
+					if (item.max_reduce_amount > this.infodata.total_amount * 100) {
+						uni.showToast({
+							title: "满减金额不够",
+							icon: "none"
+						})
+						return false
+					} else {
+						this.coupon = item.name
+						this.couponid = item.id
+						let price = (this.norderAmount * 100) - item.money
+						this.norderAmount = price
+						this.$forceUpdate()
+					}
+				}
+			},
 			confirmpay() {
 				if (this.info.balance < this.infodata.total_amount * 100) {
 					uni.showModal({
@@ -204,10 +244,6 @@
 					this.show = true
 				}
 			},
-			getUserCoupon: async function() {
-				let res = await this.$request.post("/api/v1/coupon/userCouponList")
-				console.log(res)
-			},
 			getUserInfo: async function() {
 				let res = await this.$request.post('/api/v1/user/userInfo')
 				if (res.status == 0) {
@@ -225,7 +261,8 @@
 					schedule_date: this.infodata.schedule_date,
 					time_period_id: this.infodata.time_period_id,
 					payment_type: this.infodata.payment_type,
-					pay_password: this.password
+					pay_password: this.password,
+					user_coupon_id:this.couponid
 				})
 				if (res.status == 0) {
 					this.popupShow = false
@@ -285,7 +322,8 @@
 					guardian_name: this.infodata.guardian_name,
 					relationship_type: this.infodata.relationship_type,
 					payment_type: this.infodata.payment_type,
-					pay_password: this.password
+					pay_password: this.password,
+					user_coupon_id:this.couponid
 				})
 				console.log(res)
 				if (res.status == 0) {
@@ -346,7 +384,8 @@
 					phone: this.infodata.phone,
 					phone_minutes: this.infodata.phone_minutes,
 					payment_type: 2,
-					pay_password: this.password
+					pay_password: this.password,
+					user_coupon_id:this.couponid
 				})
 				if (res.status == 0) {
 					this.popupShow = false
@@ -406,7 +445,8 @@
 					symptoms: this.infodata.symptoms,
 					medical_imgs: JSON.stringify(this.infodata.medical_imgs),
 					payment_type: 2,
-					pay_password: this.password
+					pay_password: this.password,
+					user_coupon_id:this.couponid
 				})
 				if (res.status == 0) {
 					this.popupShow = false
@@ -462,13 +502,13 @@
 					product_type: this.infodata.product_type,
 					patient_id: this.infodata.patient_id,
 					total_amount: this.infodata.total_amount * 100,
-					user_coupon_id: "",
 					organization_id: this.infodata.organization_id,
 					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,
-					pay_password: this.password
+					pay_password: this.password,
+					user_coupon_id:this.couponid
 				})
 				if (res.status == 0) {
 					this.popupShow = false
@@ -525,13 +565,13 @@
 					product_type: this.infodata.product_type,
 					patient_id: this.infodata.patient_id,
 					total_amount: this.infodata.total_amount * 100,
-					user_coupon_id: "",
 					organization_id: this.infodata.organization_id,
 					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,
-					pay_password: this.password
+					pay_password: this.password,
+					user_coupon_id:this.couponid
 				})
 				console.log(res)
 				if (res.status == 0) {

pages/personal/coupon/coupon.vue

@@ -15,8 +15,8 @@
 					</view>
 					<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">
-								<view class="cu-avatar round lg" :style="'background-image:url('+item.icon+');'">
+							<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>
 								<view class="content">
 									<view class="text-grey">
@@ -26,7 +26,7 @@
 										<text class="text-cut">{{item.title}}</text>
 									</view>
 									<view class="text-gray text-sm flex">
-										<text class="text-cut">有效期：{{item.start_time}}-{{item.end_time}}</text>
+										<text class="text-cut">有效期：{{formatDate(item.start_time*1000)}}-{{formatDate(item.end_time*1000)}}</text>
 									</view>
 								</view>
 								<view class="action">
@@ -51,7 +51,7 @@
 										<text class="text-cut">{{item.title}}</text>
 									</view>
 									<view class="text-gray text-sm flex">
-										<text class="text-cut">有效期：{{item.start_time}}-{{item.end_time}}</text>
+										<text class="text-cut">有效期：{{formatDate(item.start_time*1000)}}-{{formatDate(item.end_time*1000)}}</text>
 									</view>
 								</view>
 								<view class="action">
@@ -76,7 +76,7 @@
 										<text class="text-cut">{{item.title}}</text>
 									</view>
 									<view class="text-gray text-sm flex">
-										<text class="text-cut">有效期：{{item.start_time}}-{{item.end_time}}</text>
+										<text class="text-cut">有效期：{{formatDate(item.start_time*1000)}}-{{formatDate(item.end_time*1000)}}</text>
 									</view>
 								</view>
 								<view class="action">
@@ -127,7 +127,7 @@
 				this.TabCur = e.currentTarget.dataset.id
 			},
 			getCouponList: async function() {
-				let res = await this.$request.post("/api/v1/coupon/couponList", {
+				let res = await this.$request.post("/api/v1/coupon/userCouponList", {
 					page: this.pageindex
 				})
 				if (res.status == 0) {
@@ -146,7 +146,13 @@
 							return item
 						}
 					})
+					console.log(this.notUsedList)
 				}
+			},
+			gotoinfo(item) {
+				uni.navigateTo({
+					url: "coupon_details?data=" + JSON.stringify(item)
+				})
 			}
 		},
 		onShow() {

pages/personal/coupon/coupon_details.vue

@@ -8,9 +8,12 @@
 
 <script>
 	export default {
+		onLoad(op) {
+			this.datainfo = JSON.parse(op.data)
+		},
 		data() {
 			return {
-				title: ''
+				datainfo: ''
 			}
 		},
 		methods: {

pages/service_box/box_details.vue

@@ -95,10 +95,10 @@
 				}
 			},
 			details(data) {
-				console.log(data)
-				// uni.navigateTo({
-				// 	url: "choiceBox?data=" + JSON.stringify(data)
-				// })
+				// console.log(data)
+				uni.navigateTo({
+					url: "choiceBox?data=" + JSON.stringify(data)
+				})
 			}
 		}
 	}

pages/service_box/choiceBox.vue

@@ -5,7 +5,12 @@
 			<view class="card_view">
 				<!-- 放图片 标题 -->
 				<view class="title">
-					<image src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/横占位图.png" class="img"></image>
+					<view class="">
+						{{packs.name}}
+					</view>
+					<view class="">
+						服务中
+					</view>
 				</view>
 				<!-- 放描述 -->
 				<view class="describe">
@@ -17,6 +22,8 @@
 						<view style="padding: 27rpx 0 12rpx 0;">{{packs.intro}}</view>
 						<view style="padding: 12rpx 0;">{{packs.desc}}</view>
 					</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">
 						<!-- 头像 -->
@@ -62,6 +69,7 @@
 		name: 'productdetailspage',
 		onLoad(op) {
 			this.service = JSON.parse(op.data)
+			console.log(this.service)
 		},
 		mounted() {
 			this.getservice()
@@ -77,7 +85,8 @@
 					name: "https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/xieyi.png"
 				},
 				packs: {},
-				serviceid: ""
+				serviceid: "",
+				service:""
 			}
 		},
 		methods: {
@@ -105,10 +114,10 @@
 				}
 			},
 			getservice: async function() {
-				let res = await this.$request.post("/api/v1/order/orderDetail", {
-					order_id: this.service.order_id
+				let res = await this.$request.post("/api/v1/ServicePack/servicePackDetail", {
+					service_pack_id: this.service.service_pack_id
 				})
-				// console.log(res)
+				console.log(res)
 				if (res.status == 0) {
 					this.packs = res.data
 				}
@@ -146,8 +155,9 @@
 				width: 100%;
 				height: 20vh;
 				display: flex;
+				flex-direction: column;
 				justify-content: center;
-				align-items: flex-end;
+				align-items: center;
 
 				.img {
 					width: 90%;

pages/vaccines/vaccines_info.vue

@@ -89,7 +89,7 @@
 	export default {
 		onLoad() {
 			this.gettime()
-			
+
 		},
 		onShow() {
 			if (this.doctor != null) {
@@ -111,11 +111,11 @@
 				yuyuevalue: "请选择预约时间",
 				multiSelector: [],
 				timehour: "",
-				doctor: {},
+				doctor: "",
 				servicejigou: "请选择服务机构",
 				jigouID: "",
 				yimiao: "请选择接种疫苗",
-				yimiaoInfo: {},
+				yimiaoInfo: "",
 				time: ""
 			}
 		},
@@ -171,26 +171,47 @@
 				this.show = true
 			},
 			gotopay() {
-				if (this.yimiaoInfo != null && this.doctor != null && this.huanzheID != "" && this.timehour != "") {
-					let obj = {
-						product_type: 4,
-						patient_id: this.huanzheID,
-						total_amount: this.yimiaoInfo.price / 100,
-						organization_id: this.doctor.id,
-						schedule_date: this.time,
-						time_period_id: this.timehour,
-						vaccine_id: this.yimiaoInfo.id,
-						payment_type: 2
-					}
-					uni.navigateTo({
-						url: "../order/payment?data=" + JSON.stringify(obj)
+				if (this.huanzheID == "") {
+					uni.showToast({
+						title: "请先选择接种用户",
+						icon: "none"
+					})
+					return false
+				}
+				if (this.yimiaoInfo == "") {
+					uni.showToast({
+						title: "请先选择疫苗",
+						icon: "none"
 					})
-				} else {
+					return false
+				}
+				if (this.timehour == "") {
 					uni.showToast({
-						title: "请填写完整",
+						title: "请先选择预约时间",
 						icon: "none"
 					})
+					return false
 				}
+				if (this.doctor == "") {
+					uni.showToast({
+						title: "请先选择机构",
+						icon: "none"
+					})
+					return false
+				}
+				let obj = {
+					product_type: 4,
+					patient_id: this.huanzheID,
+					total_amount: this.yimiaoInfo.price / 100,
+					organization_id: this.doctor.id,
+					schedule_date: this.time,
+					time_period_id: this.timehour,
+					vaccine_id: this.yimiaoInfo.id,
+					payment_type: 2
+				}
+				uni.navigateTo({
+					url: "../order/payment?data=" + JSON.stringify(obj)
+				})
 			},
 			gotodoctorinfo(id) {
 				uni.navigateTo({

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

@@ -1 +1 @@
-<view style="width:100;height:100%;background-color:#f6f6f6;padding:20rpx 30rpx;"><block wx:for="{{listArray}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['open',['$0','$1'],[[['listArray','',index,'article.id']],[['listArray','',index,'article.title']]]]]]]}}" class="list" bindtap="__e"><view class="text"><view class="title">{{item.article.title}}</view><view class="type">{{item.article.type}}</view></view><view class="img"><image class="i" src="{{item.article.banner_url}}" mode="aspectFit"></image></view></view></block><u-empty vue-id="1db6ddb4-1" text="暂无数据" mode="order" show="{{show}}" margin-top="250" bind:__l="__l"></u-empty></view>
+<view style="width:100;height:100%;background-color:#f6f6f6;padding:20rpx 30rpx;"><block wx:for="{{listArray}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['open',['$0','$1'],[[['listArray','',index,'article.id']],[['listArray','',index,'article.title']]]]]]]}}" class="list" bindtap="__e"><view class="text"><view class="title">{{item.article.title}}</view><view class="type">{{item.article.created_at}}</view></view><view class="img"><image class="i" src="{{item.article.banner_url}}" mode="aspectFit"></image></view></view></block><u-empty vue-id="1db6ddb4-1" text="暂无数据" mode="order" show="{{show}}" margin-top="250" bind:__l="__l"></u-empty></view>

unpackage/dist/build/mp-weixin/pages/common_tools/my_consulting/opinionInfo.wxss

@@ -1 +1 @@
-page{background-color:#fff}.opinionList{padding-top:20rpx;padding-bottom:20rpx}.text-leftstyle{text-align:right;width:138rpx;display:inline-block}.text-leftstyle1{text-align:left;width:60px;display:inline-block}
+page{background-color:#fff}.opinionList{padding-top:20rpx;padding-bottom:20rpx}.text-leftstyle{text-align:right;width:138rpx;display:inline-block}.text-leftstyle1{text-align:left;width:138rpx;display:inline-block}

unpackage/dist/build/mp-weixin/pages/personal/coupon/couponList.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "领卷中心",
-  "usingComponents": {}
+  "usingComponents": {
+    "u-empty": "/uview-ui/components/u-empty/u-empty"
+  }
 }

unpackage/dist/build/mp-weixin/pages/personal/coupon/couponList.wxml

@@ -1 +1 @@
-<view class="main"></view>
+<view class="main"><view class="body-Discount margin-top-sm"><view class="collar"><view class="couponList"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="couponItem"><view class="couponItem-subject"><view class="couponItem-subject-left"><view class="couponItem-subject-price"><text class="couponItem-subject-icon">¥</text><text class="couponItem-subject-price-min">{{item.money/100}}</text><view class="couponItem-subject-price-reduce">{{item.name}}</view></view></view><view class="couponItem-subject-right"><view class="couponItem-subject-right-header"><label class="couponItem-subject-right-header-icon _span">{{item.type==1?'满减':'折扣'}}</label>{{''+item.title+''}}</view><block wx:if="{{item.is_receive==0}}"><button class="couponItem-subject-right-btn" data-index="{{index}}" data-event-opts="{{[['tap',[['collectCoupons',['$0',index],[[['list','',index]]]]]]]}}" bindtap="__e">领取</button></block><block wx:else><button class="iscouponItem-subject-right-btn">已领取</button></block><view class="closing-date">{{''+item.start_time+" - "+item.end_time+''}}</view></view></view></view></block></view></view></view><u-empty vue-id="65afbb62-1" text="暂无数据" show="{{show}}" mode="order" margin-top="250" bind:__l="__l"></u-empty><view class="cu-tabbar-height"></view><view class="cu-tabbar-height"></view></view>