Browse Source

Merge branch 'master' of http://192.168.1.220:10080/raolu/sr-publicServicePlatform

# Conflicts:
#	api/http-request.js
#	page/register/html/register.html
zyz 6 years ago
parent
commit
8825dbf134
49 changed files with 1307 additions and 782 deletions
  1. 6 0
      api/http-request.js
  2. 1 1
      api/patient/appointment-api.js
  3. 22 1
      api/patient/jiuzhen-api.js
  4. 49 20
      component/appointment/dept-source.js
  5. 29 15
      component/appointment/doctor-list.js
  6. 8 22
      component/appointment/hospital-source.js
  7. 1 1
      component/common/footer.js
  8. 1 1
      component/doctor-home/device-reback.js
  9. 6 6
      component/login-register/login.js
  10. 4 4
      component/mine/change-password.js
  11. 10 6
      component/mine/left-menu.js
  12. 0 31
      component/mine/personal-dialog-form.js
  13. 5 5
      component/mine/personal-info.js
  14. 8 8
      component/mine/record.js
  15. 32 32
      component/mine/security-setting.js
  16. 14 31
      component/mineJiuZhen/mineJiuZhen-dialog-form.js
  17. 1 1
      css/bootstrap.min.css
  18. 20 0
      js/util.js
  19. 5 3
      page/appointment/css/select-hospital.css
  20. 2 1
      page/appointment/html/confirm-info.html
  21. 1 0
      page/appointment/html/home.html
  22. 1 0
      page/appointment/html/select-hospital.html
  23. 1 0
      page/appointment/html/success-info.html
  24. 124 115
      page/appointment/js/confirm-info.js
  25. 3 1
      page/appointment/js/home.js
  26. 6 21
      page/appointment/js/select-hospital.js
  27. 3 22
      page/appointment/js/success-info.js
  28. 151 150
      page/home/html/index.html
  29. 6 6
      page/home/js/index.js
  30. 3 1
      page/login/html/login.html
  31. 8 1
      page/mine/css/record.css
  32. 94 0
      page/mine/css/suggest.css
  33. 145 0
      page/mine/css/xiaoxi.css
  34. 4 1
      page/mine/html/personal-info.html
  35. 1 1
      page/mine/html/record.html
  36. 2 0
      page/mine/html/security-setting.html
  37. 53 0
      page/mine/html/suggest.html
  38. 109 6
      page/mine/html/xiaoxi.html
  39. BIN
      page/mine/image/icon_biaoqian.png
  40. 12 0
      page/mine/js/suggest.js
  41. 69 0
      page/mine/js/xiaoxi.js
  42. 34 0
      page/mineJiuZhen/css/mineJiuZhen.css
  43. 56 0
      page/mineJiuZhen/html/cancelAppointment.html
  44. 13 11
      page/mineJiuZhen/html/mineJiuZhen.html
  45. 9 6
      page/mineJiuZhen/html/satisfaction.html
  46. 44 0
      page/mineJiuZhen/js/cancelAppointment.js
  47. 47 38
      page/mineJiuZhen/js/mineJiuZhen.js
  48. 79 213
      page/mineJiuZhen/js/satisfaction.js
  49. 5 0
      page/register/html/register.html

+ 6 - 0
api/http-request.js

@ -28,8 +28,14 @@
        imserver = "http://172.19.103.88:3000/api/v2";
        socketUrl = "http://172.19.103.88:3000";
//      server = "http://192.168.131.133:8080/";
<<<<<<< HEAD
		
		msgServer = "http://172.19.103.73:10000/"; //短信服务器
=======
//		server = "http://192.168.131.215:10001/"; //冬梅
//		server = "http://192.168.131.154:10001/"; //张丹
>>>>>>> 9c7149d1d5f6f95bf4ccde147cb4ac4f73fe8cbc
//      server = "http://192.168.131.127:8060/"; //逸祥
//      server = "http://192.168.131.24:8080/"; //仕杰
//      imserver = "http://192.168.131.24:3000/api/v2"

+ 1 - 1
api/patient/appointment-api.js

@ -5,7 +5,7 @@
    var appointmentAPI = {
        //查询医院列表
        querySimpleHospitalList: function(data){
            return httpRequest.fzPost("baseinfo/HospitalApi/querySimpleHospitalList", data);
           return httpRequest.get("basic/api/v1.0/appointment/combination/findHospitalList", {data: data});
        },
        //获取医院详情
        querySimpleHospitalById: function(data){

+ 22 - 1
api/patient/jiuzhen-api.js

@ -13,11 +13,32 @@
		}, //查询挂号单详情
		getRegOrderInfo: function(data) {
			return httpRequest.get("basic/api/v1.0/appointment/registration/" + data);
		},
		},		
		getRegisterWarn: function(data) {
			return httpRequest.get("basic/api/v1.0/dictionaries/170/entries/RegisterWarn",{data:data});
		},		
		CancellationWarn: function(data) {
			return httpRequest.get("basic/api/v1.0/dictionaries/170/entries/CancellationWarn",{data:data});
		},		
		cancelOrder: function(data) {
			return httpRequest.get("basic/api/v1.0/appointment/registration/updateState", {
				data: data
			});
		},//我的消息列表
		messageList: function(data) {
			return httpRequest.get("basic/api/v1.0/messageTemplate/MyMessageList", {
				data: data
			})
		},
		getSatisfactionQuestionws:function(data) {
			return httpRequest.post("basic/api/v1.0/questionnaire/getAllQuestionsByTemplateCode", {
				data: data
			})
		},
		postSatisfactionAnswers:function(data) {
			return httpRequest.post("basic/api/v1.0/questionnaire/saveAnswer", {
				data: data
			})
		},
	}

+ 49 - 20
component/appointment/dept-source.js

@ -1,41 +1,32 @@
(function() {
	Vue.component('dept-source', {
		template: '<div class="select-hospital">\
					<ul class="select-condition-list">\
						<li class="select-condition-list-item">\
					<ul class="select-condition-list" @click="itemClick">\
						<li class="select-condition-list-item" data-type="hostipal">\
							<div class="condition-name">医院</div>\
							<div class="condition-list">\
								<span>全部</span>\
								<span :class="{\'active\': hos.hospitalId==currentHospitalId}" v-for="hos in hospitalData" v-bind:data-id="hos.hospitalId">{{hos.hosName}}</span>\
								<span :class="{\'active\': hos.hospitalId==currentHospitalId}" v-for="hos in hospitalData" v-bind:data-val="hos.hospitalId">{{hos.hosName}}</span>\
							</div>\
							<div class="more-list">更多</div>\
						</li>\
						<li class="select-condition-list-item">\
						<li class="select-condition-list-item" data-type="visitdept">\
							<div class="condition-name">就诊科室</div>\
							<div class="condition-list">\
								<span>全部</span>\
								<span  v-for="dept in deptData" v-bind:data-id="dept.hosDeptId">{{dept.deptName}}</span>\
								<span class="active">全部</span>\
								<span v-for="dept in deptData" v-bind:data-val="dept.hosDeptId">{{dept.deptName}}</span>\
							</div>\
							<div class="more-list">更多</div>\
						</li>\
						<li class="select-condition-list-item">\
						<li class="select-condition-list-item" data-type="visitdate">\
							<div class="condition-name">就诊日期</div>\
							<div class="condition-list">\
								<span>全部</span>\
								<span class="active">全部</span>\
								<span data-val="{{nowDate}}">今天</span>\
								<span v-for="d in planDate" v-bind:data-val="d.date1">{{d.day}}({{d.date}})</span>\
							</div>\
							<div class="more-list">更多</div>\
						</li>\
						<li class="select-condition-list-item">\
							<div class="condition-name">医生类型</div>\
							<div class="condition-list">\
								<span>全部</span>\
								<span>主任医师</span>\
								<span>其他</span>\
							</div>\
							<div class="more-list">更多</div>\
						</li>\
					</ul>\
				</div>',
		props: ["info"],
@ -62,6 +53,27 @@
			},50);
		},
		methods: {
			itemClick:function(){
				var vm = this;
				var hosDeptId = "";
				var curType = $(event.target).closest("li").attr("data-type");
				var activeItemId = $(event.target).attr("data-val");
				$(event.target).closest("li").find("span").removeClass("active");
				$(event.target).addClass("active");
				if(curType=="hostipal") {//医院
					vm.currentHospitalId = activeItemId;
					hosDeptId = ""
					vm.getDeptList();
				}else if(curType=="visitdept"){//就诊科室
					vm.currentHospitalId = $(".select-condition-list li[data-type=hostipal]").find("span.active").attr("data-val");
					hosDeptId = activeItemId;
				}else if(curType=="subdept"){//子科室
					
				}else if(curType=="visitdate"){//就诊日期
					
				}
				EventBus.$emit('update-doctor-list',{hospitalId:vm.currentHospitalId,hosDeptId:hosDeptId});
			},
			bindEvents:function(){
				//查看更多
				$(".more-list").click(function() {
@ -100,6 +112,9 @@
				appointmentAPI.querySimpleHosDeptList(params).then(function(res) {
					if(res.successFlg && res.obj.Code == "10000") {
						vm.deptData = res.obj.Result;
//						vm.deptData = _.filter(vm.deptData,function(item){
//							return 
//						})
					}
				})
			},
@ -146,8 +161,22 @@
		}
	});
	function getDeptList(vm) {
})()
	}
//<li class="select-condition-list-item">\
//	<div class="condition-name">医生类型</div>\
//	<div class="condition-list">\
//		<span>全部</span>\
//		<span>主任医师</span>\
//		<span>其他</span>\
//	</div>\
//	<div class="more-list">更多</div>\
//</li>\
})()
//<li class="select-condition-list-item" data-type="subdept">\
//	<div class="condition-name">子科室</div>\
//	<div class="condition-list">\
//		<span class="active">全部</span>\
//	</div>\
//	<div class="more-list">更多</div>\
//</li>\

+ 29 - 15
component/appointment/doctor-list.js

