Browse Source

app bug修改

xuchunyang 8 years ago
parent
commit
f7aaaa675a

+ 10 - 5
app/html/fillinfo.html

@ -6,7 +6,8 @@
6 6
		<title>完善个人信息</title>
7 7
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
8 8
		<link href="../css/mui.min.css" rel="stylesheet" />
9
		<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
9
		<link href="../css/mui.picker.min.css" rel="stylesheet" />
10
		<link href="../css/iconfont.css" rel="stylesheet" />
10 11
		<link href="../css/app.css" rel="stylesheet" />
11 12
	</head>
12 13
@ -17,8 +18,8 @@
17 18
		<div class="mui-content">
18 19
		    <div class="mui-input-group mainbox fillbox">
19 20
				<div class="maincon" style="margin: 0;padding:4% 0;">
20
					<div class="headbox3">
21
						<a href="javascript:;" class="headimglink"></a>
21
					<div class="headbox3 headRadius">
22
						<a href="javascript:;" class="mui-icon iconfont icon-camera headimglink" id="userimg"></a>
22 23
			        </div>
23 24
					<ul class="basicinfo">
24 25
						<li><label>姓名<em class="requiredcon"></em></label></li>
@ -32,7 +33,10 @@
32 33
						<li><label>职称</label></li>
33 34
						<li class="basicfrm"><input type="text"  class="mui-input-clear frmtype" id="userTitle"></li>
34 35
						<li><label>所在地</label></li>
35
						<li class="basicfrm"><input type="text" class="mui-input-clear frmtype"  id ="showCityPicker" value=""></li>
36
						<li class="basicfrm">
37
							<input type="text" class="mui-input-clear frmtype"  id ="showCityPicker" value="">
38
							<span class="mui-icon mui-icon-arrowdown downarrow"></span>
39
						</li>
36 40
					    <input type="hidden"  class="mui-input-clear frmtype" id="data-province">
37 41
					    <input type="hidden"  class="mui-input-clear frmtype" id="data-address">
38 42
					</ul>
@ -47,7 +51,8 @@
47 51
		<script src="../js/public/mui.picker.min.js"></script>
48 52
		<script src="../js/public/city.data.js" ></script>
49 53
		<script src="../js/public/base.js"></script>
54
		<script src="../js/public/upload-avatar.js"></script>
50 55
		<script src="../js/fillinfo.js"></script>
51
	</body>
56
	</body> 
52 57
53 58
</html>

+ 12 - 12
app/html/index_home.html

@ -24,38 +24,38 @@
24 24
          <div class="mui-slider-group mui-slider-loop">
25 25
            <!-- 额外增加的一个节点(循环轮播:第一个节点是最后一张轮播) -->
26 26
            <div class="mui-slider-item mui-slider-item-duplicate">
27
              <a href="#">
28
                 <img src="http://placehold.it/200x100">
27
              <a >
28
                 <img src="../images/4.jpg">
29 29
              </a>
30 30
            </div>
31 31
            <!-- 第一张 -->
32 32
            <div class="mui-slider-item">
33
              <a href="#">
34
                 <img src="http://placehold.it/200x100">
33
              <a >
34
                 <img src="../images/1.jpg">
35 35
              </a>
36 36
            </div>
37 37
            <!-- 第二张 -->
38 38
            <div class="mui-slider-item">
39
              <a href="#">
40
                 <img src="http://placehold.it/200x100">
39
              <a >
40
                 <img src="../images/2.jpg">
41 41
              </a>
42 42
            </div>
43 43
            <!-- 第三张 -->
44 44
            <div class="mui-slider-item">
45
              <a href="#">
46
                 <img src="http://placehold.it/200x100">
45
              <a >
46
                 <img src="../images/3.jpg">
47 47
              </a>
48 48
            </div>
49 49
            <!-- 第四张 -->
50 50
            <div class="mui-slider-item">
51
              <a href="#">
52
                 <img src="http://placehold.it/200x100">
51
              <a >
52
                 <img src="../images/4.jpg">
53 53
              </a>
54 54
            </div>
55 55
            <!-- 额外增加的一个节点(循环轮播:最后一个节点是第一张轮播) -->
56 56
            <div class="mui-slider-item mui-slider-item-duplicate">
