no message

pages/common_tools/my_consulting/my_consulting.vue

@@ -536,7 +536,7 @@
 		margin-left: 15rpx;
 		background-color: #E5F5FF;
 		color: #0B73B9;
-		width: 120rpx;
+		// width: 120rpx;
 		height: 28rpx;
 		font-size: 20rpx;
 		border-radius: 10rpx;

pages/index/index.vue

@@ -325,8 +325,7 @@
 					latitude: this.latitude,
 					longitude: this.longitude
 				}, false)
-				let status = user.islogin(res)
-				if (status) {
+				if (res.status == 0) {
 					// this.doctorList = res.data.data
 					if (this.pageindex > res.data.last_page) {
 

pages/order/payment.vue

@@ -238,10 +238,11 @@
 				let res = await this.$request.post('/api/v1/Team/teamInfo', {
 					id: item.team_id[0]
 				}, false)
-				res.data.forEach(item => {
-					if (item == this.infodata.docter_id) {
+				res.data.forEach(it => {
+					if (it == this.infodata.docter_id) {
 						this.serviceid = item.id
-						this.showservice = false
+						this.showservice = false
+						console.log(this.serviceid)
 					} else {
 						uni.showModal({
 							title: "提示",
@@ -251,7 +252,6 @@
 						return false
 					}
 				})
-
 			},
 			getserviceList: async function() {
 				let res = await this.$request.post("/api/v1/order/orderList", {
@@ -259,7 +259,8 @@
 					// docter_id:this.infodata.docter_id
 					list_type: 1,
 					product_type: 6,
-					is_pack_expire: 2
+					is_pack_expire: 2,
+					order_status:3
 				})
 				console.log(res)
 				if (res.status == 0) {
@@ -277,9 +278,7 @@
 						})
 						this.pageservice++
 					}
-
 				}
-
 			},
 			getcoupon: async function() {
 				let res = await this.$request.post("/api/v1/coupon/userCouponList", {
@@ -468,7 +467,6 @@
 					})
 				} else {
 					this.payment()
-
 				}
 			},
 			getUserInfo: async function() {

pages/service_box/box_details.vue

@@ -63,7 +63,8 @@
 				serviceList: [],
 				miao: "",
 				pageindex: 1,
-				show: false
+				show: false,
+				order_status:3
 			}
 		},
 		methods: {
@@ -77,8 +78,10 @@
 				let num = 0
 				if (this.current == 0) {
 					num = 2
+					this.order_status = 3
 				} else if (this.current == 1) {
 					num = 1
+					this.order_status = 4
 				} else {
 					num = 3
 				}
@@ -87,7 +90,8 @@
 					page: this.pageindex,
 					list_type: 1,
 					product_type: 6,
-					is_pack_expire: num
+					is_pack_expire: num,
+					order_status:this.order_status
 				})
 				console.log(res)
 				if (res.status == 0) {

pages/service_box/choiceBox.vue

@@ -255,7 +255,7 @@
 					margin-right: 15rpx;
 					background-color: #E5F5FF;
 					color: #0B73B9;
-					width: 100rpx;
+					// width: 100rpx;
 					height: 28rpx;
 					font-size: 20rpx;
 					border-radius: 10rpx;

pages/service_packs/introduce.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="body">
-			<image :src="imghos+nodeEl" class="img"></image>
+			<image :src="imghos+nodeEl"  class="img"></image>
 		</view>
 		<view class="footer">
 			<view class="cu-bar bg-white tabbar border shop" style="width: 100%;">
@@ -91,6 +91,7 @@
 	.container {
 		width: 100%;
 		height: 100%;
+		// min-height: 100vh;
 		background-color: #F6F6F6;
 	}
 
@@ -99,9 +100,9 @@
 		height: 100%;
 
 		.img {
-			width: 94%;
+			width: 100%;
 			height: 88vh;
-			margin: 3% 3%;
+			// margin: 3% 3%;
 		}
 	}
 

pages/service_packs/packs_details.vue

@@ -85,7 +85,10 @@
 		<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>
+		</u-popup>
+		<!-- <view class="backfoot">
+			底部
+		</view> -->
 	</view>
 </template>
 
@@ -129,6 +132,14 @@
 			}
 		},
 		methods: {
+			pageScrollToBottom() {
+				uni.createSelectorQuery().select('.card').boundingClientRect((rect) => {
+					// 使页面滚动到底部
+					// uni.pageScrollTo({
+
+					// })
+				}).exec()
+			},
 			gotoxieyi() {
 				uni.navigateTo({
 					url: "../index/agreement?data=" + encodeURIComponent(this.packs.service_agreement_protocol)
@@ -225,7 +236,11 @@
 		position: fixed;
 		bottom: 0;
 	}
-
+	.backfoot{
+		position: fixed;
+		bottom: 120rpx;
+		right: 0;
+	}
 	.round {
 		height: 45rpx;
 		width: 50rpx;

pages/vaccines/vaccines_info.vue

@@ -261,8 +261,8 @@
 			callbacktime(item) {
 				// this.timehour = this.multiSelector[1][arr[1]].id
 				// this.yuyuevalue = this.multiSelector[0][arr[0]] + " " + this.multiSelector[1][arr[1]].start_time_period
-				// this.time = this.multiSelector[0][arr[0]]
-				
+				// this.time = this.multiSelector[0][arr[0]]
+
 				let arr = item.year.split(/[- :]/)
 				let nndate = new Date(arr[0], arr[1] - 1, arr[2]);
 				nndate = Date.parse(nndate)
@@ -396,6 +396,19 @@
 							url: "../order/order?type=" + obj.product_type
 						})
 					}, 1000)
+				} else {
+					uni.showModal({
+						title: "提示",
+						content: res.message,
+						confirmText: "查看预约",
+						success: (res) => {
+							if(res.confirm){
+								uni.navigateTo({
+									url:"../common_tools/my_consulting/my_appointment"
+								})
+							}
+						}
+					})
 				}
 				// } else {
 				// 	uni.navigateTo({