Browse Source

完善功能

lishuwen79 6 years ago
parent
commit
9a17ffdaff

File diff suppressed because it is too large
+ 16 - 0
css/mui.min.css


+ 7 - 2
js/app.js

@@ -1,6 +1,6 @@
 var urls = function() {
-	//var host = "http://192.168.100.3:7979";
-	var host = "http://192.168.5.101:7979";
+	var host = "http://192.168.100.3:7979";
+	//var host = "http://192.168.5.101:7979";
 	//var host = "http://192.168.0.83:7979";
 	var url = {
 		"path": host,
@@ -9,6 +9,7 @@ var urls = function() {
 		"login": host + "/app/user/login", //用户登录
 		"edit_pass": host + "/app/user/edit_pass", //找回密码
 		"register": host + "/app/user/register", //用户注册
+		"certification": host + "/app/user/certification", //企业重新认证
 		"userInfo": host + "/app/user/userInfo", //用户信息
 		"edit_info": host + "/app/user/edit", //编辑用户信息
 		"user_upload": host + "/app/user/uploadHeader", //用户上传头像
@@ -20,6 +21,7 @@ var urls = function() {
 		"news_detail": host + "/app/news/detail", //新闻详情
 		"resume_detail": host + "/app/resume/my_resume", //简历信息
 		"resume_list": host + "/app/resume/resume_list", //企业收到的简历列表
+		"resume_ignore": host + "/app/resume/resume_ignore", //企业用户忽略该简历
 		"resume_preview": host + "/app/resume/resume_preview", //企业预览用户的简历
 		"resume_save": host + "/app/resume/save_resume", //保存简历
 		"resume_delivery": host + "/app/resume/resume_delivery", //投递简历
@@ -30,6 +32,9 @@ var urls = function() {
 		"position_list": host + "/app/position/position_list", //企业用户发布的职位列表
 		"position_detail": host + "/app/position/position_detail", //职位预览
 		"position_delete": host + "/app/position/position_delete", //删除职位
+		"position_type_list": host + "/app/position_type/list", //职位分类列表
+		"position_type_add": host + "/app/position_type/add", //添加职位分类
+		"position_type_delete": host + "/app/position_type/delete", //删除职位分类
 		"feedback": host + "/app/other/feedback", //意见反馈
 		"agreement": host + "/app/other/agreement", //服务条款
 		"guide": host + "/app/other/guide/", //萌新必读2

+ 13 - 3
manifest.json

@@ -593,7 +593,8 @@
 					"images/ls.png"
 				],
 				"refer": [
-					"pages/user/edit_info.html"
+					"pages/user/edit_info.html",
+					"pages/user/find_pass.html"
 				],
 				"priority": 4
 			},
@@ -683,7 +684,8 @@
 					"pages/position/list.html",
 					"pages/position/my_list.html",
 					"pages/resume/resume_delivery_list.html",
-					"pages/message/list.html"
+					"pages/message/list.html",
+					"pages/user/certification.html"
 				],
 				"priority": 0
 			},
@@ -1279,7 +1281,8 @@
 				"resources": [],
 				"refer": [
 					"pages/position/push.html",
-					"pages/position/detail.html"
+					"pages/position/detail.html",
+					"pages/postion_type/list.html"
 				],
 				"priority": 0
 			},
@@ -1310,6 +1313,13 @@
 					"pages/resume/resume_preview.html"
 				],
 				"priority": 0
+			},
+			"pages/postion_type/list.html": {
+				"resources": [],
+				"refer": [
+					"pages/postion_type/add.html"
+				],
+				"priority": 0
 			}
 		},
 		"idle": {

+ 6 - 2
pages/position/detail.html

@@ -49,7 +49,7 @@
 				</div>
 				<div class="model">
 					<div class="content" style="margin-top: -5px;">
-						<span class="name">{{item.mName}}</span><span class="right">6001-8000</span>
+						<span class="name">{{item.mName}}</span><span class="right">{{item.gz=='true'?'面议':item.min+'-'+item.max+' 元/月'}}</span>
 						<div class="yh">
 							<span class="sp">更新:{{item.mTime}}</span>
 							<span class="sp" style="color: #18c31f;"><i class="icon" style="font-size: 13px;">&#xe7a1;</i> 通过审核</span>
@@ -69,7 +69,7 @@
 						</div>
 						<div class="row">
 							<div class="sm2">福利:</div>
-							<div class="sm8">
+							<div class="sm8" style="font-size: 12px;">
 								{{item.gsfl}}
 							</div>
 							<div class="clear"></div>
@@ -126,8 +126,12 @@
 							open('login', '/pages/user/login.html', null, 'slide-in-bottom');
 							return;
 						}
