lishuwen79 6 年之前
父節點
當前提交
4de70ff04b
共有 13 個文件被更改,包括 480 次插入131 次删除
  1. 0 4
      css/iconfont.css
  2. 17 3
      css/mui.min.css
  3. 二進制
      images/logo.png
  4. 二進制
      images/mp.jpg
  5. 二進制
      images/mp.png
  6. 二進制
      images/top.png
  7. 5 5
      index.html
  8. 3 29
      js/app.js
  9. 282 0
      pages/resume/my_resume.html
  10. 32 59
      pages/user/login.html
  11. 114 0
      pages/user/register.html
  12. 10 10
      pages/user/user_info.html
  13. 17 21
      tab/mine.html

File diff suppressed because it is too large
+ 0 - 4
css/iconfont.css


File diff suppressed because it is too large
+ 17 - 3
css/mui.min.css


二進制
images/logo.png


二進制
images/mp.jpg


二進制
images/mp.png


二進制
images/top.png


+ 5 - 5
index.html

@@ -9,22 +9,22 @@
 		<style>
 			.mui-tab-label,.mui-icon{font-weight: bold;}
 			.mui-bar .mui-icon{font-size: 21px;}
-			.mui-bar-tab .mui-tab-item.mui-active{color: #fe580a;}
+			.mui-bar-tab .mui-tab-item.mui-active{color: #00a0ea;}
 		</style>
 	</head>
 	<body>
 		<div class="mui-content">
 			<nav class="mui-bar mui-bar-tab">
 				<a id="defaultTab" class="mui-tab-item mui-active" href="tab/home.html">
-					<span class="mui-icon icon iconfont icon-home"></span>
+					<i class="mui-icon icon">&#xe602;</i>
 					<span class="mui-tab-label">首页</span>
 				</a>
 				<a class="mui-tab-item" href="tab/goods_list.html">
-					<span class="mui-icon icon iconfont icon-cos"></span>
-					<span class="mui-tab-label">C服</span>
+					<i class="mui-icon icon">&#xe65c;</i>
+					<span class="mui-tab-label">资讯</span>
 				</a>
 				<a class="mui-tab-item" href="tab/mine.html">
-					<span class="mui-icon icon iconfont icon-gerenxinxi"></span>
+					<i class="mui-icon icon">&#xe863;</i>
 					<span class="mui-tab-label">我的</span>
 				</a>
 			</nav>

+ 3 - 29
js/app.js

@@ -1,7 +1,7 @@
 var urls = function() {
 	//var host = "http://192.168.100.3:7979";
-	//var host = "http://192.168.5.102:7979";
-	var host = "http://app.biboacgn.com";
+	var host = "http://192.168.5.104:7979";
+	//var host = "http://app.biboacgn.com";
 	var url = {
 		"path": host,
 		"sendMessage": host + "/app/user/sendMessage", //发送短信
@@ -9,33 +9,7 @@ var urls = function() {
 		"userInfo": host + "/app/user/userInfo", //用户信息
 		"edit_info": host + "/app/user/edit", //编辑用户信息
 		"user_upload": host + "/app/user/uploadHeader", //用户上传头像
-		"main": host + "/app/goods/main", //首页加载数据
-		"goods_list": host + "/app/goods/jsonList", //衣服
-		"goods_type": host + "/app/goods/goods_type", //动漫角色
-		"goods_detail": host + "/app/goods/detail", //衣服详细
-		"order_pay": host + "/app/order/order_pay", //订单支付
-		"collection_list": host + "/app/collection/list", //我的收藏列表
-		"collection_add": host + "/app/collection/add", //添加收藏
-		"collection_delete": host + "/app/collection/delete", //删除收藏
-		"record_list": host + "/app/record/list", //浏览记录列表
-		"record_add": host + "/app/record/add", //添加浏览记录
-		"record_delete": host + "/app/record/delete", //删除浏览记录
-		"record_deleteAll": host + "/app/record/deleteAll", //删除全部浏览记录
-		"order_list": host + "/app/order/my_order", //我的订单
-		"order_user_confirm": host + "/app/order/order_confirm", //订单确认
-		"order_add": host + "/app/order/add",
-		"order_delete": host + "/app/order/delete", //删除订单
-		"order_cancel": host + "/app/order/cancel", //取消订单
-		"order_confirm": host + "/app/order/confirm", //确认收货
-		"order_returns": host + "/app/order/returns", //归还衣服
-		"shopping_cart_list": host + "/app/shopping_cart/list", //购物车列表
-		"shopping_cart_add": host + "/app/shopping_cart/add", //加入购物车
-		"shopping_cart_delete": host + "/app/shopping_cart/delete", //删除购物车
-		"appPay": host + "/app/pay/appPay", //支付
-		"address_add": host + "/app/address/add", //添加收货地址
-		"address_edit": host + "/app/address/edit", //编辑收货地址
-		"address_list": host + "/app/address/list", //收货地址列表
-		"address_delete": host + "/app/address/delete", //删除地址
+		"main": host + "/app/main", //首页加载数据
 		"feedback": host + "/app/other/feedback", //意见反馈
 		"agreement": host + "/app/other/agreement", //服务条款
 		"guide": host + "/app/other/guide/", //萌新必读

+ 282 - 0
pages/resume/my_resume.html

@@ -0,0 +1,282 @@
+<!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;}
+           .model{margin-top: 11px; background-color: white;padding: 10px;overflow: hidden;}
+           .model .content{padding: 12px;}
+           .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;}
+           .b{color: black;}
+           .e{color: #6e6f71;}
+		   .mp{width: 100%;border-radius: 3px;}
+		   .edit{float: right;color: #6e6f71;}
+		   #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="model" style="margin-top: 0px;">
+					<div class="bod">
+						<span class="text">
+							<i class="icon">&#xe64c;</i>基本信息
+						</span>
+						<span class="edit"><i class="icon e">&#xe607;</i>编辑</span>
+					</div>
+					<div class="content">
+						<div class="row">
+							<div class="sm3">
+								<img src="../../images/mp.jpg" 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>
+							<div class="clear"></div>
+						</div>
+					</div>
+				</div>
+				<div class="model">
+					<div class="bod">
+						<span class="text">
+							<i class="icon">&#xe61a;</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">xx市</span></div>
+								<div class="c">期待月薪:<span class="b">xx元/面议</span></div>
+								<div class="c">目前状态:<span class="b">离职/在职</span></div>
+						</div>
+					</div>
+				</div>
+				<div class="model">
+					<div class="bod">
+						<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>
+					</div>
+				</div>
+				<div class="model">
+					<div class="bod">
+						<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>
+						<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>	
+					</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>

+ 32 - 59
pages/user/login.html

@@ -1,26 +1,19 @@
 <!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>
-			.lg {padding: 35px;margin-top: 30px;}
+			.lg {padding: 35px;margin-top: 30px;text-align: center;}
 			.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;}
+			.btn{margin-top: 25px;}
+			.divider{margin-top: 50px;}
 		</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>
@@ -29,69 +22,52 @@
 		<div class="mui-content" id="app">
 			<div class="lg animated bounceIn">
 				<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.pass" />
 				</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="divider">
+					<div class="line" style="width: 30%;"></div>
+					<div class="text" style="width: 40%;">没有账号?</div>
+					<div class="line" style="width: 30%;"></div>
+				</div>
+				<button class="btn" @click="login()" style="background-color: #607D8B;">去注册</button>
 			</div>
-			<div class="copyright">Copyright © 2018 成都华笙科技有限公司 版权所有</div>
+			<div class="copyright">Copyright © 2018 xxxx科技有限公司 版权所有</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 time = 60; //1分钟倒计时
 			var vm = new Vue({
 				el: "#app",
 				data: {
-					msg: '发送验证码',
-					flag: true,
-					account: '',
-					code: '',
-					check:true
+					item: {
+						account: '',
+						pass: ''
+					}
 				},
 				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)
@@ -102,9 +78,6 @@
 							}
 							plus.nativeUI.closeWaiting();
 						})
-					},
-					agreement:function(){
-						open('agreement', '/pages/other/service.html', {url:urls().agreement,id: 'tpp',title: 'BIBO租赁协议'}, 'slide-in-bottom');
 					}
 				}
 			})

