@@ -26,7 +26,7 @@ var ArrayProto = Array.prototype,
2626 slice = ArrayProto . slice ,
2727 toString = ObjProto . toString ,
2828 hasOwnProperty = ObjProto . hasOwnProperty ,
29- LIB_VERSION = '1.10.1 ' ,
29+ LIB_VERSION = '1.10.2 ' ,
3030 LIB_NAME = 'MiniProgram' ;
3131
3232var source_channel_standard = 'utm_source utm_medium utm_campaign utm_content utm_term' ;
@@ -164,8 +164,7 @@ logger.info = function () {
164164 _ . extend = function ( obj ) {
165165 each ( slice . call ( arguments , 1 ) , function ( source ) {
166166 for ( var prop in source ) {
167- if ( source [ prop ] !==
168- void 0 ) {
167+ if ( source [ prop ] !== void 0 ) {
169168 obj [ prop ] = source [ prop ] ;
170169 }
171170 }
@@ -1116,7 +1115,7 @@ sa.initial = function () {
11161115
11171116sa . init = function ( obj ) {
11181117 if ( _ . isObject ( obj ) ) {
1119- sa . para = obj ;
1118+ sa . para = _ . extend ( sa . para , obj ) ;
11201119 }
11211120 sa . initialState . storeIsComplete = true ;
11221121 sa . initialState . checkIsComplete ( ) ;
@@ -1239,12 +1238,17 @@ sa.setOpenid = function (openid, isCover) {
12391238} ;
12401239
12411240sa . initWithOpenid = function ( options ) {
1242- options = options || { } ;
1241+ if ( _ . isObject ( options ) ) {
1242+ options = _ . extend ( sa . para , options ) ;
1243+ } else {
1244+ options = { } ;
1245+ }
1246+ //options = options || {};
12431247 sa . openid . getOpenid ( function ( openid ) {
12441248 if ( openid ) {
12451249 sa . setOpenid ( openid , options . isCoverLogin ) ;
12461250 }
1247- sa . init ( ) ;
1251+ sa . init ( options ) ;
12481252 } ) ;
12491253
12501254} ;
0 commit comments