修复个别bug

pages.json

@@ -212,24 +212,24 @@
 				"navigationBarTitleText": "我的服务包"
 			}
 		},
-		{
-			"path": "pages/vaccines/vaccines_info",
-			"style": {
-				"navigationBarTitleText": "疫苗信息填写"
-			}
-		},
-		{
-			"path": "pages/vaccines/mechanism",
-			"style": {
-				"navigationBarTitleText": "服务机构"
-			}
-		},
-		{
-			"path": "pages/vaccines/vaccinesList",
-			"style": {
-				"navigationBarTitleText": "接种疫苗"
-			}
-		},
+		// {
+		// 	"path": "pages/vaccines/vaccines_info",
+		// 	"style": {
+		// 		"navigationBarTitleText": "疫苗信息填写"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/vaccines/mechanism",
+		// 	"style": {
+		// 		"navigationBarTitleText": "服务机构"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/vaccines/vaccinesList",
+		// 	"style": {
+		// 		"navigationBarTitleText": "接种疫苗"
+		// 	}
+		// },
 		{
 			"path": "pages/archives/archives_info",
 			"style": {
@@ -511,6 +511,29 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "pages/vaccines",
+			"pages": [
+				{
+					"path": "vaccines_info",
+					"style": {
+						"navigationBarTitleText": "疫苗信息填写"
+					}
+				},
+				{
+					"path": "mechanism",
+					"style": {
+						"navigationBarTitleText": "服务机构"
+					}
+				},
+				{
+					"path": "vaccinesList",
+					"style": {
+						"navigationBarTitleText": "接种疫苗"
+					}
+				}
+			]
 		}
 	],
 	"tabBar": {

pages/archives/add_archives.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="cu-form-group">
 				<view class="title">就诊人姓名:</view>
-				<input v-model="name" placeholder-style="text-align:right" placeholder="请输入姓名"></input>
+				<input v-model="name" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入姓名"></input>
 			</view>
 			<view class="cu-form-group">
 				<view class="title">就诊人性别:</view>
@@ -39,7 +39,7 @@
 			</view>
 			<view class="cu-form-group">
 				<view class="title">就诊人身份证:</view>
-				<input v-model="idcrad" placeholder-style="text-align:right" placeholder="请输入就诊人身份证号"></input>
+				<input v-model="idcrad" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入就诊人身份证号"></input>
 			</view>
 			<view class="padding-sm bg-white" style="color: #C0C0C0;">
 				注：就诊人信息用于平台审核和医疗业务使用，不会外传。请正却确填写就诊人信息，如需修改身份信息可电话联系客服修改（13330431369）
@@ -151,7 +151,8 @@
 				} else {
 					num = 2
 				}
