+ 1 - 1
ipu-server/web/res/js/ui/wm-popup.js

@ -1,4 +1,4 @@
1
define(["module","tap"],function(module,tap){
1
define(["module","tap","jcl"],function(module,tap,$){
2 2
	var popup;
3 3
	function createNew(popupDom) {
4 4
		popup = typeof popupDom == 'object' ? popupDom : document.getElementById(popupDom);

update · f5e9627ed1 - Nuosi Git Service
kevin 7 years ago
parent
commit
f5e9627ed1

+ 16 - 0
IpuCommon/Frameworks/WadeMobileFunc.framework/Headers/WDFMobileMail.h

@ -0,0 +1,16 @@
1
//
2
//  WDFMobilePush.h
3
//  WadeMobileFunc
4
//
5
//  Created by tony on 16/6/2.
6
//  Copyright © 2016年 asiainfo. All rights reserved.
7
//
8
9
#import <WadeMobile/WDPlugin.h>
10
11
@interface WDFMobileMail : WDPlugin
12
13
//设置回填函数
14
- (void) shareImageBymail:(NSArray *)args;
15
16
@end

+ 6 - 0
IpuCommon/Frameworks/WadeMobileFunc.framework/Headers/WDFMobileUI.h

@ -24,7 +24,13 @@
24 24
/**关闭新webview中打开的页面*/
25 25
-(void) closeCurrentPage:(NSArray*)param;
26 26
27
//打开对话框,供外部接口(JS)调用
27 28
-(void) openDialog:(NSArray*)param;
29
/*
30
 * 打开对话框,供内部接口(OC)调用
31
 * pageAction 页面名称、pagePram 参数、wRati 宽度比率(相对于整个屏幕)、hRatio 高度比率(相对于整个屏幕)
32
 */
33
- (void) openDialog:(NSString *)pageAction params:(WDDataMap *)pageParam wRatio:(double)wRatio hRatio:(double)hRatio;
28 34
29 35
-(void) closeDialog:(NSArray*)param;
30 36

BIN
IpuCommon/Frameworks/WadeMobileFunc.framework/Info.plist


BIN
IpuCommon/Frameworks/WadeMobileFunc.framework/WadeMobileFunc


+ 2 - 0
IpuCommon/Frameworks/WadeMobileUI.framework/Headers/WDDialogViewController.h

@ -11,6 +11,8 @@
11 11
12 12
@interface WDDialogViewController : WDTemplateController
13 13
14
//设置宽、高 比率
15
- (instancetype) initWithWRatio:(double)widthRatio hRatio:(double)heightRatio;
14 16
15 17
@property(nonatomic,strong)NSString* pageAction;
16 18

BIN
IpuCommon/Frameworks/WadeMobileUI.framework/Info.plist


BIN
IpuCommon/Frameworks/WadeMobileUI.framework/WadeMobileUI


+ 8 - 2
WadeMobileFunc/WadeMobileFunc.xcodeproj/project.pbxproj

@ -665,7 +665,10 @@
665 665
		E2DE1AEB1B42DD9500762141 /* Debug */ = {
666 666
			isa = XCBuildConfiguration;
667 667
			buildSettings = {
668
				ARCHS = "$(ARCHS_STANDARD)";
668
				ARCHS = (
669
					"$(ARCHS_STANDARD)",
670
					armv7s,
671
				);
669 672
				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
670 673
				DEFINES_MODULE = YES;
671 674
				DEVELOPMENT_TEAM = "";
@ -701,7 +704,10 @@
701 704
		E2DE1AEC1B42DD9500762141 /* Release */ = {
702 705
			isa = XCBuildConfiguration;
703 706
			buildSettings = {
704
				ARCHS = "$(ARCHS_STANDARD)";
707
				ARCHS = (
708
					"$(ARCHS_STANDARD)",
709
					armv7s,
710
				);
705 711
				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
706 712
				DEFINES_MODULE = YES;
707 713
				DEVELOPMENT_TEAM = "";

+ 1 - 1
WadeMobileFunc/WadeMobileFunc/WDFMobileUI.h

@ -30,7 +30,7 @@
30 30
 * 打开对话框,供内部接口(OC)调用
31 31
 * pageAction 页面名称、pagePram 参数、wRati 宽度比率(相对于整个屏幕)、hRatio 高度比率(相对于整个屏幕)
32 32
 */
33
- (void) openDialog:(NSString *)pageAction params:(NSDictionary *)pageParam wRatio:(int)wRatio hRatio:(int)hRatio;
33
- (void) openDialog:(NSString *)pageAction params:(WDDataMap *)pageParam wRatio:(double)wRatio hRatio:(double)hRatio;
34 34
35 35
-(void) closeDialog:(NSArray*)param;
36 36

+ 3 - 3
WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m

@ -82,8 +82,8 @@
82 82
            pageParam = [[WDDataMap alloc] initWithString:param[1]];
83 83
        }
84 84
    }
85
    int wRatio = [param[2] intValue];
86
    int hRatio = [param[3] intValue];
85
    int wRatio = [param[2] doubleValue];
86
    int hRatio = [param[3] doubleValue];
87 87
    
88 88
    //展示视图
89 89
    [self openDialog:pageAction params:pageParam wRatio:wRatio hRatio:hRatio];
@ -95,7 +95,7 @@
95 95
 * @param : wRatio     宽度比率(相对于整个屏幕)
96 96
 * @param : hRatio     高度比率(相对于整个屏幕)
97 97
 */
98
- (void) openDialog:(NSString *)pageAction params:(NSDictionary *)pageParam wRatio:(int)wRatio hRatio:(int)hRatio{
98
- (void) openDialog:(NSString *)pageAction params:(WDDataMap *)pageParam wRatio:(double)wRatio hRatio:(double)hRatio{
99 99
    
100 100
    UIViewController *rootCtrl = [self getViewController];
101 101
    if (rootCtrl.presentedViewController) {