毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$ git branch
dev
* local
master
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$ git add .
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$ git commit -m 'first sumbmission of local'
[local 1c2e34c] first sumbmission of local
17 files changed, 542 insertions(+), 344 deletions(-)
create mode 100644 src/actions/uninstall.js
create mode 100644 src/constants/unintall.js
rewrite src/pages/Uninstall/Uninstall.js (69%)
rewrite src/reducers/native.js (60%)
rewrite src/static/AppMsgList.js (95%)
create mode 100644 src/static/mask_close.png
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$ git checkout dev
Switched to branch 'dev'
Your branch is ahead of 'origin/dev' by 3 commits.
(use "git push" to publish your local commits)
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ git branch
* dev
local
master
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ git merge local
Updating 4f2d01b..1c2e34c
Fast-forward
package-lock.json | 17 ++--
package.json | 1 +
src/actions/native.js | 7 --
src/actions/uninstall.js | 24 +++++
src/constants/native.js | 3 +-
src/constants/unintall.js | 3 +
src/pages/Uninstall/Uninstall.js | 127 +++++++++++--------------
src/pages/Uninstall/Uninstall.module.less | 98 +++++++++++++------
src/pages/Update/Update.js | 76 ++++++++++-----
src/pages/Update/Update.module.less | 19 ++++
src/pages/WelcomPopUp/WelcomePopUp.js | 57 +++++------
src/pages/WelcomPopUp/WelcomePopUp.module.less | 72 ++++++++++++++
src/reducers/native.js | 53 +++++++----
src/sagas/native.js | 12 ++-
src/static/AppMsgList.js | 112 +++++++++++-----------
src/static/mask_close.png | Bin 0 -> 537 bytes
src/utils/utils.js | 19 +++-
17 files changed, 449 insertions(+), 251 deletions(-)
create mode 100644 src/actions/uninstall.js
create mode 100644 src/constants/unintall.js
create mode 100644 src/static/mask_close.png
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ git push origin dev
Enumerating objects: 163, done.
Counting objects: 100% (134/134), done.
Delta compression using up to 4 threads
Compressing objects: 100% (91/91), done.
Writing objects: 100% (91/91), 240.38 KiB | 5.23 MiB/s, done.
Total 91 (delta 47), reused 0 (delta 0)
remote:
remote: To create a merge request for dev, visit:
remote: http://10.109.5.54/zhangxf26/pc-app-store-h5-react/merge_requests/new?merge_request%5Bsource_branch%5D=dev
remote:
To 10.109.5.54:zhangxf26/pc-app-store-h5-react.git
3f601cb..1c2e34c dev -> dev
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ ^C
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ ^C
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$