57
              <a href="#">
58
                 <img src="http://placehold.it/200x100">
57
              <a >
58
                 <img src="../images/1.jpg">
59 59
              </a>
60 60
            </div>
61 61
          </div>

+ 2 - 2
app/html/myaccount.html

@ -20,7 +20,7 @@
20 20
				<div class="maincon personinfo2">
21 21
					<div class="headbox2" >
22 22
					    <a class="mui-pull-left proinfor">
23
		                    <img class="mui-pull-left headimg2" src="../images/default-photo.jpg" id="userImg">
23
		                    <img class="mui-pull-left headimg2 headRadius" src="../images/default-photo.jpg" id="userImg">
24 24
		                    <div class="mui-pull-left infobasic">
25 25
		                        <span class="listtit">
26 26
		                        	<span id="userName"></span>
@ -114,7 +114,7 @@
114 114
				<div class="maincon personinfo2">
115 115
					<div class="headbox2" >
116 116
					    <a class="mui-pull-left proinfor">
117
		                    <img class="mui-pull-left headimg2" src="../images/default-photo.jpg" >
117
		                    <img class="mui-pull-left headimg2 headRadius" src="../images/default-photo.jpg" >
118 118
		                    <div class="mui-pull-left "  style="color:#797979; margin: 10% 5%;"><span id="goreg">注册</span> / <span id="gologin">登录</span> </div>
119 119
		                </a>
120 120
		              

+ 168 - 0
app/html/picture-upload.html

@ -0,0 +1,168 @@
1
<!doctype html>
2
<html>
3
<head>
4
<meta charset="UTF-8">
5
<title>头像上传</title>
6
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
7
<link href="../css/mui.min.css" rel="stylesheet" />
8
 <style type="text/css">
9
    *{margin:0;padding: 0;}
