Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小浣熊撸代码
uni-app
提交
96976b89
U
uni-app
项目概览
小浣熊撸代码
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
96976b89
编写于
3月 24, 2022
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: build
上级
2c51f0b3
变更
3
展开全部
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
22 deletion
+38
-22
packages/uni-app-plus/dist/index.v3.js
packages/uni-app-plus/dist/index.v3.js
+35
-19
packages/uni-app-plus/dist/view.umd.min.js
packages/uni-app-plus/dist/view.umd.min.js
+2
-2
packages/uni-mp-toutiao/dist/index.js
packages/uni-mp-toutiao/dist/index.js
+1
-1
未找到文件。
packages/uni-app-plus/dist/index.v3.js
浏览文件 @
96976b89
...
@@ -5756,14 +5756,14 @@ var serviceContext = (function () {
...
@@ -5756,14 +5756,14 @@ var serviceContext = (function () {
class Page {
class Page {
constructor (webview) {
constructor (webview) {
this.webview = webview;
this.webview = webview;
}
}
sendMessage (data) {
sendMessage (data) {
const message = {
const message =
JSON.parse(JSON.stringify((
{
__message: {
__message: {
data
data
}
}
};
}
)))
;
const id = this.webview.id;
const id = this.webview.id;
if (BroadcastChannel_) {
if (BroadcastChannel_) {
const channel = new BroadcastChannel_(id);
const channel = new BroadcastChannel_(id);
...
@@ -5771,7 +5771,7 @@ var serviceContext = (function () {
...
@@ -5771,7 +5771,7 @@ var serviceContext = (function () {
} else {
} else {
plus_.webview.postMessageToUniNView(message, id);
plus_.webview.postMessageToUniNView(message, id);
}
}
}
}
close () {
close () {
this.webview.close();
this.webview.close();
...
@@ -5810,7 +5810,8 @@ var serviceContext = (function () {
...
@@ -5810,7 +5810,8 @@ var serviceContext = (function () {
animationType: 'pop-in',
animationType: 'pop-in',
animationDuration: 200,
animationDuration: 200,
uniNView: {
uniNView: {
path: `${(typeof process === 'object' && process.env && process.env.VUE_APP_TEMPLATE_PATH) || ''}/${url}.js`,
// eslint-disable-next-line
path: `${typeof VUE_APP_TEMPLATE_PATH === 'string' ? VUE_APP_TEMPLATE_PATH : ''}/${url}.js`,
defaultFontSize: 16,
defaultFontSize: 16,
viewport: plus_.screen.resolutionWidth
viewport: plus_.screen.resolutionWidth
}
}
...
@@ -6847,11 +6848,11 @@ var serviceContext = (function () {
...
@@ -6847,11 +6848,11 @@ var serviceContext = (function () {
},
},
popGesture: 'close',
popGesture: 'close',
backButtonAutoControl: 'close'
backButtonAutoControl: 'close'
},
},
onClose () {
onClose () {
invoke$1(callbackId, {
invoke$1(callbackId, {
errMsg: 'openLocation:fail cancel'
errMsg: 'openLocation:fail cancel'
});
});
}
}
});
});
return {
return {
...
@@ -7976,7 +7977,8 @@ var serviceContext = (function () {
...
@@ -7976,7 +7977,8 @@ var serviceContext = (function () {
function login (params, callbackId, plus = true) {
function login (params, callbackId, plus = true) {
const provider = params.provider || 'weixin';
const provider = params.provider || 'weixin';
const errorCallback = warpErrorCallback(callbackId, 'login', plus);
const errorCallback = warpErrorCallback(callbackId, 'login', plus);
const authOptions = provider === 'apple'
const isAppleLogin = provider === 'apple';
const authOptions = isAppleLogin
? { scope: 'email' }
? { scope: 'email' }
: params.univerifyStyle
: params.univerifyStyle
? { univerifyStyle: univerifyButtonsClickHandling(params.univerifyStyle, errorCallback) }
? { univerifyStyle: univerifyButtonsClickHandling(params.univerifyStyle, errorCallback) }
...
@@ -7997,16 +7999,18 @@ var serviceContext = (function () {
...
@@ -7997,16 +7999,18 @@ var serviceContext = (function () {
}
}
service.login(res => {
service.login(res => {
const authResult = res.target.authResult;
const authResult = res.target.authResult;
const appleInfo = res.target.appleInfo;
_invoke(callbackId, {
_invoke(callbackId, {
code: authResult.code,
code: authResult.code,
authResult: authResult,
authResult: authResult,
appleInfo,
errMsg: 'login:ok'
errMsg: 'login:ok'
});
});
}, errorCallback, authOptions);
}, errorCallback, authOptions);
}
}
// 先注销再登录
// 先注销再登录
// apple登录logout之后无法重新触发获取email,fullname;一键登录无logout
// apple登录logout之后无法重新触发获取email,fullname;一键登录无logout
if (
provider === 'apple'
|| provider === 'univerify') {
if (
isAppleLogin
|| provider === 'univerify') {
login();
login();
} else {
} else {
service.logout(login, login);
service.logout(login, login);
...
@@ -8336,7 +8340,10 @@ var serviceContext = (function () {
...
@@ -8336,7 +8340,10 @@ var serviceContext = (function () {
imageUrl,
imageUrl,
mediaUrl: media,
mediaUrl: media,
scene,
scene,
miniProgram
miniProgram,
openCustomerServiceChat,
corpid,
customerUrl: url
} = args;
} = args;
if (typeof imageUrl === 'string' && imageUrl) {
if (typeof imageUrl === 'string' && imageUrl) {
...
@@ -8357,7 +8364,10 @@ var serviceContext = (function () {
...
@@ -8357,7 +8364,10 @@ var serviceContext = (function () {
miniProgram,
miniProgram,
extra: {
extra: {
scene
scene
}
},
openCustomerServiceChat,
corpid,
url
};
};
if (provider === 'weixin' && (type === 1 || type === 2)) {
if (provider === 'weixin' && (type === 1 || type === 2)) {
delete sendMsg.thumbs;
delete sendMsg.thumbs;
...
@@ -8369,12 +8379,18 @@ var serviceContext = (function () {
...
@@ -8369,12 +8379,18 @@ var serviceContext = (function () {
const sendShareMsg = function (service, params, callbackId, method = 'share') {
const sendShareMsg = function (service, params, callbackId, method = 'share') {
const errorCallback = warpPlusErrorCallback(callbackId, method);
const errorCallback = warpPlusErrorCallback(callbackId, method);
const serviceMethod = params.openCustomerServiceChat ? 'openCustomerServiceChat' : 'send';
service.send(params, () => {
try {
invoke$1(callbackId, {
service[serviceMethod](params, () => {
errMsg: method + ':ok'
invoke$1(callbackId, {
errMsg: method + ':ok'
});
}, errorCallback);
} catch (error) {
errorCallback({
message: `${params.provider} ${serviceMethod} 方法调用失败`
});
});
}
, errorCallback);
}
};
};
function shareAppMessageDirectly ({
function shareAppMessageDirectly ({
...
...
packages/uni-app-plus/dist/view.umd.min.js
浏览文件 @
96976b89
此差异已折叠。
点击以展开。
packages/uni-mp-toutiao/dist/index.js
浏览文件 @
96976b89
...
@@ -1170,7 +1170,7 @@ function initTriggerEvent (mpInstance) {
...
@@ -1170,7 +1170,7 @@ function initTriggerEvent (mpInstance) {
function
initHook
(
name
,
options
,
isComponent
)
{
function
initHook
(
name
,
options
,
isComponent
)
{
{
{
// fix by Lxh 字节自定义组件Component构造器文档上写有created,但是实测只触发了lifetimes上的created
// fix by Lxh 字节自定义组件Component构造器文档上写有created,但是实测只触发了lifetimes上的created
isComponent
&&
(
options
=
options
.
lifetimes
);
isComponent
&&
options
.
lifetimes
&&
options
.
lifetimes
[
name
]
&&
(
options
=
options
.
lifetimes
);
}
}
const
oldHook
=
options
[
name
];
const
oldHook
=
options
[
name
];
if
(
!
oldHook
)
{
if
(
!
oldHook
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录