-				if (this.imgList[0] !== undefined && this.name != "" && this.date != "请选择出生日期" && this.guanxiindex != -1) {
+				if (this.imgList[0] !== undefined && this.name != "" && this.date != "请选择出生日期" && this.guanxiindex != -1 && this.idcrad !=
+					"" && this.$util.isIdCard(this.idcrad)) {
 					let res = await this.$request.post("/api/v1/patient/createPatient", {
 						name: this.name,
 						sex: num,

pages/common_tools/home_doctor.vue

@@ -31,6 +31,10 @@
 				</view>
 			</view>
 		</view>
+		<u-empty text="暂无数据" :show="show" mode="order" margin-top="250"></u-empty>
+		<u-no-network></u-no-network>
+		<view class="cu-tabbar-height"></view>
+		<view class="cu-tabbar-height"></view>
 	</view>
 </template>
 
@@ -56,66 +60,14 @@
 					scope: '使用范围：家医团队可用，有效期内无限次、300元额度以内门诊预约与儿保预约无限制', //范围
 					giving: '赠送XXXX保险：保险介绍' //赠送
 				},
-				tcTeam: [{
-					id: '1',
-					name: '熊大',
-					label1: '熊',
-					label2: '主角',
-					department1: '外科',
-					department2: '主任医师',
-					follow: false
-				}, {
-					id: '2',
-					name: '熊二',
-					label1: '熊',
-					label2: '主角',
-					department1: '外科',
-					department2: '主任医师',
-					follow: false
-				}, {
-					id: '3',
-					name: '光头强',
-					label1: '人',
-					label2: '主角',
-					department1: '外科',
-					department2: '主任医师',
-					follow: false
-				}, {
-					id: '4',
-					name: '李老板',
-					label1: '人',
-					label2: '配角',
-					department1: '外科',
-					department2: '主任医师',
-					follow: false
-				}, {
-					id: '5',
-					name: '吉吉国王',
-					label1: '猴子',
-					label2: '配角',
-					department1: '外科',
-					department2: '主任医师',
-					follow: false
-				}, {
-					id: '6',
-					name: '毛毛',
-					label1: '猴子',
-					label2: '配角',
-					department1: '外科',
-					department2: '主任医师',
-					follow: false
-				}, {
-					id: '7',
-					name: '蹦蹦',
-					label1: '猴子',
-					label2: '配角',
-					department1: '外科',
-					department2: '主任医师',
-					follow: false
-				}],
-				doctorList: []
+				tcTeam: [],
+				doctorList: [],
+				pageindex: 1
 			}
 		},
+		onReachBottom() {
+			this.gethome_doctor()
+		},
 		methods: {
 			//关注
 			follow: async function(e) {
@@ -140,10 +92,25 @@
 				}
 			},
 			gethome_doctor: async function() {
-				let res = await this.$request.post("/api/v1/user/familyDocterList")
+				let res = await this.$request.post("/api/v1/user/familyDocterList", {
+					page: this.pageindex
+				})
 				console.log(res)
 				if (res.status == 0) {
-					this.doctorList = res.data.data
+					if (this.pageindex > res.data.last_page) {
+						uni.showToast({
+							title: "没有更多了",
+							icon: "none"
+						})
+					} else {
+						this.doctorList = this.doctorList.concat(res.data.data)
+						this.pageindex++
+					}
+				}
+				if (this.doctorList.length == 0) {
+					this.show = true
+				} else {
+					this.show = false
 				}
 			},
 			clicklist(e) {

pages/common_tools/me_evaluate.vue

@@ -38,6 +38,10 @@
 				</view>
 			</view>
 		</view>
+		<u-empty text="暂无数据" :show="show" mode="order" margin-top="250"></u-empty>
+		<u-no-network></u-no-network>
+		<view class="cu-tabbar-height"></view>
+		<view class="cu-tabbar-height"></view>
 	</view>
 </template>
 
@@ -47,12 +51,16 @@
 			return {
 				tcTeam: [],
 				pageindex: 1,
-				count: 5
+				count: 5,
+				show: false
 			}
 		},
 		mounted() {
 			this.getevaluateList()
 		},
+		onReachBottom() {
+			this.getevaluateList()
+		},
 		methods: {
 			getevaluateList: async function() {
 				let res = await this.$request.post("/api/v1/evaluate/evaluateList", {
@@ -60,7 +68,20 @@
 				})
 				console.log(res)
 				if (res.status == 0) {
-					this.tcTeam = res.data.data
+					if (this.pageindex > res.data.last_page) {
+						uni.showToast({
+							title: "没有更多了",
+							icon: "none"
+						})
+					} else {
+						this.tcTeam = this.tcTeam.concat(res.data.data)
+						this.pageindex++
+					}
+				}
+				if (this.tcTeam.length == 0) {
+					this.show = true
+				} else {
+					this.show = false
 				}
 			}
 		}

pages/common_tools/me_follow.vue

@@ -16,6 +16,7 @@
 				</view>
 			</u-collapse-item>
 		</u-collapse>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 

pages/common_tools/my_consulting/my_appointment.vue

@@ -22,12 +22,15 @@
 				</view>
 				<view class="" style="background: #FBFBFB;padding: 28rpx; border-radius: 16rpx;">
 					<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>
+						<u-avatar v-if="item.product_type==3" :src="item.docter.avatar" mode="circle"></u-avatar>
+						<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>
 					</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>
+						<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

@@ -34,7 +34,7 @@
 					</view>
 					<view class="textstyle margin-top-xs flex align-center justify-between">
 						<text style="color: #333333;">编号：{{item.order_sn}}</text>
-						<text v-if="item.order_status==4" class="text-blue">评价</text>
+						<text v-if="item.order_status==4" @click.stop="pinjia" style="width: 130rpx; text-align: right;" class="text-blue">评价</text>
 						<text v-else-if="item.order_status==1" class="text-blue">取消</text>
 					</view>
 					<view class="textstyle margin-top-xs">
@@ -167,6 +167,9 @@
 					this.show = false
 				}
 			},
