解决冲突,合并我的名片代码
Showing
components/listItem/listItem.vue
0 → 100644
myPackageA/businessCard/businessCard.vue
0 → 100644
This diff is collapsed.
Click to expand it.
myPackageA/noBusinessCard/noBusinessCard.vue
0 → 100644
This diff is collapsed.
Click to expand it.
myPackageA/static/images/cardBg.png
0 → 100644
9.29 KB
myPackageA/static/images/cardLogo.png
0 → 100644
12.1 KB
This diff is collapsed.
Click to expand it.
| ... | ... | @@ -25,7 +25,7 @@ |
| "mp-painter": "^1.0.1", | ||
| "nanoid": "^4.0.0", | ||
| "pdf.js": "^0.1.0", | ||
| "pdfjs-dist": "^2.11.338", | ||
| "pdfjs-dist": "^3.11.174", | ||
| "qrcode": "^1.5.4", | ||
| "qrcodejs2": "^0.0.2", | ||
| "uqrcodejs": "^4.0.7", | ||
| ... | ... |
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
No preview for this file type
No preview for this file type
No preview for this file type
uni_modules/uni-badge/changelog.md
0 → 100644
uni_modules/uni-badge/package.json
0 → 100644
uni_modules/uni-badge/readme.md
0 → 100644
uni_modules/uni-card/changelog.md
0 → 100644
uni_modules/uni-card/package.json
0 → 100644
uni_modules/uni-card/readme.md
0 → 100644
uni_modules/uni-file-picker/changelog.md
0 → 100644
This diff is collapsed.
Click to expand it.
uni_modules/uni-file-picker/package.json
0 → 100644
uni_modules/uni-file-picker/readme.md
0 → 100644
uni_modules/uni-list/changelog.md
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
uni_modules/uni-list/package.json
0 → 100644
uni_modules/uni-list/readme.md
0 → 100644
uni_modules/uni-segmented-control/readme.md
0 → 100644
Please
register
or
sign in
to comment