@ -2,7 +2,7 @@
	Vue.component('doctor-list', {
		template: '<div class="ui-col-1 ml15 bgc-fff c-border p20">\
						<div class="c-f16 c-323232 mb20">医生列表</div>\
						<div class="ui-grid c-border p10 pb0 mt10" v-for="(doc, index) in doctorList">\
						<div class="ui-grid c-border p10 pb0 mt10" v-for="(doc, index) in doctorList" v-show="isDoctorList">\
							<div class="ui-col-0 mr10">\
								<img v-bind:src="doc.photoUri" width="70" height="70" class="c-images-cycle">\
							</div>\
@ -19,12 +19,12 @@
								</p>\
							</div>\
							<div class="ui-col-1 div-doctor-section" v-for="(arrange, aindex) in arrangeList" v-if="index==aindex">\
								<div class="div-left-btn c-hide" @click="preClick" v-show="leftBtn"></div>\
								<div class="div-left-btn" @click="preClick"></div>\
								<ul class="doctor-ul">\
									<li v-for="(arrg, arrIndex) in arrange" @click="goToDoctorPage(doc.doctorSn, arrg.arrangeID)">\
										<div class="div-doctor-item" :class="getColorClass(arrg.numberStatus,arrg.arrangeStatus)">\
											<div class="mt5">{{arrg.registerDate}}</div>\
											<div class="mt5">{{arrg.timeName}}</div>\
											<div class="mt5">{{arrg.date}}</div>\
											<div class="mtb2">{{arrg.timeName}}</div>\
											<div class="div-doctor-type bgc-0ad8c8" v-if="arrg.numberStatus==1">预约</div>\
											<div class="div-doctor-type bgc-d1d1d1" v-if="arrg.numberStatus==2">已满</div>\
											<div class="div-doctor-type bgc-f0a65f" v-if="arrg.arrangeStatus==2">放号提醒</div>\
@ -32,10 +32,14 @@
										</div>\
									</li>\
								</ul>\
								<div class="div-right-active-btn" v-show="rightBtn" @click="nextClick" v-if="arrangeList[aindex].length>4"></div>\
								<div class="div-right-active-btn" @click="nextClick"></div>\
							</div>\
						</div>\
						<div id="page" class="page_div fr"></div>\
						<div id="page" class="page_div fr" v-show="isDoctorList"></div>\
						<div class="div-wushuju" v-show="!isDoctorList">\
							<div style="background: url(../../../images/wushuju_icon.png) no-repeat;width: 230px;height: 130px;margin: 30px auto;"></div>\
							<div style="text-align:center">查无数据</div>\
						</div>\
					</div>',
		props: ["info"],
		data: function() {
@ -44,13 +48,14 @@
				currentHospitalId: "",
				currentHosName: "",
				pageIndex: 1,
				pageSize: 10,
				pageSize: 5,
				totalPage: 0,
				hosDeptId: "",
				doctorList: [],
				arrangeList:[],
				leftBtn:false,
				rightBtn:false,
				isDoctorList:true
			}
		},
		mounted: function() {
@ -60,6 +65,14 @@
				vm.currentHosName = JSON.parse(vm.info).hosName;
				vm.getDoctorList();
			}, 50);
			
			//更新医生列表信息
			EventBus.$on('update-doctor-list', function(arg) {
				vm.isInit = true;
				vm.currentHospitalId = arg.hospitalId;
				vm.hosDeptId = arg.hosDeptId;
				vm.getDoctorList();
			})
		},
		methods: {
			getColorClass:function(numberStatus,arrangeStatus){
@ -86,16 +99,17 @@
				}
				appointmentAPI.querySimpleDoctorList(params).then(function(res) {
					if(res.successFlg && res.obj.Code == "10000") {
						vm.doctorList = res.obj.Result;
						//获取医生排班数据
						vm.getArrangeWater(vm.doctorList);
						vm.doctorList = res.obj.Result || [];
						vm.isDoctorList = vm.doctorList.length>0?true:false;
						vm.getArrangeWater(vm.doctorList);//获取医生排班数据
						if(vm.isInit) {
							vm.totalPage = Math.ceil(res.obj.Total / vm.pageSize);
							vm.totalPage = Math.ceil(res.obj.Total / vm.pageSize) || 0;
							var totalSize = res.obj.Total || 0;
							//分页初始化
							$("#page").paging({
								pageNo: 1,
								totalPage: vm.totalPage,
								totalSize: res.obj.Total,
								totalSize: totalSize,
								callback: function(num) {
									vm.pageIndex = num; //回调的页数
									getDoctorList(vm);
@ -130,13 +144,13 @@
					})
					
					vm.arrangeList = _.map(vm.arrangeList, function(data) {
						_.map(data, function(item) {
							item.registerDate = item.registerDate.substring(5,10).replace("-","/");
						_.map(data, function(item,index) {
							item.date = item.registerDate.substring(5,10).replace("-","/");
							item.timeName = item.timeId==1?"上午":item.timeId==2?"下午":"晚上";
						})	
						return data;
					})
					 $(".doctor-ul li:lt(4)").hide()
//					 $(".doctor-ul li:lt(4)").hide()
				});
			},
			preClick:function(){

+ 8 - 22
component/appointment/hospital-source.js

@ -10,10 +10,6 @@
								</div>\
								<div class="ui-col-1">\
									<div class="c-f16 c-323232">{{data.hosName}}<span class="ml10 c-f14 c-ef6b00">[{{data.levelName}}]</span></div>\
									<div class="mt16 c-f14">\
										<span class="c-0AD9C9">{{data.doctorNum}}</span>\
										<span class="c-909090">个推荐医生</span>\
									</div>\
									<div class="mt20">\
										<img src="../../../images/icon_dizhi.png" width="24" height="24" />\
										<span class="ml5 c-f14 c-909090">{{data.address}}</span>\
@ -36,7 +32,6 @@
		},
		mounted: function() {
			var vm = this;
//			getHospitalList(vm);
            vm.getHospitalList();
		},
		methods: {
@ -48,13 +43,13 @@
				var params = {
					pageIndex: vm.currentPage,
					pageSize: vm.pageSize,
					provinceCode: 360000,
					provinceCode: "360000",
					cityCode: 361100
				}
				appointmentAPI.querySimpleHospitalList(params).then(function(res) {
					if(res.successFlg && res.obj.Code == "10000") {
						var hospitalData = res.obj;
						//				vm.hospitalData = hospitalData.Result;
						vm.hospitalData = hospitalData.Result;
						if(vm.isInit) {
							vm.totalPage = Math.ceil(hospitalData.Total / vm.pageSize);
							//分页初始化
@ -68,20 +63,6 @@
								}
							})
							vm.isInit = false;
							//查询医生总数
							var doctorParams = {
								pageIndex: vm.currentPage,
								pageSize: vm.pageSize,
								hospitalId: hospitalData.Result[0].hospitalId
							}
							appointmentAPI.querySimpleDoctorList(doctorParams).then(function(doctorRes) {
								if(doctorRes.successFlg && doctorRes.obj.Code == "10000") {
									hospitalData.Result[0].doctorNum = doctorRes.obj.Total;
									vm.hospitalData = hospitalData.Result;
								}
							})
						}
					}
				})
@ -89,4 +70,9 @@
		}
	});
})()
})()
//<div class="mt16 c-f14">\
//	<span class="c-0AD9C9">{{data.doctorNum}}</span>\
//	<span class="c-909090">个推荐医生</span>\
//</div>\

+ 1 - 1
component/common/footer.js

@ -1,7 +1,7 @@
(function(){
    Vue.component('page-footer', {
        template: '<div class="pt30" style="height:170px; background-color: #edeef1">\
                    <div class="c-909090 ui-grid ui-grid-middle" style="margin: 0 auto; width: 750px;">\
                    <div class="c-909090 ui-grid ui-grid-middle" style="margin: 0 auto; width: 800px;">\
                        <div class="ui-col-0 mr20">\
                            <img src="../../../images/qr_code.png" width="105">\
                        </div>\

+ 1 - 1
component/doctor-home/device-reback.js

@ -14,7 +14,7 @@
										<p class="c-909090 m0 mt5 c-f12 txt-center">{{list.detail}}</p>
									</li>
								</ul>
								<div>
								<div class="suggestcss">
									<label class="">问题&建议<span class="c-f00">*</span></label>
									<p class="c-position-r m0" v-if="!isEdit">
										<textarea @input="limit" class="form-control" placeholder="请描述您在使用过程中遇到的问题或建议,如果遇到功能异常,上传异常页面截图能更快解决哦~"></textarea>

+ 6 - 6
component/login-register/login.js

@ -138,7 +138,7 @@
					}
					var isMobile = isCardNo(vm.mobile,2);
					if(!isMobile) {
						alert('请输入正确的手机号码!');
						toastr.error('请输入正确的手机号码!');
						return false;
					}
					if(!vm.captcha) {
@ -152,7 +152,7 @@
				var vm=this;
				var isMobile = isCardNo(vm.mobile,2);
				if(!isMobile) {
					alert('请输入正确的手机号码!');
					toastr.error('请输入正确的手机号码!');
					return false;
				}
				if(vm.codeMsg==="获取验证码"){
@ -176,7 +176,7 @@
					}
					if(num===2){
						if(res.expiresIn<=0){
							alert("验证码已失效,请重新获取验证码!");
							toastr.error("验证码已失效,请重新获取验证码!");
						}else{
							var data = {
//								grant_type: httpRequest.grant_type,
@ -211,7 +211,7 @@
					}
				}).catch(function(err){
					console.log(err)
					alert("获取短信验证码失败")
					toastr.error("获取短信验证码失败")
					vm.codeMsg="获取验证码";
					verifyCodeFlag=false;
				})
@ -296,14 +296,14 @@
		if(codeType == 1) { // 身份证号码为15位或者18位,15位时全为数字,18位前17位为数字,最后一位是校验位,可能为数字或字符X 
			var reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
			if(!reg.test(card)) {
				alert("身份证号输入不合法");
				toastr.error("身份证号输入不合法");
			} else {
				isidcard = true
			}
		} else {
			var reg = /0?(13|14|15|18|17)[0-9]{9}/;
			if(!reg.test(card)) {
				alert("手机号码输入不合法");
				toastr.error("手机号码输入不合法");
			} else {
				isidcard = true
			}

+ 4 - 4
component/mine/change-password.js

@ -60,16 +60,16 @@
						password: vm.confirmPassword
					}).then(function(res) {
						if(res) {
							alert("密码修改成功,请重新登录系统");							
							toastr.success("密码修改成功,请重新登录系统");							
							vm.existUser();
						} else {
							alert("密码修改失败");
							toastr.error("密码修改失败");
						}
					}).catch(function(err){
						alert("密码修改失败");
						toastr.error("密码修改失败");
					})
				}).catch(function(err){
					alert("原密码错误!");
					toastr.error("原密码错误!");
				})			
			},
			existUser: function() {

+ 10 - 6
component/mine/left-menu.js

@ -9,8 +9,9 @@
								<div class="c-f20">我的账户</div>
								<div class="mine-menu">
									<div id="info" class="pt20" @click="goinfo()">个人设置</div>
									<div id="notices" class="pt20"  @click="gonotices()">消息通知</div>
									<div id="xiaoxi" class="pt20"  @click="gonotices()">消息通知</div>
									<div id="securitySetting" class="pt20"  @click="gosecuritySetting()">安全设置</div>
									<div id="suggest" class="pt20"  @click="goSuggest()">意见反馈</div>
								</div>
							</div>
						</div>
@ -38,19 +39,22 @@
		},
		methods: {
			goinfo: function() {
				location.href = "../../mine/html/personal-info.html"
				window.location.href = "../../mine/html/personal-info.html"
			},
			gosecuritySetting: function() {
				location.href = "../../mine/html/security-setting.html"
				window.location.href = "../../mine/html/security-setting.html"
			},
			gorecord: function() {
				location.href = "../../mine/html/record.html"
				window.location.href = "../../mine/html/record.html"
			},
			godoctor: function() {
				location.href = "../../mine/html/doctor.html"
				window.location.href = "../../mine/html/doctor.html"
			},
			gonotices:function(){
				location.href = "../../mine/html/notices.html"
				window.location.href = "../../mine/html/xiaoxi.html"
			},
			goSuggest:function(){
				window.location.href = "../../mine/html/suggest.html"
			}
		},
	})

+ 0 - 31
component/mine/personal-dialog-form.js

@ -11,37 +11,6 @@
				content: "../../mine/html/select-industry.html?industryid=" + industryid + "&directionid=" + directionid, //iframe的url
			});
		},
		// 取消预约
		cancelAppointment: function(id) {
			return new Promise(function(resolve, reject) {
				var layerid = top.layer.confirm('<div><h3 class="c-t-center mt10">是否确认取消预约?</h3><div class="quxiaobox">取消须知:<div class="c-909090">过多的退号可能导致您在一段时间内无法预约,我们对预约和退号频次达到一定数量的帐户将采取限制措施:每个帐号每个月下单满10笔时且退号满5笔时限制该帐户当月预约权限.</div></div></div>', {
					title: '取消预约',
					area: ['500px', '370px'],
					btn: ['确定', '取消'] //按钮
				}, function() {
					var oauthInfo = JSON.parse(sessionStorage.getItem("oauthInfo"));
					appointmentAPI.cancelOrder({
						orderId: id,
						thirdPartyUserId: oauthInfo.id
					}).then(function(res) {
						if(res.Code == "10000") {
							jiuzhenAPI.cancelOrder({
								id: id,
								state: 99
							}).then(function(res) {
								alert("取消成功!")
							})
						} else {
							alert("取消失败!")
						}
						resolve(layerid)
					})
					resolve(layerid)
				}, function() {
				});
			})
		},
	}
	window.personalDialogForm = personalDialogForm

+ 5 - 5
component/mine/personal-info.js

@ -18,7 +18,7 @@
										<input type="text" class="form-control" v-model="userinfo.realName" name="realName">\
									</div>\
								</div>\
								<div class="w3-row form-group">\
								<div class="w3-row form-group" style="height: 40px;">\
									<div class="w3-col c-f16 m5 c-t-right" style="width:80px;">性&emsp;&emsp;别</div>\
									<div class="w3-rest pl15 c-f14">\
										<input type="radio" name="gender"  value="0" v-model="userinfo.gender">&emsp;男&emsp;\
@ -125,7 +125,7 @@
					vm = this
				file = e.target.files[0]
				if(file.size > 5 * 1024 * 1024) {
					alert("图片大小格式超出5M范围不可用")
					toastr.error("图片大小格式超出5M范围不可用")
					return false
				}
				var formData = new FormData()