+ 114 - 0
pages/user/register.html

@@ -0,0 +1,114 @@
+<!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>
+			.lg {padding: 35px;margin-top: 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;}
+		</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="lg animated bounceIn">
+				<div class="input-group">
+					<i class="mui-icon iconfont icon-shoujihao"></i>
+					<input type="tel" placeholder="手机号" v-model="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>
+				</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>
+			<div class="copyright">Copyright © 2018 成都华笙科技有限公司 版权所有</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 time = 60; //1分钟倒计时
+			var vm = new Vue({
+				el: "#app",
+				data: {
+					msg: '发送验证码',
+					flag: true,
+					account: '',
+					code: '',
+					check:true
+				},
+				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) {
+								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);
+							}
+							plus.nativeUI.closeWaiting();
+						})
+					},
+					agreement:function(){
+						open('agreement', '/pages/other/service.html', {url:urls().agreement,id: 'tpp',title: 'BIBO租赁协议'}, 'slide-in-bottom');
+					}
+				}
+			})
+		</script>
+	</body>
+
+</html>

+ 10 - 10
pages/user/user_info.html

@@ -9,7 +9,7 @@
 		<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-bar-nav~.mui-content{padding-top: 60px;}
            .r{float: right;margin-right: 20px;color: darkgray;font-size: 14px;}
            .head{line-height: 45px;}
            .mui-table-view-cell{padding: 14px;font-size: 14px;color: #7f7c7c;}
@@ -34,25 +34,25 @@
 			<div class="mui-content animated fadeInUp">
 				<div class="m_box">
 					<ul class="mui-table-view">
-<!--						<li class="mui-table-view-cell">
+						<li class="mui-table-view-cell">
 							<a href="#picture" class="mui-navigate-right">
 								<span class="r">
 									<img :src="item.header" class="img">
 								</span>
 						        <span class="head">头像</span>
 							</a>
-						</li>-->
+						</li>
 						<li class="mui-table-view-cell" @click="op('CN',item.nickName,1)">
-							<a class="mui-navigate-right"><span class="r">{{item.nickName}}</span>CN</a>
+							<a class="mui-navigate-right"><span class="r">{{item.nickName}}</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.height,3)">
+							<a  class="mui-navigate-right"><span class="r">{{item.email}}</span>邮箱</a>
 						</li>
