C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git status
On branch login
Your branch is up to date with 'origin/login'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: src/components/Login.vue
modified: src/plugins/dist/element.dev.js
modified: src/plugins/dist/element.prod.js
modified: src/plugins/element.js
modified: src/router/index.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/components/Home.vue
src/router/dist/
no changes added to commit (use "git add" and/or "git commit -a")
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git add .
warning: LF will be replaced by CRLF in src/plugins/dist/element.dev.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in src/plugins/element.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in src/router/index.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in src/router/dist/index.dev.js.
The file will have its original line endings in your working directory
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git status
On branch login
Your branch is up to date with 'origin/login'.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: src/components/Home.vue
modified: src/components/Login.vue
modified: src/plugins/dist/element.dev.js
modified: src/plugins/dist/element.prod.js
modified: src/plugins/element.js
new file: src/router/dist/index.dev.js
new file: src/router/dist/index.prod.js
modified: src/router/index.js
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git commit -m "完成了登陸功能"
[login c1b53fb] 完成了登陸功能
8 files changed, 117 insertions(+), 7 deletions(-)
create mode 100644 src/components/Home.vue
create mode 100644 src/router/dist/index.dev.js
create mode 100644 src/router/dist/index.prod.js
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git branch
* login
master
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git branch
login
* master
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git merge login
Updating 1c1064c..c1b53fb
Fast-forward
.eslintrc.js | 15 +-
package-lock.json | 83 ++++++
package.json | 66 ++---
src/App.vue | 34 +--
src/assets/css/global.css | 9 +
src/assets/fonts/demo.css | 539 +++++++++++++++++++++++++++++++++++++++
src/assets/fonts/demo_index.html | 239 +++++++++++++++++
src/assets/fonts/iconfont.css | 29 +++
src/assets/fonts/iconfont.eot | Bin 0 -> 2744 bytes
src/assets/fonts/iconfont.js | 1 +
src/assets/fonts/iconfont.json | 30 +++
src/assets/fonts/iconfont.svg | 35 +++
src/assets/fonts/iconfont.ttf | Bin 0 -> 2576 bytes
src/assets/fonts/iconfont.woff | Bin 0 -> 1788 bytes
src/assets/fonts/iconfont.woff2 | Bin 0 -> 1336 bytes
src/components/HelloWorld.vue | 59 -----
src/components/Home.vue | 23 ++
src/components/Login.vue | 156 +++++++++++
src/dist/main.dev.js | 31 +++
src/dist/main.prod.js | 1 +
src/main.js | 20 +-
src/plugins/dist/element.dev.js | 18 ++
src/plugins/dist/element.prod.js | 1 +
src/plugins/element.js | 17 +-
src/router/dist/index.dev.js | 48 ++++
src/router/dist/index.prod.js | 1 +
src/router/index.js | 39 +--
src/views/About.vue | 5 -
src/views/Home.vue | 18 --
vue.config.js | 3 +
30 files changed, 1356 insertions(+), 164 deletions(-)
create mode 100644 src/assets/css/global.css
create mode 100644 src/assets/fonts/demo.css
create mode 100644 src/assets/fonts/demo_index.html
create mode 100644 src/assets/fonts/iconfont.css
create mode 100644 src/assets/fonts/iconfont.eot
create mode 100644 src/assets/fonts/iconfont.js
create mode 100644 src/assets/fonts/iconfont.json
create mode 100644 src/assets/fonts/iconfont.svg
create mode 100644 src/assets/fonts/iconfont.ttf
create mode 100644 src/assets/fonts/iconfont.woff
create mode 100644 src/assets/fonts/iconfont.woff2
delete mode 100644 src/components/HelloWorld.vue
create mode 100644 src/components/Home.vue
create mode 100644 src/components/Login.vue
create mode 100644 src/dist/main.dev.js
create mode 100644 src/dist/main.prod.js
create mode 100644 src/plugins/dist/element.dev.js
create mode 100644 src/plugins/dist/element.prod.js
create mode 100644 src/router/dist/index.dev.js
create mode 100644 src/router/dist/index.prod.js
delete mode 100644 src/views/About.vue
delete mode 100644 src/views/Home.vue
create mode 100644 vue.config.js
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git push
Enumerating objects: 27, done.
Counting objects: 100% (27/27), done.
Delta compression using up to 4 threads
Compressing objects: 100% (16/16), done.
Writing objects: 100% (16/16), 3.33 KiB | 309.00 KiB/s, done.
Total 16 (delta 5), reused 0 (delta 0)
remote: Powered by GITEE.COM [GNK-3.8]
To https://gitee.com/sunny_ou/vue_shop.git
1c1064c..c1b53fb master -> master
將login分支推送到碼雲中
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git checkout login
Switched to branch 'login'
Your branch is ahead of 'origin/login' by 1 commit.
(use "git push" to publish your local commits)
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git branch
* login
master
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git push -u orgin
fatal: 'orgin' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git push -u orgin login
fatal: 'orgin' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>git push -u origin login
Total 0 (delta 0), reused 0 (delta 0)
remote: Powered by GITEE.COM [GNK-3.8]
remote: Create a pull request for 'login' on Gitee by visiting:
remote: https://gitee.com/sunny_ou/vue_shop/pull/new/sunny_ou:login...sunny_ou:master
To https://gitee.com/sunny_ou/vue_shop.git
* [new branch] login -> login
Branch 'login' set up to track remote branch 'login' from 'origin'.
C:\Users\ouguangji\Desktop\vueFile\vue3\vue3project\vue_shop>