@ -138,7 +138,7 @@
				fileAPI.uploadImg(param).then(function(reslove) {
					vm.userinfo.imgRemotePath = reslove.obj.httpUrl //上传到图片服务器成功则修改个人资料					
				}, function(err) {
					alert("选择图片失败");
					toastr.error("选择图片失败");
				})
			},
			update: function() {
@ -150,9 +150,9 @@
				}
				vm.getNewAddress()
				mineAPI.userInforUpdate(vm.userinfo).then(function (res) {
                    alert("修改成功!")
                    toastr.success("修改成功!")
                }).catch(function(){
                    alert("修改失败!")
                    toastr.error("修改失败!")
                })
			},
			

+ 8 - 8
component/mine/record.js

@ -41,7 +41,7 @@
														</div>\
														<div class="table-cell c-f16 mt25">{{record.patientName}}</div>\
														<div class="table-cell">\
															<div class="cancelbtn" @click="cancelbtn(record.orderId)">取消预约</div>\
															<div class="cancelbtn" @click="cancelbtn(record.orderId,record.id)">取消预约</div>\
															<div class="mt10" style="color:#0AD8C8"  @click="getinfo(record.id)">查看详情</span>\
														</div>\
													</div>\
@ -49,8 +49,9 @@
											</div>\
										</div>\
									</template>\
									<div v-else class="c-t-center mtb100">\
									<div v-else class="c-t-center  wushuju">\
										<img src="../../../images/queshengye-.png" />\
									<div class="mt40">暂无预约就诊记录</div>\
									</div>\
									<div id="homepage" class="page_div" v-if="!ishomeNull"></div>\
								</div>\
@ -89,8 +90,9 @@
											</div>\
										</div>\
									</template>\
									<div v-else class="c-t-center mtb100">\
									<div v-else class="c-t-center  wushuju">\
										<img src="../../../images/queshengye-.png" />\
									<div class="mt40">暂无预约就诊记录</div>\
									</div>\
									<div id="historypage" class="page_div" v-if="!ishistoryNull"></div>\
								</div>\
