Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
d79b65c8
U
uni-app
项目概览
DCloud
/
uni-app
3 个月 前同步成功
通知
718
Star
38705
Fork
3642
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
7
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
7
Issue
7
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d79b65c8
编写于
9月 02, 2019
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/dcloudio/uni-app
into alpha
上级
f4460645
1573f1a1
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
38 addition
and
37 deletion
+38
-37
packages/uni-app-plus/dist/index.js
packages/uni-app-plus/dist/index.js
+5
-5
packages/uni-mp-alipay/dist/index.js
packages/uni-mp-alipay/dist/index.js
+5
-5
packages/uni-mp-baidu/dist/index.js
packages/uni-mp-baidu/dist/index.js
+5
-5
packages/uni-mp-qq/dist/index.js
packages/uni-mp-qq/dist/index.js
+5
-5
packages/uni-mp-toutiao/dist/index.js
packages/uni-mp-toutiao/dist/index.js
+5
-5
packages/uni-mp-weixin/dist/index.js
packages/uni-mp-weixin/dist/index.js
+5
-5
packages/vue-cli-plugin-uni/generator.js
packages/vue-cli-plugin-uni/generator.js
+3
-2
src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js
src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js
+5
-5
未找到文件。
packages/uni-app-plus/dist/index.js
浏览文件 @
d79b65c8
...
...
@@ -1112,7 +1112,11 @@ const hooks = [
function
parseBaseApp
(
vm
,
{
mocks
,
initRefs
})
{
})
{
if
(
vm
.
$options
.
store
)
{
Vue
.
prototype
.
$store
=
vm
.
$options
.
store
;
}
Vue
.
prototype
.
mpHost
=
"
app-plus
"
;
Vue
.
mixin
({
...
...
@@ -1136,10 +1140,6 @@ function parseBaseApp (vm, {
if
(
this
.
mpType
!==
'
app
'
)
{
initRefs
(
this
);
initMocks
(
this
,
mocks
);
}
else
{
if
(
this
.
$options
.
store
)
{
// vuex store
Vue
.
prototype
.
$store
=
this
.
$options
.
store
;
}
}
}
});
...
...
packages/uni-mp-alipay/dist/index.js
浏览文件 @
d79b65c8
...
...
@@ -1513,7 +1513,11 @@ const hooks = [
function
parseBaseApp
(
vm
,
{
mocks
,
initRefs
})
{
})
{
if
(
vm
.
$options
.
store
)
{
Vue
.
prototype
.
$store
=
vm
.
$options
.
store
;
}
Vue
.
prototype
.
mpHost
=
"
mp-alipay
"
;
Vue
.
mixin
({
...
...
@@ -1537,10 +1541,6 @@ function parseBaseApp (vm, {
if
(
this
.
mpType
!==
'
app
'
)
{
initRefs
(
this
);
initMocks
(
this
,
mocks
);
}
else
{
if
(
this
.
$options
.
store
)
{
// vuex store
Vue
.
prototype
.
$store
=
this
.
$options
.
store
;
}
}
}
});
...
...
packages/uni-mp-baidu/dist/index.js
浏览文件 @
d79b65c8
...
...
@@ -1258,7 +1258,11 @@ const hooks = [
function
parseBaseApp
(
vm
,
{
mocks
,
initRefs
})
{
})
{
if
(
vm
.
$options
.
store
)
{
Vue
.
prototype
.
$store
=
vm
.
$options
.
store
;
}
Vue
.
prototype
.
mpHost
=
"
mp-baidu
"
;
Vue
.
mixin
({
...
...
@@ -1282,10 +1286,6 @@ function parseBaseApp (vm, {
if
(
this
.
mpType
!==
'
app
'
)
{
initRefs
(
this
);
initMocks
(
this
,
mocks
);
}
else
{
if
(
this
.
$options
.
store
)
{
// vuex store
Vue
.
prototype
.
$store
=
this
.
$options
.
store
;
}
}
}
});
...
...
packages/uni-mp-qq/dist/index.js
浏览文件 @
d79b65c8
...
...
@@ -1176,7 +1176,11 @@ const hooks = [
function
parseBaseApp
(
vm
,
{
mocks
,
initRefs
})
{
})
{
if
(
vm
.
$options
.
store
)
{
Vue
.
prototype
.
$store
=
vm
.
$options
.
store
;
}
Vue
.
prototype
.
mpHost
=
"
mp-qq
"
;
Vue
.
mixin
({
...
...
@@ -1200,10 +1204,6 @@ function parseBaseApp (vm, {
if
(
this
.
mpType
!==
'
app
'
)
{
initRefs
(
this
);
initMocks
(
this
,
mocks
);
}
else
{
if
(
this
.
$options
.
store
)
{
// vuex store
Vue
.
prototype
.
$store
=
this
.
$options
.
store
;
}
}
}
});
...
...
packages/uni-mp-toutiao/dist/index.js
浏览文件 @
d79b65c8
...
...
@@ -1268,7 +1268,11 @@ const hooks = [
function
parseBaseApp
(
vm
,
{
mocks
,
initRefs
})
{
})
{
if
(
vm
.
$options
.
store
)
{
Vue
.
prototype
.
$store
=
vm
.
$options
.
store
;
}
Vue
.
prototype
.
mpHost
=
"
mp-toutiao
"
;
Vue
.
mixin
({
...
...
@@ -1292,10 +1296,6 @@ function parseBaseApp (vm, {
if
(
this
.
mpType
!==
'
app
'
)
{
initRefs
(
this
);
initMocks
(
this
,
mocks
);
}
else
{
if
(
this
.
$options
.
store
)
{
// vuex store
Vue
.
prototype
.
$store
=
this
.
$options
.
store
;
}
}
}
});
...
...
packages/uni-mp-weixin/dist/index.js
浏览文件 @
d79b65c8
...
...
@@ -1116,7 +1116,11 @@ const hooks = [
function
parseBaseApp
(
vm
,
{
mocks
,
initRefs
})
{
})
{
if
(
vm
.
$options
.
store
)
{
Vue
.
prototype
.
$store
=
vm
.
$options
.
store
;
}
Vue
.
prototype
.
mpHost
=
"
mp-weixin
"
;
Vue
.
mixin
({
...
...
@@ -1140,10 +1144,6 @@ function parseBaseApp (vm, {
if
(
this
.
mpType
!==
'
app
'
)
{
initRefs
(
this
);
initMocks
(
this
,
mocks
);
}
else
{
if
(
this
.
$options
.
store
)
{
// vuex store
Vue
.
prototype
.
$store
=
this
.
$options
.
store
;
}
}
}
});
...
...
packages/vue-cli-plugin-uni/generator.js
浏览文件 @
d79b65c8
module
.
exports
=
(
api
,
options
,
rootOptions
)
=>
{
let
version
=
'
*
'
if
(
require
(
'
./package.json
'
).
version
.
indexOf
(
'
alpha
'
)
!==
-
1
)
{
version
=
'
^2.0.0-alpha-22420190823001
'
const
mainVersion
=
require
(
'
./package.json
'
).
version
if
(
mainVersion
.
indexOf
(
'
alpha
'
)
!==
-
1
)
{
version
=
'
^
'
+
mainVersion
}
api
.
extendPackage
(
pkg
=>
{
delete
pkg
.
postcss
...
...
src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js
浏览文件 @
d79b65c8
...
...
@@ -15,7 +15,11 @@ const hooks = [
export
default
function
parseBaseApp
(
vm
,
{
mocks
,
initRefs
})
{
})
{
if
(
vm
.
$options
.
store
)
{
Vue
.
prototype
.
$store
=
vm
.
$options
.
store
}
Vue
.
prototype
.
mpHost
=
__PLATFORM__
Vue
.
mixin
({
...
...
@@ -39,10 +43,6 @@ export default function parseBaseApp (vm, {
if
(
this
.
mpType
!==
'
app
'
)
{
initRefs
(
this
)
initMocks
(
this
,
mocks
)
}
else
{
if
(
this
.
$options
.
store
)
{
// vuex store
Vue
.
prototype
.
$store
=
this
.
$options
.
store
}
}
}
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录