Skip to content

Feature/ttalipay #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 13, 2019
Merged

Feature/ttalipay #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7759d70
project init
hucq Jan 14, 2019
1566821
update: change api name
hucq Jan 15, 2019
efce620
fix: tt template
hucq Jan 17, 2019
08a3215
support alipay
Jan 30, 2019
5f2bc67
support alipay
Jan 30, 2019
092712b
bugfix: error message
hucq Feb 13, 2019
1bcf927
update remove debugger
hucq Feb 13, 2019
444b66f
mpvue： 2.0
hucq Feb 13, 2019
1665190
Merge branch 'master' into feature/ttalipay
hucq Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/mp-compiler/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const {

function genComponentMPML (compiled, options, emitFile, emitError, emitWarning, fileExt) {
options.components['slots'] = { src: '/components/slots', name: 'slots' }
const { code: mpmlContent, compiled: compiledResult, slots, importCode } = compiler.compileToWxml(compiled, options, fileExt)
const { code: mpmlContent, compiled: compiledResult, slots, importCode } = compiler.compileToMPML(compiled, options, fileExt)
const { mpErrors, mpTips } = compiledResult
// 缓存 slots，延迟编译
cacheSlots(slots, importCode)
Expand Down
14 changes: 14 additions & 0 deletions lib/mp-compiler/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ function genSWANML (templateName, src) {
return `<import src="${src}" /><template is="${templateName}" data="{{{ ...$root['0'], $root }}}"/>`
}

function genTTML (templateName, src) {
return `<import src="${src}" /><template is="${templateName}" data="{{ ...$root['0'], $root }}"/>`
}

function genMYML (templateName, src) {
return `<import src="${src}" /><template is="${templateName}" data="{{ ...$root['0'], $root }}"/>`
}

function genPageML (templateName, src, fileExt = {}) {
let code
switch (fileExt.platform) {
Expand All @@ -15,6 +23,12 @@ function genPageML (templateName, src, fileExt = {}) {
case 'wx':
code = genWXML(templateName, src)
break
case 'tt':
code = genTTML(templateName, src)
break
case 'my':
code = genMYML(templateName, src)
break
default:
code = genWXML(templateName, src)
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mpvue-loader",
"version": "1.2.2",
"version": "2.0.0",
"description": "mpvue single-file component loader for Webpack",
"main": "index.js",
"repository": {
Expand Down