+						if(vm.item.userId==getUser().id){
+							return;
+						}
 						vm.resume = getResume();
 						vm.resume.positionId = vm.item.id;
+						deleteEmptyProperty(vm.resume);
 						request(urls().resume_delivery, vm.resume, function(res) {
 							plus.nativeUI.closeWaiting();
 							if(res.result == true) {

+ 38 - 6
pages/position/list.html

@@ -7,7 +7,13 @@
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<link href="../../css/mui.min.css" rel="stylesheet" />
 		<style>
-		    .mui-content{margin-top: 23px;padding: 10px;}
+			.top{margin-top: 64px;top:0;font-size: 14px;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);color: #292929;padding: 15px;text-align: center;position: fixed;width: 100%;background-color: white;z-index: 666;}
+			.menu{position: fixed;width: 100%;top: -148px;max-height: 250px;overflow: scroll; background-color:white;z-index:6;transition-duration: 0.3s;}
+		    .menu.active{top: 115px;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);}
+		    .fs{color: #5a5858;font-size: 15px;}
+		    .mui-table-view-cell>a:not(.mui-btn).active{color: #00a0ea;}
+		    .mui-table-view-cell:after{background-color: #dbdbdb;}
+		    .mui-content{margin-top: 73px;padding: 10px;}
 		    .items{padding: 15px;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);font-size: 12px;margin-top:10px;background-color: white;border-radius: 3px;}
 		    .title{font-size: 18px;}
 		    .cn{color: #7e7e7e;padding-top: 8px;}
@@ -26,12 +32,20 @@
 			<header class="mui-bar mui-bar-nav">
 				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
 				<h1 class="mui-title">职位列表</h1>
-				<span class="save mui-pull-right" @click="push()">发布</span>
+				<span class="save mui-pull-right" @click="type()">分类管理</span>
 			</header>
+			<div class="top" @click="show=!show">{{msg}} <i class="icon">&#xe601;</i></div>
+			<div class="menu" :class="{active:show}">
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell"v-for="(item,index) in type_list" @click="c=index;msg=item.mName;show=false;positionId=item.id;vm.getData()">
+					    <a class="mui-navigate-right fs" :class="{active:c==index}">{{item.mName}}</a>
+				    </li>
+			    </ul>
+			</div>
 			<div class="mui-content">
 				<div v-if="list.length>0">
 				<div class="items" v-for="(item,index) in list">
-					<div class="title omit">{{item.mName}} <span class="right rmb">{{item.gz=='true'?'面议':item.min+'-'+item.max}}</span></div>
+					<div class="title omit">{{item.mName}} <span class="right rmb">{{item.gz=='true'?'面议':item.min+'-'+item.max+' 元/月'}}</span></div>
 					<div class="cn">
 						<span class="dc"><i class="icon i">&#xe662;</i> {{item.gzjy}}</span>
 						<span class="dc"><i class="icon i">&#xe65e;</i> {{item.xl}}</span>
@@ -71,6 +85,8 @@
 					<li class="mui-table-view-cell" style="color: red;"><a href="#op">取消</a></li>
 				</ul>
 			</div>
+			<button class="btn add-c" @click="push()"><i class="icon icon-58">&#xe670;</i></button>
+			<div class="mask" v-show="show" @click="show=false"></div>
 		</div>
 		<script src="../../js/mui.min.js"></script>
 		<script src="../../js/app.js"></script>
@@ -79,22 +95,38 @@
 			var vm = new Vue({
 				el: "#app",
 				data: {
+					show:false,
+					c:999,
+					msg:'职位分类',
+					positionId:'',
+					type_list:[], //职位分类
 					list: [],
 					obj:{}
 				},
 				mounted: function() {
 					mui.plusReady(function() {
+						request(urls().position_type_list, {userId:getUser().id},function(res) {
+							vm.type_list.push({mName:'全部分类',id:''});
+							res.forEach(function(item){
+								vm.type_list.push(item);
+							});
+							plus.nativeUI.closeWaiting();
+						})
 						vm.getData();
 					})
 				},
 				methods: {
 					//获取数据
 					getData: function() {
-						request(urls().position_list, {userId: getUser().id},function(res) {
+						request(urls().position_list, {userId: getUser().id,positionId:vm.positionId},function(res) {
 							vm.list = res;
 							plus.nativeUI.closeWaiting();
 						})
 					},
+					//职位分类
+					type:function(){
+						open('position_type_list', '/pages/postion_type/list.html', null,'slide-in-bottom');
+					},
 					//预览
 					preview:function(){
 						mui('#op').popover('toggle');
@@ -103,7 +135,7 @@
 					//编辑
 					edit:function(){
 						mui('#op').popover('toggle');
-						open('position_push', 'push.html', vm.obj,'slide-in-bottom');
+						open('position_push', 'push.html', {type_list:vm.type_list,item:vm.obj},'slide-in-bottom');
 					},
 					//删除
 					del:function(){
@@ -119,7 +151,7 @@
 					},
 					//发布职位
 					push: function() {
-						open('position_push', 'push.html', null, 'slide-in-bottom');
+						open('position_push', 'push.html',{type_list:vm.type_list}, 'slide-in-bottom');
 					}
 				}
 			})

+ 16 - 3
pages/position/push.html

@@ -39,6 +39,12 @@
 						<input type="text" v-model="item.mName" placeholder="输入职位">
 					</div>
 					<div class="mui-input-row">
+						<label>职位类型 <span>*</span></label>
+						<select class="mui-btn mui-btn-block" v-model="item.positionId">
+					        <option :value="x.id" v-for="(x,index) in type_list">{{x.mName}}</option>
+				        </select>
+					</div>
+					<div class="mui-input-row">
 						<label>学历要求</label>
 						<select class="mui-btn mui-btn-block" v-model="item.xl">
 					        <option :value="x" v-for="(x,index) in xlyq">{{x}}</option>
@@ -101,21 +107,28 @@
 				data: {
 					xlyq:xlyq(), //学历要求
 					gzyl:gzyl(), //学历要求
+					type_list:[],
 					push:[{name:'发布',id:0},{name:'暂不发布',id:1}],
-					item: {mName:'',xl:'不限',nums:'1',gzdw:'',gzdd:'',gz:false,min:'',max:'',gzjy:'不限',phone:'',gsfl:'',zwyq:'',fb:0}
+					item: {mName:'',positionId:'',xl:'不限',nums:'1',gzdw:getUser().company,gzdd:'',gz:false,min:'',max:'',gzjy:'不限',phone:getUser().account,gsfl:'',zwyq:'',fb:0}
 				},
 				mounted: function() {
 					mui.plusReady(function() {
-						if(plus.webview.currentWebview().param!=null){
-					        vm.item=plus.webview.currentWebview().param;
+						if(plus.webview.currentWebview().param.item!=null){
+					        vm.item=plus.webview.currentWebview().param.item;
 					        vm.item.gz=vm.item.gz=='true'?true:false;
 						}
+						vm.type_list=plus.webview.currentWebview().param.type_list;
+						vm.type_list.splice({mName:'全部分类'},1);
 						vm.item.userId=getUser().id;
 					})
 				},
 				methods: {
 					//保存
 					save:function(){
+						if(vm.item.positionId==''||vm.item.positionId==null){
+							mui.alert('选择职位类型,没有请去职位管理添加');
+							return;
+						}
 						request(urls().position_push,this.item, function(res) {
 							 if(res.result==true){
 							  	mui.toast("操作成功");

+ 71 - 0
pages/postion_type/add.html

@@ -0,0 +1,71 @@
+<!doctype html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>添加</title>
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<link href="../../css/mui.min.css" rel="stylesheet" />
+		<link rel="stylesheet" href="../../css/animate.min.css" />
+		<style>
+			.mui-bar-nav~.mui-content{padding-top: 54px;}
+			.bg{padding: 20px;text-align: center;}
+			input{height: 50px!important;}
+			.m_box {padding: 10px 10px 25px 10px;box-shadow: 0 1px 6px #dbdbdb;}
+			.btn{width: 230px;margin-top: -21px;}
+		</style>
+	</head>
+
+	<body>
+		<div id="app">
+			<header class="mui-bar mui-bar-nav">
+				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+				<h1 class="mui-title">添加或编辑</h1>
+			</header>
+			<div class="mui-content animated fadeInUp" id="app" style="margin-top: 10px;">
+				<div class="bg">
+					<div class="m_box">
+					<div class="input-group">
+						<input type="text" placeholder="输入分类名称" v-model="item.mName"/>
+					</div>
+					</div>
+					<button class="btn" @click="ok()">确认</button>
+				</div>
+			</div>
+		</div>
+		<script src="../../js/mui.min.js"></script>
+		<script src="../../js/app.js"></script>
+		<script src="../../js/vue.min.js"></script>
+		<script>
+			var vm=new Vue({
+				el: "#app",
+				data: {
+					item: {id: '',userId:getUser().id,mName:''},
+				},
+				mounted:function() {
+					mui.plusReady(function() {
+					    if(plus.webview.currentWebview().param!=null){
+					    	vm.item=plus.webview.currentWebview().param;
+					    }	
+					})	
+				},
+				methods: {
+					//编辑
+					ok: function() {
+						request(urls().position_type_add,this.item, function(res) {
+							if(res.result == true) {
+								mui.toast("操作成功");
+								plus.webview.getWebviewById("position_list").reload(true);
+								plus.webview.getWebviewById("position_type_list").reload(true);
+							} else {
+								mui.toast(res.msg);
+							}
+							plus.nativeUI.closeWaiting();
+						})
+					}
+				}
+			})
+		</script>
+	</body>
+
+</html>

+ 85 - 0
pages/postion_type/list.html

@@ -0,0 +1,85 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>分类列表</title>
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<link href="../../css/mui.min.css" rel="stylesheet" />
+		<style>
+		    .mui-content{margin-top: 23px;padding: 10px;}
+		    .items{padding: 20px;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);font-size: 12px;margin-top:10px;background-color: white;border-radius: 3px;}
+		    .title{font-size: 17px;}
+		    .save{color:white;padding-top: 12px;}
+		    .m{color: darkgray;font-size: 15px;padding-left: 10px;}
+		    .right{color: #FF5722;font-size: 13px;float: right;}
+		    [v-cloak] {display: none;}
+		</style>
+	</head>
+	<body>
+		<div id="app" v-cloak>
+			<header class="mui-bar mui-bar-nav">
+				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+				<h1 class="mui-title">职位分类列表</h1>
+				<span class="save mui-pull-right" @click="add()">添加</span>
+			</header>
+			<div class="mui-content">
+				<div v-if="list.length>0">
+				<div class="items" v-for="(item,index) in list" @click="detail(item)">
+					<div class="title omit">{{item.mName}} 
+						<span class="right" @click.stop="del(item)"><i class="icon icon-48">&#xe67d;</i> 删除<i class="icon m">&#xe61c;</i></span>
+				    </div>
+				</div>
+				</div>
+				<div class="no_data" v-else>
+					<i class="icon icon-48">&#xe65f;</i><br />没有数据
+				</div>
+			</div>
+		</div>
+		<script src="../../js/mui.min.js"></script>
+		<script src="../../js/app.js"></script>
+		<script src="../../js/vue.min.js"></script>
+		<script type="text/javascript">
+			var vm = new Vue({
+				el: "#app",
+				data: {
+					list: [],
+				},
+				mounted: function() {
+					mui.plusReady(function() {
+						vm.getData();
+					})
+				},
+				methods: {
+					//获取数据
+					getData: function() {
+						request(urls().position_type_list, {userId: getUser().id},function(res) {
+							vm.list = res;
+							plus.nativeUI.closeWaiting();
+						})
+					},
+					//添加分类
+					add: function(item) {
+						open('position_type_add', 'add.html', null,'slide-in-bottom');
+					},
+					//查看当前职位下面的简历列表
+					detail: function(item) {
+						open('position_type_add', 'add.html', item,'slide-in-bottom');
+					},
+					//删除
+					del:function(item){
+						mui.confirm('是否删除该分类?', '提示', ['否', '是'], function(e) {
+							if(e.index == 1) {
+								request(urls().position_type_delete,{id:item.id},function(res) {
+							            vm.list.splice(vm.list.indexOf(item),1);
+							            mui.toast("删除成功");
+							            plus.nativeUI.closeWaiting();
+						         })
+							}
+						})
+					}
+				}
+			})
+		</script>
+	</body>
+
+</html>

+ 18 - 4
pages/resume/resume_list.html

@@ -15,6 +15,7 @@
 		    .rmb{color: #FF5722;font-size: 15px;}
 		    .right{float: right;}
 		    .i{color: #00a0ea;}
+		    .browse{font-size: 10px;color: #2196F3;}
 		    .flex{text-align: center;border-top: 1px solid #e2e2e2;margin-top: 3px;}
 		    .flex .f{padding: 10px 10px 0px 10px;font-size: 12px;color: #26cc2c;}
 		    [v-cloak] {display: none;}
@@ -29,7 +30,10 @@
 			<div class="mui-content">
 				<div v-if="list.length>0">
 				<div class="items" v-for="(item,index) in list" @click="preview(item.id)">
-					<div class="title omit">{{item.mz}} <span class="right rmb">{{item.gz==null?'面议':item.gz}}</span></div>
+					<div class="title omit">{{item.mz}} 
+						<span class="browse" v-show="item.isBrowse==0" style="color: darkgray;">待浏览</span>
+						<span class="browse" v-show="item.isBrowse==1">已查看</span>
+						<span class="right rmb">{{item.gz==null?'面议':item.gz+' 元/月'}}</span></div>
 					<div class="cn">
 						<span class="dc"><i class="icon i">&#xe645;</i> {{item.sex}}</span>
 						<span class="dc"><i class="icon i">&#xe682;</i> {{item.csny}}</span>
@@ -44,6 +48,7 @@
 						<div class="flex">
 							<div class="f" @click.stop="phone(item.phone)"><i class="icon">&#xe62c;</i> 拨打电话</div>
 							<div class="f" @click.stop="message(item.phone)"><i class="icon">&#xe625;</i> 发送短信</div>
+							<div class="f" @click.stop="ignore(item)" style="color:#FF5722;"><i class="icon">&#xe67d;</i> 忽略该简历</div>
 						</div>
 					</div>
 				</div>
@@ -86,9 +91,18 @@
 					},
 					//发送短信
 					message:function(){
-						var msg = plus.messaging.createMessage(plus.messaging.TYPE_SMS);
-	                          msg.to = ['18611497504'];
-	                          plus.messaging.sendMessage( msg );
+					},
+					//忽略该简历
+					ignore:function(item){
+						mui.confirm('是否忽略该简历,忽略后将不再显示?', '提示', ['否', '是'], function(e) {
+							if(e.index == 1) {
+								request(urls().resume_ignore,{id:item.id},function(res) {
+							            plus.nativeUI.closeWaiting();
+							            mui.toast('操作成功');
+							            vm.list.splice(vm.list.indexOf(item),1);
+						         })
+							}
+						})
 					}
 				}
 			})

+ 27 - 0
pages/resume/resume_preview.html

@@ -15,6 +15,7 @@
            .d{color: darkgray;font-size: 12px;padding-top: 5px;}
            .b{color: black;}
            .e{color: #6e6f71;}
+           .save{color:white;padding-top: 12px;float: right;}
 		   .mp{width: 90%;border-radius: 3px;}
 		   .edit{float: right;color: #6e6f71;font-size: 15px;}
 		   .nr{padding: 5px;font-size: 12px;color: darkgray;}
@@ -26,6 +27,7 @@
 			<header class="mui-bar mui-bar-nav">
 				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
 				<h1 class="mui-title">查看简历</h1>
+				<a class="save" href="#op">操作</a>
 			</header>
 			<div class="mui-content animated fadeInUp">
 				<div class="model" style="margin-top: 0px;">
@@ -116,6 +118,17 @@
 					</div>
 				</div>
 			</div>
+			<!--操作-->
+			<div id="op" class="mui-popover mui-popover-action mui-popover-bottom">
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell"><a :href=" 'tel:'+item.phone">打电话</a></li>
+					<li class="mui-table-view-cell"><a :href=" 'sms:'+item.phone">发短信</a></li>
+					<li class="mui-table-view-cell" @click="ignore()"><a>忽略该简历</a></li>
+				</ul>
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell" style="color: red;"><a href="#op"><b>取消</b></a></li>
+				</ul>
+			</div>
 		</div>
 		<script src="../../js/mui.min.js"></script>
 		<script src="../../js/app.js"></script>
@@ -131,11 +144,25 @@
 						var id=plus.webview.currentWebview().param.id;
 						request(urls().resume_preview, {id:id}, function(res) {
 							vm.item = res;
+							console.log(JSON.stringify(vm.item));
 							plus.nativeUI.closeWaiting();
 						})
 					})
 				},
 				methods: {
+					//忽略该简历
+					ignore:function(){
+						mui('#op').popover('toggle');
+						mui.confirm('是否忽略该简历,忽略后将不再显示?', '提示', ['否', '是'], function(e) {
+							if(e.index == 1) {
+								request(urls().resume_ignore,{id:vm.item.id},function(res) {
+							            plus.nativeUI.closeWaiting();
+							            mui.toast('操作成功');
+							            plus.webview.getWebviewById('resume_list').reload(true);
+						         })
+							}
+						})
+					}
 				}
 			})
 		</script>

+ 112 - 0
pages/user/certification.html

@@ -0,0 +1,112 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>企业信息</title>
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<link href="../../css/mui.min.css" rel="stylesheet" />
+		<link href="../../css/animate.min.css" rel="stylesheet" />
+		<style>
+			.lg {padding: 35px;margin-top: 10px;text-align: center;}
+			.bg{background-color: white;border-radius: 5px;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);}
+			.mui-input-row{border-bottom: 1px solid #ececec;padding: 8px;}
+            .mui-input-row:last-child{border-bottom: 0px;}
+			.ht{margin-top: 21px;padding: 5px;background-color: #fffbee;color: #ed9f2b;font-size: 12px;}
+			img{max-width: 80px;border-radius: 7px;float: left;}
+			.sp{color: red;}
+			.btn{margin-top: 25px;}
+		</style>
+	</head>
+	<body>
+		<header class="mui-bar mui-bar-nav">
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+			<h1 class="mui-title">企业信息</h1>
+		</header>
+		<div class="mui-content" id="app">
+			<div class="ht">
+				<span v-if="item.mSate==2"><i class="icon warn">&#xe648;</i> 等待后台审核企业信息</span>
+				<span v-if="item.mSate==3"><i class="icon warn">&#xe648;</i> 审核不通过 原因如下 : 营业执照模糊</span>
+				<span v-if="item.mSate==0"><i class="icon warn">&#xe60b;</i> 审核通过</span>
+			</div>
+			<div class="lg animated bounceIn">
+				<div class="bg">
+				<div class="mui-input-row">
+						<label>企业名称 <span class="sp">*</span></label>
+						<input type="text" v-model="item.company" placeholder="输入企业名称">
+				</div>	
+				<div class="mui-input-row">
+						<label>营业执照 <span class="sp">*</span></label>
+						<a href="#picture"><img :src="item.fj==''?'../../images/zz.png':item.fj" /></a>
+				</div>	
+				</div>
+				<button class="btn" @click="register()" v-show="item.mSate!=0">重新提交</button>
+			</div>
+			<!--选择照片-->
+			<div id="picture" class="mui-popover mui-popover-action mui-popover-bottom">
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell" @click="takePhoto()"><a>拍照</a></li>
+					<li class="mui-table-view-cell" @click="pickImg()"><a>选取现有</a></li>
+				</ul>
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell" style="color: red;"><a href="#picture"><b>取消</b></a></li>
+				</ul>
+			</div>
+		</div>
+		<script src="../../js/mui.min.js"></script>
+		<script src="../../js/app.js"></script>
+		<script src="../../js/vue.min.js"></script>
+		<script type="text/javascript">
+			var vm = new Vue({
+				el: "#app",
+				data: {
+					item: {}
+				},
+				mounted: function() {
+					mui.plusReady(function() {
+						request(urls().userInfo, {id: getUser().id}, function(res) {
+							vm.item=res.data;
+							plus.nativeUI.closeWaiting();
+						})
+					})
+				},
+				methods: {
+					//拍照
+					takePhoto: function() {
+						takePhoto(function(path) {
+							plus.io.resolveLocalFileSystemURL(path, function(entry) {
+								vm.compress(entry.toLocalURL());
+							});
+						})
+					},
+					//选取照片
+					pickImg: function() {
+						pickImg(function(p) {
+							vm.compress(p.files[0]);
+						}, 1);
+					},
+					//图片压缩上传
+					compress: function(path) {
+						compress(function(c) {
+							upload(urls().uploadFj,path,function(res) {
+								  plus.nativeUI.closeWaiting();
+								  var res=JSON.parse(res.responseText);
+								  vm.item.fj=urls().path+res.url;
+							});
+						}, path, '75%');
+					},
+					//重新提交
+					register: function() {
+						if(this.item.company=='') {mui.toast("输入企业名称");return;}
+						if(this.item.fj=='') {mui.toast("上传营业执照");return;}
+						request(urls().certification,this.item, function(res) {
+							mui.toast("提交成功");
+							vm.item.mSate=2;
+							plus.nativeUI.closeWaiting();
+						})
+					}
+				}
+			})
+		</script>
+	</body>
+
+</html>

+ 2 - 9
pages/user/edit_info.html

@@ -27,8 +27,7 @@
 					<div class="m_box">
 					<div class="input-group">
 						<input type="text" placeholder="输入昵称" v-model="item.value" v-if="item.field=='nickName' " />
-						<input type="number" placeholder="输入体重" v-model="item.value" v-if="item.field=='weight' " />
-						<input type="number" placeholder="输入身高" v-model="item.value" v-if="item.field=='height' " />
+						<input type="text" placeholder="输入邮箱" v-model="item.value" v-if="item.field=='email' " />
 					</div>
 					</div>
 					<button class="btn" @click="ok()">确认</button>
@@ -51,13 +50,7 @@
 					vm.msg = p.param.msg;
 					vm.item.id = getUser().id;
 					vm.item.value=p.param.value;
-					if(p.param.op == 1) {
-						vm.item.field = 'nickName';
-					} else if(p.param.op == 2) {
-						vm.item.field = 'weight';
-					} else if(p.param.op == 3) {
-						vm.item.field = 'height';
-					}
+					vm.item.field=p.param.op;
 					})	
 				},
 				methods: {

+ 1 - 9
pages/user/find_pass.html

@@ -5,6 +5,7 @@
 		<title>找回密码</title>
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<link href="../../css/mui.min.css" rel="stylesheet" />
+		<link href="../../css/animate.min.css" rel="stylesheet" />
 		<style>
 			.lg {padding: 35px;margin-top: 10px;text-align: center;}
 			.input-group{height: auto;}
@@ -12,8 +13,6 @@
 			.input-group input{padding: 10px 11px 11px 35px;}
 			.code{position: absolute;right: 0;top: 0;margin-top: 10px;margin-right: 12px;font-size: 12px;color: #fe580a;font-weight: bold;}
 			.btn{margin-top: 25px;}
-			.divider{margin-top: 50px;}
-			.register{margin-top: 50px;color: darkgray;font-size: 13px;}
 		</style>
 	</head>
 	<body>
@@ -41,13 +40,6 @@
 					<span class="code" @click.stop="sendMessage()">{{msg}}</span>
 				</div>
 				<button class="btn" @click="forget()">立即找回</button>
-				<div class="divider">
-					<div class="line" style="width: 30%;"></div>
-					<div class="text" style="width: 40%;">已有账号?</div>
-					<div class="line" style="width: 30%;"></div>
-					<div class="clear"></div>
-				</div>
-				<div class="mui-action-back register" @click="register()">去登录</div>
 			</div>
 		</div>
 		<script src="../../js/mui.min.js"></script>

+ 18 - 59
pages/user/user_info.html

@@ -42,14 +42,14 @@
 						        <span class="head">头像</span>
 							</a>
 						</li>
-						<li class="mui-table-view-cell" @click="op('CN',item.nickName,1)">
+						<li class="mui-table-view-cell" @click="op(' 昵称',item.nickName,'nickName')">
 							<a class="mui-navigate-right"><span class="r">{{item.nickName}}</span>昵称</a>
 						</li>
-						<li class="mui-table-view-cell" @click="op('身高',item.height,3)">
-							<a  class="mui-navigate-right"><span class="r">{{item.email}}</span>邮箱</a>
+						<li class="mui-table-view-cell" @click="pwd()">
+							<a class="mui-navigate-right"><span class="r">修改密码</span>密码</a>
 						</li>
-						<li class="mui-table-view-cell">
-							<a href="#sex" class="mui-navigate-right"><span class="r">{{item.size}}</span>出生日期</a>
+						<li class="mui-table-view-cell" @click="op(' 邮箱',item.email,'email')">
+							<a  class="mui-navigate-right"><span class="r">{{item.email}}</span>邮箱</a>
 						</li>
 						<li class="mui-table-view-cell">
 							<a href="#sex" class="mui-navigate-right"><span class="r">{{item.mTime}}</span>注册时间</a>
@@ -57,38 +57,17 @@
 					</ul>
 				</div>
 			</div>
-			<!--拍照-->
+			<!--选择照片-->
 			<div id="picture" class="mui-popover mui-popover-action mui-popover-bottom">
 				<ul class="mui-table-view">
-					<li class="mui-table-view-cell" @click="takePhoto()">
-						<a>拍照</a>
-					</li>
-					<li class="mui-table-view-cell" @click="pickImg()">
-						<a>选取现有</a>
-					</li>
-				</ul>
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell" style="color: red;">
-						<a href="#picture"><b>取消</b></a>
-					</li>
-				</ul>
-			</div>
-			<!--性别-->
-			<div id="sex" class="mui-popover mui-popover-action mui-popover-bottom">
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell" @click="size('S')"><a>S</a></li>
-					<li class="mui-table-view-cell" @click="size('M')"><a>M</a></li>
-					<li class="mui-table-view-cell" @click="size('L')"><a>L</a></li>
-					<li class="mui-table-view-cell" @click="size('XL')"><a>XL</a></li>
-					<li class="mui-table-view-cell" @click="size('均码')"><a>均码</a></li>
+					<li class="mui-table-view-cell" @click="takePhoto()"><a>拍照</a></li>
+					<li class="mui-table-view-cell" @click="pickImg()"><a>选取现有</a></li>
 				</ul>
 				<ul class="mui-table-view">
-					<li class="mui-table-view-cell" style="color: red;">
-						<a href="#sex"><b>取消</b></a>
-					</li>
+					<li class="mui-table-view-cell" style="color: red;"><a href="#picture"><b>取消</b></a></li>
 				</ul>
 			</div>
-			<!--新增的图片剪裁-->
+			<!--图片剪裁-->
 			<div id="clipp">
 				<img id="image" alt="Picture" src="../../images/APP-banner2.jpg">
 				<div class="op">
@@ -129,12 +108,8 @@
 					},
 					//拍照
 					takePhoto: function() {
-						mui('#picture').popover('toggle');
-						var cmr = plus.camera.getCamera();
-						var res = cmr.supportedImageResolutions[0];
-						var fmt = cmr.supportedImageFormats[0];
 						plus.nativeUI.showWaiting("准备剪裁...");
-						cmr.captureImage(function(path) {
+						takePhoto(function(path) {
 							plus.io.resolveLocalFileSystemURL(path, function(entry) {
 								plus.nativeUI.closeWaiting();
 								if(cropper != null) {
@@ -142,25 +117,16 @@
 								}
 								cropper = getClipper(1, entry.toLocalURL());
 							});
-						}, function(error) {
-							plus.nativeUI.closeWaiting();
-						}, {
-							resolution: res,
-							format: fmt
-						});
+						})
 					},
 					//选择现有
 					pickImg: function() {
-						mui('#picture').popover('toggle');
-						// 从相册中选择图片然后裁剪
-						plus.gallery.pick(function(path) {
+						pickImg(function(p) {
 							if(cropper != null) {
 								cropper.destroy();
 							}
-							cropper = getClipper(1, path);
-						}, {
-							filter: "image"
-						});
+							cropper = getClipper(1, p.files[0]);
+						}, 1);
 					},
 					//裁剪结束并上传
 					save: function() {
@@ -180,16 +146,9 @@
 					cancel: function() {
 						document.getElementById("clipp").style.display = 'none';
 					},
-					//编辑尺码
-					size: function(op) {
-						mui('#sex').popover('toggle');
-						request(urls().edit_info, {field: 'size',id: getUser().id,value: op}, function(res) {
-							if(res.result == true) {
-								mui.toast("修改成功");
-								vm.item.size = op;
-							}
-							plus.nativeUI.closeWaiting();
-						})
+					//修改密码
+					pwd:function(){
+						open('find_pass', 'find_pass.html', null, 'slide-in-bottom');
 					},
 					//编辑其它
 					op: function(msg, val, op) {

+ 1 - 1
tab/list.html

@@ -65,7 +65,7 @@
 			<div class="mui-content">
 				<div v-if="position_list.length>0">
 				<div class="items" v-for="(item,index) in position_list" @click="detail(item.id)">
-					<div class="title omit">{{item.mName}} <span class="right rmb">{{item.gz=='true'?'面议':item.min+'-'+item.max}}</span></div>
+					<div class="title omit">{{item.mName}} <span class="right rmb">{{item.gz=='true'?'面议':item.min+'-'+item.max+' 元/月'}}</span></div>
 					<div class="cn">
 						<span class="dc"><i class="icon i">&#xe662;</i> {{item.gzjy}}</span>
 						<span class="dc"><i class="icon i">&#xe65e;</i> {{item.xl}}</span>

+ 9 - 2
tab/mine.html

@@ -21,6 +21,7 @@
 			.mui-table-view-cell{padding: 15px;color: #7a7a7a;font-weight: bold;}
 			.mui-table-view-cell:after{background-color: #dbdbdb;}
 			.ic{margin-right: 10px;font-size: 18px;font-weight: bold;}
+			.error{top: 100px;background-color: #FF5722;}
 		</style>
 	</head>
 	<body>
@@ -32,7 +33,8 @@
 					<div class="nickName" v-if="user.nickName==null">未登录</div>
 					<div class="nickName" v-else>{{user.nickName}} <br><span class="email">{{user.email}}</span></div>
 				</div>
-				<div class='qh' v-if="user.nickName!=null"><i class="icon">&#xe863;</i> {{user.mType==0?'个人用户':'企业用户'}}</div>
+				<div class='qh' @click="qy()" v-if="user.nickName!=null"><i class="icon">&#xe863;</i> {{user.mType==0?'个人用户':'企业用户'}}</div>
+				<div class='qh error' v-if="user.mSate==2"><i class="icon">&#xe67d;</i> 审核不通过</div>
 			</div>
 			<div class="banner">
 				<div class="row" v-if="user.mType==1">
@@ -44,7 +46,6 @@
 				<div class="row" v-else>
 					<div class="sm" @click="page('my_resume','../pages/resume/my_resume.html')"><i class="icon ic" style="color: #FF5722;margin:0;">&#xe670;</i><br />我的简历</div>
 					<div class="sm" @click="page('resume_delivery_list','../pages/resume/resume_delivery_list.html')"><i class="icon ic" style="color: #607D8B;margin:0;">&#xe614;</i><br />投递历史</div>
-					<div class="sm" @click="page('message_list','../pages/message/list.html')"><i class="icon ic" style="color: #4CAF50;margin:0;">&#xe625;</i><br />消息</div>
 					<div class="clear"></div>
 				</div>
 			</div>
@@ -89,6 +90,12 @@
 						}
 						open(id, url, null, 'slide-in-bottom');
 					},
+					//企业信息
+					qy:function(){
+						if(vm.user.mType==1){
+							open('qy', '../pages/user/certification.html', null, 'slide-in-bottom');
+						}
+					},
 					//分享
 					share:function(){
 						plus.share.sendWithSystem({content: "找工作,就上党建扶贫APP,合浦县的APP,:http://www.biboacgn.com/"});

Some files were not shown because too many files changed in this diff