+			pinjia(){
+				console.log("ssss")
+			},
 			goinfoorder(e) {
 				uni.navigateTo({
 					url: "consultingInfo?id=" + e.currentTarget.dataset.id

pages/common_tools/my_consulting/my_opinion.vue

@@ -19,6 +19,9 @@
 				</view>
 			</view>
 		</view>
+		<u-empty text="暂无数据" :show="show" mode="order" margin-top="250"></u-empty>
+		<view class="cu-tabbar-height"></view>
+		<view class="cu-tabbar-height"></view>
 	</view>
 </template>
 
@@ -30,9 +33,13 @@
 		data() {
 			return {
 				pageindex: 1,
-				opinion: []
+				opinion: [],
+				show: false
 			}
 		},
+		onReachBottom() {
+			this.getopinion()
+		},
 		methods: {
 			getopinion: async function() {
 				let res = await this.$request.post("/api/v1/suggest/suggestList", {
@@ -40,7 +47,20 @@
 				})
 				console.log(res)
 				if (res.status == 0) {
-					this.opinion = res.data.data
+					if (this.pageindex > res.data.last_page) {
+						uni.showToast({
+							title: "没有更多了",
+							icon: "none"
+						})
+					} else {
+						this.opinion = this.opinion.concat(res.data.data)
+						this.pageindex++
+					}
+				}
+				if (this.opinion.length == 0) {
+					this.show = true
+				} else {
+					this.show = false
 				}
 			},
 			gotoinfo(e) {

pages/doctor_related/doctor_info.vue

@@ -7,8 +7,8 @@
 					<view class="m-xstart pr m-bottom-line pb25 margin-bottom-sm">
 						<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 fb f16">{{doctor.name||''}}</text>
+								<text class="dpb f14 m-gray-small ml5" v-for="(itm,index) in doctor.label" :key="index">{{itm||''}}</text>
 							</view>
 							<view class="dpb m-flex margin-top-sm">科室：{{doctor.office.name}} {{doctor.qualification.name}}</view>
 							<view class="m-xend mt12">
@@ -72,7 +72,7 @@
 					 :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">
@@ -89,7 +89,7 @@
 						<text class="dpb iconfont icon-arrow-right m-gray-letter f20"></text>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="margin-lr-sm mt15 bg-white" 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>
@@ -127,6 +127,7 @@
 			<view v-else-if="barindex==2" class="submit text-white" @click="phonezixun" style="background-color: rgb(11,115,186)">图文咨询</view>
 			<view v-else class="submit text-white" @click="phonezixun" style="background-color: rgb(11,115,186)">门诊预约</view>
 		</view>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 
@@ -199,23 +200,25 @@
 				})
 				console.log(res)
 				if (res.status == 0) {
-					let nian = res.data.data.map(item => {
-						return item.schedule_date
-					})
-					let time = res.data.data.map(item => {
-						return item.schedule_period.map(itm => {
-							return { ...itm.time_period,
-								...itm.organization
-							}
+					if (res.data.data.length != 0) {
+						let nian = res.data.data.map(item => {
+							return item.schedule_date
 						})
-					})
-					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)
+						let time = res.data.data.map(item => {
+							return item.schedule_period.map(itm => {
+								return { ...itm.time_period,
+									...itm.organization
+								}
+							})
+						})
+						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) {
@@ -233,7 +236,14 @@
 				})
 			},
 			xuantime() {
-				this.show = !this.show
+				if (this.multiSelector.length != 0) {
+					this.show = !this.show
+				} else {
+					uni.showToast({
+						title: "该医生暂未排班",
+						icon: "none"
+					})
+				}
 			},
 			callbacktime(arr) {
 				this.daytime = this.multiSelector[0][arr[0]] + " " + this.multiSelector[1][arr[1]].start_time_period

pages/doctor_related/info_write.vue

@@ -177,6 +177,7 @@
 		</u-popup>
 		<view class="cu-tabbar-height"></view>
 		<view class="cu-tabbar-height"></view>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 

pages/doctor_related/select_doctor.vue

@@ -90,6 +90,7 @@
 			<u-loadmore :status="nomore" :icon-type="flower" />
 		</view>
 		<u-back-top :scroll-top="scrollTop" bottom="80" top="400"></u-back-top>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 

pages/index/book.vue

@@ -20,6 +20,7 @@
 		<view class="margin-tb padding-tb-xs">
 			<u-loadmore :status="nomore" :icon-type="flower" />
 		</view>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 

pages/index/editinfo.vue

@@ -14,10 +14,10 @@
 					<text class="text-grey">已绑定电话</text>
 				</view>
 				<view class="action">
-					<text class="text-grey text-sm"></text>
+					<text class="text-grey text-sm">{{phone!=''?phone:'未绑定手机号'}}</text>
 				</view>
 			</view>
-			<view class="cu-item arrow" @click="">
+			<view class="cu-item arrow" @click="show=true">
 				<view class="content">
 					<text class="text-grey">切换账号</text>
 				</view>
@@ -29,7 +29,7 @@
 					<text class="text-grey">支付密码</text>
 				</view>
 				<view class="action">
-					
+
 				</view>
 			</view>
 		</view>
@@ -53,6 +53,7 @@
 				</view>
 			</view>
 		</block>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 
@@ -60,6 +61,7 @@
 	export default {
 		onLoad(options) {
 			this.newName = options.name
+			this.phone = options.phone
 		},
 		mounted() {
 
@@ -67,7 +69,9 @@
 		data() {
 			return {
 				isShowConfirm: false,
-				newName: ""
+				newName: "",
+				phone: "",
+				show: false
 			}
 		},
 		methods: {
@@ -78,19 +82,19 @@
 				if (res.status == 0) {
 					this.isShowConfirm = false
 					uni.showToast({
-						title:"修改成功",
-						icon:"none"
+						title: "修改成功",
+						icon: "none"
 					})
 				}
 			},
-			gotophone(){
+			gotophone() {
 				uni.navigateTo({
-					url:"editphone"
+					url: "editphone"
 				})
 			},
-			gotopwd(){
+			gotopwd() {
 				uni.navigateTo({
-					url:"paypassword"
+					url: "paypassword"
 				})
 			}
 		}

pages/index/editphone.vue

@@ -26,6 +26,7 @@
 		</view>
 		<view class="cu-tabbar-height"></view>
 		<view class="cu-tabbar-height"></view>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 

pages/index/index.vue

@@ -221,6 +221,7 @@
 			<u-loadmore :status="nomore" :load-text="loadText" :icon-type="flower" />
 		</view>
 		<u-back-top :scroll-top="scrollTop" bottom="80" top="400"></u-back-top>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 

pages/index/message.vue

@@ -21,6 +21,7 @@
 		<u-empty text="暂无数据" mode="order" :show="show" margin-top="250"></u-empty>
 		<view class="cu-tabbar-height"></view>
 		<view class="cu-tabbar-height"></view>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 

pages/index/mine.vue

@@ -10,7 +10,7 @@
 						<view class="m-dpflex m-justify-start m-align-center" style="height: 165rpx;">
 							<image binderror="_binderror" mode="scaleToFill" :src="info.avatar" style="width: 120rpx;height: 120rpx;border-radius: 50%;"></image>
 							<text class="line1 f20 fb plr15 text-white">{{info.nickname}}</text>
-							<navigator hoverClass="none" :url="'editinfo?name='+info.nickname">
+							<navigator hoverClass="none" :url="'editinfo?name='+info.nickname+'&phone='+info.phone">
 								<image class="header-img" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/myedit.png"></image>
 							</navigator>
 							<view class="pr tr m-flex">
@@ -115,7 +115,7 @@
 					</navigator>
 					<navigator class="width25 m-ycenter overflow pr" hoverClass="none" url="/pages/common_tools/me_order/me_order">
 						<image style="width: 42rpx;height: 42rpx;" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/baodan.png"></image>
-						<view class="tip"></view>
+						<!-- <view class="tip"></view> -->
 						<view class="f14 m-gray-small mt10 line1">我的保单</view>
 					</navigator>
 				</view>
@@ -137,6 +137,7 @@
 		</view>
 		<view class="cu-tabbar-height"></view>
 		<view class="cu-tabbar-height"></view>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 

pages/index/paypassword.vue

@@ -19,6 +19,7 @@
 		</view>
 		<view class="cu-tabbar-height"></view>
 		<view class="cu-tabbar-height"></view>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 

pages/login/login.vue

@@ -51,13 +51,14 @@
 
 			<!-- 底部信息 -->
 			<view class="footer">
-				<view class="flex align-center">
-					<image @click="isqueren" :src="imgitem.name" mode="" style="width: 30rpx;height: 30rpx;"></image>
+				<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: #999999;">服务协议</text>
 				</view>
 			</view>
 		</view>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 

pages/order/payment.vue

@@ -80,10 +80,11 @@
 				<text style="padding-left: 30rpx;font-size: 32rpx;">合计：</text>
 				<text style="padding-left: 20rpx;font-size: 36;font-weight: 500;color: #FF4F61;">{{orderAmount}}</text>
 			</view>
-			<view class="submit text-white" @click="popupShow=true,show=true" style="background-color: rgb(11,115,186); font-size: 32rpx;">确认支付</view>
+			<view class="submit text-white" @click="confirmpay" style="background-color: rgb(11,115,186); font-size: 32rpx;">确认支付</view>
 		</view>
 		<u-keyboard @change="valChange" @backspace="backspace" ref="uKeyboard" mode="number" v-model="popupShow" :tooltip="false"
 		 :mask="false"></u-keyboard>
+		<u-no-network></u-no-network>
 	</view>
 </template>
 
@@ -95,7 +96,7 @@
 			this.norderAmount = this.infodata.total_amount
 			console.log(this.infodata)
 		},
-		mounted() {
+		onShow() {
 			this.getUserInfo()
 		},
 		data() {
@@ -141,6 +142,25 @@
 			click(e) {
 				console.log(e)
 			},
+			confirmpay() {
+				if (this.info.balance < this.infodata.total_amount * 100) {
+					uni.showModal({
+						title: "错误提示",
+						content: "余额不足，请先充值",
+						confirmText: "去充值",
+						success(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "../personal/recharge"
+								})
+							}
+						}
+					})
+				} else {
+					popupShow = true
+					show = true
+				}
+			},
 			getUserInfo: async function() {
 				let res = await this.$request.post('/api/v1/user/userInfo')
 				if (res.status == 0) {

pages/personal/coupon/coupon.vue

@@ -5,9 +5,9 @@
 				<view :class="index==TabCur?'cu-item text-blue cur':'cu-item'" v-for="(item,index) in list" :key="index" @click="tabSelect"
 				 :data-id="index" style="">
 					{{item.name}}
-					<text v-if="index == 0">({{notUsed}})</text>
-					<text v-if="index == 1">({{used}})</text>
-					<text v-if="index == 2">({{invalid}})</text>
+					<text v-if="index == 0">({{notUsedList.length}})</text>
+					<text v-if="index == 1">({{usedList.length}})</text>
+					<text v-if="index == 2">({{invalidList.length}})</text>
 				</view>
 				<view class="coupon-List" v-if="TabCur == 0">
 					<view style="text-align: right;">
@@ -15,18 +15,18 @@
 					</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 5" :key="index">
-								<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Taric.png);">
+							<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>
 								<view class="content">
 									<view class="text-grey">
-										<text class="text-cut">九折卷</text>
+										<text class="text-cut">{{item.name}}</text>
 									</view>
 									<view class="text-gray text-sm flex">
-										<text class="text-cut">满20元可用，优惠上限50元</text>
+										<text class="text-cut">{{item.title}}</text>
 									</view>
 									<view class="text-gray text-sm flex">
-										<text class="text-cut">有效期：2020.01.01 11:00:00-2020.01.10 11:00:00</text>
+										<text class="text-cut">有效期：{{item.start_time}}-{{item.end_time}}</text>
 									</view>
 								</view>
 								<view class="action">
@@ -38,12 +38,54 @@
 					</view>
 				</view>
 				<view v-else-if="TabCur == 1">
-
-
+					<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>
+								<view class="content">
+									<view class="text-grey">
+										<text class="text-cut">{{item.name}}</text>
+									</view>
+									<view class="text-gray text-sm flex">
+										<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>
+									</view>
+								</view>
+								<view class="action">
+									<!-- <view class="text-grey text-xs">22:20</view>
+									<view class="cuIcon-notice_forbid_fill text-gray"></view> -->
+								</view>
+							</view>
+						</view>
+					</view>
 				</view>
 				<view v-else="TabCur == 2">
-
-
+					<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>
+								<view class="content">
+									<view class="text-grey">
+										<text class="text-cut">{{item.name}}</text>
+									</view>
+									<view class="text-gray text-sm flex">
+										<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>
+									</view>
+								</view>
+								<view class="action">
+									<!-- <view class="text-grey text-xs">22:20</view>
+									<view class="cuIcon-notice_forbid_fill text-gray"></view> -->
+								</view>
+							</view>
+						</view>
+					</view>
 				</view>
 			</scroll-view>
 		</view>
@@ -73,21 +115,37 @@
 				current: 0, // tabs组件的current值，表示当前活动的tab选项
 				swiperCurrent: 0, // swiper组件的current值，表示当前那个swiper-item是活动的
 				pageindex: 1,
-				couponList:[]
+				couponList: [],
+				notUsedList: [],
+				usedList: [],
+				invalidList: [],
+				show: false
 			};
 		},
 		methods: {
 			tabSelect(e) {
 				this.TabCur = e.currentTarget.dataset.id
-				console.log(this.TabCur)
 			},
 			getCouponList: async function() {
 				let res = await this.$request.post("/api/v1/coupon/couponList", {
 					page: this.pageindex
 				})
-				console.log(res)
-				if(res.status == 0){
-					this.couponList = res.data.data
+				if (res.status == 0) {
+					this.notUsedList = res.data.data.filter(item => {
+						if (item.status == 1) {
+							return item
+						}
+					})
+					this.usedList = res.data.data.filter(item => {
+						if (item.status == 2) {
+							return item
+						}
+					})
+					this.invalidList = res.data.data.filter(item => {
+						if (item.status == 3) {
+							return item
+						}
+					})
 				}
 			}
 		},
@@ -100,7 +158,7 @@
 	.coupon-List {
 		height: 100%;
 		width: 100%;
-		background-color: #f9f9f9;
+		/* background-color: #f9f9f9; */
 		padding: 20rpx 20rpx 0 20rpx;
 	}
 

pages/service_box/box_details.vue

@@ -19,7 +19,8 @@
 									</view>
 								</view>
 								<view class="margin-top-xs">
-									剩余时长：<u-count-down v-if="true" color="#EEAA3F" separator="zh" :timestamp="itm.end_time-miao"></u-count-down><text v-else>已结束</text>
+									剩余时长：<u-count-down v-if="true" color="#EEAA3F" separator="zh" :timestamp="itm.end_time-miao"></u-count-down><text
+									 v-else>已结束</text>
 								</view>
 							</view>
 						</view>
@@ -27,6 +28,7 @@
 				</view>
 			</view>
 		</view>
+		<u-empty text="暂无数据" :show="show" mode="order" margin-top="250"></u-empty>
 		<view class="cu-tabbar-height"></view>
 		<view class="cu-tabbar-height"></view>
 	</view>
@@ -49,7 +51,9 @@
 				}, ],
 				current: 0,
 				serviceList: [],
-				miao: ""
+				miao: "",
+				pageindex: 1,
+				show:false
 			}
 		},
 		methods: {
@@ -58,12 +62,25 @@
 			},
 			getserviceList: async function() {
 				let res = await this.$request.post("/api/v1/order/orderList", {
+					page: this.pageindex,
 					list_type: 1,
 					product_type: 6
 				})
 				if (res.status == 0) {
-					this.serviceList = res.data.data
-					console.log(this.serviceList)
+					if (this.pageindex > res.data.last_page) {
+						uni.showToast({
+							title: "没有更多了",
+							icon: "none"
+						})
+					} else {
+						this.serviceList = this.serviceList.concat(res.data.data)
+						this.pageindex++
+					}
+				}
+				if (this.serviceList.length == 0) {
+					this.show = true
+				} else {
+					this.show = false
 				}
 			}
 		}