-						<li class="mui-table-view-cell" @click="op('体重',item.weight,2)">
-							<a  class="mui-navigate-right"><span class="r">{{item.weight==null?'':item.weight+' kg'}}</span>我的体重</a>
+						<li class="mui-table-view-cell">
+							<a href="#sex" class="mui-navigate-right"><span class="r">{{item.size}}</span>出生日期</a>
 						</li>
-						<li class="mui-table-view-cell" @click="op('身高',item.height,3)">
-							<a  class="mui-navigate-right"><span class="r">{{item.height==null?'':item.height+' cm'}}</span>我的身高</a>
+						<li class="mui-table-view-cell">
+							<a href="#sex" class="mui-navigate-right"><span class="r">{{item.mTime}}</span>注册时间</a>
 						</li>
 					</ul>
 				</div>

+ 17 - 21
tab/mine.html

@@ -8,8 +8,10 @@
 		<link href="../css/mui.min.css" rel="stylesheet" />
 		<link href="../css/iconfont.css" rel="stylesheet" />
 		<style>
-			.top{color:white;font-weight: bold;background-color:#fe580a;;text-align: center;padding-top: 40px;padding-bottom: 30px;}
-			.top img{width: 80px;height: 80px;border-radius: 50%;border: 2px solid white;}
+			.top{color:white;font-weight: bold;text-align: center;background-image:url(../images/top.png);background-size: cover; padding-top: 40px;padding-bottom: 60px;}
+			.top img{width: 70px;height: 70px;border-radius: 50%;border: 2px solid white;}
+			.nickName{font-size: 15px;padding-top: 5px;}
+			.email{font-size: 12px;}
 			.banner{margin: 15px 20px 10px 20px;box-shadow: 0 1px 6px #ccc;position: relative;}
 			.row{background-color: white;border-radius: 4px;}
 			.sm{text-align: center;padding: 15px;font-size: 12px;color: #7a7a7a;position: relative;font-weight: bold;}
@@ -28,36 +30,36 @@
 				<div @click="user_info()">
 					<img src="../images/ls.png" v-if="user.header==null" />
 					<img :src="user.header" v-else /><br>
-					<span v-if="user.nickName==null">未登录</span>
-					<span>{{user.nickName}}</span>
+					<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>
 			<div class="banner">
-				<div class="row" style="border-radius: 4px 4px 0px 0px;">
-					<div class="sm" @click="skip(1)"><span class="icon iconfont icon-dingdan ic" style="color: #FF5722;margin: 0;"></span><br />我的订单<!--<span class="mui-badge mui-badge-danger">45</span>--></div>
-					<div class="sm" @click="skip(2)"><span class="icon iconfont icon-gouwuchekong1 ic" style="color: rgb(251, 125, 85);margin: 0;"></span><br />次元袋</div>
-					<div class="sm" @click="skip(3)"><span class="icon iconfont icon-shoucang ic" style="color: #03A9F4;margin: 0;"></span><br />我的收藏</div>
+				<div class="row">
+					<div class="sm" @click="skip(1)"><i class="icon ic" style="color: #FF5722;margin:0;">&#xe670;</i><br />我的简历</div>
+					<div class="sm" @click="skip(2)"><i class="icon ic" style="color: #607D8B;margin:0;">&#xe614;</i><br />投递历史</div>
+					<div class="sm" @click="skip(3)"><i class="icon ic" style="color: #00BCD4;margin:0;">&#xe662;</i><br />企业用户</div>
 					<div class="clear"></div>
 				</div>
-				<div class="row" style="border-radius: 0px 0px 4px 4px;border-top: 1px solid #efefef;">
+				<!--<div class="row" style="border-radius: 0px 0px 4px 4px;border-top: 1px solid #efefef;">
 					<div class="sm" @click="skip(4)"><span class="icon iconfont icon-dizhi ic" style="color: #3F51B5;margin: 0;"></span><br />收货地址</div>
 					<div class="sm" @click="skip(5)"><span class="icon iconfont icon-liulanjilu ic" style="color: #009688;margin: 0;"></span><br />浏览记录</div>
-					<!--<div class="sm" @click="skip(6)"><span class="icon iconfont icon-xiaoxi ic" style="color:#607D8B;margin: 0;"></span><br />消息通知</div>-->
+					<div class="sm" @click="skip(6)"><span class="icon iconfont icon-xiaoxi ic" style="color:#607D8B;margin: 0;"></span><br />消息通知</div>
 					<div class="clear"></div>
-				</div>
+				</div>-->
 			</div>
 			<ul class="mui-table-view">
 				<li class="mui-table-view-cell" @click="user_info()">
-					<a class="mui-navigate-right"><i class="icon iconfont icon-gerenxinxi ic" style="color: #cd542e;"></i>个人信息</a>
+					<a class="mui-navigate-right"><i class="icon ic" style="color: #00BCD4;">&#xe863;</i>个人信息</a>
 				</li>
 				<li class="mui-table-view-cell" @click="other(1)">
-					<a class="mui-navigate-right"><i class="icon iconfont icon-jianyi ic" style="color: #4CAF50;"></i>建议反馈</a>
+					<a class="mui-navigate-right"><i class="icon ic" style="color: #4CAF50;">&#xe607;</i>建议反馈</a>
 				</li>
 				<li class="mui-table-view-cell" @click="other(5)">
-					<a class="mui-navigate-right"><i class="icon iconfont icon-20 ic" style="color: #00BCD4;"></i>软件分享</a>
+					<a class="mui-navigate-right"><i class="icon ic" style="color: #00BCD4;">&#xe61a;</i>软件分享</a>
 				</li>
 				<li class="mui-table-view-cell" @click="other(3)">
-					<a class="mui-navigate-right"><i class="icon iconfont icon-shezhi ic" style="color: #607D8B;"></i>系统设置</a>
+					<a class="mui-navigate-right"><i class="icon ic" style="color: #607D8B;">&#xe619;</i>系统设置</a>
 				</li>
 			</ul>
 		</div>
@@ -104,12 +106,6 @@
 							case 3:
 							    open('collection_list', '../pages/collection/list.html',null,'slide-in-bottom');
 								break;	
-							case 4:
-								open('address_list', '../pages/address/list.html',null,'slide-in-bottom');
-								break;
-							case 5:
-								open('records_list', '../pages/records/list.html',null,'slide-in-bottom');
-								break;
 						}
 					},
 					//系统设置

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