PS E:\weixin\app-uni> git checkout -b search
Switched to a new branch 'search'
PS E:\weixin\app-uni> git status
On branch search
nothing to commit, working tree clean
PS E:\weixin\app-uni> git branch
master
* search
tabble
PS E:\weixin\app-uni> git status
On branch search
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: pages.json
modified: pages/cate/cate.vue
modified: pages/home/home.vue
Untracked files:
(use "git add <file>..." to include in what will be committed)
components/
pages/unitest/
subpkg/search/
uni_modules/
no changes added to commit (use "git add" and/or "git commit -a")
PS E:\weixin\app-uni> git branch
master
* search
tabble
PS E:\weixin\app-uni> git add .
warning: LF will be replaced by CRLF in pages.json.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in pages/cate/cate.vue.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in pages/home/home.vue.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in components/my-search/my-search.vue.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in components/uni-calendar/util.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in components/uni-icons/icons.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in components/uni-swipe-action-item/bindingx.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in components/uni-swipe-action-item/index.wxs.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in components/uni-swipe-action-item/mp.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in components/uni-swipe-action-item/mpalipay.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in components/uni-swipe-action-item/mpother.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in components/uni-swipe-action-item/mpwxs.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in pages/unitest/unitest.vue.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in subpkg/search/search.vue.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-icons/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-icons/components/uni-icons/icons.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-icons/components/uni-icons/uni-icons.vue.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-icons/components/uni-icons/uniicons.css.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-icons/package.json.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-icons/readme.md.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/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-scss/index.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/package.json.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/readme.md.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/styles/index.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/styles/setting/_border.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/styles/setting/_color.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/styles/setting/_radius.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/styles/setting/_space.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/styles/setting/_styles.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/styles/setting/_text.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/styles/setting/_variables.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/styles/tools/functions.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/theme.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-scss/variables.scss.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-search-bar/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-search-bar/components/uni-search-bar/i18n/en.json.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-search-bar/package.json.
The file will have its original line endings in your working directory
warning: LF will be replaced by CRLF in uni_modules/uni-search-bar/readme.md.
The file will have its original line endings in your working directory
PS E:\weixin\app-uni> git commit -m "完成了搜索功能的开发"
[search 27e5311] 完成了搜索功能的开发
85 files changed, 13442 insertions(+), 158 deletions(-)
create mode 100644 components/my-search/my-search.vue
create mode 100644 components/uni-badge/uni-badge.vue
create mode 100644 components/uni-calendar/calendar.js
create mode 100644 components/uni-calendar/uni-calendar-item.vue
create mode 100644 components/uni-calendar/uni-calendar.vue
create mode 100644 components/uni-calendar/util.js
create mode 100644 components/uni-card/uni-card.vue
create mode 100644 components/uni-collapse-item/uni-collapse-item.vue
create mode 100644 components/uni-collapse/uni-collapse.vue
create mode 100644 components/uni-combox/uni-combox.vue
create mode 100644 components/uni-countdown/uni-countdown.vue
create mode 100644 components/uni-drawer/uni-drawer.vue
create mode 100644 components/uni-fab/uni-fab.vue
create mode 100644 components/uni-fav/uni-fav.vue
create mode 100644 components/uni-goods-nav/uni-goods-nav.vue
create mode 100644 components/uni-grid-item/uni-grid-item.vue
create mode 100644 components/uni-grid/uni-grid.vue
create mode 100644 components/uni-icons/icons.js
create mode 100644 components/uni-icons/uni-icons.vue
create mode 100644 components/uni-indexed-list/uni-indexed-list-item.vue
create mode 100644 components/uni-indexed-list/uni-indexed-list.vue
create mode 100644 components/uni-link/uni-link.vue
create mode 100644 components/uni-list-item/uni-list-item.vue
create mode 100644 components/uni-list/uni-list.vue
create mode 100644 components/uni-list/uni-refresh.vue
create mode 100644 components/uni-list/uni-refresh.wxs
create mode 100644 components/uni-load-more/uni-load-more.vue
create mode 100644 components/uni-nav-bar/uni-nav-bar.vue
create mode 100644 components/uni-notice-bar/uni-notice-bar.vue
create mode 100644 components/uni-number-box/uni-number-box.vue
create mode 100644 components/uni-pagination/uni-pagination.vue
create mode 100644 components/uni-popup/uni-popup.vue
create mode 100644 components/uni-rate/uni-rate.vue
create mode 100644 components/uni-search-bar/uni-search-bar.vue
create mode 100644 components/uni-section/uni-section.vue
create mode 100644 components/uni-segmented-control/uni-segmented-control.vue
create mode 100644 components/uni-status-bar/uni-status-bar.vue
create mode 100644 components/uni-steps/uni-steps.vue
create mode 100644 components/uni-swipe-action-item/bindingx.js
create mode 100644 components/uni-swipe-action-item/index.wxs
create mode 100644 components/uni-swipe-action-item/mp.js
create mode 100644 components/uni-swipe-action-item/mpalipay.js
create mode 100644 components/uni-swipe-action-item/mpother.js
create mode 100644 components/uni-swipe-action-item/mpwxs.js
create mode 100644 components/uni-swipe-action-item/uni-swipe-action-item.vue
create mode 100644 components/uni-swipe-action/uni-swipe-action.vue
create mode 100644 components/uni-swiper-dot/uni-swiper-dot.vue
create mode 100644 components/uni-tag/uni-tag.vue
create mode 100644 components/uni-title/uni-title.vue
create mode 100644 components/uni-transition/uni-transition.vue
rewrite pages/cate/cate.vue (66%)
create mode 100644 pages/unitest/unitest.vue
create mode 100644 subpkg/search/search.vue
create mode 100644 uni_modules/uni-icons/changelog.md
create mode 100644 uni_modules/uni-icons/components/uni-icons/icons.js
create mode 100644 uni_modules/uni-icons/components/uni-icons/uni-icons.vue
create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons.css
create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons.ttf
create mode 100644 uni_modules/uni-icons/package.json
create mode 100644 uni_modules/uni-icons/readme.md
create mode 100644 uni_modules/uni-scss/changelog.md
create mode 100644 uni_modules/uni-scss/index.scss
create mode 100644 uni_modules/uni-scss/package.json
create mode 100644 uni_modules/uni-scss/readme.md
create mode 100644 uni_modules/uni-scss/styles/index.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_border.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_color.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_radius.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_space.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_styles.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_text.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_variables.scss
create mode 100644 uni_modules/uni-scss/styles/tools/functions.scss
create mode 100644 uni_modules/uni-scss/theme.scss
create mode 100644 uni_modules/uni-scss/variables.scss
create mode 100644 uni_modules/uni-search-bar/changelog.md
create mode 100644 uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json
create mode 100644 uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js
create mode 100644 uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json
create mode 100644 uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json
create mode 100644 uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
create mode 100644 uni_modules/uni-search-bar/package.json
create mode 100644 uni_modules/uni-search-bar/readme.md
PS E:\weixin\app-uni> git push -u origin search
Enumerating objects: 150, done.
Counting objects: 100% (150/150), done.
Delta compression using up to 12 threads
Compressing objects: 100% (102/102), done.
Writing objects: 100% (142/142), 161.97 KiB | 1.64 MiB/s, done.
Total 142 (delta 10), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (10/10), completed with 4 local objects.
remote: Powered by GITEE.COM [GNK-6.4]
remote: Create a pull request for 'search' on Gitee by visiting:
remote: https://gitee.com/yangmshu/shops/pull/new/yangmshu:search...yangmshu:master
To gitee.com:yangmshu/shops.git
* [new branch] search -> search
Branch 'search' set up to track remote branch 'search' from 'origin'.
PS E:\weixin\app-uni> git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
PS E:\weixin\app-uni> git branch
* master
search
tabble
PS E:\weixin\app-uni> git merge search
Updating 6968e2a..27e5311
Fast-forward
components/my-search/my-search.vue | 74 ++
components/uni-badge/uni-badge.vue | 146 +++
components/uni-calendar/calendar.js | 546 +++++++++
components/uni-calendar/uni-calendar-item.vue | 151 +++
components/uni-calendar/uni-calendar.vue | 431 ++++++++
components/uni-calendar/util.js | 327 ++++++
components/uni-card/uni-card.vue | 298 +++++
components/uni-collapse-item/uni-collapse-item.vue | 217 ++++
components/uni-collapse/uni-collapse.vue | 59 +
components/uni-combox/uni-combox.vue | 202 ++++
components/uni-countdown/uni-countdown.vue | 200 ++++
components/uni-drawer/uni-drawer.vue | 155 +++
components/uni-fab/uni-fab.vue | 428 +++++++
components/uni-fav/uni-fav.vue | 136 +++
components/uni-goods-nav/uni-goods-nav.vue | 229 ++++
components/uni-grid-item/uni-grid-item.vue | 114 ++
components/uni-grid/uni-grid.vue | 133 +++
components/uni-icons/icons.js | 132 +++
components/uni-icons/uni-icons.vue | 67 ++
.../uni-indexed-list/uni-indexed-list-item.vue | 142 +++
components/uni-indexed-list/uni-indexed-list.vue | 317 ++++++
components/uni-link/uni-link.vue | 71 ++
components/uni-list-item/uni-list-item.vue | 270 +++++
components/uni-list/uni-list.vue | 78 ++
components/uni-list/uni-refresh.vue | 65 ++
components/uni-list/uni-refresh.wxs | 87 ++
components/uni-load-more/uni-load-more.vue | 364 ++++++
components/uni-nav-bar/uni-nav-bar.vue | 235 ++++
components/uni-notice-bar/uni-notice-bar.vue | 392 +++++++
components/uni-number-box/uni-number-box.vue | 197 ++++
components/uni-pagination/uni-pagination.vue | 200 ++++
components/uni-popup/uni-popup.vue | 264 +++++
components/uni-rate/uni-rate.vue | 157 +++
components/uni-search-bar/uni-search-bar.vue | 203 ++++
components/uni-section/uni-section.vue | 136 +++
.../uni-segmented-control.vue | 133 +++
components/uni-status-bar/uni-status-bar.vue | 26 +
components/uni-steps/uni-steps.vue | 253 +++++
components/uni-swipe-action-item/bindingx.js | 245 ++++
components/uni-swipe-action-item/index.wxs | 203 ++++
components/uni-swipe-action-item/mp.js | 95 ++
components/uni-swipe-action-item/mpalipay.js | 160 +++
components/uni-swipe-action-item/mpother.js | 158 +++
components/uni-swipe-action-item/mpwxs.js | 95 ++
.../uni-swipe-action-item.vue | 264 +++++
components/uni-swipe-action/uni-swipe-action.vue | 58 +
components/uni-swiper-dot/uni-swiper-dot.vue | 198 ++++
components/uni-tag/uni-tag.vue | 226 ++++
components/uni-title/uni-title.vue | 170 +++
components/uni-transition/uni-transition.vue | 279 +++++
pages.json | 44 +-
pages/cate/cate.vue | 171 +--
pages/home/home.vue | 19 +
pages/unitest/unitest.vue | 27 +
subpkg/search/search.vue | 174 +++
uni_modules/uni-icons/changelog.md | 22 +
.../uni-icons/components/uni-icons/icons.js | 1169 ++++++++++++++++++++
.../uni-icons/components/uni-icons/uni-icons.vue | 96 ++
.../uni-icons/components/uni-icons/uniicons.css | 663 +++++++++++
.../uni-icons/components/uni-icons/uniicons.ttf | Bin 0 -> 35760 bytes
uni_modules/uni-icons/package.json | 86 ++
uni_modules/uni-icons/readme.md | 8 +
uni_modules/uni-scss/changelog.md | 8 +
uni_modules/uni-scss/index.scss | 1 +
uni_modules/uni-scss/package.json | 82 ++
uni_modules/uni-scss/readme.md | 4 +
uni_modules/uni-scss/styles/index.scss | 7 +
uni_modules/uni-scss/styles/setting/_border.scss | 3 +
uni_modules/uni-scss/styles/setting/_color.scss | 66 ++
uni_modules/uni-scss/styles/setting/_radius.scss | 55 +
uni_modules/uni-scss/styles/setting/_space.scss | 56 +
uni_modules/uni-scss/styles/setting/_styles.scss | 167 +++
uni_modules/uni-scss/styles/setting/_text.scss | 24 +
.../uni-scss/styles/setting/_variables.scss | 146 +++
uni_modules/uni-scss/styles/tools/functions.scss | 19 +
uni_modules/uni-scss/theme.scss | 31 +
uni_modules/uni-scss/variables.scss | 62 ++
uni_modules/uni-search-bar/changelog.md | 33 +
.../components/uni-search-bar/i18n/en.json | 4 +
.../components/uni-search-bar/i18n/index.js | 8 +
.../components/uni-search-bar/i18n/zh-Hans.json | 4 +
.../components/uni-search-bar/i18n/zh-Hant.json | 4 +
.../components/uni-search-bar/uni-search-bar.vue | 298 +++++
uni_modules/uni-search-bar/package.json | 89 ++
uni_modules/uni-search-bar/readme.md | 14 +
85 files changed, 13367 insertions(+), 83 deletions(-)
create mode 100644 components/my-search/my-search.vue
create mode 100644 components/uni-badge/uni-badge.vue
create mode 100644 components/uni-calendar/calendar.js
create mode 100644 components/uni-calendar/uni-calendar-item.vue
create mode 100644 components/uni-calendar/uni-calendar.vue
create mode 100644 components/uni-calendar/util.js
create mode 100644 components/uni-card/uni-card.vue
create mode 100644 components/uni-collapse-item/uni-collapse-item.vue
create mode 100644 components/uni-collapse/uni-collapse.vue
create mode 100644 components/uni-combox/uni-combox.vue
create mode 100644 components/uni-countdown/uni-countdown.vue
create mode 100644 components/uni-drawer/uni-drawer.vue
create mode 100644 components/uni-fab/uni-fab.vue
create mode 100644 components/uni-fav/uni-fav.vue
create mode 100644 components/uni-goods-nav/uni-goods-nav.vue
create mode 100644 components/uni-grid-item/uni-grid-item.vue
create mode 100644 components/uni-grid/uni-grid.vue
create mode 100644 components/uni-icons/icons.js
create mode 100644 components/uni-icons/uni-icons.vue
create mode 100644 components/uni-indexed-list/uni-indexed-list-item.vue
create mode 100644 components/uni-indexed-list/uni-indexed-list.vue
create mode 100644 components/uni-link/uni-link.vue
create mode 100644 components/uni-list-item/uni-list-item.vue
create mode 100644 components/uni-list/uni-list.vue
create mode 100644 components/uni-list/uni-refresh.vue
create mode 100644 components/uni-list/uni-refresh.wxs
create mode 100644 components/uni-load-more/uni-load-more.vue
create mode 100644 components/uni-nav-bar/uni-nav-bar.vue
create mode 100644 components/uni-notice-bar/uni-notice-bar.vue
create mode 100644 components/uni-number-box/uni-number-box.vue
create mode 100644 components/uni-pagination/uni-pagination.vue
create mode 100644 components/uni-popup/uni-popup.vue
create mode 100644 components/uni-rate/uni-rate.vue
create mode 100644 components/uni-search-bar/uni-search-bar.vue
create mode 100644 components/uni-section/uni-section.vue
create mode 100644 components/uni-segmented-control/uni-segmented-control.vue
create mode 100644 components/uni-status-bar/uni-status-bar.vue
create mode 100644 components/uni-steps/uni-steps.vue
create mode 100644 components/uni-swipe-action-item/bindingx.js
create mode 100644 components/uni-swipe-action-item/index.wxs
create mode 100644 components/uni-swipe-action-item/mp.js
create mode 100644 components/uni-swipe-action-item/mpalipay.js
create mode 100644 components/uni-swipe-action-item/mpother.js
create mode 100644 components/uni-swipe-action-item/mpwxs.js
create mode 100644 components/uni-swipe-action-item/uni-swipe-action-item.vue
create mode 100644 components/uni-swipe-action/uni-swipe-action.vue
create mode 100644 components/uni-swiper-dot/uni-swiper-dot.vue
create mode 100644 components/uni-tag/uni-tag.vue
create mode 100644 components/uni-title/uni-title.vue
create mode 100644 components/uni-transition/uni-transition.vue
create mode 100644 pages/unitest/unitest.vue
create mode 100644 subpkg/search/search.vue
create mode 100644 uni_modules/uni-icons/changelog.md
create mode 100644 uni_modules/uni-icons/components/uni-icons/icons.js
create mode 100644 uni_modules/uni-icons/components/uni-icons/uni-icons.vue
create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons.css
create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons.ttf
create mode 100644 uni_modules/uni-icons/package.json
create mode 100644 uni_modules/uni-icons/readme.md
create mode 100644 uni_modules/uni-scss/changelog.md
create mode 100644 uni_modules/uni-scss/index.scss
create mode 100644 uni_modules/uni-scss/package.json
create mode 100644 uni_modules/uni-scss/readme.md
create mode 100644 uni_modules/uni-scss/styles/index.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_border.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_color.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_radius.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_space.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_styles.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_text.scss
create mode 100644 uni_modules/uni-scss/styles/setting/_variables.scss
create mode 100644 uni_modules/uni-scss/styles/tools/functions.scss
create mode 100644 uni_modules/uni-scss/theme.scss
create mode 100644 uni_modules/uni-scss/variables.scss
create mode 100644 uni_modules/uni-search-bar/changelog.md
create mode 100644 uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json
create mode 100644 uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js
create mode 100644 uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json
create mode 100644 uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json
create mode 100644 uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
create mode 100644 uni_modules/uni-search-bar/package.json
create mode 100644 uni_modules/uni-search-bar/readme.md
PS E:\weixin\app-uni> git push
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.4]
To gitee.com:yangmshu/shops.git
6968e2a..27e5311 master -> master
PS E:\weixin\app-uni> git branch -d search
Deleted branch search (was 27e5311).
PS E:\weixin\app-uni> git branch
* master
tabble
PS E:\weixin\app-uni> git branch -d tabble
Deleted branch tabble (was 6968e2a).
PS E:\weixin\app-uni> git branch
* master
PS E:\weixin\app-uni>