Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/pr-comment-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
}
})

let next_action = ''
let next_action = ''
if (isReviewer) {
const body = context.payload.comment.body
core.info(`body: ${body}`)
Expand All @@ -41,7 +41,7 @@ jobs:
}
if (body.startsWith('/update-snapshot')) {
next_action='update-snapshot'
}
}
} else {
core.warning('You are not collaborator');
}
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
**/*.md
**/*.md
src/_common
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
}
},
"lint-staged": {
"{src,example,script}/**/*.{js,ts,wxml,html,json,less}": [
"{src,example,script}/**/*.{js,ts,wxml,wxss,html,json,less}": [
"prettier --write"
],
"{src,example}/**/*.{js,ts}": [
Expand All @@ -127,4 +127,4 @@
"dayjs": "^1.10.7",
"tinycolor2": "^1.4.2"
}
}
}
4 changes: 2 additions & 2 deletions src/avatar/avatar.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ module.exports = {
},

getSize: function (size = 'medium', systemInfo) {
var res = getRegExp('^([0-9]+)(px|rpx)$').exec(size);;
var res = getRegExp('^([0-9]+)(px|rpx)$').exec(size);

if (res && res.length >= 3) {
var px = res[1];
if (res[2] === 'rpx') {
px = Math.floor((systemInfo.windowWidth * res[1]) / 750);
px = Math.floor((systemInfo.windowWidth * res[1]) / 750);
}

return 'width:' + size + ';height:' + size + ';font-size:' + ((px / 8) * 3 + 2) + 'px';
Expand Down
Loading