pages/service_packs/packs_details.vue

@@ -53,8 +53,8 @@
 		</view>
 		<!-- 协议 -->
 		<view style="height: 200rpx;width: 100%;display: flex;justify-content: left;">
-			<view style="height: 35rpx;width: auto;font-size: 24rpx;margin-left: 30rpx;display: flex;align-items: center;">
-				<image @click="isqueren" :src="imgitem.name" mode="" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;"></image>
+			<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: #999999;">服务协议</text>

unpackage/dist/build/mp-weixin/app.json

@@ -9,9 +9,6 @@
     "pages/order/payment",
     "pages/order/order",
     "pages/service_box/box_details",
-    "pages/vaccines/vaccines_info",
-    "pages/vaccines/mechanism",
-    "pages/vaccines/vaccinesList",
     "pages/archives/archives_info",
     "pages/index/editinfo",
     "pages/index/editphone",
@@ -72,6 +69,14 @@
         "choicepacks",
         "introduce"
       ]
+    },
+    {
+      "root": "pages/vaccines",
+      "pages": [
+        "vaccines_info",
+        "mechanism",
+        "vaccinesList"
+      ]
     }
   ],
   "window": {

unpackage/dist/build/mp-weixin/components/uni-badge/uni-badge.json

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

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/doctor_related/doctor_info.json

@@ -7,6 +7,7 @@
     "u-grid-item": "/uview-ui/components/u-grid-item/u-grid-item",
     "u-line": "/uview-ui/components/u-line/u-line",
     "u-picker": "/uview-ui/components/u-picker/u-picker",
-    "u-rate": "/uview-ui/components/u-rate/u-rate"
+    "u-rate": "/uview-ui/components/u-rate/u-rate",
+    "u-no-network": "/uview-ui/components/u-no-network/u-no-network"
   }
 }

