no message

pages/archives/add_archives.vue

@@ -16,7 +16,7 @@
 			</view>
 			<view class="cu-form-group">
 				<view class="title">联系电话:</view>
-				<input v-model="phone" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入联系电话"></input>
+				<input type="number" v-model="phone" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入联系电话"></input>
 			</view>
 			<view class="cu-form-group">
 				<view class="title">电子邮箱:</view>

pages/archives/archives_info.vue

@@ -17,7 +17,7 @@
 					</view>
 					<view class=" header-box" style="padding: 0 8rpx;background-color: #fff;border-radius: 16rpx;">
 						<view class="cu-list menu">
-							<view class="cu-item arrow" @click="gotoupcard(infodata.patient.id)">
+							<view class="cu-item arrow" @click="gotoupcard(infodata.patient)">
 								<view class="content">
 									<text class="text-grey">证件照</text>
 								</view>
@@ -86,22 +86,22 @@
 		<view style="width: 100vw;height: auto;background-color: #f6f6f6;">
 			<view style="width: 100%;height: 100%;">
 				<view v-for="(item,index) in infodata.orders.service_packs" :key="index">
-					<view class="card flex justify-center" v-for="itm,idx in item.order_pack" :key="idx">
-						<view class="taocan" :data-id="item.id" @click="details">
+					<view class="card flex justify-center">
+						<view class="taocan" :data-id="item.order_pack.id" @click="details">
 							<view class="tc_left">
-								<text>{{itm.pack_name}}</text>
+								<text>{{item.order_pack.pack_name}}</text>
 							</view>
 							<view class="tc_right">
 								<view style="width: 100%;">
-									<view class="text">{{itm.pack_intro}}</view>
+									<view class="text">{{item.order_pack.pack_intro}}</view>
 									<!-- <view class="text">{{item.desc}}</view> -->
 									<view class="text">
-										<text style="text-align: left;">时长:{{itm.effective_days}}天</text>
-										<text style="float: right;color: #FF4F61;font-weight: bold;">¥{{itm.pack_price/100}}</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 v-if="true" color="#EEAA3F" separator="zh" :timestamp="itm.end_time-miao"></u-count-down><text
+									剩余时长：<u-count-down v-if="true" color="#EEAA3F" separator="zh" :timestamp="item.order_pack.end_time-miao"></u-count-down><text
 									 v-else>已结束</text>
 								</view>
 							</view>
@@ -151,9 +151,14 @@
 					this.show = false
 				}
 			},
-			gotoupcard(id) {
+			gotoupcard(item) {
+				let imglist = [{
+					url: item.card_img_url
+				}, {
+					url: item.card_back_img_url
+				}]
 				uni.navigateTo({
-					url: "upcard?id=" + id
+					url: "upcard?id=" + item.id + "&data=" + JSON.stringify(imglist)
 				})
 			}
 		}

pages/archives/upcard.vue

@@ -6,7 +6,19 @@
 		<view class="padding-lr-sm text-sm text-gray margin-top-sm margin-bottom-sm">
 			办理家医计划业务需上传被保人清晰证件照片(身份证正反面，护照，户口簿选择其中一种即可)
 		</view>
-		<u-upload ref="uUpload" :action="action" max-count="2"></u-upload>
+		<view class="cu-form-group">
+			<view class="grid col-4 grid-square flex-sub">
+				<view class="bg-img" v-for="(item,index) in imgListpoint" :key="index" :data-url="imgListpoint[index]">
+					<image :src="imgListpoint[index].url" mode='aspectFill'></image>
+					<view class="cu-tag bg-red" @click="DelImg" :data-index="index">
+						<text class="cuIcon-close"></text>
+					</view>
+				</view>
+				<view class="solids" @click="ChooseImage" v-if="imgListpoint.length<2">
+					<text class="cuIcon-cameraadd"></text>
+				</view>
+			</view>
+		</view>
 		<view class="cu-bar bg-white tabbar" style="position: fixed;bottom: 0;width: 100%;">
 			<view class="submit" style="background-color: #0B73B9;color: white;" @click="upcard">
 				提交审核
