Browse Source

完善功能

lishuwen79 6 năm trước cách đây
mục cha
commit
0f39409cd2
9 tập tin đã thay đổi với 418 bổ sung123 xóa
  1. 3 2
      css/mui.min.css
  2. 4 2
      js/app.js
  3. 12 3
      manifest.json
  4. 68 0
      pages/news/detail.html
  5. 45 83
      pages/news/list.html
  6. 243 0
      pages/resume/base_info.html
  7. 36 26
      pages/resume/my_resume.html
  8. 6 6
      tab/home.html
  9. 1 1
      tab/mine.html

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 3 - 2
css/mui.min.css


+ 4 - 2
js/app.js

@@ -1,7 +1,6 @@
 var urls = function() {
 	//var host = "http://192.168.100.3:7979";
-	var host = "http://192.168.5.104:7979";
-	//var host = "http://app.biboacgn.com";
+	var host = "http://192.168.5.103:7979";
 	var url = {
 		"path": host,
 		"sendMessage": host + "/app/user/sendMessage", //发送短信
@@ -10,6 +9,9 @@ var urls = function() {
 		"edit_info": host + "/app/user/edit", //编辑用户信息
 		"user_upload": host + "/app/user/uploadHeader", //用户上传头像
 		"main": host + "/app/main", //首页加载数据
+		"column": host + "/app/column", //文章栏目
+		"news_list": host + "/app/news/jsonList", //新闻列表
+		"news_detail": host + "/app/news/detail", //新闻详情
 		"feedback": host + "/app/other/feedback", //意见反馈
 		"agreement": host + "/app/other/agreement", //服务条款
 		"guide": host + "/app/other/guide/", //萌新必读

+ 12 - 3
manifest.json

@@ -4,7 +4,7 @@
 		"iPhone",
 		"iPad"
 	],
-	"id": "H521C3800",/*应用的标识,创建应用时自动生成,勿手动修改*/
+	"id": "H550943C5",/*应用的标识,创建应用时自动生成,勿手动修改*/
 	"name": "党建扶贫",/*应用名称,程序桌面图标名称*/
 	"version": {
 		"name": "1.0.3",/*应用版本名称*/
@@ -678,7 +678,8 @@
 					"pages/collection/list.html",
 					"pages/records/list.html",
 					"pages/order/list.html",
-					"pages/shopping_cart/list.html"
+					"pages/shopping_cart/list.html",
+					"pages/resume/my_resume.html"
 				],
 				"priority": 0
 			},
@@ -833,7 +834,8 @@
 					"pages/other/guide.html",
 					"pages/other/mx0.html",
 					"pages/other/mx1.html",
-					"pages/other/mx2.html"
+					"pages/other/mx2.html",
+					"pages/news/list.html"
 				],
 				"priority": 1
 			},
@@ -1250,6 +1252,13 @@
 					"pages/goods/detail.html"
 				],
 				"priority": 0