10
    body,html{background-color:#000;position:relative;width:100%;height:100%;overflow: hidden;}
11
    .canvas_img,.canvas,.canvas_div,.canvas_btn,.canvas_bg{position: absolute;}
12
    .canvas_div,.canvas_bg{left:0;top:0;bottom:0;right:0;}
13
    .canvas_img{z-index:1;width:100%; top:0;}
14
    .canvas_bg{background-color: rgba(0,0,0,.6);z-index:2;}
15
    .canvas{left:25px ;border:1px solid #fff;top:30px;z-index:100; }
16
    .canvas_div{z-index:999;}
17
    .canvas_btn {bottom:0;left:0;right:0;height:50px;background-color: #fff;z-index:1000;}
18
    .canvas_btn a{float:left;color:#222;width:60px;line-height:50px;text-decoration: none;text-align: center;}
19
    .canvas_btn .canvas_ok{float:right;}
20
    .canvas_save:active{color:#fff;}
21
</style>
22
</head>
23
<body>
24
	<input type="hidden" name="imgfh" id="imgfh" value="" />
25
	<input type="hidden" name="img_base64" id="img_base64" value="" />
26
	<img id="canvas_img" src="" class="canvas_img"/>
27
	<div class="canvas_bg"></div>
28
	<canvas id="canvas" class="canvas"></canvas> 
29
	<div id="canvas_div" class="canvas_div"></div>
30
	<div class="canvas_btn">
31
		<a href="javascript:void(0);" class="canvas_cancel mui-action-back">取消</a>
32
		<a href="javascript:void(0);" class="canvas_ok"  id="canvas_ok">完成</a>
33
	</div>
34
	<script src="../js/public/mui.min.js"></script>
35
	<script src="../js/public/base.js"></script>
36
	<script type="text/javascript">
37
	mui.plusReady(function(){
38
		var img_obj = document.querySelector("#canvas_img");
39
		var canvas_ok = document.querySelector("#canvas_ok");
40
		var list = plus.webview.currentWebview();
41
		var userId = plus.storage.getItem('userid');
42
        img_obj.setAttribute("src",list.imgurl);
43
        canvas_ok.addEventListener("tap",function(){
44
        	 save_img();
45
        	 imgOk = document.querySelector("#img_base64").value;
46
        	 imgfh = document.querySelector("#imgfh").value;
47
        	 console.log(imgfh)
48
        	 mui.ajax(baseUrl + '/ajax/image/saveHead', {
49
				data: {
50
					"id": userId,
51
					"base64": imgOk,
52
				},
53
				dataType: 'json', //数据格式类型
54
				type: 'post', //http请求类型
55
				timeout: 10000,
56
				success: function(data) {
57
					console.log(JSON.stringify(data));
58
					console.log(data.success);
59
					plus.nativeUI.toast("图片上传成功", toastStyle); 
60
					mui.currentWebview.close();
61
				    mui.back();
62
				    var fPage = plus.webview.getWebviewById('../html/fillinfo.html');
63
				    mui.fire(fPage, 'closePage', {
64
						id:imgfh
65
					});
66
				},
67
				error: function(data) {
68
					plus.nativeUI.toast("服务器链接超时", toastStyle);
69
				}
70
			});
71
       
72
        })
73
	})
74
</script>
75
  <script>
76
        //获取手机屏幕宽高
77
        var c_w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
78
        var c_h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
79
        
80
        var can_obj = document.querySelector("#canvas");
81
        var img_obj = document.querySelector("#canvas_img");
82
        var div_obj = document.querySelector("#canvas_div");
83
        
84
        var posX = 0,posY = 0;//相对坐标
85
        var scale = 0;//记录在缩放动作执行前的 缩放值
86
        var start_X1=0,start_Y1=0,start_X2=0,start_Y2=0;
87
        var start_sqrt =0;//开始缩放比例
88
        var sqrt = 1;
89
        var left_x = 0,left_y = 0;//计算 偏移量 设置画布中的X,Y轴 (加偏移量)
90
        function load(){ 
91
            //设置canvas 宽度(全屏显示),高度,上下居中显示
92
            can_obj.width = c_w -50;
93
            can_obj.height = c_w -50;
94
            can_obj.style.top = (c_h - c_w - 2) / 2 + "px";
95
           // can_obj.style.left ="25px";
96
            
97
            //设置图片自适应大小及图片的居中显示
98
          // autoResizeImage(c_w,c_h,img_obj);
99
           // img_obj.style.top = (c_h - img_obj.height - 2) / 2 + "px";
100
            //img_obj.style.left = (c_w - img_obj.width) / 2 + "px";
101
            
102
            document.querySelector("#canvas_div").addEventListener('touchstart',touch, false);
103
            document.querySelector("#canvas_div").addEventListener('touchmove',touch, false);
104
            document.querySelector("#canvas_div").addEventListener('touchend',touch, false);
105
            
106
            var ctx_img = can_obj.getContext("2d");
107
            var ctx_X = (can_obj.width - img_obj.width) /2,ctx_Y = (can_obj.height - img_obj.height) /2;
108
            ctx_img.drawImage(img_obj,ctx_X,ctx_Y,img_obj.width,img_obj.height);//初始化 canvas 加入图片
109
            
110
            function touch (event){
111
                 var event = event || window.event;
112
                 event.preventDefault();//阻止浏览器或body 其他冒泡事件
113
                 var mv_x1 = event.changedTouches[0].clientX,
114
                	 mv_y1 = event.changedTouches[0].clientY;//手指坐标
115
                 var img_left = img_obj.left,img_top = img_obj.top;//图片坐标
116
                 if(event.touches.length == 1){//单指操作
117
                    if(event.type == "touchstart"){//开始移动
118
                        posX = mv_x1 - img_obj.offsetLeft; //获取img相对坐标
119
                        posY = mv_y1 - img_obj.offsetTop;
120
                    }else if(event.type == "touchmove"){//移动中
121
                        var _x = mv_x1 - posX; //移动坐标
122
                        var _y = mv_y1 - posY;
123
                        img_obj.style.left = _x + "px";
124
                        img_obj.style.top = _y + "px";
125
                        ctx_img.clearRect(0,0,can_obj.width,can_obj.height);//清除画布
126
                        ctx_img.drawImage(img_obj,_x + left_x/2-25,_y - parseFloat(can_obj.style.top) + left_y/2,img_obj.width * sqrt,img_obj.height * sqrt);//画布内图片移动
127
                    }
128
                 }else if(event.touches.length == 2){//双指操作
129
                     if(event.type == "touchstart"){
130
                         scale = img_obj.style.Transform == undefined ? 1 : parseFloat(img_obj.style.Transform.replace(/[^0-9^\.]/g,""));//获取在手指按下瞬间的放大缩小值(scale),作用,在移动时,记录上次移动的放大缩小值
131
                         start_X1 = event.touches[0].clientX;//记录开始的坐标值,作用:在下次放大缩小后,去掉上次放大或缩小的值
132
                         start_Y1 = event.touches[0].clientY;
133
                         start_X2 = event.touches[1].clientX;
134
                         start_Y2 = event.touches[1].clientY;
135
                         start_sqrt = Math.sqrt((start_X2 - start_X1) * (start_X2 - start_X1) + (start_Y2 - start_Y1) * (start_Y2 - start_Y1)) / 200;//获取在缩放时 当前缩放的值
136
                         
137
                     }else if(event.type == "touchmove"){
138
                         var mv_x2 = event.touches[1].clientX,mv_y2 = event.touches[1].clientY;
139
                         var move_sqrt = Math.sqrt((mv_x2 - mv_x1) * (mv_x2 - mv_x1) + (mv_y2 - mv_y1) * (mv_y2 - mv_y1)) / 200;//动态获取上一次缩放值(随时变更),在下次缩放时减去上一次的值,作用:防止累加之前的缩放
140
                         sqrt = move_sqrt - start_sqrt + scale;//求出缩放值
141
                         
142
                         img_obj.style.webkitTransform = "scale("+ sqrt +")";//设置放大缩小
143
                         img_obj.style.Transform = "scale("+ sqrt +")";
144
                         ctx_img.clearRect(0,0,can_obj.width,can_obj.height);//清除画布
145
                         var dImg_left = parseFloat(img_obj.style.left.replace("px","")),dImg_top = parseFloat(img_obj.style.top.replace("px",""));
146
                         var w = img_obj.width,h = img_obj.height,sw = w * sqrt, sh = h * sqrt;
147
                         left_x = w - sw;//计算 偏移量 设置画布中的X,Y轴 (加偏移量) 注:canvas 原点放大(canvas中图片左上角坐标),css3 scale 中点放大
148
                         left_y = h - sh;
149
                         ctx_img.drawImage(img_obj,dImg_left + left_x/2-25,dImg_top - parseFloat(can_obj.style.top.replace("px","")) + left_y/2,sw,sh);//画布内图片重置
150
                     }
151
                 }
152
            }
153
        }
154
        
155
        window.addEventListener('load',load, false);
156
        
157
        //裁图
158
        function save_img(){
159
            var base64 = can_obj.toDataURL("image/jpeg",1);
160
            var subbase = base64.substring(22);
161
            document.querySelector("#img_base64").value = subbase;
162
            document.querySelector("#imgfh").value = base64; 
163
        }
164
        
165
      
166
   </script>
167
</body>
168
</html>

+ 4 - 6
app/html/search.html

@ -84,12 +84,10 @@
84 84
	
85 85
	<!--学术领域-->
86 86
	<div id="middlePopoveracad" class="mui-popover popoverbox2" >
87
		<div class="mui-scroll-wrapper" style="height: 200px; top:0;">
88
			<div class="mui-scroll">
89
				<ul class="mui-table-view xsly"  id="xsly">
90
					
91
				</ul>
92
			</div>
87
		<div id="wrapper">
88
			<ul class="mui-table-view xsly"  id="xsly">
89
				
90
			</ul>
93 91
		</div>
94 92
	</div>
95 93
   <script src="../js/public/mui.min.js"></script>

BIN
app/images/1.jpg


BIN
app/images/2.jpg


BIN
app/images/3.jpg


BIN
app/images/4.jpg


+ 1 - 1
app/js/attentions.js

@ -100,7 +100,7 @@ function getOneExpert(pageNo, pageSize) {
100 100
				mui('#pullrefresh').pullRefresh().refresh(true); //重置上拉加载
101 101
			},
102 102
			error: function() {
103
				plus.nativeUI.toast("服务器链接超时", toastStyle);
103
				plus.nativeUI.toast("服务器链接超时", toastStyle); 
104 104
			}
105 105
		});
106 106
	});

+ 3 - 2
app/js/fillinfo.js

@ -10,6 +10,8 @@ mui.ready(function() {
10 10
	var goIndex = document.getElementById("goIndex");
11 11
	var dataProvince = document.getElementById("data-province");
12 12
	var dataAddress = document.getElementById("data-address");
13
	
14
	
13 15
	/*选择地址*/
14 16
	var cityPicker = new mui.PopPicker({layer: 2});
15 17
	cityPicker.setData(cityData);
@ -24,9 +26,8 @@ mui.ready(function() {
24 26
		});
25 27
	}, false);
26 28
	mui.plusReady(function() {
27
		
28 29
		var self = plus.webview.currentWebview();
29
		
30
	
30 31
		/*校验提交按钮显示状态*/
31 32
		mui('.basicinfo').on('keyup', "#userName,#userMechanism", function() {
32 33
			hideButtn(userName,userMechanism,goIndex,"frmactiveok");

+ 5 - 6
app/js/myaccount.js

@ -34,7 +34,7 @@ mui.ready(function() {
34 34
		/*退出登录刷新页面*/
35 35
		window.addEventListener('closeUser', function(event) {
36 36
			userId = event.detail.id;
37
			//console.log(userId);
37
			console.log(userId);
38 38
			//console.log('dd');
39 39
			loginStatus();
40 40
		});
@ -42,10 +42,9 @@ mui.ready(function() {
42 42
		function loginStatus() {
43 43
			console.log(userId);
44 44
			if(userId && userId != "null" && userId != null) {
45
				
46
				loginYes.style.display = "block";
47 45
				loginNo.style.display = "none";
48
				
46
				loginYes.style.display = "block";
47
				//alert('dd')
49 48
				/*设置*/
50 49
				goSetup.addEventListener('tap', function() {
51 50
					mui.openWindow({
@ -60,7 +59,7 @@ mui.ready(function() {
60 59
				/*我的关注*/
61 60
				goFollow.addEventListener('tap', function() {
62 61
					plus.nativeUI.showWaiting(); //显示原生等待框
63
					plus.webview.create("../html/attentions.html");
62
					plus.webview.create("../html/attentions.html","../html/attentions.html");
64 63
				})
65 64

66 65
				/*我的修改*/
@ -130,7 +129,7 @@ mui.ready(function() {
130 129
							start[i].classList.add("icon-favorfill");
131 130
						}
132 131
						if($info.hasHeadImage == 1) {
133
							document.getElementById("userImg").setAttribute("src", baseUrl + "/images/head/" + $info.id + "_m.jpg");
132
							document.getElementById("userImg").setAttribute("src", baseUrl + "/images/head/" + $info.id + "_l.jpg");
134 133
						} else {
135 134
							document.getElementById("userImg").setAttribute("src", baseUrl +  "/images/default-photo.jpg");
136 135
						}

+ 15 - 315
app/js/public/city.data.js

@ -3,126 +3,15 @@ var cityData = [{
3 3
	text: '北京市',
4 4
	children: [{
5 5
		value: "110101",
6
		text: "东城区"
7
	}, {
8
		value: "110102",
9
		text: "西城区"
10
	}, {
11
		value: "110103",
12
		text: "崇文区"
13
	}, {
14
		value: "110104",
15
		text: "宣武区"
16
	}, {
17
		value: "110105",
18
		text: "朝阳区"
19
	}, {
20
		value: "110106",
21
		text: "丰台区"
22
	}, {
23
		value: "110107",
24
		text: "石景山区"
25
	}, {
26
		value: "110108",
27
		text: "海淀区"
28
	}, {
29
		value: "110109",
30
		text: "门头沟区"
31
	}, {
32
		value: "110111",
33
		text: "房山区"
34
	}, {
35
		value: "110112",
36
		text: "通州区"
37
	}, {
38
		value: "110113",
39
		text: "顺义区"
40
	}, {
41
		value: "110114",
42
		text: "昌平区"
43
	}, {
44
		value: "110115",
45
		text: "大兴区"
46
	}, {
47
		value: "110116",
48
		text: "怀柔区"
49
	}, {
50
		value: "110117",
51
		text: "平谷区"
52
	}, {
53
		value: "110228",
54
		text: "密云县"
55
	}, {
56
		value: "110229",
57
		text: "延庆县"
58
	}, {
59
		value: "110230",
60
		text: "其它区"
6
		text: "北京市" 
61 7
	}]
62 8
}, {
63 9
	value: '120000',
64 10
	text: '天津市',
65 11
	children: [{
66 12
		value: "120101",
67
		text: "和平区"
68
	}, {
69
		value: "120102",
70
		text: "河东区"
71
	}, {
72
		value: "120103",
73
		text: "河西区"
74
	}, {
75
		value: "120104",
76
		text: "南开区"
77
	}, {
78
		value: "120105",
79
		text: "河北区"
80
	}, {
81
		value: "120106",
82
		text: "红桥区"
83
	}, {
84
		value: "120107",
85
		text: "塘沽区"
86
	}, {
87
		value: "120108",
88
		text: "汉沽区"
89
	}, {
90
		value: "120109",
91
		text: "大港区"
92
	}, {
93
		value: "120110",
94
		text: "东丽区"
95
	}, {
96
		value: "120111",
97
		text: "西青区"
98
	}, {
99
		value: "120112",
100
		text: "津南区"
101
	}, {
102
		value: "120113",
103
		text: "北辰区"
104
	}, {
105
		value: "120114",
106
		text: "武清区"
107
	}, {
108
		value: "120115",
109
		text: "宝坻区"
110
	}, {
111
		value: "120116",
112
		text: "滨海新区"
113
	}, {
114
		value: "120221",
115
		text: "宁河县"
116
	}, {
117
		value: "120223",
118
		text: "静海县"
119
	}, {
120
		value: "120225",
121
		text: "蓟县"
122
	}, {
123
		value: "120226",
124
		text: "其它区"
125
	}]
13
		text: "天津市"
14
	}] 
126 15
}, {
127 16
	value: '130000',
128 17
	text: '河北省',
@ -199,7 +88,7 @@ var cityData = [{
199 88
	}]
200 89
}, {
201 90
	value: '150000',
202
	text: '内蒙古',
91
	text: '内蒙古自治区',
203 92
	children: [{
204 93
		value: "150100",
205 94
		text: "呼和浩特市"
@ -362,67 +251,7 @@ var cityData = [{
362 251
	text: '上海市',
363 252
	children: [{
364 253
		value: "310101",
365
		text: "黄浦区"
366
	}, {
367
		value: "310103",
368
		text: "卢湾区"
369
	}, {
370
		value: "310104",
371
		text: "徐汇区"
372
	}, {
373
		value: "310105",
374
		text: "长宁区"
375
	}, {
376
		value: "310106",
377
		text: "静安区"
378
	}, {
379
		value: "310107",
380
		text: "普陀区"
381
	}, {
382
		value: "310108",
383
		text: "闸北区"
384
	}, {
385
		value: "310109",
386
		text: "虹口区"
387
	}, {
388
		value: "310110",
389
		text: "杨浦区"
390
	}, {
391
		value: "310112",
392
		text: "闵行区"
393
	}, {
394
		value: "310113",
395
		text: "宝山区"
396
	}, {
397
		value: "310114",
398
		text: "嘉定区"
399
	}, {
400
		value: "310115",
401
		text: "浦东新区"
402
	}, {
403
		value: "310116",
404
		text: "金山区"
405
	}, {
406
		value: "310117",
407
		text: "松江区"
408
	}, {
409
		value: "310118",
410
		text: "青浦区"
411
	}, {
412
		value: "310119",
413
		text: "南汇区"
414
	}, {
415
		value: "310120",
416
		text: "奉贤区"
417
	}, {
418
		value: "310152",
419
		text: "川沙区"
420
	}, {
421
		value: "310230",
422
		text: "崇明县"
423
	}, {
424
		value: "310231",
425
		text: "其它区"
254
		text: "上海市"
426 255
	}]
427 256
}, {
428 257
	value: '320000',
@ -907,7 +736,7 @@ var cityData = [{
907 736
	}]
908 737
}, {
909 738
	value: '450000',
910
	text: '广西壮族',
739
	text: '广西壮族自治区 ',
911 740
	children: [{
912 741
		value: "450100",
913 742
		text: "南宁市"
@ -1020,130 +849,10 @@ var cityData = [{
1020 849
	}]
1021 850
}, {
1022 851
	value: '500000',
1023
	text: '重庆',
852
	text: '重庆',
1024 853
	children: [{
1025 854
		value: "500101",
1026
		text: "万州区"
1027
	}, {
1028
		value: "500102",
1029
		text: "涪陵区"
1030
	}, {
1031
		value: "500103",
1032
		text: "渝中区"
1033
	}, {
1034
		value: "500104",
1035
		text: "大渡口区"
1036
	}, {
1037
		value: "500105",
1038
		text: "江北区"
1039
	}, {
1040
		value: "500106",
1041
		text: "沙坪坝区"
1042
	}, {
1043
		value: "500107",
1044
		text: "九龙坡区"
1045
	}, {
1046
		value: "500108",
1047
		text: "南岸区"
1048
	}, {
1049
		value: "500109",
1050
		text: "北碚区"
1051
	}, {
1052
		value: "500110",
1053
		text: "万盛区"
1054
	}, {
1055
		value: "500111",
1056
		text: "双桥区"
1057
	}, {
1058
		value: "500112",
1059
		text: "渝北区"
1060
	}, {
1061
		value: "500113",
1062
		text: "巴南区"
1063
	}, {
1064
		value: "500114",
1065
		text: "黔江区"
1066
	}, {
1067
		value: "500115",
1068
		text: "长寿区"
1069
	}, {
1070
		value: "500222",
1071
		text: "綦江县"
1072
	}, {
1073
		value: "500223",
1074
		text: "潼南县"
1075
	}, {
1076
		value: "500224",
1077
		text: "铜梁县"
1078
	}, {
1079
		value: "500225",
1080
		text: "大足县"
1081
	}, {
1082
		value: "500226",
1083
		text: "荣昌县"
1084
	}, {
1085
		value: "500227",
1086
		text: "璧山县"
1087
	}, {
1088
		value: "500228",
1089
		text: "梁平县"
1090
	}, {
1091
		value: "500229",
1092
		text: "城口县"
1093
	}, {
1094
		value: "500230",
1095
		text: "丰都县"
1096
	}, {
1097
		value: "500231",
1098
		text: "垫江县"
1099
	}, {
1100
		value: "500232",
1101
		text: "武隆县"
1102
	}, {
1103
		value: "500233",
1104
		text: "忠县"
1105
	}, {
1106
		value: "500234",
1107
		text: "开县"
1108
	}, {
1109
		value: "500235",
1110
		text: "云阳县"
1111
	}, {
1112
		value: "500236",
1113
		text: "奉节县"
1114
	}, {
1115
		value: "500237",
1116
		text: "巫山县"
1117
	}, {
1118
		value: "500238",
1119
		text: "巫溪县"
1120
	}, {
1121
		value: "500240",
1122
		text: "石柱土家族自治县"
1123
	}, {
1124
		value: "500241",
1125
		text: "秀山土家族苗族自治县"
1126
	}, {
1127
		value: "500242",
1128
		text: "酉阳土家族苗族自治县"
1129
	}, {
1130
		value: "500243",
1131
		text: "彭水苗族土家族自治县"
1132
	}, {
1133
		value: "500381",
1134
		text: "江津区"
1135
	}, {
1136
		value: "500382",
1137
		text: "合川区"
1138
	}, {
1139
		value: "500383",
1140
		text: "永川区"
1141
	}, {
1142
		value: "500384",
1143
		text: "南川区"
1144
	}, {
1145
		value: "500385",
1146
		text: "其它区"
855
		text: "重庆市"
1147 856
	}]
1148 857
}, {
1149 858
	value: '510000',
@ -1297,7 +1006,7 @@ var cityData = [{
1297 1006
	}]
1298 1007
}, {
1299 1008
	value: '540000',
1300
	text: '西藏',
1009
	text: '西藏自治区',
1301 1010
	children: [{
1302 1011
		value: "540100",
1303 1012
		text: "拉萨市"
@ -1430,7 +1139,7 @@ var cityData = [{
1430 1139
	}]
1431 1140
}, {
1432 1141
	value: '640000',
1433
	text: '宁夏',
1142
	text: '宁夏回族自治区',
1434 1143
	children: [{
1435 1144
		value: "640100",
1436 1145
		text: "银川市"
@ -1449,7 +1158,7 @@ var cityData = [{
1449 1158
	}]
1450 1159
}, {
1451 1160
	value: '650000',
1452
	text: '新疆',
1161
	text: '新疆维吾尔自治区 ',
1453 1162
	children: [{
1454 1163
		value: "650100",
1455 1164
		text: "乌鲁木齐市"
@ -1574,26 +1283,17 @@ var cityData = [{
1574 1283
	}]
1575 1284
}, {
1576 1285
	value: '810000',
1577
	text: '香港',
1286
	text: '香港特别行政区',
1578 1287
	children: [{
1579 1288
		value: "810100",
1580
		text: "香港"
1581
	}, {
1582
		value: "810200",
1583
		text: "九龙"
1584
	}, {
1585
		value: "810300",
1586
		text: "新界"
1289
		text: "香港特别行政区"
1587 1290
	}]
1588 1291
}, {
1589 1292
	value: '820000',
1590
	text: '澳门',
1293
	text: '澳门特别行政区',
1591 1294
	children: [{
1592 1295
		value: "820100",
1593
		text: "澳门半岛"
1594
	}, {
1595
		value: "820200",
1596
		text: "离岛"
1296
		text: "澳门特别行政区"
1597 1297
	}]
1598 1298
}, {
1599 1299
	value: '990000',

+ 92 - 0
app/js/public/upload-avatar.js

@ -0,0 +1,92 @@
1
/*头像上传*/
2
var userimg = document.getElementById("userimg");
3

4
window.addEventListener('closePage', function(event) {
5
	bimg = event.detail.id;
6
	var imgvar='<img src="'+bimg+'" style="width:100%"/>';  
7
	userimg.innerHTML=imgvar;
8
});		
9

10
mui.plusReady(function() {
11

12
	userimg.addEventListener("tap", function() {
13
		if(mui.os.plus) {
14
			var a = [{
15
				title: "拍照"
16
			}, {
17
				title: "从手机相册选择"
18
			}];
19
			plus.nativeUI.actionSheet({
20
				title: "修改头像",
21
				cancel: "取消",
22
				buttons: a
23
			}, function(b) {
24
				switch(b.index) {
25
					case 0:
26
						break;
27
					case 1:
28
						getImage(); //照相机
29
						break;
30
					case 2:
31
						galleryImg(); //相册
32
						break;
33
					default:
34
						break
35
				}
36
			})
37
		}
38
	})
39

40
	/*摄像头拍照*/
41
	function getImage() {
42
		var c = plus.camera.getCamera();
43
		c.captureImage(function(e) {
44
			plus.io.resolveLocalFileSystemURL(e, function(entry) {
45
				mui.openWindow({
46
					url: '../html/picture-upload.html',
47
					id: 'html/picture-upload.html',
48
					show: {
49
						aniShow: "slide-in-right"
50
					},
51
					extras: {
52
						imgurl: entry.toLocalURL(),
53
					}
54
				});
55
			}, function(e) {
56
				plus.nativeUI.toast("读取拍照文件错误", toastStyle);
57
			});
58
		}, function(s) {
59
			console.log("error" + s);
60
		}, {
61
			filename: "_doc/head.jpg"
62
		})
63
	}
64

65
	/*相册获取照片*/
66
	function galleryImg() {
67
		plus.gallery.pick(function(file) {
68
			changeToLocalUrl(file);
69
		}, function(err) {
70
			console.log(JSON.stringify(err));
71
		}, {
72
			filter: 'image',
73
			multiple: false
74
		});
75
	}
76

77
	function changeToLocalUrl(path) {
78
		plus.io.resolveLocalFileSystemURL(path, function(entry) {
79
			mui.openWindow({
80
				url: '../html/picture-upload.html',
81
				id: 'html/picture-upload.html',
82
				show: {
83
					aniShow: "slide-in-right"
84
				},
85
				extras: {
86
					imgurl: entry.toLocalURL(),
87
				}
88
			});
89
		});
90
	}
91

92
})