@@ -18,8 +30,12 @@
 <script>
 	export default {
 		onLoad(options) {
-			if (options.id) {
+			if (options.id != undefined) {
 				this.archivesId = options.id
+				if (JSON.parse(options.data)[0].url != "" && JSON.parse(options.data)[1].url != "") {
+					this.imgListpoint = JSON.parse(options.data)
+				}
+
 			}
 		},
 		onShow() {
@@ -27,28 +43,53 @@
 		},
 		data() {
 			return {
-				action: "https://t5.9026.com/api/v1/common/uploadFile",
-				filesArr: [],
-				archivesId: ""
+				archivesId: "",
+				imgListpoint: [],
+				imgList: []
 			}
 		},
 		methods: {
-			upcard: async function() {
-				let files = [];
-				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-				files = this.$refs.uUpload.lists.filter(val => {
-					return val.progress == 100;
-				})
-				files = files.map(item => {
-					return item.response.data.url
+			ChooseImage() {
+				uni.chooseImage({
+					count: 2, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album', 'camera'], //从相册选择
+					success: (res) => {
+						if (this.imgList.length != 0) {
+							this.imgList = this.imgList.concat(res.tempFilePaths)
+							this.$request.upload("/api/v1/common/uploadFile", this.imgList[this.imgList.length - 1], {}).then(data => {
+								this.imgListpoint.push(JSON.parse(data).data)
+								console.log(this.imgListpoint)
+							})
+						} else {
+							this.imgList = res.tempFilePaths
+							this.$request.upload("/api/v1/common/uploadFile", this.imgList[0], {}).then(data => {
+								this.imgListpoint.push(JSON.parse(data).data)
+							})
+						}
+					}
+				});
+			},
+			DelImg(e) {
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除吗？',
+					cancelText: '再想想',
+					confirmText: '删除',
+					success: res => {
+						if (res.confirm) {
+							this.imgListpoint.splice(e.currentTarget.dataset.index, 1);
+							this.imgListpoint = this.imgListpoint
+						}
+					}
 				})
-				// 如果您不需要进行太多的处理，直接如下即可
-				// files = this.$refs.uUpload.lists;
-				if (files.length != 0) {
+			},
+			upcard: async function() {
+				if (this.imgListpoint.length != 0) {
 					let res = await this.$request.post("/api/v1/patient/submitCardImg", {
 						id: this.archivesId,
-						card_img_url: files[0],
-						card_back_img_url:files[1]
+						card_img_url: this.imgListpoint[0].url,
+						card_back_img_url: this.imgListpoint[1].url
 					})
 					if (res.status == 0) {
 						uni.showToast({
@@ -68,6 +109,9 @@
 	};
 </script>
 
-<style scoped lang="scss">
-	.main {}
+<style lang="scss">
+	page {
+		background-color: #fff;
+		height: 100%;
+	}
 </style>

pages/childcare/child_care.vue

@@ -190,7 +190,7 @@
 			yuyuetime() {
 				this.show = true
 			},
-			gotopay() {
+			gotopay: async function() {
 				if (this.huanzheID == "") {
 					uni.showToast({
 						title: "请先选择接种用户",
@@ -198,7 +198,7 @@
 					})
 					return false
 				}
-				if (this.yimiaoInfo == "") {
+				if (this.yimiao == "") {
 					uni.showToast({
 						title: "请先选择儿保项目",
 						icon: "none"
@@ -231,9 +231,36 @@
 					}),
 					payment_type: 2
 				}
-				uni.navigateTo({
-					url: "../order/payment?data=" + JSON.stringify(obj)
-				})
+				console.log(this.yimiao)
+				if (this.yimiao == 0) {
+					let res = await this.$request.post("/api/v1/order/appointPlaceOrder", {
+						product_type: obj.product_type,
+						patient_id: obj.patient_id,
+						total_amount: obj.total_amount * 100,
+						organization_id: obj.organization_id,
+						schedule_date: obj.schedule_date,
+						time_period_id: obj.time_period_id,
+						nurse_ids: JSON.stringify(obj.nurse_ids),
+						payment_type: obj.payment_type,
+					})
+					if (res.status == 0) {
+						uni.showToast({
+							title: "提交成功!",
+							icon: "none",
+							duration: 1000
+						})
+						setTimeout(() => {
+							uni.redirectTo({
+								url: "../order/order?type=" + obj.product_type
+							})
+						}, 1000)
+					}
+				} else {
+					uni.navigateTo({
+						url: "../order/payment?data=" + JSON.stringify(obj)
+					})
+				}
+
 			},
 			gotodoctorinfo(id) {
 				uni.navigateTo({

pages/common_tools/my_consulting/consultingInfo.vue

@@ -132,7 +132,7 @@
 
 	.text-leftstyle {
 		text-align: right;
-		width: 138rpx;
+		width: 140rpx;
 		display: inline-block;
 	}
 

pages/common_tools/my_consulting/my_appointment.vue

@@ -29,13 +29,14 @@
 						<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>
 					</view>
 					<view class="textstyle margin-top-xs">
-						<text style="color: #333333;">下单时间：{{item.created_at}}</text>
+						<text style="color: #333333;">预约时间：{{format(item.order_patient.appoint_start_time*1000)+' - '+format(item.order_patient.appoint_end_time*1000)}}</text>
 					</view>
 				</view>
 			</view>
@@ -120,6 +121,17 @@
 			}
 		},
 		methods: {
+			format(t) {
+				let time = new Date(t);
+				let str = time.getMonth() < 9 ? ('0' + (time.getMonth() + 1)) : (time.getMonth() + 1);
+				str += '-';
+				str += time.getDate() < 10 ? ('0' + time.getDate()) : time.getDate();
+				str += ' ';
+				str += time.getHours();
+				str += ':';
+				str += time.getMinutes() < 10 ? ('0' + time.getMinutes()) : time.getMinutes();
+				return str;
+			},
 			typechange(value) {
 				this.value1 = value
 				if (value == 3) {
@@ -128,19 +140,22 @@
 					this.textcontent = "计免预约"
 				} else if (value == 5) {
 					this.textcontent = "儿保预约"
-				}else{
+				} else {
 					this.textcontent = "全部预约"
 				}
+				this.pageindex = 1
 				this.ordersList = []
 				this.getordersList()
 			},
 			paychange(value) {
 				this.value2 = value
+				this.pageindex = 1
 				this.ordersList = []
 				this.getordersList()
 			},
 			timechange(value) {
 				this.value3 = value
+				this.pageindex = 1
 				this.ordersList = []
 				this.getordersList()
 			},

pages/index/book.vue

@@ -35,7 +35,7 @@
 			this.getconfigLsit()
 		},
 		mounted() {
-			
+
 		},
 		data() {
 			return {
@@ -58,7 +58,7 @@
 		},
 		methods: {
 			getbook: async function() {
-				let res = await this.$request.post("/api/v1/article/articleList")
+				let res = await this.$request.post("/api/v1/article/articleList", {}, false)
 				let status = user.islogin(res)
 				if (status) {
 					this.list = res.data.data
@@ -70,7 +70,7 @@
 				})
 			},
 			getconfigLsit: async function() {
-				let res = await this.$request.post("/api/v1/common/configList")
+				let res = await this.$request.post("/api/v1/common/configList", {}, false)
 				console.log(res)
 				if (res.status == 0) {
 					this.configInfo = res.data

pages/index/index.vue

@@ -316,7 +316,7 @@
 					page: this.pageindex,
 					latitude: this.latitude,
 					longitude: this.longitude
-				})
+				}, false)
 				let status = user.islogin(res)
 				if (status) {
 					// this.doctorList = res.data.data
@@ -336,7 +336,7 @@
 					let res = await this.$request.post("/api/v1/collection/submitCollect", {
 						type: 1,
 						relation_id: e.currentTarget.dataset.id
-					})
+					}, false)
 					if (res.status == 0) {
 						if (res.data.is_collect == 0) {
 							uni.showToast({
@@ -416,7 +416,7 @@
 
 			},
 			getconfigData: async function() {
-				let res = await this.$request.post("/api/v1/common/configList")
+				let res = await this.$request.post("/api/v1/common/configList",{},false)
 				console.log(res)
 				if (res.status == 0) {
 					this.configInfo = res.data

pages/index/mine.vue

@@ -176,7 +176,7 @@
 				this.itemcurrent = e.detail.current
 			},
 			getUserInfo: async function() {
-				let res = await this.$request.post('/api/v1/user/userInfo')
+				let res = await this.$request.post('/api/v1/user/userInfo',{},false)
 				let status = user.islogin(res)
 				if (status) {
 					this.info = res.data
@@ -196,7 +196,7 @@
 				})
 			},
 			getarchives: async function() {
-				let res = await this.$request.post("/api/v1/patient/patientList")
+				let res = await this.$request.post("/api/v1/patient/patientList",{},false)
 				if (res.status == 0) {
 					this.patientList = res.data.data
 					console.log(this.patientList)

pages/personal/coupon/coupon.vue

@@ -10,9 +10,9 @@
 					<text v-if="index == 2">({{invalidList.length}})</text>
 				</view>
 				<view class="coupon-List" v-if="TabCur == 0">
-					<view style="text-align: right;">
+					<!-- <view style="text-align: right;">
 						<text>使用规则 ></text>
-					</view>
+					</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" @click="gotoinfo(item)">
@@ -26,7 +26,7 @@
 										<text class="text-cut">{{item.title}}</text>
 									</view>
 									<view class="text-gray text-sm flex">
-										<text class="text-cut">有效期：{{formatDate(item.start_time*1000)}}-{{formatDate(item.end_time*1000)}}</text>
+										<text class="">有效期：{{formatDate(item.start_time*1000)}}-{{formatDate(item.end_time*1000)}}</text>
 									</view>
 								</view>
 								<view class="action">

pages/personal/coupon/coupon_details.vue

@@ -1,7 +1,38 @@
-<template style="background: #F6F6F6;">
-	<view style="width: 100%;height: 100%;">
+<template>
+	<view style="width: 100%;height: 100%;background-color: #0B73B9;">
 		<view class="v">
-			
+			<view class="" style="font-size: 28rpx;color: #666;">
+				{{datainfo.title}}
+			</view>
+			<view class="" style="font-size: 56rpx;margin-top: 28rpx;margin-bottom: 10rpx;">
+				￥{{datainfo.max_reduce_amount/100}}
+			</view>
+			<view class="">
+				{{datainfo.name}}
+			</view>
+			<view class="buttomstyle">
+				{{datainfo.status==1?'未使用':datainfo.status==2?'已使用':'已过期'}}
+			</view>
+		</view>
+		<view class="details">
+			<view class="title">
+				有效期
+			</view>
+			<view class="">
+				{{formatDate(datainfo.start_time*1000)}} - {{formatDate(datainfo.end_time*1000)}}
+			</view>
+			<view class="title">
+				使用规则
+			</view>
+			<view class="">
+				{{datainfo.rules||'暂无使用规则'}}
+			</view>
+			<view class="title">
+				使用说明
+			</view>
+			<view class="">
+				{{datainfo.desc||'暂无使用说明'}}
+			</view>
 		</view>
 	</view>
 </template>
@@ -10,28 +41,63 @@
 	export default {
 		onLoad(op) {
 			this.datainfo = JSON.parse(op.data)
+			console.log(this.datainfo)
 		},
 		data() {
 			return {
 				datainfo: '',
-				
+
 			}
 		},
 		methods: {
 
 		},
-		onLoad: function() {
-			
-		}
 	}
 </script>
 
 <style>
+	Page {
+		height: 100%;
+	}
+
 	.v {
-		margin: 28rpx;
-		padding: 36rpx;
-		border-radius: 12px;
-		box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.04);
-		background-color: #FFFFFF
+		background-color: #fff;
+		margin: 0 25rpx;
+		text-align: center;
+		padding-top: 60rpx;
+		border-top-left-radius: 25rpx;
+		border-top-right-radius: 25rpx;
+		color: #353535;
+		font-size: 32rpx;
+		position: relative;
+		top: 25rpx;
+	}
+
+	.details {
+		background-color: #fff;
+		margin: -2rpx 25rpx 0;
+		font-size: 28rpx;
+		padding: 25rpx 40rpx 65rpx;
+		border-bottom-left-radius: 25rpx;
+		border-bottom-right-radius: 25rpx;
+	}
+
+	.details>.title {
+		color: #b0b0b0;
+		font-size: 26rpx;
+		margin-bottom: 25rpx;
+		margin-top: 50rpx;
+	}
+
+	.buttomstyle {
+		background-color: #fff;
+		color: #0B73B9;
+		/* border: 0.5px solid #ff4544; */
+		height: 56rpx;
+		line-height: 52rpx;
+		width: 240rpx;
+		margin: 35rpx auto 0;
+		font-size: 30rpx;
+		border-radius: 28rpx;
 	}
 </style>

pages/service_box/box_details.vue

@@ -4,22 +4,22 @@
 		<view style="width: 100vw;height: auto;background-color: #f6f6f6;">
 			<view style="width: 100%;height: 100%;">
 				<view v-for="(item,index) in serviceList" :key="index">
-					<view class="card flex justify-center" v-for="itm,idx in item.order_pack" :key="idx">
-						<view class="taocan" :data-id="item.id" @click="details(item.order_pack[idx])">
+					<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>{{itm.pack_name}}</text>
+								<text>{{item.order_pack.pack_name}}</text>
 							</view>
 							<view class="tc_right">
 								<view style="width: 100%;">
-									<view class="text">{{itm.pack_intro}}</view>
+									<view class="text">{{item.order_pack.pack_intro}}</view>
 									<!-- <view class="text">{{item.desc}}</view> -->
 									<view class="text">
-										<text style="text-align: left;">时长:{{itm.effective_days}}天</text>
-										<text style="float: right;color: #FF4F61;font-weight: bold;">¥{{itm.pack_price/100}}</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 v-if="current!=1" color="#EEAA3F" separator="zh" :timestamp="itm.end_time-miao"></u-count-down><text
+									剩余时长：<u-count-down v-if="current!=1" color="#EEAA3F" separator="zh" :timestamp="item.order_pack.end_time-miao"></u-count-down><text
 									 v-else>已结束</text>
 								</view>
 							</view>

pages/vaccines/vaccines_info.vue

@@ -170,7 +170,7 @@
 			yuyuetime() {
 				this.show = true
 			},
-			gotopay() {
+			gotopay: async function() {
 				if (this.huanzheID == "") {
 					uni.showToast({
 						title: "请先选择接种用户",
@@ -209,9 +209,34 @@
 					vaccine_id: this.yimiaoInfo.id,
 					payment_type: 2
 				}
-				uni.navigateTo({
-					url: "../order/payment?data=" + JSON.stringify(obj)
-				})
+				if ((this.yimiaoInfo.price / 100) == 0) {
+					let res = await this.$request.post("/api/v1/order/appointPlaceOrder", {
+						product_type: obj.product_type,
+						patient_id: obj.patient_id,
+						total_amount: obj.total_amount * 100,
+						organization_id: obj.organization_id,
+						schedule_date: obj.schedule_date,
+						time_period_id: obj.time_period_id,
+						vaccine_id: obj.vaccine_id,
+						payment_type: obj.payment_type,
+					})
+					if (res.status == 0) {
+						uni.showToast({
+							title: "提交成功!",
+							icon: "none",
+							duration: 1000
+						})
+						setTimeout(() => {
+							uni.redirectTo({
+								url: "../order/order?type=" + obj.product_type
+							})
+						}, 1000)
+					}
+				} else {
+					uni.navigateTo({
+						url: "../order/payment?data=" + JSON.stringify(obj)
+					})
+				}
 			},
 			gotodoctorinfo(id) {
 				uni.navigateTo({