unpackage/dist/build/mp-weixin/pages/doctor_related/select_doctor.json

@@ -9,6 +9,7 @@
     "u-tag": "/uview-ui/components/u-tag/u-tag",
     "u-line": "/uview-ui/components/u-line/u-line",
     "u-loadmore": "/uview-ui/components/u-loadmore/u-loadmore",
-    "u-back-top": "/uview-ui/components/u-back-top/u-back-top"
+    "u-back-top": "/uview-ui/components/u-back-top/u-back-top",
+    "u-no-network": "/uview-ui/components/u-no-network/u-no-network"
   }
 }

unpackage/dist/build/mp-weixin/pages/index/editinfo.wxss

@@ -1 +1 @@
-.button2 button.data-v-52cc9c59{width:100%;font-size:26rpx;height:70rpx;color:#606266;background-color:#fff;border-radius:0;border-top:2rpx solid rgba(0,0,0,.2)}.button2 button.data-v-52cc9c59::after{border:none}.toast-box.data-v-52cc9c59{width:100%;height:100%;opacity:1;position:fixed;top:0;left:0}.toastbg.data-v-52cc9c59{opacity:.2;background-color:#000;position:absolute;width:100%;min-height:100vh}.showToast.data-v-52cc9c59{position:absolute;opacity:1;width:70%;margin-left:15%;margin-top:40%}.toast-title.data-v-52cc9c59{padding-left:5%;background-color:#2196f3;color:#fff;padding-top:2vh;padding-bottom:2vh;border-top-right-radius:16rpx;border-top-left-radius:16rpx}.toast-main.data-v-52cc9c59{padding-top:2vh;padding-bottom:2vh;background-color:#fff;text-align:center}.toast-input.data-v-52cc9c59{margin-left:5%;margin-right:5%;border:1px solid #ddd;padding-left:2vh;padding-right:2vh;padding-top:1vh;padding-bottom:1vh}
+.button2 button.data-v-53b2bf1f{width:100%;font-size:26rpx;height:70rpx;color:#606266;background-color:#fff;border-radius:0;border-top:2rpx solid rgba(0,0,0,.2)}.button2 button.data-v-53b2bf1f::after{border:none}.toast-box.data-v-53b2bf1f{width:100%;height:100%;opacity:1;position:fixed;top:0;left:0}.toastbg.data-v-53b2bf1f{opacity:.2;background-color:#000;position:absolute;width:100%;min-height:100vh}.showToast.data-v-53b2bf1f{position:absolute;opacity:1;width:70%;margin-left:15%;margin-top:40%}.toast-title.data-v-53b2bf1f{padding-left:5%;background-color:#2196f3;color:#fff;padding-top:2vh;padding-bottom:2vh;border-top-right-radius:16rpx;border-top-left-radius:16rpx}.toast-main.data-v-53b2bf1f{padding-top:2vh;padding-bottom:2vh;background-color:#fff;text-align:center}.toast-input.data-v-53b2bf1f{margin-left:5%;margin-right:5%;border:1px solid #ddd;padding-left:2vh;padding-right:2vh;padding-top:1vh;padding-bottom:1vh}

unpackage/dist/build/mp-weixin/pages/index/index.json

@@ -11,6 +11,7 @@
     "u-tag": "/uview-ui/components/u-tag/u-tag",
     "u-line": "/uview-ui/components/u-line/u-line",
     "u-loadmore": "/uview-ui/components/u-loadmore/u-loadmore",
-    "u-back-top": "/uview-ui/components/u-back-top/u-back-top"
+    "u-back-top": "/uview-ui/components/u-back-top/u-back-top",
+    "u-no-network": "/uview-ui/components/u-no-network/u-no-network"
   }
 }

