wangyj18 9 年 前
コミット
f520af855e
共有33 個のファイルを変更した41 個の追加37 個の削除を含む
  1. 5 1
      display-server/etc/server-page.xml
  2. 1 1
      display-server/web/biz/js/more/chart/ChartIndex.js
  3. 1 1
      display-server/web/biz/js/more/push/Chat.js
  4. 1 1
      display-server/web/biz/js/more/push/Push.js
  5. 1 1
      display-server/web/biz/js/more/scene/demo/Demo.js
  6. 1 1
      display-server/web/biz/js/more/scene/demo/DemoAdd.js
  7. 2 2
      display-server/web/biz/js/more/scene/demo/DemoDetail.js
  8. 1 1
      display-server/web/biz/js/more/scene/pageRefresh.js
  9. 1 1
      display-server/web/biz/js/more/scene/templateRefresh.js
  10. 1 1
      display-server/web/biz/js/plugin/basic.js
  11. 1 1
      display-server/web/biz/js/plugin/contacts.js
  12. 1 1
      display-server/web/biz/js/plugin/database.js
  13. 1 1
      display-server/web/biz/js/plugin/hammer.js
  14. 1 1
      display-server/web/biz/js/plugin/map.js
  15. 1 1
      display-server/web/biz/js/plugin/photo.js
  16. 1 1
      display-server/web/biz/js/plugin/qr.js
  17. 1 1
      display-server/web/biz/js/plugin/storage.js
  18. 1 1
      display-server/web/biz/js/plugin/ui/ui.js
  19. 1 1
      display-server/web/biz/js/plugin/uploaddownload.js
  20. 1 1
      display-server/web/biz/js/tag/WmDropmenu.js
  21. 1 1
      display-server/web/biz/js/tag/WmSlider.js
  22. 1 1
      display-server/web/biz/js/tag/WmSwitch.js
  23. 1 1
      display-server/web/biz/js/ui/button.js
  24. 1 1
      display-server/web/biz/js/ui/ui.js
  25. 4 4
      display-server/web/res/css/base.css
  26. 1 1
      display-server/web/res/js/require-config.js
  27. 1 1
      display-server/web/res/js/ui/wm-refresh.js
  28. 1 1
      display-server/web/template/webapp/more/scene/Scene.html
  29. 1 1
      display-server/web/template/webapp/plugin/UI/UI-CustomWindow.html
  30. 1 1
      display-server/web/template/webapp/tag/WmProgress.html
  31. 1 1
      display-server/web/template/webapp/tag/WmSegment.html
  32. 1 1
      display-server/web/template/webapp/tag/WmSegmentSrc.html
  33. 1 1
      display-server/web/template/webapp/tag/WmToolTip.html

+ 5 - 1
display-server/etc/server-page.xml

@ -91,13 +91,17 @@
91 91
 	<action name="EchartsLine" template="template/webapp/more/chart/echarts/EchartsLine.html"></action>
92 92
 	<action name="EchartsHistogram" template="template/webapp/more/chart/echarts/EchartsHistogram.html"></action>
93 93
 	<action name="EchartsPie" template="template/webapp/more/chart/echarts/EchartsPie.html"></action>
94
 	<action name="EchartsDashboard" template="template/webapp/more/chart/echarts/EchartsDashboard.html"></action>
95 94
 	<!-- Highcharts -->
96 95
 	<action name="HighchartsLine" template="template/webapp/more/chart/highcharts/HighchartsLine.html"></action>
97 96
 	<action name="HighchartsHistogram" template="template/webapp/more/chart/highcharts/HighchartsHistogram.html"></action>
98 97
 	<action name="HighchartsPie" template="template/webapp/more/chart/highcharts/HighchartsPie.html"></action>
99 98
 	<action name="HighchartsPie-3d" template="template/webapp/more/chart/highcharts/HighchartsPie-3d.html"></action>
100 99
 	<action name="HighchartsDashboard" template="template/webapp/more/chart/highcharts/HighchartsDashboard.html"></action>
100
 	<!-- icharts -->
101
 	<action name="ichartsLine" template="template/webapp/more/chart/icharts/ichartsLine.html"></action>
102
 	<action name="ichartsHistogram" template="template/webapp/more/chart/icharts/ichartsHistogram.html"></action>
103
 	<action name="ichartsPie" template="template/webapp/more/chart/icharts/ichartsPie.html"></action>
104
 	<action name="ichartsPie-3d" template="template/webapp/more/chart/icharts/ichartsPie-3d.html"></action>
