Microsoft Windows [版本 10.0.19045.2251]
(c) Microsoft Corporation。保留所有权利。
G:\fruit\memberShip\member>git branch
* dev
master
G:\fruit\memberShip\member>git add .
warning: LF will be replaced by CRLF in pages/points/pointrule/pointrule.vue.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-link/changelog.md.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-link/readme.md.
The file will have its original line endings in your working directory
G:\fruit\memberShip\member>git commit -m "第二次提交"
[dev 8477b63] 第二次提交
101 files changed, 817 insertions(+), 391 deletions(-)
rewrite pages/index/index.vue (98%)
rewrite pages/points/pointrule/pointrule.vue (69%)
create mode 100644 uni_modules/uni-link/changelog.md
create mode 100644 uni_modules/uni-link/components/uni-link/uni-link.vue
create mode 100644 uni_modules/uni-link/package.json
create mode 100644 uni_modules/uni-link/readme.md
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map (66%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/car/car.js.map (90%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map (91%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/points/pointrule/pointrule.js.map (88%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/scanCode/scanCode.js.map (89%)
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-link/components/uni-link/uni-link.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-link/u-link.js.map
G:\fruit\memberShip\member>git push origin dev
Enumerating objects: 363, done.
Counting objects: 100% (363/363), done.
Delta compression using up to 4 threads
Compressing objects: 100% (140/140), done.
Writing objects: 100% (210/210), 137.99 KiB | 1.09 MiB/s, done.
Total 210 (delta 98), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (98/98), completed with 55 local objects.
remote: Powered by GITEE.COM [GNK-6.4]
To https://gitee.com/caojunone/member.git
b5d2cec..8477b63 dev -> dev
G:\fruit\memberShip\member>git branch
* dev
master
G:\fruit\memberShip\member>git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
G:\fruit\memberShip\member>git branch
dev
* master
G:\fruit\memberShip\member>git checkout dev
error: Your local changes to the following files would be overwritten by checkout:
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/empty/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/goods-sku-popup/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/goods-sku-popup/number-box/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/grade-popup/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/jyf-parser/jyf-parser.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/jyf-parser/libs/trees.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/kevy-mask/kevy-mask.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/merchant-shortcut/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/mescroll-uni/components/mescroll-empty.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/mescroll-uni/components/mescroll-top.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/mescroll-uni/mescroll-body.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/article/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/banner/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/goods/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/guide/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/image/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/location/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/navBar/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/richText/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/search/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/service/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/video/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/page/window/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/prestore-popup/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/prestore-popup/number-box/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/search/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/shortcut/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-transition/uni-transition.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/car/car.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/category/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/confirm/doConfirm.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/confirm/result.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon/detail.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon/list.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon/receive.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/custom/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/detail/detail.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/give/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/SlideImage.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/detail.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/list.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/help/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/location/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/auth.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/components/main.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/components/mp-weixin.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/merchant/index.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/merchant/member/index.js.map
unpackage/dist/dev/.sourcemap/mp-weix
error: The following untracked working tree files would be overwritten by checkout:
unpackage/dist/dev/.sourcemap/mp-weixin/pages/points/historyPoints.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/pages/points/pointrule/pointrule.js.map
Please move or remove them before you switch branches.
Aborting
G:\fruit\memberShip\member>git add .
G:\fruit\memberShip\member>git commit -m "第五次提交"
[master 2a66b69] 第五次提交
91 files changed, 91 insertions(+), 89 deletions(-)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map (91%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/empty/index.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/goods-sku-popup/index.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/goods-sku-popup/number-box/index.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/grade-popup/index.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/jyf-parser/jyf-parser.js.map (98%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/jyf-parser/libs/trees.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/kevy-mask/kevy-mask.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/merchant-shortcut/index.js.map (91%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/mescroll-uni/components/mescroll-empty.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/mescroll-uni/components/mescroll-top.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/mescroll-uni/mescroll-body.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/article/index.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/banner/index.js.map (94%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/goods/index.js.map (93%)
copy unpackage/dist/dev/.sourcemap/mp-weixin/components/page/{search => guide}/index.js.map (50%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/image/index.js.map (88%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/index.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/location/index.js.map (94%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/navBar/index.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/richText/index.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/search/index.js.map (97%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/service/index.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/video/index.js.map (90%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/page/window/index.js.map (90%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/prestore-popup/index.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/prestore-popup/number-box/index.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/search/index.js.map (90%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/shortcut/index.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-transition/uni-transition.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/car/car.js.map (87%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/index.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/category/index.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/confirm/doConfirm.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/confirm/result.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon/detail.js.map (94%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon/list.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon/receive.js.map (87%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/custom/index.js.map (90%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/detail/detail.js.map (89%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/give/index.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/SlideImage.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/detail.js.map (94%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/list.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/help/index.js.map (91%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/location/index.js.map (91%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/auth.js.map (89%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/components/main.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/components/mp-weixin.js.map (94%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map (90%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/merchant/index.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/merchant/member/index.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/merchant/order/index.js.map (82%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/my-coupon/index.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/detail.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/result.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/points/detail.js.map (93%)
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/points/historyPoints.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/points/pointrule/pointrule.js.map
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/prestore/buy.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/prestore/detail.js.map (94%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/scanCode/scanCode.js.map (87%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/index.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/sign/index.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/timer/detail.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/code.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/setting.js.map (89%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/wallet/balance/log.js.map (86%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/wallet/index.js.map (90%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/wallet/recharge/index.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/pages/wallet/recharge/order.js.map (89%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/keyboard-plate/components/keyboard-plate/keyboard-plate.js.map (94%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.js.map (98%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-row/components/uni-col/uni-col.js.map (92%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-row/components/uni-row/uni-row.js.map (91%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map (91%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-column-notice/u-column-notice.js.map (98%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form-item/u-form-item.js.map (97%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form/u-form.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map (93%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map (91%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-notice-bar/u-notice-bar.js.map (95%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-number-box/u-number-box.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map (94%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-row-notice/u-row-notice.js.map (96%)
rewrite unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map (95%)
G:\fruit\memberShip\member>git push origin matser
error: src refspec matser does not match any
error: failed to push some refs to 'https://gitee.com/caojunone/member.git'
G:\fruit\memberShip\member>git push origin master
Enumerating objects: 326, done.
Counting objects: 100% (326/326), done.
Delta compression using up to 4 threads
Compressing objects: 100% (126/126), done.
Writing objects: 100% (186/186), 145.04 KiB | 1.59 MiB/s, done.
Total 186 (delta 89), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (89/89), completed with 49 local objects.
remote: Powered by GITEE.COM [GNK-6.4]
To https://gitee.com/caojunone/member.git
0ad412e..2a66b69 master -> master
G:\fruit\memberShip\member>git checkout dev
Switched to branch 'dev'
G:\fruit\memberShip\member>git bash 或者cmd提交代码
猜你喜欢
转载自blog.csdn.net/weixin_46085718/article/details/131829213
今日推荐
周排行