 liuxin
|
1aa0cf02e1
|
完成1.0
|
2024-04-10 17:13:31 +08:00 |
|
liuxin
|
53da938b96
|
tongbu
|
2024-04-09 22:01:38 +08:00 |
 liujian
|
a8ce879d9e
|
Merge branch 'main' of http://maomaochong.top:30000/liuxin/aosiyiliaouniapp into main
# Conflicts:
# unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/components/hqs-popup/hqs-popup.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/components/hqs-popup/uni-popup.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/components/hqs-popup/uni-transition.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/cijimulu/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/me.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/project/projectIndex.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/wuliugenzong1/genzong.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/wuliugenzongX/genzong.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/liu-checkBox/components/liu-checkBox/liu-checkBox.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-col/u-col.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-image/u-image.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-notify/u-notify.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-row/u-row.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-search/u-search.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabs/u-tabs.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tag/u-tag.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
# unpackage/dist/dev/mp-weixin/common/runtime.js
# unpackage/dist/dev/mp-weixin/common/vendor.js
# unpackage/dist/dev/mp-weixin/components/hqs-popup/hqs-popup.js
# unpackage/dist/dev/mp-weixin/components/hqs-popup/uni-popup.js
# unpackage/dist/dev/mp-weixin/components/hqs-popup/uni-transition.js
# unpackage/dist/dev/mp-weixin/pages/cijimulu/index.js
# unpackage/dist/dev/mp-weixin/pages/index/index.js
# unpackage/dist/dev/mp-weixin/pages/login/login.js
# unpackage/dist/dev/mp-weixin/pages/project/projectIndex.js
# unpackage/dist/dev/mp-weixin/pages/project/projectIndex.json
# unpackage/dist/dev/mp-weixin/pages/project/projectIndex.wxml
# unpackage/dist/dev/mp-weixin/pages/project/projectIndex.wxss
# unpackage/dist/dev/mp-weixin/pages/wuliugenzong1/genzong.js
# unpackage/dist/dev/mp-weixin/pages/wuliugenzongX/genzong.js
# unpackage/dist/dev/mp-weixin/uni_modules/liu-checkBox/components/liu-checkBox/liu-checkBox.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--input/u--input.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-col/u-col.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-image/u-image.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-notify/u-notify.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-row/u-row.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.json
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-search/u-search.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.json
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-tabs/u-tabs.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-tag/u-tag.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js
# unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js
|
2024-04-09 08:49:48 +08:00 |
|
liujian
|
2cc32ce8d4
|
123
|
2024-04-09 08:49:07 +08:00 |
|
liuxin
|
c3cd1fbc54
|
已合并代码
|
2024-04-09 08:43:48 +08:00 |
|
liuxin
|
05ae37ee65
|
刘健修改完成会员一界面
|
2024-04-09 08:26:49 +08:00 |
|
liujian
|
14230f0df4
|
增加页面
Signed-off-by: liujian <783617141@qq.com>
|
2024-04-08 23:49:04 +08:00 |
|
liuxin
|
ecc405fc80
|
登录/流程已完成
|
2024-04-08 10:59:47 +08:00 |