@ -186,7 +188,7 @@
				var oauthInfo = JSON.parse(sessionStorage.getItem("oauthInfo"));
				var filters = "userId=" + oauthInfo.id
				if(types == '2') {
					filters += ";state=" + types
					filters += ";state=" + types+";orderId<>null"
				}
				var param = {
					fields: '',
@ -215,10 +217,8 @@
				})
			},
			cancelbtn: function(id) {
				personalDialogForm.cancelAppointment(id).then(function(layerid) {
					top.layer.close(layerid)
				})
			cancelbtn: function(orderid, thirdorderid) {
				mineJiuZhenDialogForm.cancelAppointment(orderid, thirdorderid)
			},
			inithomePage: function(pageNo, total, size) {
				var vm = this

+ 32 - 32
component/mine/security-setting.js

@ -1,37 +1,37 @@
(function() {
	Vue.component('security-setting', {
		template: `<div class="container ptb20 ">
				<div class="row w3-row">
					<left-menu :code="code"></left-menu>
					<div class="pl251" >
						<div class="bgc-fff c-border ptb30" style="height: 706px;">
							<div id="security">
								<div class="w3-row pl30">
									<div class="w3-col" style="width:60px;"><img src="../../../images/icon_wodezhanghu.png" width="43" height="50" /></div>
									<div class="w3-rest pl10 pb35 c-border-b pr30">
										<div class="w3-col mt15" style="width:117px;float: right;"><button class="btn btn-default btn-block" type="button" @click="changePassword()">修 改</button></div>
										<div class="w3-rest">
											<div class="c-f20 ">登陆密码</div>
											<div class="c-f14 c-909090 mt15 ">建议您定期更改密码,设置安全性高的密码可以使账号更安全</div>
										</div>
									</div>
								</div>
								<div class="w3-row pl30 pt30">
									<div class="w3-col" style="width:60px; "><img src="../../../images/icon_wodezhanghu.png " width="43 " height="50 " /></div>
									<div class="w3-rest pl10 pb35 c-border-b pr30">
										<div class="w3-col mt15 " style="width:117px;float: right; "><button class="btn btn-default btn-block  " type="button" @click="changePhone()" disabled="disabled">更 改</button></div>
										<div class="w3-rest">
											<div class="c-f20 ">安全手机 180****1111</div>
											<div class="c-f14 c-909090 mt15 ">安全手机可以用于登录账号,重置密码或者其他安全验证</div>
										</div>
									</div>
								</div>
							</div>							
							<change-password></change-password>
							<change-phone></change-phone>
						</div>
					</div>
				</div>`,
		template: '<div class="container ptb20 ">\
				<div class="row w3-row">\
					<left-menu :code="code"></left-menu>\
					<div class="pl251" >\
						<div class="bgc-fff c-border ptb30" style="min-height: 706px;">\
							<div id="security">\
								<div class="w3-row pl30">\
									<div class="w3-col" style="width:60px;"><img src="../../../images/icon_wodezhanghu.png" width="43" height="50" /></div>\
									<div class="w3-rest pl10 pb35 c-border-b pr30">\
										<div class="w3-col mt15" style="width:117px;float: right;"><button class="btn btn-default btn-block" type="button" @click="changePassword()">修 改</button></div>\
										<div class="w3-rest">\
											<div class="c-f20 ">登陆密码</div>\
											<div class="c-f14 c-909090 mt15 ">建议您定期更改密码,设置安全性高的密码可以使账号更安全</div>\
										</div>\
									</div>\
								</div>\
								<div class="w3-row pl30 pt30">\
									<div class="w3-col" style="width:60px; "><img src="../../../images/icon_wodezhanghu.png " width="43 " height="50 " /></div>\
									<div class="w3-rest pl10 pb35 c-border-b pr30">\
										<div class="w3-col mt15 " style="width:117px;float: right; "><button class="btn btn-default btn-block  " type="button" @click="changePhone()" disabled="disabled">更 改</button></div>\
										<div class="w3-rest">\
											<div class="c-f20 ">安全手机 180****1111</div>\
											<div class="c-f14 c-909090 mt15 ">安全手机可以用于登录账号,重置密码或者其他安全验证</div>\
										</div>\
									</div>\
								</div>\
							</div>\
							<change-password></change-password>\
							<change-phone></change-phone>\
						</div>\
					</div>\
				</div>',
		props: [],
		data: function() {
			return {

+ 14 - 31
component/mineJiuZhen/mineJiuZhen-dialog-form.js

@ -1,49 +1,32 @@
(function() {
	var mineJiuZhenDialogForm = {
		// 新增接口权限
		satisfaction: function(id) {
		satisfaction: function(messageId) {
			top.layer.open({
				type: 2,
				title: '满意度调查',
				shadeClose: false,
				closeBtn: true, //显示关闭按钮
				area: ['500px', '714px'],
				btn: [], //按钮
				content: '../../../page/mineJiuZhen/html/satisfaction.html', //iframe的url
				content: '../../../page/mineJiuZhen/html/satisfaction.html?messageId='+messageId, //iframe的url
				end: function() {
					
				}
			});
		},
		// 取消预约
		cancelAppointment: function(id,orderid) {
			return new Promise(function(resolve, reject) {
				var layerid = top.layer.confirm('<div><h3 class="c-t-center mt10">是否确认取消预约?</h3><div class="quxiaobox">取消须知:<div class="c-909090">过多的退号可能导致您在一段时间内无法预约,我们对预约和退号频次达到一定数量的帐户将采取限制措施:每个帐号每个月下单满10笔时且退号满5笔时限制该帐户当月预约权限。</div></div></div>', {
					title: '取消预约',
					area: ['500px', '370px'],
					btn: ['确定', '取消'] //按钮
				}, function() {
					var oauthInfo = JSON.parse(sessionStorage.getItem("oauthInfo"));
					appointmentAPI.cancelOrder({
						orderId: orderid,
						thirdPartyUserId: oauthInfo.id
					}).then(function(res) {
						if(res.Code == "10000") {
							jiuzhenAPI.cancelOrder({
								id: id,
								state: 99
							}).then(function(res) {alert("取消成功!")})
						} else {
							alert("取消失败!")
						}
						resolve(layerid)
					})
					resolve(layerid)
				}, function() {
				});
			})
		cancelAppointment: function(orderid,thirdorderid) {
			top.layer.open({
				type: 2,
				title: '取消预约',
				shadeClose: false,
				closeBtn: true, //显示关闭按钮
				area: ['500px', '370px'],
				content: '../../../page/mineJiuZhen/html/cancelAppointment.html?orderid='+orderid+'&thirdorderid='+thirdorderid, //iframe的url
				end: function() {
					
				}
			});
		},
	}

File diff suppressed because it is too large
+ 1 - 1
css/bootstrap.min.css


+ 20 - 0
js/util.js

@ -58,6 +58,26 @@ function GetRequest() {
   return theRequest;
}
//正则匹配法
function GetRequest1(name){
	var url = window.location.href; //获取地址栏url
	var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
	var matcher = pattern.exec(url);
	var items = null;
	if(null != matcher) {
		try {
			items = decodeURIComponent(decodeURIComponent(matcher[1]));
		} catch(e) {
			try {
				items = decodeURIComponent(matcher[1]);
			} catch(e) {
				items = matcher[1];
			}
		}
	}
	return items;
}
//判断输入字符串是否为空或全是空格
function isNull(str) {
	if(str == null) return true;

+ 5 - 3
page/appointment/css/select-hospital.css

@ -95,7 +95,7 @@
.doctor-ul {
	padding-left: 10px;
	height: 72px;
	width:390px;
	width: 480px;
	overflow: hidden;
}
@ -107,7 +107,7 @@
}
.div-doctor-info {
	width: 240px !important;
	width: 250px !important;
}
.ml276 {
@ -203,4 +203,6 @@
	color: #fff;
	border-bottom-left-radius: 10px;
	border-bottom-right-radius: 10px;
}
}
.mtb2{margin-bottom: 2px;margin-top: 2px;}

+ 2 - 1
page/appointment/html/confirm-info.html

@ -74,7 +74,7 @@
                        </div>
                        <div class="mt30 mb30 c-border-dashed bgc-f6f6f6 ptb15 plr20">
                            <div class="c-f16 c-909090">预约须知</div>
                            <div class="c-666 mt5">频繁刷新导致IP被限制2小时不能预约挂号,若耽误您预约,后果自负。</div>
                            <div class="c-666 mt5">{{Warntxt}}</div>
                            <div class="c-f16 c-909090 mt10">温馨提示</div>
                            <div class="c-666 mt5">1、3个月内无故爽约2次,将列入黑名单限制3个月内不予预约</div>
                        </div>
@ -99,6 +99,7 @@
        <script src="../../../component/common/appointment-step.js" type="text/javascript" charset="utf-8"></script>
        <!--利用搜狐的接口获得ip-->
        <script src="http://pv.sohu.com/cityjson?ie=utf-8"></script>
        <script src="../../../api/patient/jiuzhen-api.js"></script>
        <script src="../js/confirm-info.js" type="text/javascript" charset="utf-8"></script>
    </body>
</html>

+ 1 - 0
page/appointment/html/home.html

@ -45,6 +45,7 @@
			<script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
			<script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
			<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>
			<script src="../../../plugins/pace/pace.min.js" type="text/javascript" charset="utf-8"></script>
			<script src="../../../js/paging.js"></script>
			<script src="../../../api/http-request.js"></script>
			<script src="../../../api/patient/appointment-api.js"></script>

+ 1 - 0
page/appointment/html/select-hospital.html

@ -46,6 +46,7 @@
		<script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/pace/pace.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../api/http-request.js"></script>
		<script src="../../../api/patient/appointment-api.js"></script>
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>

+ 1 - 0
page/appointment/html/success-info.html

@ -79,6 +79,7 @@
        <script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../plugins/pace/pace.min.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../api/patient/appointment-api.js"></script>
        <script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>

+ 124 - 115
page/appointment/js/confirm-info.js

@ -1,118 +1,127 @@
var request = GetRequest(),
    id = request.id;
	id = request.id;
new Vue({
    el: "#main",
    data: {
        dateInfo: {},
        numberInfo: {},
        baseInfo: {},
        patientInfo: {}
    },
    mounted: function(){
        EventBus.$emit("jump-step",{step:4});//step:跳转的步数
        //从缓存获取前一个页面缓存的信息
        var dateInfo = window.localStorage.getItem("dateInfo"),
            numberInfo = window.localStorage.getItem("numberInfo"),
            baseInfo = window.localStorage.getItem("baseInfo"),
            patientInfo = window.sessionStorage.getItem("oauthInfo");
        
        if(patientInfo){
            patientInfo = JSON.parse(patientInfo);
            this.patientInfo = patientInfo;
        }
        if(dateInfo){
            dateInfo = JSON.parse(dateInfo);
            this.dateInfo = dateInfo;
        }
        if(numberInfo){
            numberInfo = JSON.parse(numberInfo);
            this.numberInfo = numberInfo;
        }
        if(baseInfo){
            baseInfo = JSON.parse(baseInfo);
            this.baseInfo = baseInfo;
        }
    },
    methods: {
        confirm: function(){
            var userInfo = this.patientInfo,
                baseInfo = this.baseInfo,
                dateInfo = this.dateInfo,
                numberInfo = this.numberInfo;
            var params = {
                thirdPartyUserId: userInfo.id,
                patientName: userInfo.realName,
                tel: userInfo.telephone,
                IP: returnCitySN.cip, //通过搜狐接口获得ip地址
                cardNo: userInfo.idCardNo,
                modeId: dateInfo.modeId,
                hospitalId: baseInfo.hospitalId,
                hospitalName: baseInfo.hosName,
                hosDeptId: baseInfo.hosDeptId,
                hosDeptName: baseInfo.deptName,
                doctorSn: baseInfo.doctorSn,
                doctorName: baseInfo.doctorName,
                numberSn: numberInfo.numberSN,
                numberPrice: dateInfo.specialPrice,
                thirdPartyOrderId: id,
                registerDate: dateInfo.registerDate,
                timeId: dateInfo.timeId,
                commendTime: numberInfo.commendTime,
                serialNo: numberInfo.serialNo
            }
            appointmentAPI.createRegOrderForOpen(params).then(function(res){
                if(res.successFlg){
                    if(res.obj.Code == "10000"){
                        var orderId = res.obj.orderId;
                        //更新我们自己系统的挂号单信息
                        var params2 = {
                            id: res.obj.thirdPartyOrderId,
                            userId: userInfo.id
                        };
                        appointmentAPI.updateRegistrationOrder(params2).then(function(res){
                            console.log(res);
                            if(res.successFlg){
                                window.localStorage.removeItem("dateInfo");
                                window.localStorage.removeItem("numberInfo");
                                window.localStorage.removeItem("baseInfo");
                                
                                window.location.href = "success-info.html?orderId="+orderId+"&hospitalId="+baseInfo.hospitalId+"&deptId="+baseInfo.hosDeptId;
                            }else{
                                console.log(res.errorMsg);
                            }
                        })
                    }else{
                        showErrorMessage(res.obj.Message);
                    }
                }else{
                    showErrorMessage(res.errorMsg);
                }
            });
        },
        cancel: function(){
            var params = {
                id: id,
                state: 99 //订单状态: 1-待付款,2-待就诊,11-预约中,22-退款中,99-已退号,-1-系统取消,3-已就诊
            };
            appointmentAPI.updateOrderState(params).then(function(res){
                if(res.successFlg){
                    window.localStorage.removeItem("dateInfo");
                    window.localStorage.removeItem("numberInfo");
                    window.localStorage.removeItem("baseInfo");
            
                    document.history.back();
                }else{
                    showErrorMessage(res.errorMsg);
                }
            })
            
        }
    }
    
    function showErrorMessage(content){
        layer.msg(content, {
            icon: 2,
            time: 3000
        });
    }
	el: "#main",
	data: {
		dateInfo: {},
		numberInfo: {},
		baseInfo: {},
		patientInfo: {},
		Warntxt: "",
	},
	mounted: function() {
		EventBus.$emit("jump-step", {
			step: 4
		}); //step:跳转的步数
		//从缓存获取前一个页面缓存的信息
		var dateInfo = window.localStorage.getItem("dateInfo"),
			numberInfo = window.localStorage.getItem("numberInfo"),
			baseInfo = window.localStorage.getItem("baseInfo"),
			patientInfo = window.sessionStorage.getItem("oauthInfo");
		if(patientInfo) {
			patientInfo = JSON.parse(patientInfo);
			this.patientInfo = patientInfo;
		}
		if(dateInfo) {
			dateInfo = JSON.parse(dateInfo);
			this.dateInfo = dateInfo;
		}
		if(numberInfo) {
			numberInfo = JSON.parse(numberInfo);
			this.numberInfo = numberInfo;
		}
		if(baseInfo) {
			baseInfo = JSON.parse(baseInfo);
			this.baseInfo = baseInfo;
		}
		jiuzhenAPI.getRegisterWarn({
			token: "e8b01d2e-6dc8-4ba2-8422-462ae7535651"
		}).then(function(res) {
			this.Warntxt = res.value.replace("预约须知:", "")
		})
	},
	methods: {
		confirm: function() {
			var userInfo = this.patientInfo,
				baseInfo = this.baseInfo,
				dateInfo = this.dateInfo,
				numberInfo = this.numberInfo;
			var params = {
				thirdPartyUserId: userInfo.id,
				patientName: userInfo.realName,
				tel: userInfo.telephone,
				IP: returnCitySN.cip, //通过搜狐接口获得ip地址
				cardNo: userInfo.idCardNo,
				modeId: dateInfo.modeId,
				hospitalId: baseInfo.hospitalId,
				hospitalName: baseInfo.hosName,
				hosDeptId: baseInfo.hosDeptId,
				hosDeptName: baseInfo.deptName,
				doctorSn: baseInfo.doctorSn,
				doctorName: baseInfo.doctorName,
				numberSn: numberInfo.numberSN,
				numberPrice: dateInfo.specialPrice,
				thirdPartyOrderId: id,
				registerDate: dateInfo.registerDate,
				timeId: dateInfo.timeId,
				commendTime: numberInfo.commendTime,
				serialNo: numberInfo.serialNo
			}
			appointmentAPI.createRegOrderForOpen(params).then(function(res) {
				if(res.successFlg) {
					if(res.obj.Code == "10000") {
						var orderId = res.obj.orderId;
						//更新我们自己系统的挂号单信息
						var params2 = {
							id: res.obj.thirdPartyOrderId,
							userId: userInfo.id
						};
						appointmentAPI.updateRegistrationOrder(params2).then(function(res) {
							console.log(res);
							if(res.successFlg) {
								window.localStorage.removeItem("dateInfo");
								window.localStorage.removeItem("numberInfo");
								window.localStorage.removeItem("baseInfo");
								window.location.href = "success-info.html?orderId=" + orderId + "&hospitalId=" + baseInfo.hospitalId + "&deptId=" + baseInfo.hosDeptId;
							} else {
								console.log(res.errorMsg);
							}
						})
					} else {
						showErrorMessage(res.obj.Message);
					}
				} else {
					showErrorMessage(res.errorMsg);
				}
			});
		},
		cancel: function() {
			var params = {
				id: id,
				state: 99 //订单状态: 1-待付款,2-待就诊,11-预约中,22-退款中,99-已退号,-1-系统取消,3-已就诊
			};
			appointmentAPI.updateOrderState(params).then(function(res) {
				if(res.successFlg) {
					window.localStorage.removeItem("dateInfo");
					window.localStorage.removeItem("numberInfo");
					window.localStorage.removeItem("baseInfo");
					document.history.back();
				} else {
					showErrorMessage(res.errorMsg);
				}
			})
		}
	}
})
function showErrorMessage(content) {
	layer.msg(content, {
		icon: 2,
		time: 3000
	});
}

+ 3 - 1
page/appointment/js/home.js

@ -4,6 +4,8 @@ new Vue({
        
    },
    mounted:function(){
		EventBus.$emit("jump-step",{});//step:跳转的步数
		EventBus.$emit("jump-step", {
				step: 1
			}); //step: 跳转的步数
    }
})

+ 6 - 21
page/appointment/js/select-hospital.js

@ -1,3 +1,5 @@
    var hospitalId = GetRequest1("hospitalId"),
        hosName = GetRequest1("hosName");
new Vue({
	el: "#main",
	data: {
@ -5,34 +7,17 @@ new Vue({
	},
	mounted: function() {
		this.info = JSON.stringify({
			hospitalId: this.getRequest("hospitalId"),
			hosName: this.getRequest("hosName")
			hospitalId: hospitalId,
			hosName: hosName
		});
		this.bindEvents();
	},
	methods: {
		bindEvents: function() {
			EventBus.$emit("jump-step", {
				step: 1
				step: 2
			}); //step: 跳转的步数
		},
		getRequest: function(name) {
			var url = window.location.href; //获取地址栏url
			var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
			var matcher = pattern.exec(url);
			var items = null;
			if(null != matcher) {
				try {
					items = decodeURIComponent(decodeURIComponent(matcher[1]));
				} catch(e) {
					try {
						items = decodeURIComponent(matcher[1]);
					} catch(e) {
						items = matcher[1];
					}
				}
			}
			return items;
		}
		
	}
})

+ 3 - 22
page/appointment/js/success-info.js

@ -1,14 +1,13 @@
var hospitalId = GetRequest1("hospitalId");
new Vue({
	el: "#main",
	data: function() {
		return {
			activeTabIdx: 1,
			hospitalId:"",
			data: {}
		}
	},
	mounted: function() {
		this.hospitalId = this.getRequest("hospitalId");
		EventBus.$emit("jump-step", {
			step: 4
		}); //step:跳转的步数
@ -22,7 +21,7 @@ new Vue({
		querySimpleHospitalById: function() {
			var vm = this;
			appointmentAPI.querySimpleHospitalById({
				hospitalId: vm.hospitalId
				hospitalId: hospitalId
			}).then(function(res) {
				if(res.successFlg && res.obj.Code == "10000") {
					var obj = res.obj;
@ -32,7 +31,7 @@ new Vue({
			});
		},
		backPage: function() {
			window.location.href = "select-hospital.html";
			window.location.href = "select-hospital.html?hospitalId="+hospitalId;
		},
		//根据经纬度定位
		doLocate: function(jd, wd) {
@ -57,24 +56,6 @@ new Vue({
			map.centerAndZoom(point, 15);
			// 初始化地图,设置中心点坐标和地图级别。
		},
		getRequest: function(name) {
			var url = window.location.href; //获取地址栏url
			var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
			var matcher = pattern.exec(url);
			var items = null;
			if(null != matcher) {
				try {
					items = decodeURIComponent(decodeURIComponent(matcher[1]));
				} catch(e) {
					try {
						items = decodeURIComponent(matcher[1]);
					} catch(e) {
						items = matcher[1];
					}
				}
			}
			return items;
		}
	}
})

+ 151 - 150
page/home/html/index.html

@ -1,156 +1,157 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="UTF-8">
    <title>健康上饶</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="renderer" content="webkit">
    <meta http-equiv="Cache-Control" content="no-siteapp" />
    <meta name="keywords" content="公众健康服务平台">
    <meta name="description" content="公众健康服务平台">
    <link rel="shortcut icon" href="../../favicon.ico">
    <link rel="stylesheet" type="text/css" href="../../../css/font-awesome.min.css" />
    <link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css" />
    <link rel="stylesheet" type="text/css" href="../../../plugins/artDialog/6.0.5/api/css/ui-dialog.css" />
    <link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
    <link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
    <link rel="stylesheet" type="text/css" href="../css/index.css" />
</head>
	<head>
		<meta charset="UTF-8">
		<title>健康上饶</title>
		<meta name="viewport" content="width=device-width, initial-scale=1.0">
		<meta name="renderer" content="webkit">
		<meta http-equiv="Cache-Control" content="no-siteapp" />
		<meta name="keywords" content="公众健康服务平台">
		<meta name="description" content="公众健康服务平台">
		<link rel="shortcut icon" href="../../favicon.ico">
		<link rel="stylesheet" type="text/css" href="../../../css/font-awesome.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/artDialog/6.0.5/api/css/ui-dialog.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/toastr/toastr.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../css/index.css" />
	</head>
<body>
    <div id="main">
        <page-header></page-header>
        <div id="myCarousel" class="carousel slide">
            <!-- 轮播(Carousel)指标 -->
            <ol class="carousel-indicators">
                <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
                <li data-target="#myCarousel" data-slide-to="1"></li>
                <li data-target="#myCarousel" data-slide-to="2"></li>
            </ol>
            <!-- 轮播(Carousel)项目 -->
            <div class="carousel-inner">
                <div class="item active  fc">
                    <img src="../image/queshengye-.png" alt="First slide">
                </div>
                <div class="item fc">
                    <img src="../image/queshengye-.png" alt="Second slide">
                </div>
                <div class="item fc">
                    <img src="../image/queshengye-.png" alt="Third slide">
                </div>
            </div>
        </div>
        <div class="fc mb60">
            <div class="index_wrap">
                <div class="box_container fc fwrap">
                    <div class="box">
                        <div class="box_head">
                            <span class="box_title">我的就诊</span>
                            <span class="box_title_remark">就诊全程提醒</span>
                        </div>
                        <div class="box_content">下载APP已便获取提醒消息,我们诚邀您对每一次就诊进行评价,帮助我们提供更好的服务</div>
                        <div class="box_bottom">
                            <button class="box_button" @click="goMyJiuZhen">查看详情</button>
                            <img src="../image/p1.png">
                        </div>
                    </div>
                    <div class="box">
                        <div class="box_head">
                            <span class="box_title">全息健康档案</span>
                            <span class="box_title_remark">360度了解您的健康情况</span>
                        </div>
                        <div class="box_content">基于医疗服务、公共卫生、医学影像体征设备以及个人日常健康保健信息大数据,提供全景式、全生命周期的居民健康档案信息调阅与查询</div>
                        <div class="box_bottom mt20">
                            <button class="box_button">查看详情</button>
                            <img src="../image/p2.png">
                        </div>
                    </div>
                    <div class="box lastBox" >
                        <div class="box_head">
                            <span class="frendBox_head">快速预约</span>
                            <span class="box_title_remark">节省80%就医时间</span>
                        </div>
                        <div class="fcolumn">
                            <div class="dropdown" style="margin-top:30px">
                                <a type="button" class="btn dropdown-toggle box_select" id="dropdownMenu1" data-toggle="dropdown">{{YiYuan.hosName || '请选择医院'}}
                                    <span class="caret"></span>
                                </a>
                                <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
                                    <li role="presentation"  v-for="(item,i) in YiYuanArr">
                                        <a role="menuitem" tabindex="-1"  @click="setYiYuan(item)">{{item.hosName}}</a>
                                    </li>
                                    
                                </ul>
                            </div>
                            <div class="dropdown">
                                <a type="button" class="btn dropdown-toggle box_select" id="dropdownMenu2" data-toggle="dropdown">{{KeShi.deptName   ||  '请选择科室'}}
                                    <span class="caret"></span>
                                </a>
                                <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
                                    <li role="presentation"  v-for="(item,i) in KeShiArr">
                                        <a role="menuitem" tabindex="-1"  @click="setKeShi(item)">{{item.deptName}}</a>
                                    </li>
                                    
                                </ul>
                            </div>
                            <div class="dropdown">
                                <a type="button" class="btn dropdown-toggle box_select" id="dropdownMenu3" data-toggle="dropdown">{{YiSheng.doctorName  ||  '请选择医生'}}
                                    <span class="caret"></span>
                                </a>
                                <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu3">
                                    <li role="presentation"  v-for="(item,i) in YiShengArr">
                                        <a role="menuitem" tabindex="-1"  @click="setYiSheng(item)">{{item.doctorName}}</a>
                                    </li>
                                    
                                </ul>
                            </div>
                            <button class="box_largeBtn" @click="save">立即挂号</button>
                        </div>
        
                    </div>
                </div>
                <div class="frendBox">
                    <div class="frendBox_head ml20">友情链接</div>
                    <div class="frendBox_content fc fwrap">
                        <div class="frendBox_content_box fc">
                            <img src="../image/frend_logo.png">
                            <span>国家卫生与计划生育委员会</span>
                        </div>
                        <div class="frendBox_content_box fc">
                            <img src="../image/frend_logo.png">
                            <span>江西省卫生与计划生育委员会</span>
                        </div>
                        <div class="frendBox_content_box fc">
                            <img src="../image/frend_logo.png">
                            <span>上饶市卫生与计划生育委员会</span>
                        </div>
                        <div class="frendBox_content_box fc">
                            <img src="../image/icon_logo.png">
                            <span>健康上饶医生工作管理平台</span>
                        </div>
                    </div>       
                </div>
            </div>
        </div>
        
       
        <page-footer></page-footer>
    </div>
    <script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
    <script src="../../../js/jquery-2.2.4.js"></script>
    <script src="../../../js/bootstrap.min.js"></script>
    <script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
    <script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
    <script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
    <script src="../../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
    <script src="../../../js/base64.min.js" type="text/javascript" charset="utf-8"></script>
    <script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>
    <script src="../../../api/patient/appointment-api.js"></script>
    <script src="../../../component/common/header.js" type="text/javascript" charset="utf-8"></script>
    <script src="../../../component/common/footer.js" type="text/javascript" charset="utf-8"></script>
    <script src="../../../component/common/event-bus.js" type="text/javascript" charset="utf-8"></script>
    <script src="../js/index.js" type="text/javascript" charset="utf-8"></script>
</body>
	<body>
		<div id="main">
			<page-header></page-header>
			<div id="myCarousel" class="carousel slide">
				<!-- 轮播(Carousel)指标 -->
				<ol class="carousel-indicators">
					<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
					<li data-target="#myCarousel" data-slide-to="1"></li>
					<li data-target="#myCarousel" data-slide-to="2"></li>
				</ol>
				<!-- 轮播(Carousel)项目 -->
				<div class="carousel-inner">
					<div class="item active  fc">
						<img src="../image/queshengye-.png" alt="First slide">
					</div>
					<div class="item fc">
						<img src="../image/queshengye-.png" alt="Second slide">
					</div>
					<div class="item fc">
						<img src="../image/queshengye-.png" alt="Third slide">
					</div>
				</div>
			</div>
			<div class="fc mb60">
				<div class="index_wrap">
					<div class="box_container fc fwrap">
						<div class="box">
							<div class="box_head">
								<span class="box_title">我的就诊</span>
								<span class="box_title_remark">就诊全程提醒</span>
							</div>
							<div class="box_content">下载APP已便获取提醒消息,我们诚邀您对每一次就诊进行评价,帮助我们提供更好的服务</div>
							<div class="box_bottom">
								<button class="box_button" @click="goMyJiuZhen">查看详情</button>
								<img src="../image/p1.png">
							</div>
						</div>
						<div class="box">
							<div class="box_head">
								<span class="box_title">全息健康档案</span>
								<span class="box_title_remark">360度了解您的健康情况</span>
							</div>
							<div class="box_content">基于医疗服务、公共卫生、医学影像体征设备以及个人日常健康保健信息大数据,提供全景式、全生命周期的居民健康档案信息调阅与查询</div>
							<div class="box_bottom mt20">
								<button class="box_button">查看详情</button>
								<img src="../image/p2.png">
							</div>
						</div>
						<div class="box lastBox">
							<div class="box_head">
								<span class="frendBox_head">快速预约</span>
								<span class="box_title_remark">节省80%就医时间</span>
							</div>
							<div class="fcolumn">
								<div class="dropdown" style="margin-top:30px">
									<a type="button" class="btn dropdown-toggle box_select" id="dropdownMenu1" data-toggle="dropdown">{{YiYuan.hosName || '请选择医院'}}
										<span class="caret"></span>
									</a>
									<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
										<li role="presentation" v-for="(item,i) in YiYuanArr">
											<a role="menuitem" tabindex="-1" @click="setYiYuan(item)">{{item.hosName}}</a>
										</li>
									</ul>
								</div>
								<div class="dropdown">
									<a type="button" class="btn dropdown-toggle box_select" id="dropdownMenu2" data-toggle="dropdown">{{KeShi.deptName || '请选择科室'}}
										<span class="caret"></span>
									</a>
									<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
										<li role="presentation" v-for="(item,i) in KeShiArr">
											<a role="menuitem" tabindex="-1" @click="setKeShi(item)">{{item.deptName}}</a>
										</li>
									</ul>
								</div>
								<div class="dropdown">
									<a type="button" class="btn dropdown-toggle box_select" id="dropdownMenu3" data-toggle="dropdown">{{YiSheng.doctorName || '请选择医生'}}
										<span class="caret"></span>
									</a>
									<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu3">
										<li role="presentation" v-for="(item,i) in YiShengArr">
											<a role="menuitem" tabindex="-1" @click="setYiSheng(item)">{{item.doctorName}}</a>
										</li>
									</ul>
								</div>
								<button class="box_largeBtn" @click="save">立即挂号</button>
							</div>
						</div>
					</div>
					<div class="frendBox">
						<div class="frendBox_head ml20">友情链接</div>
						<div class="frendBox_content fc fwrap">
							<div class="frendBox_content_box fc">
								<img src="../image/frend_logo.png">
								<span>国家卫生与计划生育委员会</span>
							</div>
							<div class="frendBox_content_box fc">
								<img src="../image/frend_logo.png">
								<span>江西省卫生与计划生育委员会</span>
							</div>
							<div class="frendBox_content_box fc">
								<img src="../image/frend_logo.png">
								<span>上饶市卫生与计划生育委员会</span>
							</div>
							<div class="frendBox_content_box fc">
								<img src="../image/icon_logo.png">
								<span>健康上饶医生工作管理平台</span>
							</div>
						</div>
					</div>
				</div>
			</div>
			<page-footer></page-footer>
		</div>
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/jquery-2.2.4.js"></script>
		<script src="../../../js/bootstrap.min.js"></script>
		<script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/base64.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/toastr/toastr.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../api/patient/appointment-api.js"></script>
		<script src="../../../component/common/header.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/common/footer.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/common/event-bus.js" type="text/javascript" charset="utf-8"></script>
		<script src="../js/index.js" type="text/javascript" charset="utf-8"></script>
	</body>
</html>

+ 6 - 6
page/home/js/index.js

@ -65,7 +65,7 @@ $(function () {
            setKeShi(value) {
                console.log(value);
                if (!this.YiYuan.hospitalId) {
                    alert('请先选择医院')
                    toastr.warning('请先选择医院')
                    return
                }
                this.KeShi.deptName = value.deptName;
@ -82,7 +82,7 @@ $(function () {
                    console.log(res);
                    if (res.successFlg && res.obj.Code == "10000") {
                        if (!res.obj.Result) {
                            res.obj.Message && alert(res.obj.Message)
                            res.obj.Message && toastr.warning(res.obj.Message)
                        } else {
                            vm.YiShengArr = res.obj.Result;
                            vm.YiSheng.doctorName = '';
@ -97,7 +97,7 @@ $(function () {
            setYiSheng(value) {
                console.log(value);
                if (!this.KeShi.hosDeptId) {
                    alert('请先选择科室')
                    toastr.warning('请先选择科室')
                    return
                }
                this.YiSheng.doctorName = value.doctorName;
@ -125,13 +125,13 @@ $(function () {
            },
            save() {
                if (!this.YiYuan.hospitalId) {
                    alert('请选择医院')
                    toastr.warning('请选择医院')
                    return
                } else if (!this.KeShi.hosDeptId) {
                    alert('请选择科室')
                    toastr.warning('请选择科室')
                    return
                } else if (!this.YiSheng.doctorSn) {
                    alert('请选择医生')
                    toastr.warning('请选择医生')
                    return
                }
                window.location.href = "../../appointment/html/select-time.html?doctorSn="+Base64.encode(this.YiSheng.doctorSn);

+ 3 - 1
page/login/html/login.html

@ -13,6 +13,7 @@
		<!--<link rel="stylesheet" type="text/css" href="../../css/font-awesome.min.css" />-->
		<link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/artDialog/6.0.5/api/css/ui-dialog.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/toastr/toastr.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../login.css" />
@ -34,7 +35,8 @@
		<script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../api/patient/login-api.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>		
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/toastr/toastr.min.js" type="text/javascript" charset="utf-8"></script>		
		<script src="../../../component/login-register/login.js"></script>	
		<script src="../../../component/common/footer.js"></script>
		<script src="../login.js"></script>

+ 8 - 1
page/mine/css/record.css

@ -165,7 +165,7 @@ cancelbtnbody {
.modal-list {
	line-height: 44px;
	font-size: 14;
	font-size: 14px;
	color: #909090;
	border-bottom: 1px solid #E3EDE8;
	padding: 0 20px;
@ -201,4 +201,11 @@ cancelbtnbody {
.layui-layer-btn .layui-layer-btn0 {
    border-color: #0AD8C8 !important;
    background-color: #0AD8C8 !important;
}
.wushuju{
	margin:150px auto 290px;
	color:#909090;
	font-size: 14px;
}

+ 94 - 0
page/mine/css/suggest.css

@ -0,0 +1,94 @@
body {
	background: rgba(245, 249, 249, 1);
	color: #323232;
}
.w3-row:after {
	content: "";
	display: table;
	clear: both
}
.w3-col {
	float: left;
	width: 100%
}
.w3-rest {
	overflow: hidden
}
.mine-menu {}
.mine-menu {
	font-size: 16px;
	color: #909090;
}
.mine-menu .active {
	color: #0AD8C8;
}
.all-center {
	position: absolute;
	top: 0;
	left: 0;
	bottom: 0;
	right: 0;
	margin: 0 auto;
}
.mainbox {
	width: 420px;
	margin: 0 auto;
}
.btn-theme {
	color: #fff;
	background: #0AD8C8;
	border-color: #0AD8C8;
}
.btn-theme:hover,
.btn-theme:active {
	color: #fff;
	background: #0aD9ff;
	border-color: #0AD8C8;
}
.pl105 {
	padding-left: 105px;
}
.pl251 {
	padding-left: 251px;
}
.m8 {
	margin-top: 8px;
}
.btn-default {
	background: #fff;
	color: #909090;
	font-size: 16px;
	border: 1px solid #D1D7D4;
}
.btn-default:hover,
.btn-default:active {
	color: #333;
	background: #F4F6FA;
}
.clearfix:after {
	content: none;
}
.list-record li {
	height: 50px;
}
.suggestcss {
	margin-top: 80px;
}

+ 145 - 0
page/mine/css/xiaoxi.css

@ -0,0 +1,145 @@
body {
	background: rgba(245, 249, 249, 1);
	color: #323232;
}
.w3-row:after {
	content: "";
	display: table;
	clear: both
}
.w3-col {
	float: left;
	width: 100%
}
.w3-rest {
	overflow: hidden
}
.mine-menu {}
.mine-menu {
	font-size: 16px;
	color: #909090;
}
.mine-menu .active {
	color: #0AD8C8;
}
.all-center {
	position: absolute;
	top: 0;
	left: 0;
	bottom: 0;
	right: 0;
	margin: 0 auto;
}
.mainbox {
	width: 420px;
	margin: 0 auto;
}
.btn-theme {
	color: #fff;
	background: #0AD8C8;
	border-color: #0AD8C8;
}
.btn-theme:hover,
.btn-theme:active {
	color: #fff;
	background: #0aD9ff;
	border-color: #0AD8C8;
}
.pl105 {
	padding-left: 105px;
}
.pl251 {
	padding-left: 251px;
}
.m8 {
	margin-top: 8px;
}
.btn-default {
	background: #fff;
	color: #909090;
	font-size: 16px;
	border: 1px solid #D1D7D4;
}
.btn-default:hover,
.btn-default:active {
	color: #333;
	background: #F4F6FA;
}
.remark {
	color: #a8a8a8;
	font-size: 12px;
}
.xiaoxi-title {
	margin-left: -80px;
	color: #fff;
	line-height: 54px;
}
.xiaoxi-time {
	float: right;
	line-height: 54px;
	font-size: 14px;
	color: #909090;
	padding-right: 10px;
}
.xiao-content {
	height: 70px;
	font-size: 14px;
	color: #323232;
	vertical-align: middle;
}
.xiaoxi-rest {
	line-height: 70px;
	overflow: hidden;
	text-overflow: ellipsis;
	white-space: nowrap;
}
.satisfactionbtn {
	padding: 5px 13px 5px;
	border: 1px solid #0AD8C8;
	color: #0AD8C8;
	font-size: 14px;
	width: 130px;
	margin: 0 auto;
}
#appointmentinfo {
	border-radius: 0;
	/*max-width: 500px;*/
}
.modal-header {
	padding: 10px 20px;
}
.modal-body {
	padding: 0px 20px;
}
.modal-list {
	line-height: 44px;
	font-size: 14px;
	color: #909090;
	border-bottom: 1px solid #E3EDE8;
	padding: 0 20px;
}

+ 4 - 1
page/mine/html/personal-info.html

@ -12,6 +12,7 @@
		<link rel="stylesheet" type="text/css" href="../../../css/font-awesome.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/artDialog/6.0.5/api/css/ui-dialog.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/toastr/toastr.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../css/personal-info.css" />
@ -38,7 +39,9 @@
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js " type="text/javascript " charset="utf-8 "></script>
		<script src="../../../api/patient/mine-api.js" type="text/javascript " charset="utf-8 "></script>
		<script src="../../../api/patient/login-api.js" type="text/javascript " charset="utf-8 "></script>
		<script src="../../../api/patient/file-api.js" type="text/javascript " charset="utf-8 "></script>
		<script src="../../../api/patient/file-api.js" type="text/javascript " charset="utf-8 ">			
		</script><script src="../../../plugins/toastr/toastr.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/mine/personal-dialog-form.js "></script>
		<script src="../../../component/common/footer.js "></script>
		<script src="../../../component/common/header.js "></script>

+ 1 - 1
page/mine/html/record.html

@ -43,7 +43,7 @@
		<script src="../../../component/common/header.js"></script>
		<script src="../../../component/common/pagination.js"></script>
		<script src="../../../component/mine/left-menu.js"></script>
		<script src="../../../component/mine/personal-dialog-form.js"></script>
		<script src="../../../component/mineJiuZhen/mineJiuZhen-dialog-form.js"></script>
		<script src="../../../component/mine/record.js"></script>
		<script src="../js/record.js"></script>
	</body>

+ 2 - 0
page/mine/html/security-setting.html

@ -11,6 +11,7 @@
		<link rel="stylesheet" type="text/css" href="../../../css/font-awesome.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/artDialog/6.0.5/api/css/ui-dialog.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/toastr/toastr.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../css/security-setting.css" />
@ -34,6 +35,7 @@
		<script src="../../../js/util.js " type="text/javascript " charset="utf-8 "></script>
		<script src="../../../api/http-request.js " type="text/javascript " charset="utf-8 "></script>
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js " type="text/javascript " charset="utf-8 "></script>
		<script src="../../../plugins/toastr/toastr.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/selector.js " type="text/javascript " charset="utf-8 "></script>
		<script src="../../../api/patient/mine-api.js" type="text/javascript " charset="utf-8 "></script>
		<script src="../../../component/common/footer.js "></script>

+ 53 - 0
page/mine/html/suggest.html

@ -0,0 +1,53 @@
<!DOCTYPE html>
<html>
	<head>
		<meta charset="UTF-8">
		<title>意见反馈</title>
		<meta name="viewport" content="width=device-width, initial-scale=1.0">
		<meta name="renderer" content="webkit">
		<meta http-equiv="Cache-Control" content="no-siteapp" />
		<meta name="keywords" content="公众健康服务平台">
		<meta name="description" content="公众健康服务平台">
		<link rel="shortcut icon" href="../../favicon.ico">
		<link rel="stylesheet" type="text/css" href="../../../css/font-awesome.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/artDialog/6.0.5/api/css/ui-dialog.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../../../doctor/home/css/mine.css" />
		<link rel="stylesheet" type="text/css" href="../css/suggest.css" />
	</head>
	<body>
		<div id="app">
			<page-header></page-header>
			<div class="container ptb20 ">
				<div class="row w3-row">
					<left-menu :code="code"></left-menu>
					<div class="pl251">
						<div class="bgc-fff c-border" style="min-height: 706px;">
							<device-reback></device-reback>
						</div>
					</div>
				</div>
			</div>
			<page-footer></page-footer>
		</div>
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/jquery-2.2.4.js"></script>
		<script src="../../../js/bootstrap.min.js"></script>
		<script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/common/header.js"></script>
		<script src="../../../component/doctor-home/device-reback.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/common/footer.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/common/event-bus.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/mine/left-menu.js"></script>
		<script src="../js/suggest.js" type="text/javascript" charset="utf-8"></script>
	</body>
</html>

+ 109 - 6
page/mine/html/xiaoxi.html

@ -3,7 +3,7 @@
	<head>
		<meta charset="UTF-8">
		<title>预约记录</title>
		<title>消息通知</title>
		<meta name="viewport" content="width=device-width, initial-scale=1.0">
		<meta name="renderer" content="webkit">
		<meta http-equiv="Cache-Control" content="no-siteapp" />
@ -14,13 +14,115 @@
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/common.css" />
		<link rel="stylesheet" type="text/css" href="../css/record.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/toastr/toastr.min.css" />
		<link rel="stylesheet" type="text/css" href="../css/xiaoxi.css" />
	</head>
	<body>
		<div id="app">
			<page-header></page-header>
			<record></record>
			<div class="container ptb20 ">
				<div class="row w3-row">
					<left-menu :code="code"></left-menu>
					<div class="pl251">
						<div class="bgc-fff c-border ptb30" style="min-height: 706px;">
							<div class="plr20">
								<div class="pb10 c-border-b c-f20">
									消息通知
								</div>
								<div class="width-100 c-border mt20" v-for="data in xiaoxis">
									<div class="c-border-b plr10 ptb12" @click="getinfo(data.orderId)">
										<img src="../image/icon_biaoqian.png" />
										<span class="xiaoxi-title">{{data.title}}</span>
										<span class="xiaoxi-time">{{data.createDate}}</span>
									</div>
									<div class="w3-row xiao-content">
										<div class="w3-col" style="width:150px;float: right;padding-top:20px;" v-if="data.issatisfaction">
											<div class="satisfactionbtn" @click="satisfactionbtn(data.id)">参与满意度调查</div>
										</div>
										<div class="w3-rest xiaoxi-rest" @click="getinfo(data.orderId)">
											<span class="pl35">{{data.classification}}</span>
											<template v-if="data.islong">
												<template v-for="item in data.contentJsons">
													<span v-if="item.value!=''" class="pl10">													
													{{item.name}}:{{item.value}}
													</span>
												</template>
											</template>
											<template v-else><span class="pl10">{{data.contentJsons[0].value}}</span></template>
											<span class="pl10">{{data.afterContent}}</span>
										</div>
									</div>
								</div>
								<div id="page" class="page_div"></div>
							</div>
						</div>
					</div>
				</div>
				<div class="modal fade" id="appointmentinfo" tabindex="-1" role="dialog" aria-labelledby="appointmentinfoLabel">
					<div class="modal-dialog" role="document">
						<div class="modal-content">
							<div class="modal-header bgc-f9f9f9">
								<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
								<h4 class="modal-title" id="appointmentinfoLabel">挂号明细</h4>
							</div>
							<div class="modal-body">
								<div class="bgc-fff">
									<div class="w3-row modal-list">
										<div class="w3-col" style="width:120px;">订单号</div>
										<div class="w3-rest">{{recordinfo.orderId}}</div>
									</div>
									<div class="w3-row modal-list" style="border:none;">
										<div class="w3-col" style="width:120px;">订单状态</div>
										<div class="w3-rest">{{recordinfo.stateDesc}}</div>
									</div>
									<div class="w3-row modal-list bgc-f9f9f9" style="color:#323232;border:none;">预约信息</div>
									<div class="w3-row c-border-b modal-list">
										<div class="w3-col" style="width:120px;">预约医院</div>
										<div class="w3-rest">{{recordinfo.hospitalName}}</div>
									</div>
									<div class="w3-row modal-list">
										<div class="w3-col" style="width:120px;">预约科室</div>
										<div class="w3-rest">{{recordinfo.deptName}}</div>
									</div>
									<div class="w3-row modal-list">
										<div class="w3-col" style="width:120px;">就诊日期</div>
										<div class="w3-rest">{{recordinfo.registerDate}} {{recordinfo.timeId}}</div>
									</div>
									<div class="w3-row modal-list">
										<div class="w3-col" style="width:120px;">就诊时间</div>
										<div class="w3-rest">{{recordinfo.commendTime}}</div>
									</div>
									<div class="w3-row modal-list">
										<div class="w3-col" style="width:120px;">就诊序号</div>
										<div class="w3-rest">{{recordinfo.serialNo}}</div>
									</div>
									<div class="w3-row modal-list" style="border:none;">
										<div class="w3-col" style="width:120px;">退号截止时间</div>
										<div class="w3-rest">{{recordinfo.invalidDate}}</div>
									</div>
									<div class="w3-row modal-list bgc-f9f9f9" style="color:#323232;border:none;">就诊人信息</div>
									<div class="w3-row modal-list">
										<div class="w3-col" style="width:120px;">姓名</div>
										<div class="w3-rest">{{recordinfo.patientName}}</div>
									</div>
									<div class="w3-row  modal-list">
										<div class="w3-col" style="width:120px;">证件号</div>
										<div class="w3-rest">{{recordinfo.cardNo}}</div>
									</div>
									<div class="w3-row  modal-list">
										<div class="w3-col" style="width:120px;">手机号</div>
										<div class="w3-rest">{{recordinfo.phoneNo}}</div>
									</div>
									<div class="c-t-center">
										<button type="button" class="btn btn-default c-f16 mt30 mb20" style="width:144px;" @click="hideModel()">关 闭</button>
									</div>
								</div>
							</div>
						</div>
					</div>
				</div>
			</div>
			<page-footer></page-footer>
		</div>
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
@ -35,15 +137,16 @@
		<script src="../../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/layer/layer.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/toastr/toastr.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/paging.js"></script>
		<script src="../../../api/patient/jiuzhen-api.js"></script>
		<script src="../../../component/common/event-bus.js"></script>
		<script src="../../../component/common/footer.js"></script>
		<script src="../../../component/common/header.js"></script>
		<script src="../../../component/common/pagination.js"></script>
		<script src="../../../component/mine/left-menu.js"></script>
		<script src="../../../component/mine/personal-dialog-form.js"></script>
		<script src="../../../component/mine/record.js"></script>
		<script src="../js/record.js"></script>
		<script src="../../../component/mineJiuZhen/mineJiuZhen-dialog-form.js"></script>
		<script src="../js/xiaoxi.js"></script>
	</body>
</html>

BIN
page/mine/image/icon_biaoqian.png


+ 12 - 0
page/mine/js/suggest.js

@ -0,0 +1,12 @@
new Vue({
	el: "#app",
	data: {
		code: "suggest",
	},
	mounted: function() {
		
	},
	methods: {
	}
});

+ 69 - 0
page/mine/js/xiaoxi.js

@ -0,0 +1,69 @@
new Vue({
	el: "#app",
	data: {
		code: "xiaoxi",
		xiaoxis: [],
		recordinfo: '',
	},
	mounted: function() {
		var vm = this
		var oauthInfo = JSON.parse(sessionStorage.getItem("oauthInfo"));
		vm.toUserId = oauthInfo.id
		vm.appId = httpRequest.client_id
		vm.getxiaoxi(1)
	},
	methods: {
		getxiaoxi: function(pageNo) {
			var vm = this
			var filters = "typeId?7;appId?" + vm.appId + ";toUserId?" + vm.toUserId
			jiuzhenAPI.messageList({
				filters: filters,
				size: 10,
				page: pageNo,
				sorts: "",
				fields: ""
			}).then(function(res) {
				vm.xiaoxis = res.detailModelList.map(function(v) {
					if(v.contentJsons.length == 1) {
						v.islong = false //短内容
					} else {
						v.islong = true
						v.issatisfaction = false
						if(v.portalMessagerTemplateType == "100" && v.notifieFlag == "0") {
							v.issatisfaction = true //长内容
						}
					}
					return v
				})
				vm.initPage(pageNo, res.totalPage, res.totalCount)
			})
		},
		initPage: function(pageNo, total, size) {
			var vm = this
			//分页初始化
			$("#page").paging({
				pageNo: pageNo,
				totalPage: total,
				totalSize: size,
				callback: function(num) {
					//回调的页数
					vm.getxiaoxi(num)
				}
			})
		},
		getinfo: function(orderid) {
			var vm = this
			if(orderid == null || orderid == undefined || orderid == "") {
				toastr.warning("该订单无法查看!");
			} else {
				jiuzhenAPI.getRegOrderInfo(orderid).then(function(res) {
					vm.recordinfo = res.obj
					$('#appointmentinfo').modal('show')
				})
			}
		},
		satisfactionbtn: function(id) {
			mineJiuZhenDialogForm.satisfaction(id)
		},
	}
});

+ 34 - 0
page/mineJiuZhen/css/mineJiuZhen.css

@ -124,6 +124,7 @@ body {
	padding: 16px;
	background: #F5FAFA;
	line-height: 30px;
	margin-top: 20px;
}
.layui-layer-btn {
@ -135,4 +136,37 @@ body {
.layui-layer-btn .layui-layer-btn0 {
    border-color: #0AD8C8 !important;
    background-color: #0AD8C8 !important;
}
.wushuju{
	margin:150px auto 290px;
	color:#909090;
	font-size: 14px;
}
.btn-theme {
	color: #fff;
	background: #0AD8C8;
	border-color: #0AD8C8;
}
.btn-theme:hover,
.btn-theme:active {
	color: #fff;
	background: #0aD9ff;
	border-color: #0AD8C8;
}
.btn-default{
	background: #fff;
	color:#909090;
	font-size: 16px;
	border: 1px solid #D1D7D4;
}
.btn-default:hover,.btn-default:active{
	color:#333;
	background: #F4F6FA;
}

+ 56 - 0
page/mineJiuZhen/html/cancelAppointment.html

@ -0,0 +1,56 @@
<!DOCTYPE html>
<html>
	<head>
		<meta charset="UTF-8">
		<title>取消预约</title>
		<meta name="viewport" content="width=device-width, initial-scale=1.0">
		<meta name="renderer" content="webkit">
		<meta http-equiv="Cache-Control" content="no-siteapp" />
		<meta name="keywords" content="我的就诊">
		<meta name="description" content="我的就诊">
		<link rel="shortcut icon" href="../../../favicon.ico">
		<link rel="stylesheet" type="text/css" href="../../../css/font-awesome.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/artDialog/6.0.5/api/css/ui-dialog.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/toastr/toastr.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/common.css" />
		<link rel="stylesheet" type="text/css" href="../css/mineJiuZhen.css" />
	</head>
	<body class="bgc-fff" style="height: 295px;">
		<div id="app" class="plr20">
			<h3 class="c-t-center mt30">是否确认取消预约?</h3>
			<div class="quxiaobox">取消须知:
				<div class="c-909090">{{Warntxt}}</div>
			</div>
			<div class="c-t-center mt40">
				<button type="button" class="btn btn-theme c-f16" style="width:144px;" @click="cancelAppointment()">确 认</button>
				<button type="button" class="btn btn-default c-f16 ml20" style="width:144px;" @click="back()">取 消</button>
			</div>
		</div>
		<script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/jquery-2.2.4.js"></script>
		<script src="../../../js/bootstrap.min.js"></script>
		<script src="../../../js/security.js"></script>
		<script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/toastr/toastr.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/layer/layer.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/paging.js"></script>
		<script src="../../../api/patient/jiuzhen-api.js"></script>
		<script src="../../../api/patient/appointment-api.js"></script>
		<script src="../../../component/common/event-bus.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/mineJiuZhen/mineJiuZhen-dialog-form.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/common/header.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/common/footer.js" type="text/javascript" charset="utf-8"></script>
		<script src="../js/cancelAppointment.js"></script>
	</body>
</html>

+ 13 - 11
page/mineJiuZhen/html/mineJiuZhen.html

@ -37,29 +37,29 @@
						<div role="tabpanel" class="tab-pane active" id="home">
							<template v-if="records.length>0">
								<div class="list-body" v-for="record in records">
									<div class="list-header"><span>就诊时间</span><span class="pl20">{{record.mRegistration.register_date}} {{record.mRegistration.time_id_desc}} {{record.mRegistration.commend_time}}</span></div>
									<div class="list-header"><span>就诊时间</span><span class="pl20">{{record.registerDate}} {{record.timeIdDesc}} {{record.commendTime}}</span></div>
									<div class="w3-row">
										<div class="w3-col" style="width:150px;float: right;padding-top: 30px;">
											<div class="cancelbtn" @click="cancelbtn(record.id,record.mRegistration.order_id)">取消预约</div>
											<div class="cancelbtn" @click="cancelbtn(record.orderId,record.id)">取消预约</div>
										</div>
										<div class="w3-rest">
											<div class="div-table">
												<div class="table-row">
													<div class="table-cell">
														<div class="c-909090">医院</div>
														<div>{{record.mRegistration.hospital_name}}</div>
														<div>{{record.hospitalName}}</div>
													</div>
													<div class="table-cell">
														<div class="c-909090">科室</div>
														<div>{{record.mRegistration.dept_name}}</div>
														<div>{{record.deptName}}</div>
													</div>
													<div class="table-cell">
														<div class="c-909090">医师</div>
														<div>{{record.mRegistration.doctor_name}}</div>
														<div>{{record.doctorName}}</div>
													</div>
													<div class="table-cell">
														<div class="c-909090">挂号方式</div>
														<div>预约挂号</div>
														<div>{{record.registerTypeDesc}}</div>
													</div>
												</div>
											</div>
@ -67,8 +67,9 @@
									</div>
								</div>
							</template>
							<div v-else class="c-t-center mtb100">
							<div v-else class="c-t-center wushuju">
								<img src="../../../images/queshengye-.png" />
								<div class="mt40">暂无就诊记录</div>
							</div>
							<div id="homepage" class="page_div"></div>
						</div>
@ -104,11 +105,12 @@
										</div>
									</div>
								</div>
								<div v-else class="c-t-center mtb100">
									<img src="../../../images/queshengye-.png" />
								</div>
								<div id="historypage" class="page_div"></div>
							</template>
							<div v-else class="c-t-center wushuju">
								<img src="../../../images/queshengye-.png" />
								<div class="mt40">暂无待评论记录</div>
							</div>
							<div id="historypage" class="page_div"></div>
						</div>
					</div>
				</div>

+ 9 - 6
page/mineJiuZhen/html/satisfaction.html

@ -13,22 +13,23 @@
		<link rel="stylesheet" type="text/css" href="../../../plugins/artDialog/6.0.5/api/css/ui-dialog.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/toastr/toastr.min.css" />
		<link rel="stylesheet" type="text/css" href="../../mine/css/security-setting.css" />
	</head>
	<body>
		<div id="app" class="plr20">
		<div id="app" class="plr20 bgc-fff" style="margin-top: -10px;padding-top: 10px;">
			<div v-for="question in questions" class="mt10" style="line-height: 30px;">
				<div>{{question.sort}}、{{question.qstTitle}}</div>
				<div>{{question.sort}}、{{question.title}}</div>
				<div class="ui-grid">
					<div class="ui-col-4 c-t-center" v-for="option in question.options">
						<input type="radio" :value="option.code" :name="question.qstCode" :sort="question.sort" :itemsort="option.sort" /><label>&emsp;{{option.content}}</label>
						<input type="radio" :value="option.code" :name="question.qstCode" @click="checkRadio(question.sort,option.sort)"/><label>&emsp;{{option.content}}</label>
					</div>
				</div>
			</div>
			<div class="c-t-center mt50">
				<button type="submit" class="btn btn-theme c-f16" style="width:144px;" @click="changePassword()">确 定</button>
				<button type="button" class="btn btn-default c-f16 ml20" style="width:144px;" @click="gotosetting()">取 消</button>
			<div class="c-t-center mtb50">
				<button type="submit" class="btn btn-theme c-f16" style="width:144px;" @click="sumbit()">提 交</button>
				<button type="button" class="btn btn-default c-f16 ml20" style="width:144px;" @click="close()">取 消</button>
			</div>
		</div>
		<script src="../../../js/vue.js " type="text/javascript " charset="utf-8 "></script>
@ -43,6 +44,8 @@
		<script src="../../../js/util.js " type="text/javascript " charset="utf-8 "></script>
		<script src="../../../api/http-request.js " type="text/javascript " charset="utf-8 "></script>
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js " type="text/javascript " charset="utf-8 "></script>
		<script src="../../../plugins/toastr/toastr.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../api/patient/jiuzhen-api.js"></script>
		<script src="../js/satisfaction.js "></script>
	</body>

+ 44 - 0
page/mineJiuZhen/js/cancelAppointment.js

@ -0,0 +1,44 @@
new Vue({
	el: "#app",
	data: {
		orderid: "",
		thirdorderid: "",
		Warntxt: "",
	},
	mounted: function() {
		var vm = this
		var query = GetRequest();
		vm.orderid = query.orderid;
		vm.thirdorderid = query.thirdorderid;
		jiuzhenAPI.CancellationWarn({token:"e8b01d2e-6dc8-4ba2-8422-462ae7535651"}).then(function(res) {
			vm.Warntxt = res.value.replace("预约须知:","")
		})
	},
	methods: {
		cancelAppointment: function() {
			var vm = this
			var oauthInfo = JSON.parse(sessionStorage.getItem("oauthInfo"));
			//取消总部预约记录
			appointmentAPI.cancelOrder({
				orderId: vm.orderid,
				thirdPartyUserId: oauthInfo.id
			}).then(function(res) {
				if(res.obj.Code == "10000") {
					//取消我们这边的预约记录
					jiuzhenAPI.cancelOrder({
						id: vm.thirdorderid,
						state: 99,
					}).then(function(res) {
						toastr.success("取消成功!")
					})
				} else {
					toastr.error("取消失败!")
				}
				resolve(layerid)
			})
		},
		back: function() {
		},
	}
});

+ 47 - 38
page/mineJiuZhen/js/mineJiuZhen.js

@ -10,15 +10,35 @@ new Vue({
	},
	mounted: function() {
		var vm = this
		vm.getlist(1, vm.recodestype)
		vm.getlist(1, vm.historytype)
		vm.getlist(1)
		vm.gethistory(1)
	},
	methods: {
		getlist: function(pageNo, types) {
		getlist: function(pageNo) {
			var vm = this
			var oauthInfo = JSON.parse(sessionStorage.getItem("oauthInfo"));
			var filters = "userId=" + oauthInfo.id+";state=2;orderId<>null"
			var param = {
				type: types,
				fields: '',
				filters: filters,
				sort: '+registerDate',
				page: pageNo,
				size: 5
			}
			jiuzhenAPI.queryRegOrderInfos(param).then(function(res) {
				vm.records = res.detailModelList
				if(res.totalCount == 0) {
					vm.ishomeNull = true
				} else {
					vm.inithomePage(pageNo, res.totalPage, res.totalCount)
				}
			})
		},
		gethistory: function(pageNo) {
			var vm = this
			var oauthInfo = JSON.parse(sessionStorage.getItem("oauthInfo"));
			var param = {
				type: 100,
				appId: httpRequest.client_id,
				toUserId: oauthInfo.id,
				page: pageNo,
@ -26,36 +46,27 @@ new Vue({
				typeId: 7,
			}
			jiuzhenAPI.getRemind(param).then(function(res) {
				if(types == '101') {
					vm.records = res.detailModelList
					if(res.totalCount == 0) {
						vm.ishomeNull = true
					} else {
						vm.inithomePage(pageNo, Math.ceil(res.obj.total / 5), res.obj.total)
					}
				} else if(types == '100') {
					vm.historyrecords = res.detailModelList
					vm.historyrecords = res.detailModelList.map(function(v) {
						var content = JSON.parse(v.content);
						for(var i = 0; i < content.length; i++) {
							var aaa = content[i].code
							if(content[i].code == 'registerDate') {
								v.registerDate = content[i].value
							} else if(content[i].code == 'deptName') {
								v.deptName = content[i].value
							} else if(content[i].code == 'doctorName') {
								v.doctorName = content[i].value
							} else if(content[i].code == 'hospitalName') {
								v.hospitalName = content[i].value
							}
				vm.historyrecords = res.detailModelList
				vm.historyrecords = res.detailModelList.map(function(v) {
					var content = JSON.parse(v.content);
					for(var i = 0; i < content.length; i++) {
						var aaa = content[i].code
						if(content[i].code == 'registerDate') {
							v.registerDate = content[i].value
						} else if(content[i].code == 'deptName') {
							v.deptName = content[i].value
						} else if(content[i].code == 'doctorName') {
							v.doctorName = content[i].value
						} else if(content[i].code == 'hospitalName') {
							v.hospitalName = content[i].value
						}
						return v
					})
					if(res.totalCount == 0) {
						vm.ishomeNull = true
					} else {
						vm.inithistoryPage(pageNo, Math.ceil(res.obj.total / 5), res.obj.total)
					}
					return v
				})
				if(res.totalCount == 0) {
					vm.ishomeNull = true
				} else {
					vm.inithistoryPage(pageNo, res.totalPage, res.totalCount)
				}
			})
		},
@ -68,7 +79,7 @@ new Vue({
				totalSize: size,
				callback: function(num) {
					//回调的页数
					vm.getrecords(num)
					vm.getlist(1)
				}
			})
		},
@ -81,14 +92,12 @@ new Vue({
				totalSize: size,
				callback: function(num) {
					//回调的页数
					vm.gethistory(num, vm.monthtimes)
					vm.gethistory(1)
				}
			})
		},
		cancelbtn: function(id, orderid) {
			mineJiuZhenDialogForm.cancelAppointment(id, orderid).then(function(layerid) {
				top.layer.close(layerid)
			})
		cancelbtn: function(orderid, thirdorderid) {
			mineJiuZhenDialogForm.cancelAppointment(orderid, thirdorderid)
		},
		satisfactionbtn: function(id) {
			mineJiuZhenDialogForm.satisfaction(id)

+ 79 - 213
page/mineJiuZhen/js/satisfaction.js

@ -1,222 +1,88 @@
new Vue({
	el: "#app",
	data: {
		questions: [{
			qstCode: "question_1",
			qstTitle: "您对就诊过程中我院的总体满意程度?",
			type: 0,
			sort: 1,
			options: [{
				id: 0,
				sort: 1,
				code: "0001",
				content: "满意"
			}, {
				id: 1,
				sort: 2,
				code: "0002",
				content: "基本满意"
			}, {
				id: 2,
				sort: 3,
				code: "0003",
				content: "不满意"
			}, ]
		}, {
			qstCode: "question_2",
			qstTitle: "您对就诊过程中我院的总体满意程度?",
			type: 0,
			sort: 2,
			options: [{
				id: 0,
				sort: 1,
				code: "0001",
				content: "满意"
			}, {
				id: 1,
				sort: 2,
				code: "0002",
				content: "基本满意"
			}, {
				id: 2,
				sort: 3,
				code: "0003",
				content: "不满意"
			}, ]
		}, {
			qstCode: "question_3",
			qstTitle: "您对就诊过程中我院的总体满意程度?",
			type: 0,
			sort: 3,
			options: [{
				id: 0,
				sort: 1,
				code: "0001",
				content: "满意"
			}, {
				id: 1,
				sort: 2,
				code: "0002",
				content: "基本满意"
			}, {
				id: 2,
				sort: 3,
				code: "0003",
				content: "不满意"
			}, ]
		}, {
			qstCode: "question_4",
			qstTitle: "您对就诊过程中我院的总体满意程度?",
			type: 0,
			sort: 4,
			options: [{
				id: 0,
				sort: 1,
				code: "0001",
				content: "满意"
			}, {
				id: 1,
				sort: 2,
				code: "0002",
				content: "基本满意"
			}, {
				id: 2,
				sort: 3,
				code: "0003",
				content: "不满意"
			}, ]
		}, {
			qstCode: "question_5",
			qstTitle: "您对就诊过程中我院的总体满意程度?",
			type: 0,
			sort: 5,
			options: [{
				id: 0,
				sort: 1,
				code: "0001",
				content: "满意"
			}, {
				id: 1,
				sort: 2,
				code: "0002",
				content: "基本满意"
			}, {
				id: 2,
				sort: 3,
				code: "0003",
				content: "不满意"
			}, ]
		}, {
			qstCode: "question_6",
			qstTitle: "您对就诊过程中我院的总体满意程度?",
			type: 0,
			sort: 6,
			options: [{
				id: 0,
				sort: 1,
				code: "0001",
				content: "满意"
			}, {
				id: 1,
				sort: 2,
				code: "0002",
				content: "基本满意"
			}, {
				id: 2,
				sort: 3,
				code: "0003",
				content: "不满意"
			}, ]
		}, {
			qstCode: "question_7",
			qstTitle: "您对就诊过程中我院的总体满意程度?",
			type: 0,
			sort: 7,
			options: [{
				id: 0,
				sort: 1,
				code: "0001",
				content: "满意"
			}, {
				id: 1,
				sort: 2,
				code: "0002",
				content: "基本满意"
			}, {
				id: 2,
				sort: 3,
				code: "0003",
				content: "不满意"
			}, ]
		}, {
			qstCode: "question_8",
			qstTitle: "您对就诊过程中我院的总体满意程度?",
			type: 0,
			sort: 8,
			options: [{
				id: 0,
				sort: 1,
				code: "0001",
				content: "满意"
			}, {
				id: 1,
				sort: 2,
				code: "0002",
				content: "基本满意"
			}, {
				id: 2,
				sort: 3,
				code: "0003",
				content: "不满意"
			}, ]
		}, {
			qstCode: "question_9",
			qstTitle: "您对就诊过程中我院的总体满意程度?",
			type: 0,
			sort: 9,
			options: [{
				id: 0,
				sort: 1,
				code: "0001",
				content: "满意"
			}, {
				id: 1,
				sort: 2,
				code: "0002",
				content: "基本满意"
			}, {
				id: 2,
				sort: 3,
				code: "0003",
				content: "不满意"
			}, ]
		}, {
			qstCode: "question_10",
			qstTitle: "您对就诊过程中我院的总体满意程度?",
			type: 0,
			sort: 10,
			options: [{
				id: 0,
				sort: 1,
				code: "0001",
				content: "满意"
			}, {
				id: 1,
				sort: 2,
				code: "0002",
				content: "基本满意"
			}, {
				id: 2,
				sort: 3,
				code: "0003",
				content: "不满意"
			}, ]
		}],
		questions: [],
		questioncode: "03deb476eb634436b4d72b9965539065",
		answers: [],
		count: 0,
		toUserId: "",
		messageId:"",
	},
	mounted: function() {
		var vm = this
		var query = GetRequest();
		vm.messageId = query.messageId;
		var oauthInfo = JSON.parse(sessionStorage.getItem("oauthInfo"));
		vm.toUserId = oauthInfo.id
		vm.getQuestions()
	},
	methods: {
		getQuestions: function() {
			var vm = this
			jiuzhenAPI.getSatisfactionQuestionws({
				surveyTemplateCode: vm.questioncode
			}).then(function(res) {
				vm.questions = res.obj.questions
			})
		},
		checkRadio: function(q_sort, a_sort) {
			var vm = this
			q_sort = q_sort - 1
			var answer = $.extend(true, {}, vm.questions[q_sort])
			a_sort = a_sort - 1
			vm.pushAnswers(answer, q_sort, a_sort)
		},
		pushAnswers: function(answer, q_sort, a_sort) {
			var vm = this
			var options = answer.options[a_sort]
			answer.options = options
			//未答题
			if(answer.isAnswer == undefined) {
				vm.questions[q_sort].isAnswer = true
				vm.questions[q_sort].aid = vm.count
				vm.answers.push(answer)
				vm.count++
			} else {
				//已答题
				var count = vm.questions[q_sort].aid
				vm.answers[count] = answer
			}
		},
		sumbit: function() {
			var vm = this
			var all = vm.questions.length
			if(vm.answers.length < all) {
				var answer = vm.answers.concat()
				var answer1 = _.sortBy(answer, function(item) {
					return item.sort;
				})
				for(var i = 0; i < all; i++) {
					var j = i + 1
					if(answer1[i].sort != j) {
						toastr.warning("第" + j + "题未作答!")
						break;
					}
				}
			} else {
				var jsonData = {
					"userId": vm.toUserId,
					"surveyCode": vm.questioncode,
					"questions": vm.answers,
					"messageId": vm.messageId,
				}
				jiuzhenAPI.postSatisfactionAnswers({
					jsonData: JSON.stringify(jsonData)
				}).then(function(res) {
					toastr.success("提交答案成功。谢谢配合!")
				    setTimeout(function(){vm.close()},3000)
				}).catch(function(err) {
					console.log(err)
				})
			}
		},
		close: function() {
			var index = top.layer.getFrameIndex(window.name);
			top.layer.close(index);
		}
	}
});

+ 5 - 0
page/register/html/register.html

@ -13,6 +13,7 @@
		<link rel="stylesheet" type="text/css" href="../../../css/font-awesome.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/artDialog/6.0.5/api/css/ui-dialog.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/toastr/toastr.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
		<link rel="stylesheet" href="../../../plugins/toastr/toastr.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
@ -29,13 +30,17 @@
		<script src="../../../js/bootstrap.min.js"></script>
		<script src="../../../js/validate/jquery.validate.min.js"></script>
		<script src="../../../js/validate/messages_zh.min.js"></script>
<<<<<<< HEAD
		<script src="../../../plugins/toastr/toastr.min.js"></script>
=======
>>>>>>> 9c7149d1d5f6f95bf4ccde147cb4ac4f73fe8cbc
		<script src="../../../js/security.js"></script>
		<script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/artDialog/6.0.5/api/js/dialog-plus.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../plugins/toastr/toastr.min.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/login-register/register.js"></script>
		<script src="../../../api/patient/login-api.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../component/common/footer.js"></script>