Merge commit '0a251a21'
# Conflicts: # .DS_Store # manifest.json # package.json # pages.json # static/.DS_Store
Showing
{ | { | ||
"name": "shop_mobile_uni", | "name": "shop_mobile_uni", | ||
"version": "1.0.12", | "version": "1.0.13", | ||
"description": "谛宝多多商城", | "description": "谛宝多多商城", | ||
"scripts": { | "scripts": { | ||
"test": "echo \"Error: no test specified\" && exit 1", | "test": "echo \"Error: no test specified\" && exit 1", | ||
... | @@ -27,6 +27,7 @@ | ... | @@ -27,6 +27,7 @@ |
"dependencies": { | "dependencies": { | ||
"clipboard": "^2.0.6", | "clipboard": "^2.0.6", | ||
"jweixin-module": "^1.6.0", | "jweixin-module": "^1.6.0", | ||
"md5": "^2.2.1", | |||
"moment": "^2.24.0" | "moment": "^2.24.0" | ||
} | } | ||
} | } |
pages/setinfo/setinfo.vue
0 → 100644
2.42 KB