+			},
+			"pages/news/list.html": {
+				"resources": [],
+				"refer": [
+					"pages/news/detail.html"
+				],
+				"priority": 0
 			}
 		},
 		"idle": {

+ 68 - 0
pages/news/detail.html

@@ -0,0 +1,68 @@
+<!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>
+			.icon{color: white;font-size: 20px;padding-top: 10px;}
+            .mui-content{overflow:hidden;padding:15px;background-color: white;margin-top: 23px;}
+            .mui-content img{width:100%;border-radius: 3px;}
+            .title{font-size:18px;margin-top:20px;text-align:left;font-weight:700}
+            .bq{font-size:13px;color:#a9a9a9;padding-top:10px;padding-bottom: 10px;}
+            .content{font-size:13px;line-height:30px!important;color:#464646;letter-spacing:1.1px;text-align:left;padding:5px;overflow:hidden;margin-top:15px}
+            .content img{width:100%!important;height:auto!important;text-align:center!important}
+            .content p{color:#464646}
+            .content span{color:#464646}
+		</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>
+				<i @click="fx()" class="icon mui-pull-right">&#xe61a;</i>
+			</header>
+			<div class="mui-content">
+				<div class="title">{{item.mTitle}}</div>
+				<div class="bq">{{item.mTime}}</div>
+				<div class="divider" style="margin-top: 15px;">
+					<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="content" v-html="item.mContent"></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: {
+					item: {}
+				},
+				mounted: function() {
+					mui.plusReady(function() {
+						var obj = plus.webview.currentWebview();
+						request(urls().news_detail, {id: obj.param.id}, function(res) {
+							 vm.item = res;
+							plus.nativeUI.closeWaiting();
+						})
+					})
+				},
+				methods: {
+					//分享
+					fx: function() {
+						plus.share.sendWithSystem({content: vm.item.mTitle +'  链接:'+urls().path + '/news/share/'+ vm.item.id});
+					},
+				}
+			})
+		</script>
+	</body>
+
+</html>

+ 45 - 83
pages/news/list.html

@@ -12,9 +12,12 @@
 		    .ui.secondary.pointing.menu{overflow:auto;border-bottom:0px;margin-top: 65px;}
 			.ui.secondary.pointing.menu::-webkit-scrollbar {display:none}
 		    .main{margin-top: 115px;background-color: white;}
-		    .items{padding: 18px;font-size: 13px;color: #606060;border-bottom: 1px solid #efefef;}
+		    .items{padding: 15px;font-size: 15px;color: #3a3939;border-bottom: 1px solid #efefef;}
 		    .items:last-child{border: 0px;}
-		    .sm4{text-align: right;font-size: 12px;position: relative;}
+		    .cn{font-size: 10px;color: darkgray;padding-top: 3px;}
+		    .dc{padding-left: 5px;}
+		    .isTop{color: red;font-weight: bold;}
+		    .icon{font-size: 48px;display: block;}
 		    [v-cloak] {display: none;}
 		</style>
 	</head>
@@ -24,75 +27,31 @@
 				<div class="top">
 					<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>
+						<h1 class="mui-title">{{param.type}}</h1>
 					</header>
 					<div class="ui secondary pointing menu">
-						<a class="item" :style="{'color':index==current?'#00a0ea':'','border-bottom':index==current?'4px solid #00a0ea':''}" v-for="(item,index) in column_list" @click="selected(item.id,index)">{{item.mColumnName}} </a>
+						<a class="item" :style="{'color':index==current?'#00a0ea':'','border-bottom':index==current?'4px solid #00a0ea':''}" v-for="(item,index) in column_list" @click="selected(param.columnId=item.id,current=index)">{{item.mColumnName}} </a>
 					</div>
 				</div>
-				<div class="main">
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02 </div>
-							<div class="clear"></div>
+				<div class="main" v-if="news_list.length>0">
+						<div class="items" v-for="(item,index) in news_list" @click="detail(item.id)">
+							<div class="omit">{{item.mTitle}}</div>
+							<div class="cn">
+								<span class="isTop" v-show="item.isTop==1">置顶</span> 
+								<span class="dc"> {{item.mColumnName}}</span> 
+								<span class="dc"> {{item.mTime.substring(0,16)}}</span>
+							</div>
 						</div>
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02</div>
-							<div class="clear"></div>
-						</div>
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02</div>
-							<div class="clear"></div>
-						</div>
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02</div>
-							<div class="clear"></div>
-						</div>
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02</div>
-							<div class="clear"></div>
-						</div>	
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02</div>
-							<div class="clear"></div>
-						</div>	
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02</div>
-							<div class="clear"></div>
-						</div>	
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02</div>
-							<div class="clear"></div>
-						</div>
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02</div>
-							<div class="clear"></div>
-						</div>	
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02</div>
-							<div class="clear"></div>
-						</div>	
-						<div class="items row">
-							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
-							<div class="sm4">09-30 12:02</div>
-							<div class="clear"></div>
-						</div>		
+				</div>
+				<div class="no_data" v-else>
+					<i @click="fx()" class="icon">&#xe65f;</i>没有数据
 				</div>
 					<!--加载更多-->
 					<div class="more">
-						<div class="loading" v-if="loading" style="margin: 10px"><span class="mui-spinner"></span>
+						<div class="loading" v-if="loading">
+							<span class="mui-spinner"></span>
 							<div class="mc">加载中...</div>
 						</div>
-						<div v-else><span class="icon iconfont icon-meiyou"></span> 没有更多内容了</div>
 					</div>
 			</div>
 		</div>
@@ -103,22 +62,26 @@
 			var vm = new Vue({
 				el: "#app",
 				data: {
+					news_list:[],
 					column_list: [],
-					param: {page: 1},
+					param: {page: 1,type:'时政信息','columnId':''},
 					current: 0,
 					loading: false,
 					hasMore: false,
 				},
 				mounted: function() {
-					//mui.plusReady(function() {
-					request(urls().column, {
-						mType: 1
-					}, function(res) {
-						vm.column_list = res;
-						//plus.nativeUI.closeWaiting();
-					})
-					//vm.getData();
-					//})
+					mui.plusReady(function() {
+					var obj = plus.webview.currentWebview();
+					vm.param.type=obj.param.type;
+					request(urls().column, {mType: obj.param.type=='时政信息'?1:2}, function(res) {
+						vm.column_list.push({mColumnName:'最近文章',id:''})
+						res.forEach(function(item){
+							vm.column_list.push(item);
+						})
+						plus.nativeUI.closeWaiting();
+					  })
+					   vm.getData();
+				    })
 					//监听滚动加载
 					window.addEventListener('scroll', function() {
 						//滚动高度+内高度>=文档高度  
@@ -130,7 +93,7 @@
 								vm.param.page++;
 								setTimeout(function() {
 									vm.getData()
-								}, 500);
+								}, 1000);
 							}
 						}
 					})
@@ -138,27 +101,26 @@
 				methods: {
 					//获取数据
 					getData: function() {
-						request(urls().goods_list, this.param, function(res) {
-							res.list.forEach(function(item) {
-								item.mCove = urls().path + item.mCove;
-								vm.goods_list.push(item);
+						request(urls().news_list, this.param, function(res) {
+							res.rows.forEach(function(item) {
+								vm.news_list.push(item);
 							});
-							vm.hasMore = vm.param.page < res.totalPage ? true : false;
+							vm.hasMore = vm.param.page < res.total ? true : false;
 							vm.loading = false;
 							plus.nativeUI.closeWaiting();
 						})
 					},
 					//选择栏目
-					selected: function(columnId, index) {},
+					selected: function(columnId, index) {
+						vm.refresh();
+					},
 					//详情
-					detail: function(item) {
-						open('goods_detail', '../pages/goods/detail.html', {
-							id: item.id
-						}, 'slide-in-bottom');
+					detail: function(id) {
+						open('news_detail', 'detail.html', {id: id}, 'slide-in-bottom');
 					},
 					//刷新
 					refresh: function() {
-						vm.goods_list = [];
+						vm.news_list = [];
 						vm.param.page = 1;
 						vm.getData();
 					}

+ 243 - 0
pages/resume/base_info.html

@@ -0,0 +1,243 @@
+<!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" />
+		<link href="../../css/cropper.min.css" rel="stylesheet" />
+		<style>
+		   .mui-bar-nav~.mui-content{padding-top: 60px;}
+           .mui-input-row{border-bottom: 1px solid #ececec;padding: 8px;}
+           .mui-input-row:last-child{border-bottom: 0px;}
+		   .img{width: 40px;height: 40px;border-radius: 50%;}
+		   .m_box {padding: 0px 10px 0px 10px;margin: 15px;box-shadow: 0 1px 6px #dbdbdb;}
+		   .mui-input-row .mui-btn{width: 65%;padding: 0px;}
+		   #clipp{position:fixed;width:100%;height:100%;top:0;background-color:black;display:none;z-index:9999999}
+		   #clipp img{max-width:100%;height:auto;vertical-align:middle;}
+		   #clipp .op{position:fixed;width:100%;bottom:0;}
+		   #clipp .mui-icon{color:white;font-size:50px;font-weight:bold}
+		  [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>
+			</header>
+			<div class="mui-content animated fadeInUp">
+				<div class="m_box">
+					<div class="mui-input-row">
+						<label>照片</label>
+						<input type="text" placeholder="输入姓名">
+					</div>
+					<div class="mui-input-row">
+						<label>姓名</label>
+						<input type="text" placeholder="输入姓名">
+					</div>
+					<div class="mui-input-row">
+						<label>性别</label>
+						<select class="mui-btn mui-btn-block">
+					        <option value="item-1">item-1</option>
+					        <option value="item-2">item-2</option>
+				        </select>
+					</div>
+					<div class="mui-input-row">
+						<label>出生年月</label>
+						<input type="text" placeholder="选择日期">
+					</div>
+					<div class="mui-input-row">
+						<label>最高学历</label>
+						<select class="mui-btn mui-btn-block">
+					        <option value="item-1">item-1</option>
+					        <option value="item-2">item-2</option>
+				        </select>
+					</div>
+					<div class="mui-input-row">
+						<label>毕业学校</label>
+						<input type="text" placeholder="输入姓名">
+					</div>
+					<div class="mui-input-row">
+						<label>所学专业</label>
+						<input type="text" placeholder="输入姓名">
+					</div>
+					<div class="mui-input-row">
+						<label>函授学校</label>
+						<input type="text" placeholder="输入姓名">
+					</div>	
+				</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>
+				</ul>
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell" style="color: red;">
+						<a href="#sex"><b>取消</b></a>
+					</li>
+				</ul>
+			</div>
+			<!--新增的图片剪裁-->
+			<div id="clipp">
+				<img id="image" alt="Picture" src="../../images/APP-banner2.jpg">
+				<div class="op">
+					<span class="mui-icon mui-icon mui-icon-closeempty mui-pull-left" @click="cancel()"></span>
+					<span class="mui-icon mui-icon-checkmarkempty mui-pull-right" @click="save()"></span>
+				</div>
+			</div>
+		</div>
+		<script src="../../js/mui.min.js"></script>
+		<script src="../../js/app.js"></script>
+		<script src="../../js/vue.min.js"></script>
+		<script src="../../js/cropper.min.js"></script>
+		<script type="text/javascript">
+			var cropper = null;
+			var vm = new Vue({
+				el: "#app",
+				data: {
+					item: {}
+				},
+				mounted: function() {
+					mui.plusReady(function() {
+						vm.getData();
+					})
+				},
+				methods: {
+					getData: function() {
+						request(urls().userInfo, {
+							id: getUser().id
+						}, function(res) {
+							if(res.result == true) {
+								vm.item = res.data;
+								localStorage.setItem("user", JSON.stringify(res.data));
+								vm.item.header = urls().path + vm.item.header;
+								plus.webview.getWebviewById('tab/mine.html').reload(true);
+							} else {
+								mui.alert(res.msg);
+							}
+							plus.nativeUI.closeWaiting();
+						})
+					},
+					//拍照
+					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) {
+							plus.io.resolveLocalFileSystemURL(path, function(entry) {
+								plus.nativeUI.closeWaiting();
+								if(cropper != null) {
+									cropper.destroy();
+								}
+								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) {
+							if(cropper != null) {
+								cropper.destroy();
+							}
+							cropper = getClipper(1, path);
+						}, {
+							filter: "image"
+						});
+					},
+					//裁剪结束并上传
+					save: function() {
+						plus.nativeUI.showWaiting("正在上传...");
+						//获得裁剪对象
+						var croppedCanvas = cropper.getCroppedCanvas({
+							width: 100,
+							height: 100
+						})
+						var dataUrl = croppedCanvas.toDataURL();
+						request(urls().user_upload, {
+							id: getUser().id,
+							dataImage: dataUrl
+						}, function(res) {
+							vm.item.header = urls().path + res.url;
+							mui.toast("上传成功");
+							vm.getData();
+							plus.nativeUI.closeWaiting();
+						})
+						document.getElementById("clipp").style.display = 'none';
+					},
+					//取消裁剪
+					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();
+						})
+					},
+					//编辑其它
+					op: function(msg, val, op) {
+						open('edit_info', 'edit_info.html', {
+							msg: msg,
+							value: val,
+							op: op
+						}, 'slide-in-bottom');
+					}
+				}
+			})
+		</script>
+	</body>
+
+</html>

+ 36 - 26
pages/resume/my_resume.html

@@ -1,6 +1,5 @@
 <!doctype html>
 <html>
-
 	<head>
 		<meta charset="UTF-8">
 		<title>我的简历</title>
@@ -11,13 +10,14 @@
 		<style>
 			.mui-bar-nav~.mui-content{padding-top: 60px;}
            .icon{padding-right: 5px;font-size:20px;color: #00a0ea;}
-           .sm7{padding-left: 15px;line-height: 25px;}
-           .d{color: darkgray;font-size: 14px;}
-           .c{color: darkgray;font-size: 16px;line-height: 35px;}
+           .sm7{padding-left: 15px;}
+           .d{color: darkgray;font-size: 14px;padding-top: 5px;}
            .b{color: black;}
            .e{color: #6e6f71;}
 		   .mp{width: 100%;border-radius: 3px;}
-		   .edit{float: right;color: #6e6f71;}
+		   .save{color:white;padding-top: 12px;}
+		   textarea{border: 0px;margin-top: -10px;font-size: 13px;}
+		   .edit{float: right;color: #6e6f71;font-size: 15px;}
 		   #clipp{position:fixed;width:100%;height:100%;top:0;background-color:black;display:none;z-index:9999999}
 		   #clipp img{max-width:100%;height:auto;vertical-align:middle;}
 		   #clipp .op{position:fixed;width:100%;bottom:0;}
@@ -30,6 +30,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>
+				<span class="save mui-pull-right">保存</span>
 			</header>
 			<div class="mui-content animated fadeInUp">
 				<div class="model" style="margin-top: 0px;">
@@ -53,6 +54,19 @@
 							</div>
 							<div class="clear"></div>
 						</div>
+						<div class="row" style="margin-top: 10px;border-top: 1px solid #ececec;padding-top: 5px;">
+							<div class="sm5">
+								<div class="d">最高学历:<span class="b">xx市</span></div>
+								<div class="d">毕业学校:<span class="b">xxxx</span></div>
+								<div class="d">所学专业:<span class="b">xxxx</span></div>
+							</div>
+							<div class="sm5">
+								<div class="d">获得学位:<span class="b">xx市</span></div>
+								<div class="d">函授学校:<span class="b">xxxx</span></div>
+								<div class="d">函授专业:<span class="b">xxxx</span></div>
+							</div>
+							<div class="clear"></div>
+						</div>
 					</div>
 				</div>
 				<div class="model">
@@ -64,10 +78,10 @@
 					</div>
 					<div class="content">
 						<div class="row">
-								<div class="c">职位:<span class="b">xxx职业</span></div>
-								<div class="c">工作地点:<span class="b">xx市</span></div>
-								<div class="c">期待月薪:<span class="b">xx元/面议</span></div>
-								<div class="c">目前状态:<span class="b">离职/在职</span></div>
+							<div class="d">职位:<span class="b">xxx职业</span></div>
+							<div class="d">工作地点:<span class="b">xx市</span></div>
+							<div class="d">期待月薪:<span class="b">xx元/面议</span></div>
+							<div class="d">目前状态:<span class="b">离职/在职</span></div>
 						</div>
 					</div>
 				</div>
@@ -76,13 +90,9 @@
 						<span class="text">
 							<i class="icon">&#xe65e;</i>教育经历
 						</span>
-						<span class="edit"><i class="icon e">&#xe607;</i>编辑</span>
 					</div>
 					<div class="content">
-						<div class="row">
-								<div class="c">学校 • 机构:<span class="b">xxx职业</span></div>
-								<div class="c">时间:<span class="b">xxxx-xxxx</span></div>
-						</div>
+						<textarea rows="5" placeholder="输入教育经历"></textarea>
 					</div>
 				</div>
 				<div class="model">
@@ -90,21 +100,21 @@
 						<span class="text">
 							<i class="icon">&#xe652;</i>工作经历
 						</span>
-						<span class="edit"><i class="icon e">&#xe607;</i>编辑</span>
 					</div>
 					<div class="content">
-						<div class="row" style="border-bottom: 1px solid #efefef;">
-								<div class="c">公司或单位:<span class="b">xxx职业</span></div>
-								<div class="c">职位:<span class="b">xxxx-xxxx</span></div>
-								<div class="c">负责:<span class="b">xxxx-xxxx</span></div>
-								<div class="c">时间:<span class="b">xxxx-xxxx</span></div>
-						</div>
+						<textarea rows="5" placeholder="输入工作经历"></textarea>
+					</div>
+				</div>
+				<div class="model">
+					<div class="bod">
+						<span class="text">
+							<i class="icon">&#xe652;</i>自我评价
+						</span>
+					</div>
+					<div class="content">
 						<div class="row">
-								<div class="c">公司或单位:<span class="b">xxx职业</span></div>
-								<div class="c">职位:<span class="b">xxxx-xxxx</span></div>
-								<div class="c">负责:<span class="b">xxxx-xxxx</span></div>
-								<div class="c">时间:<span class="b">xxxx-xxxx</span></div>
-						</div>	
+							<textarea rows="5" placeholder="输入自我评价"></textarea>
+						</div>
 					</div>
 				</div>
 			</div>

+ 6 - 6
tab/home.html

@@ -64,7 +64,7 @@
 					<div class="model">
 						<div class="bod">
 							<span class="text"><i class="icon">&#xe660;</i>时政信息</span>
-							<span class="mores" @click="more()">更多</span>
+							<span class="mores" @click="more('时政信息')">更多</span>
 						</div>
 						<div class="item row">
 							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
@@ -85,7 +85,7 @@
 					<div class="model">
 						<div class="bod">
 							<span class="text"><i class="icon">&#xe6a1;</i>政策宣传</span>
-							<span class="mores">更多</span>
+							<span class="mores" @click="more('政策宣传')">更多</span>
 						</div>
 						<div class="item row">
 							<div class="sm6 omit">浦北县举行2018年 “烈士纪念日”烈士</div>
@@ -120,13 +120,13 @@
 				el: "#app",
 				data: {
 					banner_list: [],
-					new_list: [],
+					new_list1: [],
+					new_list2: [],
 					path: urls().path
 				},
 				mounted: function() {
 					mui.plusReady(function() {
 						request(urls().main, null, function(res) {
-							console.log(res.banner_list);
 							vm.banner_list = res.banner_list;
 							//vm.new_list = res.new_list;
 							//plus.nativeUI.closeWaiting();
@@ -134,8 +134,8 @@
 					})
 				},
 				methods: {
-					more:function(){
-						open('news_list', '../pages/news/list.html', null, 'slide-in-bottom');
+					more:function(type){
+						open('news_list', '../pages/news/list.html', {type:type}, 'slide-in-bottom');
 					},
 					//每月上新
 					detail: function(item) {

+ 1 - 1
tab/mine.html

@@ -98,7 +98,7 @@
 						}
 						switch(index) {
 							case 1:
-							 open('order_list', '../pages/order/list.html',null,'slide-in-bottom');
+							 open('my_resume', '../pages/resume/my_resume.html',null,'slide-in-bottom');
 								break;
 							case 2:
 							    open('shopping_cart', '/pages/shopping_cart/list.html',null,'slide-in-bottom');

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác