Browse Source

完善功能

lishuwen79 6 năm trước cách đây
mục cha
commit
f00c8b99b1

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


+ 2 - 2
index.html

@@ -19,7 +19,7 @@
 					<i class="mui-icon icon">&#xe602;</i>
 					<span class="mui-tab-label">首页</span>
 				</a>
-				<a class="mui-tab-item" href="tab/goods_list.html">
+				<a class="mui-tab-item" href="tab/mine.html">
 					<i class="mui-icon icon">&#xe65c;</i>
 					<span class="mui-tab-label">资讯</span>
 				</a>
@@ -34,7 +34,7 @@
 			mui.plusReady(function() {
 				plus.navigator.setStatusBarStyle('light');
 				mui.init();
-				var subpages = ['tab/home.html', 'tab/goods_list.html','tab/mine.html'];
+				var subpages = ['tab/home.html', 'tab/mine.html','tab/mine.html'];
 				var subpage_style = {
 					top: '0px',
 					bottom: '51px',

+ 77 - 95
pages/resume/base_info.html

@@ -8,13 +8,15 @@
 		<link href="../../css/mui.min.css" rel="stylesheet" />
 		<link href="../../css/animate.min.css" rel="stylesheet" />
 		<link href="../../css/cropper.min.css" rel="stylesheet" />
+		<link href="../../css/mui.picker.min.css" rel="stylesheet" />
 		<style>
-		   .mui-bar-nav~.mui-content{padding-top: 60px;}
+		   .mui-content{padding-top: 70px!important;background-color: white;}
            .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;}
+		   .img{width: 60px;height: 80px;border-radius: 5px;}
+		   .mui-input-row label span{font-weight: bold;color: red;}
 		   .mui-input-row .mui-btn{width: 65%;padding: 0px;}
+		   .save{color:white;padding-top: 12px;}
 		   #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;}
@@ -28,49 +30,74 @@
 			<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="save()">保存</span>
 			</header>
 			<div class="mui-content animated fadeInUp">
-				<div class="m_box">
 					<div class="mui-input-row">
-						<label>照片</label>
-						<input type="text" placeholder="输入姓名">
+						<label style="padding-top: 35px;">照片</label>
+							<a href="#picture">
+								<img :src="item.tx" class="img">
+							</a>
 					</div>
 					<div class="mui-input-row">
-						<label>姓名</label>
-						<input type="text" placeholder="输入姓名">
+						<label>姓名 <span>*</span></label>
+						<input type="text" v-model="item.mz" 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 class="mui-btn mui-btn-block" v-model="item.sex">
+					        <option :value="s" v-for="(s,index) in sex">{{s}}</option>
 				        </select>
 					</div>
 					<div class="mui-input-row">
-						<label>出生年月</label>
-						<input type="text" placeholder="选择日期">
+						<label>出生年月 <span>*</span></label>
+						<input type="text" v-model="item.csny" placeholder="选择日期" readonly @click="picker()">
 					</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 class="mui-btn mui-btn-block" v-model="item.zgxl">
+					        <option :value="x" v-for="(x,index) in xl">{{x}}</option>
 				        </select>
 					</div>
 					<div class="mui-input-row">
+						<label>学位</label>
+						<select class="mui-btn mui-btn-block" v-model="item.xw">
+					        <option :value="w" v-for="(w,index) in xw">{{w}}</option>
+				        </select>
+					</div>	
+					<div class="mui-input-row">
 						<label>毕业学校</label>
-						<input type="text" placeholder="输入姓名">
+						<input type="text" v-model="item.xx" placeholder="输入毕业学校">
 					</div>
 					<div class="mui-input-row">
 						<label>所学专业</label>
-						<input type="text" placeholder="输入姓名">
+						<input type="text" v-model="item.zy" placeholder="输入所学专业">
 					</div>
 					<div class="mui-input-row">
 						<label>函授学校</label>
-						<input type="text" placeholder="输入姓名">
+						<input type="text" v-model="item.hs" placeholder="输入函授学校">
+					</div>
+					<div class="mui-input-row">
+						<label>函授专业</label>
+						<input type="text" v-model="item.hszy" placeholder="输入函授专业">
+					</div>
+					<div class="mui-input-row">
+						<label>目前所在地</label>
+						<input type="text" v-model="item.mqszd" placeholder="输入目前所在地">
+					</div>	
+					<div class="mui-input-row">
+						<label>联系电话 <span>*</span></label>
+						<input type="tel" v-model="item.phone" placeholder="输入联系电话">
+					</div>	
+					<div class="mui-input-row">
+						<label>工作经验</label>
+						<input type="tel" v-model="item.gzjy" placeholder="输入工作经验(年)">
+					</div>	
+					<div class="mui-input-row">
+						<label>电子邮箱 <span>*</span></label>
+						<input type="email" v-model="item.email" placeholder="输入电子邮箱">
 					</div>	
 				</div>
-			</div>
 			<!--拍照-->
 			<div id="picture" class="mui-popover mui-popover-action mui-popover-bottom">
 				<ul class="mui-table-view">
@@ -87,37 +114,12 @@
 					</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">
+				<img id="image">
 				<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>
+					<span class="mui-icon mui-icon-checkmarkempty mui-pull-right" @click="upload()"></span>
 				</div>
 			</div>
 		</div>
@@ -125,33 +127,30 @@
 		<script src="../../js/app.js"></script>
 		<script src="../../js/vue.min.js"></script>
 		<script src="../../js/cropper.min.js"></script>
+		<script src="../../js/mui.picker.min.js"></script>
 		<script type="text/javascript">
 			var cropper = null;
 			var vm = new Vue({
 				el: "#app",
 				data: {
+					sex:['男','女'],
+					xl:xl(), //学历
+					xw:xw(),//学位
 					item: {}
 				},
 				mounted: function() {
 					mui.plusReady(function() {
-						vm.getData();
+						vm.item=plus.webview.currentWebview().param;
 					})
 				},
 				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();
-						})
+					//选择时间
+					picker:function(){
+						var picker = new mui.DtPicker({"type":"date"});
+						picker.show(function(rs) {
+							vm.item.csny=rs.text;
+							picker.dispose();
+						});
 					},
 					//拍照
 					takePhoto: function() {
@@ -183,27 +182,20 @@
 							if(cropper != null) {
 								cropper.destroy();
 							}
-							cropper = getClipper(1, path);
+							cropper = getClipper(2/3, path);
 						}, {
 							filter: "image"
 						});
 					},
 					//裁剪结束并上传
-					save: function() {
+					upload: function() {
 						plus.nativeUI.showWaiting("正在上传...");
 						//获得裁剪对象
-						var croppedCanvas = cropper.getCroppedCanvas({
-							width: 100,
-							height: 100
-						})
+						var croppedCanvas = cropper.getCroppedCanvas({width: 200,height: 300})
 						var dataUrl = croppedCanvas.toDataURL();
-						request(urls().user_upload, {
-							id: getUser().id,
-							dataImage: dataUrl
-						}, function(res) {
-							vm.item.header = urls().path + res.url;
+						request(urls().uploadPhoto, {dataImage: dataUrl}, function(res) {
+							vm.item.tx= urls().path + res.url;
 							mui.toast("上传成功");
-							vm.getData();
 							plus.nativeUI.closeWaiting();
 						})
 						document.getElementById("clipp").style.display = 'none';
@@ -212,28 +204,18 @@
 					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;
-							}
+					//保存
+					save:function(){
+						if(this.item.mz =='') {mui.toast("姓名为空");return;}
+						if(this.item.csny == '') {mui.toast("出生年月为空");return;}
+						if(this.item.phone == '') {mui.toast("联系电话为空");return;}
+						if(!isPhone(this.item.phone)) {mui.toast("手机格式不正确");return;}
+						alert(JSON.stringify(vm.item));
+						request(urls().resume_save,this.item, function(res) {
+							mui.toast("保存成功");
+							plus.webview.getWebviewById('my_resume').reload(true);
 							plus.nativeUI.closeWaiting();
 						})
-					},
-					//编辑其它
-					op: function(msg, val, op) {
-						open('edit_info', 'edit_info.html', {
-							msg: msg,
-							value: val,
-							op: op
-						}, 'slide-in-bottom');
 					}
 				}
 			})

+ 64 - 0
pages/resume/edit_info.html

@@ -0,0 +1,64 @@
+<!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;}
+			textarea{min-height: 200px;border: 0;}
+			.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">编辑{{item.msg}}</h1>
+			</header>
+			<div class="mui-content animated fadeInUp">
+				<div class="bg">
+					<div class="m_box">
+						<textarea  placeholder="输入内容......" v-model="item.jyjl"  v-if="item.field=='jyjl' "></textarea>
+						<textarea  placeholder="输入内容......" v-model="item.gzjl" v-if="item.field=='gzjl' "></textarea>
+						<textarea  placeholder="输入内容......" v-model="item.zwpj" v-if="item.field=='zwpj' "></textarea>
+					</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: {},
+				},
+				mounted:function() {
+					mui.plusReady(function() {
+					    vm.item= plus.webview.currentWebview().param;
+					})	
+				},
+				methods: {
+					//编辑
+					ok: function() {
+						request(urls().resume_save, vm.item, function(res) {
+							mui.toast("修改成功");
+							plus.webview.getWebviewById("my_resume").reload(true);
+							mui.back();
+							plus.nativeUI.closeWaiting();
+						})
+					}
+				}
+			})
+		</script>
+	</body>
+
+</html>

+ 79 - 0
pages/resume/intention.html

@@ -0,0 +1,79 @@
+<!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>
+		   .mui-content{padding-top: 70px!important;background-color: white;}
+           .mui-input-row{border-bottom: 1px solid #ececec;padding: 8px;}
+           .mui-input-row:last-child{border-bottom: 0px;}
+		   .mui-input-row label span{font-weight: bold;color: red;}
+		   .mui-input-row .mui-btn{width: 65%;padding: 0px;}
+		   .save{color:white;padding-top: 12px;}
+		  [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="save()">保存</span>
+			</header>
+			<div class="mui-content animated fadeInUp">
+					<div class="mui-input-row">
+						<label>职位 <span>*</span></label>
+						<input type="text" v-model="item.zw" placeholder="输入应聘职位">
+					</div>
+					<div class="mui-input-row">
+						<label>工作地点</label>
+						<input type="text" v-model="item.gzdd" placeholder="输入工作地点">
+					</div>
+					<div class="mui-input-row">
+						<label>期待月薪 </label>
+						<input type="tel" v-model="item.gz" placeholder="留空则算面议">
+					</div>		
+					<div class="mui-input-row">
+						<label>目前状态</label>
+						<select class="mui-btn mui-btn-block" v-model="item.zt">
+					        <option :value="s" v-for="(s,index) in zt">{{s}}</option>
+				        </select>
+					</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: {
+					zt:['离职','在职'],
+					item: {}
+				},
+				mounted: function() {
+					mui.plusReady(function() {
+						vm.item=plus.webview.currentWebview().param;
+					})
+				},
+				methods: {
+					//保存
+					save:function(){
+						if(this.item.zw =='') {mui.toast("职位为空");return;}
+						request(urls().resume_save,this.item, function(res) {
+							mui.toast("保存成功");
+							plus.webview.getWebviewById('my_resume').reload(true);
+							plus.nativeUI.closeWaiting();
+						})
+					}
+				}
+			})
+		</script>
+	</body>
+
+</html>

+ 43 - 178
pages/resume/my_resume.html

@@ -15,13 +15,9 @@
            .b{color: black;}
            .e{color: #6e6f71;}
 		   .mp{width: 100%;border-radius: 3px;}
-		   .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;}
-		   #clipp .mui-icon{color:white;font-size:50px;font-weight:bold}
+		   .nr{padding: 5px;font-size: 12px;color: darkgray;}
 		  [v-cloak] {display: none;}
 		</style>
 	</head>
@@ -30,7 +26,6 @@
 			<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;">
@@ -38,32 +33,32 @@
 						<span class="text">
 							<i class="icon">&#xe64c;</i>基本信息
 						</span>
-						<span class="edit"><i class="icon e">&#xe607;</i>编辑</span>
+						<span class="edit" @click="op(1)"><i class="icon e">&#xe607;</i>编辑</span>
 					</div>
 					<div class="content">
 						<div class="row">
 							<div class="sm3">
-								<img src="../../images/mp.jpg" class="mp">
+								<img :src="item.tx" class="mp">
 							</div>
 							<div class="sm7">
-								<div>姓名</div>
-								<div style="font-size: 13px;">女 ,xxxx,xx年工作年龄</div>
-								<div class="d">目前所在城市:<span class="b">xx市</span></div>
-								<div class="d">联系电话:<span class="b">xxxx</span></div>
-								<div class="d">电子邮箱:<span class="b">xxxxxxx</span></div>
+								<div>{{item.mz}}</div>
+								<div style="font-size: 13px;">{{item.sex}} ,{{item.csny}},{{item.gzjy}}年工作年龄</div>
+								<div class="d">目前所在地:<span class="b">{{item.mqszd}}市</span></div>
+								<div class="d">联系电话:<span class="b">{{item.phone}}</span></div>
+								<div class="d">电子邮箱:<br><span class="b">{{item.email}}</span></div>
 							</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 class="d">最高学历:<span class="b">{{item.zgxl}}</span></div>
+								<div class="d">毕业学校:<br><span class="b">{{item.xx}}</span></div>
+								<div class="d">所学专业:<span class="b">{{item.zy}}</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 class="d">获得学位:<span class="b">{{item.xw}}</span></div>
+								<div class="d">函授学校:<br><span class="b">{{item.hs}}</span></div>
+								<div class="d">函授专业:<span class="b">{{item.hszy}}</span></div>
 							</div>
 							<div class="clear"></div>
 						</div>
@@ -74,14 +69,14 @@
 						<span class="text">
 							<i class="icon">&#xe61a;</i>求职意向
 						</span>
-						<span class="edit"><i class="icon e">&#xe607;</i>编辑</span>
+						<span class="edit" @click="op(2)"><i class="icon e">&#xe607;</i>编辑</span>
 					</div>
 					<div class="content">
 						<div class="row">
-							<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 class="d">职位:<span class="b">{{item.zw}}</span></div>
+							<div class="d">工作地点:<span class="b">{{item.gzdd}}</span></div>
+							<div class="d">期待月薪:<span class="b">{{item.gz}}</span></div>
+							<div class="d">目前状态:<span class="b">{{item.zt}}</span></div>
 						</div>
 					</div>
 				</div>
@@ -90,9 +85,10 @@
 						<span class="text">
 							<i class="icon">&#xe65e;</i>教育经历
 						</span>
+						<span class="edit" @click="op(3,'jyjl','教育经历')"><i class="icon e">&#xe607;</i>编辑</span>
 					</div>
 					<div class="content">
-						<textarea rows="5" placeholder="输入教育经历"></textarea>
+						<div class="nr">{{item.jyjy}}</div>
 					</div>
 				</div>
 				<div class="model">
@@ -100,9 +96,10 @@
 						<span class="text">
 							<i class="icon">&#xe652;</i>工作经历
 						</span>
+						<span class="edit" @click="op(3,'gzjl','工作经历')"><i class="icon e">&#xe607;</i>编辑</span>
 					</div>
 					<div class="content">
-						<textarea rows="5" placeholder="输入工作经历"></textarea>
+						 <div class="nr">{{item.gzjl}}</div>
 					</div>
 				</div>
 				<div class="model">
@@ -110,177 +107,45 @@
 						<span class="text">
 							<i class="icon">&#xe652;</i>自我评价
 						</span>
+					   <span class="edit" @click="op(3,'zwpj','自我评价')"><i class="icon e">&#xe607;</i>编辑</span>	
 					</div>
 					<div class="content">
-						<div class="row">
-							<textarea rows="5" placeholder="输入自我评价"></textarea>
-						</div>
+						<div class="nr">{{item.zwpj}}</div>
 					</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: {}
+					item: {tx:'',mz:'',sex:'男',zgxl:'本科',xx:'',zy:'',xw:'无',hs:'',hszy:'',mqszd:'',phone:'',csny:'',gzjy:'',email:''}
 				},
 				mounted: function() {
 					mui.plusReady(function() {
-						vm.getData();
+						request(urls().resume_detail,{userId: getUser().id}, function(res) {
+							vm.item=res;
+							plus.nativeUI.closeWaiting();
+						})
 					})
 				},
 				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');
+					//编辑
+					op: function(index,field,msg) {
+						if(index==1){
+							open('base_info', 'base_info.html',vm.item,'slide-in-bottom');
+						}
+						if(index==2){
+							open('intention', 'intention.html',vm.item,'slide-in-bottom');
+						}
+						if(index==3){
+							vm.item.field=field;
+						    vm.item.msg=msg;
+							open('edit_one', 'edit_info.html',vm.item,'slide-in-bottom');
+						}
 					}
 				}
 			})

+ 13 - 17
pages/user/login.html

@@ -10,8 +10,10 @@
 			.input-group{height: auto;}
 			.input-group i{margin: 11px 0px 10px 5px;font-size: 18px;}
 			.input-group input{padding: 10px 11px 11px 35px;}
+			.forget{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;}
 		</style>
 	</head>
 	<body>
@@ -28,14 +30,16 @@
 				<div class="input-group">
 					<i class="icon">&#xe63a;</i>
 					<input type="password" placeholder="密码" v-model="item.pass" />
+				    <span class="forget" @click.stop="forget()">忘记密码</span>
 				</div>
 				<button class="btn" @click="login()">立即登录</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>
-				<button class="btn" @click="login()" style="background-color: #607D8B;">去注册</button>
+				<div class="register" @click="register()">去注册</div>
 			</div>
 			<div class="copyright">Copyright © 2018 xxxx科技有限公司 版权所有</div>
 		</div>
@@ -46,26 +50,14 @@
 			var vm = new Vue({
 				el: "#app",
 				data: {
-					item: {
-						account: '',
-						pass: ''
-					}
+					item: {account: '',pass: ''}
 				},
 				methods: {
 					//登录
 					login: function() {
-						if(this.item.account == '') {
-							mui.toast("手机号为空");
-							return;
-						}
-						if(this.item.pass == '') {
-							mui.toast("密码为空");
-							return;
-						}
-						if(!isPhone(this.item.account)) {
-							mui.toast("手机格式不正确");
-							return;
-						}
+						if(this.item.account == '') {mui.toast("手机号为空");return;}
+						if(this.item.pass == '') {mui.toast("密码为空");return;}
+						if(!isPhone(this.item.account)) {mui.toast("手机格式不正确");return;}
 						request(urls().login, this.item, function(res) {
 							if(res.result == true) {
 								mui.toast("登陆成功");
@@ -78,6 +70,10 @@
 							}
 							plus.nativeUI.closeWaiting();
 						})
+					},
+					//去注册
+					register:function(){
+						open('register', 'register.html',null,'slide-in-bottom');
 					}
 				}
 			})

+ 79 - 63
pages/user/register.html

@@ -1,101 +1,106 @@
 <!doctype html>
 <html>
-
 	<head>
 		<meta charset="UTF-8">
-		<title>登录</title>
+		<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/iconfont.css" rel="stylesheet" />
-		<link href="../../css/animate.min.css" rel="stylesheet" />
 		<style>
-			.lg {padding: 35px;margin-top: 30px;}
+			.lg {padding: 35px;margin-top: 30px;text-align: center;}
+			.fq{padding: 0px 30px 30px 30px;}
 			.input-group{height: auto;}
 			.input-group i{margin: 11px 0px 10px 5px;font-size: 18px;}
 			.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;}
-		    .icon-fuxuankuang2{padding-right: 5px;}
-		    .icon-fuxuankuang2.active{color: #fe580a;}
-		    .tk{font-size: 14px;color: darkgray;margin-top: -5px;}
-		    .copyright{font-size: 10px;position: fixed;width: 100%;bottom: 0px;margin-bottom: 15px;color: darkgray;text-align: center;}
+			.qy{color: darkgray;text-align: left;font-size: 12px;}
+			.btn{margin-top: 25px;}
+			.divider{margin-top: 50px;}
+			.register{margin-top: 50px;color: darkgray;}
 		</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>
+			<h1 class="mui-title">注册</h1>
 		</header>
 		<div class="mui-content" id="app">
 			<div class="lg animated bounceIn">
+				 <div class="fq">
+				 	<div class="mui-segmented-control">
+					     <a class="mui-control-item mui-active" id="0">个人用户</a>
+					     <a class="mui-control-item" id="1">企业用户</a>
+				    </div>
+				 </div>
 				<div class="input-group">
-					<i class="mui-icon iconfont icon-shoujihao"></i>
-					<input type="tel" placeholder="手机号" v-model="account" />
+					<i class="icon">&#xe641;</i>
+					<input type="tel" placeholder="手机号" v-model="item.account" />
 				</div>
 				<div class="input-group">
-					<i class="mui-icon iconfont icon-yanzhengma"></i>
-					<input type="tel" placeholder="验证码" v-model="code" />
-					<span class="code" @click.stop="sendMessage()">{{msg}}</span>
+					<i class="icon">&#xe63a;</i>
+					<input type="password" placeholder="密码" v-model="item.account" />
+				</div>
+				<div class="input-group">
+					<i class="icon">&#xe63a;</i>
+					<input type="password" placeholder="重复密码" v-model="item.account" />
+				</div>	
+				<div class="input-group">
+					<i class="icon">&#xe7a1;</i>
+					<input type="tel" placeholder="验证码" v-model="item.pass" />
+				    <span class="code" @click.stop="forget()">忘记密码</span>
 				</div>
-				<div class="tk" @click="agreement()"><i class="icon iconfont icon-fuxuankuang2" :class="{active:check}" @click.stop="check=!check"></i>服务条款</div>
-				<div style="margin-top: 25px;"></div>
-				<button class="btn" @click="login()">立即登录</button>
+			    <div class="input-group">
+					<i class="icon">&#xe724;</i>
+					<input type="password" placeholder="企业名称" v-model="item.account" />
+				</div>	
+				<div class="qy" v-if="item.mType==1">
+					  <div class="qy">上传营业执照(需审核)</div>
+					  <a href="#picture"><img src="../../images/zz.png"/></a>
+				</div>
+				<button class="btn" @click="login()">立即注册</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 class="copyright">Copyright © 2018 成都华笙科技有限公司 版权所有</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 src="../../js/upload.js"></script>
 		<script type="text/javascript">
-			var time = 60; //1分钟倒计时
 			var vm = new Vue({
 				el: "#app",
 				data: {
-					msg: '发送验证码',
-					flag: true,
-					account: '',
-					code: '',
-					check:true
+					item: {account: '',pass: '',mType:1}
 				},
 				methods: {
-					//发送验证码
-					sendMessage: function() {
-						if(!isPhone(this.account)) {mui.toast("手机格式不正确");return;}
-						if(this.flag == false) {return;}
-						request(urls().sendMessage, {account: this.account}, function(res) {
-							if(res.result == true) {
-								mui.toast("发送成功");
-								//一分钟倒计时
-								var countdown = setInterval(function() {
-									time--;
-									if(time == 0) {
-										vm.flag = true;
-										vm.msg = '发送验证码';
-										time = 60;
-										clearInterval(countdown);
-									} else {
-										vm.flag = false;
-										vm.msg = '重新获取(' + time + ')';
-									}
-								}, 1000)
-							} else {
-								mui.toast(res.msg);
-							}
-							plus.nativeUI.closeWaiting();
-						})
-					},
 					//登录
 					login: function() {
-						if(this.account==''){mui.toast("手机号为空");return;}
-						if(!isPhone(this.account)) {mui.toast("手机格式不正确");return;}
-						if(this.code==''){mui.toast("验证码为空");return;}
-						if(!this.check){mui.toast("请同意服务条款");return;}
-						request(urls().login,{account:this.account,code:this.code}, function(res) {
-							if(res.result== true) {
+						if(this.item.account == '') {mui.toast("手机号为空");return;}
+						if(this.item.pass == '') {mui.toast("密码为空");return;}
+						if(!isPhone(this.item.account)) {mui.toast("手机格式不正确");return;}
+						request(urls().login, this.item, function(res) {
+							if(res.result == true) {
 								mui.toast("登陆成功");
-								localStorage.setItem("user", JSON.stringify(res.user));
-								localStorage.setItem("token", res.user.token)
-								plus.webview.getWebviewById('tab/mine.html').reload(true);
 								mui.back();
 							} else {
 								mui.alert(res.msg);
@@ -103,11 +108,22 @@
 							plus.nativeUI.closeWaiting();
 						})
 					},
-					agreement:function(){
-						open('agreement', '/pages/other/service.html', {url:urls().agreement,id: 'tpp',title: 'BIBO租赁协议'}, 'slide-in-bottom');
+					takePhoto:function(){
+						upload.takePhoto(this);
+					},
+					pickImg:function(){
+						var path=upload.pickImg();
+						console.log(path);
+					},
+					//去注册
+					register:function(){
+						open('register', 'register.html',null,'slide-in-bottom');
 					}
 				}
 			})
+			mui('body').on('tap','.mui-control-item',function(e){
+				  vm.item.mType=e.target.id;
+            })
 		</script>
 	</body>
 

+ 0 - 199
tab/goods_list.html

@@ -1,199 +0,0 @@
-<!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/iconfont.css" rel="stylesheet" />
-		<link href="../css/animate.min.css" rel="stylesheet" />
-		<style>
-			.input-group input{padding-right: 5px;background-color: #fe580a;text-align: left;color: white;font-size: 14px;}
-			input::-webkit-input-placeholder{color:white!important;}
-			.icon-sousuo{font-size: 19px!important;margin-top:7px!important;}
-			form{margin-top: 0px;position: relative;}
-			.mui-bar .mui-icon{position: absolute;color: white;margin-top: 2px;margin-left:0px!important;}
-		    .top{padding: 5px 10px 0px 10px;position: fixed;width: 100%;z-index: 666; margin-top: 12px;background-color:#fe580a;font-size: 14px;}
-		    .flex .f{text-align: center;padding: 10px;color: white;font-size: 14px;}
-		    .menu{position: fixed;width: 100%;top: -148px;max-height: 250px;overflow: scroll; background-color:white;z-index:6;transition-duration: 0.3s;}
-		    .mask{position: fixed;width: 100%;z-index: 5; height: 100%;top: 0;background-color: rgba(0, 0, 0, 0.7);}
-		    .menu.active{top: 102px;box-shadow: 0 1px 6px #ccc;}
-		    .mui-table-view-cell>a:not(.mui-btn){color: #818181;font-size: 13px;}
-		    .mui-table-view-cell>a:not(.mui-btn).active{color: #fe580a;}
-		    .mui-table-view-cell:after{background-color: #dbdbdb;}
-		    .main{margin-top: 65px;padding: 0px 0px 10px 12px;}
-		    .row{position: relative;}
-		    .item{float: left; width: 44%;box-shadow: 0 1px 6px #ccc;border-radius: 5px 5px 5px 5px;margin: 7px;background-color: white;overflow: hidden;position: relative;}
-		    .item .title{font-size: 12px;padding:0px 10px 0px 10px;}
-		    .price{color:#fe580a;margin-left: -2px;}
-		    .content{text-align:left;margin-left: -11px;padding: 10px 10px 5px 10px;margin-top: -11px;}
-		    .item img{width: 101%;border-radius: 5px 5px 0px 0px;max-height: 220px;}
-		    .tags{position: absolute;top: 10px;color: white;font-size: 11px;margin-top: 10px;left: 0;background-color: rgba(254, 88, 10, 0.74);padding: 1px 13px;border-radius: 0px 19px 19px 0px;}
-		    [v-cloak] {display: none;}
-		</style>
-	</head>
-	<body>
-	<div id="app" v-cloak>	
-		<header class="mui-bar mui-bar-nav">
-			<form class="input-group" v-on:submit.prevent="search()">
-				<i class="mui-icon icon iconfont icon-sousuo"></i>
-				<input type="search" placeholder="搜索衣服" v-model="param.name" />
-			</form>
-		</header>
-		<div class="mui-content">
-			<div class="top flex">
-				<div class="f" @click="menu1=!menu1,menu2=false">{{m1_se}}<i class="icon iconfont icon-iconfonti2-copy-copy-copy-copy"></i></div>
-				<div class="f" @click="menu2=!menu2,menu1=false">{{m2_se}}<i class="icon iconfont icon-iconfonti2-copy-copy-copy-copy"></i></div>
-			</div>
-			<div class="menu" :class="{active:menu1}">
-				<ul class="mui-table-view">
-				<li class="mui-table-view-cell" @click="select_anime('',999)" style="background-color: #eaeaea;"><a class="mui-navigate-right" :class="{active:m1_c==999}"> • 展示全部</a></li>
-				<li class="mui-table-view-cell"v-for="(item,index) in anime_list" @click="select_anime(item,index)">
-					<a class="mui-navigate-right" :class="{active:m1_c==index}">
-						  • {{item.mName}}
-					</a>
-				</li>
-			    </ul>
-			</div>
-			<div class="menu" :class="{active:menu2}">
-				<ul class="mui-table-view">
-				<li class="mui-table-view-cell" @click="select_role('',999)" style="background-color: #eaeaea;"><a class="mui-navigate-right" :class="{active:m2_c==999}" >展示全部</a></li>
-				<li class="mui-table-view-cell" v-for="(item,index) in role_list" @click="select_role(item,index)">
-					<a class="mui-navigate-right" :class="{active:m2_c==index}">
-						 {{item.mName}}
-					</a>
-				</li>
-			    </ul>
-			</div>
-			<div class="mask" v-show="menu1||menu2" @click="menu1=false,menu2=false"></div>
-			<div class="main">
-				<div class="row">
-					<div class="item animated bounceInDown" v-for="(item,index) in goods_list" @click="detail(item)">
-						<img :src="item.mCove">
-						<div class="content">
-							<div class="title omit">{{item.mName}}</div>
-							<div class="title price">
-								¥{{item.price}} • {{item.days}}天
-							</div>
-						</div>
-						<div class="tags" v-show="item.tag!='' ">{{item.tag}}</div>
-					</div>
-					<div class="clear"></div>
-				</div>
-					<!--加载更多-->
-					<div class="more">
-						<div class="loading" v-if="loading" style="margin: 10px" ><span class="mui-spinner"></span><div class="mc">加载中...</div></div>
-						<div v-else><span class="icon iconfont icon-meiyou"></span> 没有更多内容了</div>
-					</div>
-			</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: {
-					goods_list: [],
-					role_list:[],
-					anime_list:[],
-					param: {page:1,animeId:'',roleId:'',name:''},
-					loading: true,
-					hasMore: false,
-					menu1:false,
-					m1_se:'动漫 • 游戏', //当前选中
-					m2_se:'角色',  //当前选中
-					m1_c:999, //选中的下标
-					m2_c:999, //选中的下标
-					menu2:false
-				},
-				mounted: function() {
-					mui.plusReady(function() {
-						request(urls().goods_type,null,function(res) {
-						         vm.anime_list=res.anime_list;
-						         vm.role_list=res.role_list;
-						         plus.nativeUI.closeWaiting();
-						})
-						vm.getData();
-					})
-					//监听滚动加载
-					window.addEventListener('scroll', function() {
-						//滚动高度+内高度>=文档高度  
-						if(document.body.scrollTop + window.innerHeight + 20 >= document.body.offsetHeight) {
-							if(vm.hasMore) {
-								vm.loading = true;
-								//避免重复加载
-								vm.hasMore = false;
-								vm.param.page++;
-								setTimeout(function() {vm.getData()}, 500);
-							}
-						}
-					})
-				},
-				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);
-							});
-							vm.hasMore =vm.param.page<res.totalPage? true : false;
-							vm.loading = false;
-							plus.nativeUI.closeWaiting();
-						})
-					},
-					//选择动漫/游戏
-					select_anime: function(item,index) {
-						if(index==999){
-							vm.m1_se='动漫 • 游戏';
-							vm.param.animeId='';
-						}else{
-							vm.m1_se=item.mName;
-							vm.param.animeId=item.id;
-						}
-						vm.param.name='';
-						vm.menu1=false;
-						vm.m1_c=index;
-						vm.refresh();
-					},
-					//选择角色
-					select_role: function(item,index) {
-						if(index==999){
-							vm.m2_se='角色';
-							vm.param.roleId='';
-						}else{
-							vm.m2_se=item.mName;
-							vm.param.roleId=item.id;
-						}
-						vm.param.name='';
-						vm.menu2=false;
-						vm.m2_c=index;
-						vm.refresh();
-					},
-					//回车搜索
-					search: function() {
-						//隐藏键盘
-						document.activeElement.blur();
-						vm.param.roleId='';
-						vm.param.animeId=''
-						vm.refresh();
-					},
-					//详情
-					detail: function(item) {
-						open('goods_detail', '../pages/goods/detail.html', {id: item.id}, 'slide-in-bottom');
-					},
-					//刷新
-					refresh:function(){
-						vm.goods_list=[];
-						vm.param.page=1;
-						vm.getData();
-					}
-				}
-			})
-		</script>
-	</body>
-
-</html>

+ 0 - 105
tab/order.html

@@ -1,105 +0,0 @@
-<!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/iconfont.css" rel="stylesheet" />
-		<style>
-			body{background-color: white;}
-			.mui-content{background-color: white;}
-		    .main{background-color: white;margin-top: 15px;}
-		    .row{position: relative;}
-		    .item{padding: 15px;border-bottom: 1px solid #e3e3e3;}
-		    .row .sm3{width: 25%;}
-		    .icon-wushuju{font-size: 50px;}
-		    .ddd{padding-top: 15px;}
-		    .sm3 img{width: 100%;border-radius:5px;}
-		    .sm7{padding: 5px;}
-		    .title{font-weight: bold;font-size: 13px;display: block;padding: 0px 5px 5px 5px;width: 80%;}
-		    .btn{position: absolute;top: 50px;right: 5px;height: 30px; display: block;width: 70px;line-height: 8px;margin: 0 auto;font-size: 12px;}
-		    .d{color: darkgray;}
-		    .icon-warning{font-size: 50px;display: block;margin-bottom: 25px;}
-		    .dl{border: 1px solid darkgray; padding: 3px 10px 3px 10px;width: 100px;width: 100px;margin: 0 auto;border-radius: 20px;font-size: 14px;}
-		</style>
-	</head>
-	<body>
-		<header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">购物车</h1>
-		</header>
-		<div class="mui-content" id="app" v-cloak>
-			<div class="main">
-				<div class="item">
-					<div class="row">
-						<div class="sm3"><img src="../images/yy2.jpg"></div>
-						<div class="sm7">
-							<div class="title omit" style="font-size: 17px;">水电费</div>
-							<div class="title" style="color: #626262;margin-top: 5px;">影院:  莎莎影院</div>
-							<div class="title omit d">场次: </div>
-							<div class="title omit d">数量: 总价:¥300</div>
-							<button class="btn">去使用</button>
-						</div>
-						<div class="clear"></div>
-					</div>
-				</div>
-					<div class="no_data" v-if="list.length==0&&hasLogin">
-						<i class="icon iconfont icon-wushuju"></i>
-						<div class="ddd">没有订单</div>
-					</div>
-					<div class="no_data" v-if="hasLogin==false">
-						<i class="icon iconfont icon-warning"></i>
-						<div class="dl" @click="login()">去登录</div>
-					</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: {
-						column:['待使用','待评价','全部'],
-						current:0,
-						list: [],
-						param:{state:0,userId:0},
-						hasLogin:hasLogin()
-					},
-					mounted:function() {
-						mui.plusReady(function() {
-						 if(hasLogin()){
-						 	   vm.param.userId=getUser().id;
-						 	   vm.getData();	
-						   }
-					    })
-					},
-					methods:{
-						//获取数据
-						getData:function(){
-							request(urls().my_order_list, this.param, function(res) {
-							 vm.list =res;
-							 plus.nativeUI.closeWaiting();
-						     })
-						},
-						//选择
-						selected:function(index){
-							this.current=index;
-							this.param.state=index;
-							this.getData();	
-						},
-						//去登录
-						login:function(){
-							open('login', '../pages/user/login.html', null, 'slide-in-bottom');
-						},
-						//电影票详情
-						detail:function(item){
-							open('movie_detail', '../pages/movie/ticketl.html', {item: item}, 'slide-in-bottom');
-						}
-					}
-				})
-		</script>
-	</body>
-
-</html>

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