101 105
 	
102 106
 	<!-- 模板语法 -->
103 107
 	<action name="Syntax" template="template/webapp/more/syntax/Syntax.html"></action>

+ 1 - 1
display-server/web/biz/js/more/chart/ChartIndex.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","mobile","util"],function(doc, Mobile) {
2
	new iScroll("#content",{scrollbars:true});
2
	new iScroll("content",{scrollbars:true});
3 3
	
4 4
	var echartsMenus =$("#EchartsMenus").children("li");
5 5
	$.each(echartsMenus,function(index,item){

+ 1 - 1
display-server/web/biz/js/more/push/Chat.js

@ -27,7 +27,7 @@ require(["domReady!","wadeMobile","mobile","util"],function(doc,WadeMobile,Mobil
27 27
		return format;
28 28
	}
29 29
	
30
	var iscroll = new iScroll("#content");
30
	var iscroll = new iScroll("content");
31 31
	
32 32
	/*接受信息的处理方法*/
33 33
	window.receiveMessage = function(msg){

+ 1 - 1
display-server/web/biz/js/more/push/Push.js

@ -21,7 +21,7 @@ require(["domReady!","wadeMobile","mobile","util"],function(doc,WadeMobile,Mobil
21 21
			param.put("ONLINE_STAFFS",params);
22 22
			Mobile.getTemplate("OnlineList",param.toString(),function(html){
23 23
				$("#content").html(html);
24
				new iScroll("#content");
24
				new iScroll("content");
25 25
				$("#refresh").tap(function(){
26 26
					refreshOnlineList();
27 27
				});

+ 1 - 1
display-server/web/biz/js/more/scene/demo/Demo.js

@ -1,5 +1,5 @@
1 1
require(["mobile","common","hammer","handlebars","util"],function(Mobile,Common,Hammer,Handlebars){	
2
	var iscroll = new iScroll("#scroll");
2
	var iscroll = new iScroll("scroll");
3 3
	
4 4
	var currentPage = 1;
5 5
	var PageSize = 5;

+ 1 - 1
display-server/web/biz/js/more/scene/demo/DemoAdd.js

@ -1,5 +1,5 @@
1 1
require(["mobile","common","hammer","util"],function(Mobile,Common,Hammer){	
2
	var iscroll = new iScroll("#content");
2
	var iscroll = new iScroll("content");
3 3
	
4 4
	// 保存
5 5
	$("#save,.save-btn").tap(function() {

+ 2 - 2
display-server/web/biz/js/more/scene/demo/DemoDetail.js

@ -19,7 +19,7 @@ require(["mobile","common","hammer","handlebars","util"],function(Mobile,Common,
19 19
		var html = Handlebars.compile($("#T_infoDetail").val())(jsonData);
20 20
		$("#content").empty();
21 21
		$("#content").append($(html));
22
		var iscroll = new iScroll("#content");
22
		var iscroll = new iScroll("content");
23 23
		iscroll.refresh();
24 24
		
25 25
		// 编辑状态更改为详情状态
@ -45,7 +45,7 @@ require(["mobile","common","hammer","handlebars","util"],function(Mobile,Common,
45 45
		var html = Handlebars.compile($("#T_infoEdit").val())(jsonData);
46 46
		$("#content").empty();
47 47
		$("#content").append($(html));
48
		var iscroll = new iScroll("#content");
48
		var iscroll = new iScroll("content");
49 49
		iscroll.refresh();
50 50
		
51 51
		// 详情状态更改为编辑状态

+ 1 - 1
display-server/web/biz/js/more/scene/pageRefresh.js

@ -5,7 +5,7 @@ require(["wmTabbar","common","mobile","util"], function(WmTabbar,Common,Mobile)
5 5
		param.put("id", $(this).data("id"));
6 6
		Mobile.getPage("PageRefresh.PersonDetailTemplateMore", param.toString(), function(html){
7 7
			$("#content2").html(html);
8
			new iScroll("#content2");
8
			new iScroll("content2");
9 9
		});
10 10
	});
11 11
	

+ 1 - 1
display-server/web/biz/js/more/scene/templateRefresh.js

@ -8,7 +8,7 @@ require(["wmTabbar","common","mobile","util"], function(WmTabbar,Common,Mobile)
8 8
		param.put("gender",  $(this).children().eq(2).text());
9 9
		Mobile.getTemplate("TemplateRefresh.PersonDetailTemplate", param.toString(), function(html){
10 10
			$("#content2").html(html);
11
			new iScroll("#content2");
11
			new iScroll("content2");
12 12
		});
13 13
	});
14 14
	

+ 1 - 1
display-server/web/biz/js/plugin/basic.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
2
	new iScroll("#content");
2
	new iScroll("content");
3 3
	// 调用手机拨打电话
4 4
	$("#call").tap(function() {
5 5
		// 电话号码

+ 1 - 1
display-server/web/biz/js/plugin/contacts.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
2
	var iscroll=new iScroll("#content");
2
	var iscroll=new iScroll("content");
3 3
	
4 4
	$("#getContactDetail").tap(function(){
5 5
		WadeMobile.getContacts(function(str){

+ 1 - 1
display-server/web/biz/js/plugin/database.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","mobile", "util"], function(doc,Mobile) {
2
	new iScroll("#content");
2
	new iScroll("content");
3 3
	
4 4
	var dbName = "display", tableName = "student";
5 5
	//数据信息

+ 1 - 1
display-server/web/biz/js/plugin/hammer.js

@ -1,5 +1,5 @@
1 1
require([ "domReady!", "mobile", "hammer", "jquery", "util" ], function(doc, Mobile, Hammer, jQuery) {
2
	new iScroll("#content");
2
	new iScroll("content");
3 3
	
4 4
	// rotate
5 5
	var rotateHam = new Hammer($(".rotate")[0], {

+ 1 - 1
display-server/web/biz/js/plugin/map.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
2
	var iscroll=new iScroll("#content");
2
	var iscroll=new iScroll("content");
3 3
	// 获取当前位置(定位)
4 4
	$("#location").tap(function(){
5 5
		WadeMobile.loadingStart("正在定位");

+ 1 - 1
display-server/web/biz/js/plugin/photo.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
2
	var iscroll = new iScroll("#content");
2
	var iscroll = new iScroll("content");
3 3
	
4 4
	// 调用手机的照相功能,返回相片的路径或相片的Base64编码
5 5
	$("#tack_a_picture").tap(function() {

+ 1 - 1
display-server/web/biz/js/plugin/qr.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
2
	var iscroll=new iScroll("#content");
2
	var iscroll=new iScroll("content");
3 3
	$("#scan").tap(function() {
4 4
		WadeMobile.scanQrCode(function(result){
5 5
			$("#result").html(result);

+ 1 - 1
display-server/web/biz/js/plugin/storage.js

@ -1,6 +1,6 @@
1 1
require(["domReady!","mobile","wmPopup","util"], function(doc,Mobile,wmPopup) {
2 2
	var popup = new wmPopup("editPopup","confirm","cancel","add2","add1");
3
	var iscroll = new iScroll("#content");
3
	var iscroll = new iScroll("content");
4 4
	var Flag0={
5 5
			"key1":false,
6 6
			"key2":false,

+ 1 - 1
display-server/web/biz/js/plugin/ui/ui.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","wadeMobile","mobile","util"], function(doc,WadeMobile,Mobile) {
2
	new iScroll("#content");
2
	new iScroll("content");
3 3
	$("#progressBar").tap(function() {
4 4
		WadeMobile.loadingStart('加载中……', '进度条');
5 5
		// 关闭进度条

+ 1 - 1
display-server/web/biz/js/plugin/uploaddownload.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","wadeMobile", "util"], function(doc,WadeMobile) {
2
	var iscroll = new iScroll("#content");
2
	var iscroll = new iScroll("content");
3 3
	var picPath = "picture/my.png";
4 4
	
5 5
	/**

+ 1 - 1
display-server/web/biz/js/tag/WmDropmenu.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","mobile","util"],function(doc,Mobile){
2
	new iScroll("#content",{tap:true,scrollbars: true,useTransform:false});//增加页面滑动效果
2
	new iScroll("content",{tap:true,scrollbars: true,useTransform:false});//增加页面滑动效果
3 3
	$("#testSwitch").tap(function() {
4 4
		var dropmenu = WmWebUI.select("myDropmenu");
5 5
		var that = this;

+ 1 - 1
display-server/web/biz/js/tag/WmSlider.js

@ -19,5 +19,5 @@ require([ "domReady!", "util"], function(doc) {
19 19
			that.html("停止自动播放")
20 20
		}
21 21
	});
22
	new iScroll("#content",{tap:true,scrollbars: true});
22
	new iScroll("content",{tap:true,scrollbars: true});
23 23
});

+ 1 - 1
display-server/web/biz/js/tag/WmSwitch.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","mobile","util"],function(doc,Mobile){
2
	new iScroll("#content",{tap:true,scrollbars: true});
2
	new iScroll("content",{tap:true,scrollbars: true});
3 3
	/*开关打开和关闭*/
4 4
	$("#testSwitch").tap( function(){
5 5
		var mySwitch = WmWebUI.select("mySwitch");

+ 1 - 1
display-server/web/biz/js/ui/button.js

@ -1,5 +1,5 @@
1 1
require(["domReady!","util"], function(doc,util) {
2
	new iScroll("#content");
2
	new iScroll("content");
3 3
	/*也可以通过标签属性ontap=";"来展示触感,使用ontap演示*/
4 4
	//$("#title_button").tap(function(){});
5 5
	//$("#icon_button").tap(function(){});

+ 1 - 1
display-server/web/biz/js/ui/ui.js

@ -1,3 +1,3 @@
1 1
require(["domReady!","util"], function(doc,util) {
2
	new iScroll("#content");
2
	new iScroll("content");
3 3
});

+ 4 - 4
display-server/web/res/css/base.css

@ -243,10 +243,10 @@ a { text-decoration:none;}
243 243
.e_button { display:inline-block; height:0.3rem; line-height:0.3rem; border-radius:0.15rem; background:#333; padding:0 0.18rem; white-space:nowrap; color:#fff;}
244 244
.e_button [class^="e_ico"] { vertical-align:top;}
245 245
.e_button-singleIco { padding:0; width:0.3rem; text-align:center;margin-top:0.1rem;}/*添加的小按钮*/
246
.e_button-ok { background:#8fc320; color:#fff; padding:0 0.35rem; border-radius:0.05rem; text-align:center; box-sizing:border-box; -webkit-box-sizing:border-box; border:1px solid #6a940d; line-height:0.6rem; font-size:0.24rem; height:0.6rem; box-shadow:inset 0 -0.02rem 0 0 #5b7e11;}
247
.e_button-cancel { background:#f7f7f7; padding:0 0.35rem; border-radius:0.05rem; text-align:center; box-sizing:border-box; -webkit-box-sizing:border-box; border:1px solid #ccc; line-height:0.6rem; font-size:0.24rem; height:0.6rem; box-shadow:inset 0 -0.02rem 0 0 #bbb; color:#333;}
248
.e_button-red { background:#e40177; padding:0 0.35rem; border-radius:0.05rem; text-align:center; box-sizing:border-box; -webkit-box-sizing:border-box; border:1px solid #8c1a55; line-height:0.6rem; font-size:0.24rem; height:0.6rem; box-shadow:inset 0 -0.02rem 0 0 #8c1a55; color:#fff;}
249
.e_button-blue { background:#0085d0; padding:0 0.35rem; border-radius:0.05rem; text-align:center; box-sizing:border-box; -webkit-box-sizing:border-box; border:1px solid #1a5c81; line-height:0.6rem; font-size:0.24rem; height:0.6rem; box-shadow:inset 0 -0.02rem 0 0 #1a5c81; color:#fff;}
246
.e_button-ok { background:#8fc320; color:#fff; padding:0 0.25rem; border-radius:0.05rem; text-align:center; box-sizing:border-box; -webkit-box-sizing:border-box; border:1px solid #6a940d; line-height:0.6rem; font-size:0.24rem; height:0.6rem; box-shadow:inset 0 -0.02rem 0 0 #5b7e11;}
247
.e_button-cancel { background:#f7f7f7; padding:0 0.25rem; border-radius:0.05rem; text-align:center; box-sizing:border-box; -webkit-box-sizing:border-box; border:1px solid #ccc; line-height:0.6rem; font-size:0.24rem; height:0.6rem; box-shadow:inset 0 -0.02rem 0 0 #bbb; color:#333;}
248
.e_button-red { background:#e40177; padding:0 0.25rem; border-radius:0.05rem; text-align:center; box-sizing:border-box; -webkit-box-sizing:border-box; border:1px solid #8c1a55; line-height:0.6rem; font-size:0.24rem; height:0.6rem; box-shadow:inset 0 -0.02rem 0 0 #8c1a55; color:#fff;}
249
.e_button-blue { background:#0085d0; padding:0 0.25rem; border-radius:0.05rem; text-align:center; box-sizing:border-box; -webkit-box-sizing:border-box; border:1px solid #1a5c81; line-height:0.6rem; font-size:0.24rem; height:0.6rem; box-shadow:inset 0 -0.02rem 0 0 #1a5c81; color:#fff;}
250 250
.e_button.active { opacity:0.6;}
251 251
.e_button-ok.active { background:#6a940d; opacity:1;}
252 252
.e_button-cancel.active { background:#ccc; opacity:1;}

+ 1 - 1
display-server/web/res/js/require-config.js

@ -44,7 +44,7 @@ require.config({
44 44
		'zepto' : 'base/zepto/zepto.min-1.1.6',
45 45
		'handlebars' : 'base/handlebars/handlebars-4.0.5',
46 46
		'hammer' : 'base/hammer/hammer.min-2.0.8',
47
		'iScroll' : 'base/iscroll/iscroll-5.2.0',
47
		'iScroll' : 'base/iscroll/iscroll',
48 48
		'jquery' : 'base/jquery/jquery-1.12.4.min',
49 49
		
50 50
		'highcharts' : 'base/chart/highchart-4.2.5/highcharts',

+ 1 - 1
display-server/web/res/js/ui/wm-refresh.js

@ -44,7 +44,7 @@ define(["iScroll"], function(iScroll){
44 44
		pullDownOffset = pullDownEl.offsetHeight;
45 45
		pullUpEl = document.getElementById('pullUp');	
46 46
		pullUpOffset = pullUpEl.offsetHeight;
47
		var myScroll = new iScroll('#c-refresh-wrapper', {
47
		var myScroll = new iScroll('c-refresh-wrapper', {
48 48
		//	scrollbarClass: 'myScrollbar', /* 重要样式 */
49 49
			useTransition: true, /* 此属性不知用意,本人从true改为false */
50 50
			topOffset: pullDownOffset,

+ 1 - 1
display-server/web/template/webapp/more/scene/Scene.html

@ -102,7 +102,7 @@
102 102
</body>
103 103
<script type="text/javascript">
104 104
require(["mobile","iScroll","util"], function(Mobile,iScroll) {
105
	new iScroll("#content");
105
	new iScroll("content");
106 106
	
107 107
	$("#scene-menu > li").each(function(index, item) {
108 108
		if (item.getAttribute("action") != "null") {

+ 1 - 1
display-server/web/template/webapp/plugin/UI/UI-CustomWindow.html

@ -22,7 +22,7 @@
22 22
	</div>
23 23
	<div class="c_submit">
24 24
		<ul>
25
			<li><button class="e_button-ok" id="openWindow">新窗口</button></li>
25
			<li><button class="e_button-ok" id="openWindow">新窗口</button></li>
26 26
			<li><button class="e_button-cancel" id="return">返回</button></li>
27 27
			<li><button class="e_button-ok" id="cancel">取消</button></li>
28 28
		</ul>

+ 1 - 1
display-server/web/template/webapp/tag/WmProgress.html

@ -43,7 +43,7 @@
43 43
</div>
44 44
<script type="text/javascript">
45 45
require(["util","mobile"], function(util,Mobile) {
46
	new iScroll("#content");
46
	new iScroll("content");
47 47
});
48 48
</script>
49 49
</body>

+ 1 - 1
display-server/web/template/webapp/tag/WmSegment.html

@ -135,7 +135,7 @@
135 135

136 136
<script type="text/javascript">
137 137
require(["util","mobile"], function(util,Mobile) {
138
	new iScroll("#content");
138
	new iScroll("content");
139 139
	
140 140
	window.action = function(a,b){
141 141
		alert(a+b);

+ 1 - 1
display-server/web/template/webapp/tag/WmSegmentSrc.html

@ -188,7 +188,7 @@ require(["iScroll","wmSegment"],function(iScroll,WmSegment) {
188 188
// 	alert(segment.getValueByIndex(1));//根据index取segValue
189 189
  	segment.setAction("action");//选中项触发事件
190 190
  	
191
  	new iScroll("#iscroll-content");
191
  	new iScroll("iscroll-content");
192 192

193 193
});
194 194
</script>

+ 1 - 1
display-server/web/template/webapp/tag/WmToolTip.html

@ -53,7 +53,7 @@
53 53
</wm-tooltip>
54 54
<script type="text/javascript">
55 55
require(["util","mobile"], function(util,Mobile) {
56
	new iScroll("#content");
56
	new iScroll("content");
57 57
	/*	iscroll.refresh();*/
58 58
	window.action = function(a,b){
59 59
		alert("action");