unpackage/dist/build/mp-weixin/pages/index/mine.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "我的",
-  "usingComponents": {}
+  "usingComponents": {
+    "u-no-network": "/uview-ui/components/u-no-network/u-no-network"
+  }
 }

unpackage/dist/build/mp-weixin/uview-ui/components/u-column-notice/u-column-notice.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/build/mp-weixin/uview-ui/components/u-no-network/u-no-network.json

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

unpackage/dist/build/mp-weixin/uview-ui/components/u-no-network/u-no-network.wxml

@@ -0,0 +1 @@
+<block wx:if="{{!isConnected}}"><view data-event-opts="{{[['touchmove',[['e0',['$event']]]]]}}" class="u-no-network data-v-77eeb170" style="{{'z-index:'+(uZIndex)+';'}}" catchtouchmove="__e"><view class="u-inner data-v-77eeb170"><image class="u-error-icon data-v-77eeb170" src="{{image}}" mode="widthFix"></image><view class="u-tips data-v-77eeb170">{{''+tips+''}}</view><view class="u-retry data-v-77eeb170" hover-stay-time="{{150}}" hover-class="u-retry-hover" data-event-opts="{{[['tap',[['retry',['$event']]]]]}}" bindtap="__e">重试</view></view></view></block>

unpackage/dist/build/mp-weixin/uview-ui/components/u-no-network/u-no-network.wxss

@@ -0,0 +1 @@
+.u-no-network.data-v-77eeb170{background-color:#fff;position:fixed;top:0;left:0;right:0;bottom:0}.u-inner.data-v-77eeb170{height:100vh;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;flex-direction:row;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;margin-top:-15%}.u-tips.data-v-77eeb170{color:#909399;font-size:28rpx;padding:30rpx 0}.u-error-icon.data-v-77eeb170{width:300rpx}.u-to-setting.data-v-77eeb170{color:#c0c4cc;font-size:26rpx}.u-setting-btn.data-v-77eeb170{font-size:26rpx;color:#2979ff}.u-retry.data-v-77eeb170{margin-top:30rpx;border:1px solid #909399;color:#909399;font-size:28rpx;padding:6rpx 30rpx;border-radius:3px}.u-retry-hover.data-v-77eeb170{color:#fff;background-color:#909399}

unpackage/dist/build/mp-weixin/uview-ui/components/u-number-keyboard/u-number-keyboard.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }