|
|
5a900e0378
|
submit
|
2023-09-25 19:01:50 +08:00 |
|
|
|
2cad89d5e6
|
fix
|
2023-09-25 18:57:21 +08:00 |
|
|
|
a62d60c9b3
|
fix
|
2023-09-25 18:52:25 +08:00 |
|
|
|
1d5c05dbda
|
fix
|
2023-09-25 18:50:49 +08:00 |
|
|
|
7387056f84
|
submit
|
2023-09-25 15:15:58 +08:00 |
|
|
|
581a84bb9c
|
submit
|
2023-09-25 12:00:57 +08:00 |
|
|
|
212ab81594
|
submit
|
2023-09-23 17:23:26 +08:00 |
|
|
|
32a9cb2eed
|
submit
|
2023-09-23 15:37:27 +08:00 |
|
|
|
8375b86499
|
fix
|
2023-09-23 15:01:34 +08:00 |
|
|
|
62696009b2
|
Merge branch 'master' of http://192.168.12.3:3000/xingyy/uni-Identify-quality
|
2023-09-23 15:00:10 +08:00 |
|
|
|
46a6927de9
|
fix
|
2023-09-23 14:59:54 +08:00 |
|
|
|
dd91a4f69e
|
submit
|
2023-09-23 14:38:30 +08:00 |
|
|
|
87e69ec0d6
|
submit
|
2023-09-23 13:31:49 +08:00 |
|
|
|
fd184702e0
|
submit
|
2023-09-23 13:18:04 +08:00 |
|
|
|
2d0e817c1f
|
submit
|
2023-09-23 11:50:34 +08:00 |
|
|
|
cbfdf4bc0d
|
submit
|
2023-09-22 16:16:11 +08:00 |
|
|
|
14e466918c
|
submit
|
2023-09-22 15:49:19 +08:00 |
|
|
|
3ced458dd7
|
submit
|
2023-09-22 15:42:56 +08:00 |
|
|
|
8d9f1d7280
|
submit
|
2023-09-22 15:39:58 +08:00 |
|
|
|
da93883a3f
|
submit
|
2023-09-22 15:33:22 +08:00 |
|
|
|
fa425e8b23
|
submit
|
2023-09-22 15:25:18 +08:00 |
|
|
|
52b35116bf
|
Merge branch 'xingyy'
|
2023-09-22 15:24:14 +08:00 |
|
|
|
df52885c1b
|
update .gitignore
|
2023-09-22 15:24:01 +08:00 |
|
|
|
adea57afd7
|
update .gitignore
|
2023-09-22 15:23:12 +08:00 |
|
|
|
60f8322dae
|
submit
|
2023-09-22 15:14:28 +08:00 |
|
|
|
ecb08e26a4
|
submit
|
2023-09-22 15:13:39 +08:00 |
|
|
|
f4089c927f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# components/title-block/title-block.vue
# unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/components/title-block/title-block.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/components/uiq-tabbar/uiq-tabbar.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/contract/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/set-up.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/order-details.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/paySuccess/paySuccess.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/realName/realName.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/register.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-count-down/u-count-down.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-divider/u-divider.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line/u-line.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-transition/u-transition.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-upload/u-upload.js.map
# unpackage/dist/dev/mp-weixin/common/vendor.js
# unpackage/dist/dev/mp-weixin/components/title-block/title-block.js
# unpackage/dist/dev/mp-weixin/components/uiq-tabbar/uiq-tabbar.js
# unpackage/dist/dev/mp-weixin/pages/cameraContext/cameraContext.js
# unpackage/dist/dev/mp-weixin/pages/contract/index.js
# unpackage/dist/dev/mp-weixin/pages/login/login.js
# unpackage/dist/dev/mp-weixin/pages/order-goods/index.js
# unpackage/dist/dev/mp-weixin/pages/order-goods/order-details.js
# unpackage/dist/dev/mp-weixin/pages/realName/realName.js
# unpackage/dist/dev/mp-weixin/pages/register/register.js
# unpackage/dist/dev/mp-weixin/tm-vuetify/components/tm-poup/tm-poup.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u--image/u--image.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u--input/u--input.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-count-down/u-count-down.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-divider/u-divider.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-image/u-image.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-input/u-input.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-line/u-line.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-transition/u-transition.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-upload/u-upload.js
|
2023-09-22 15:07:06 +08:00 |
|
|
|
b13aa9a66c
|
submit
|
2023-09-22 15:06:42 +08:00 |
|
|
|
63854ca9a2
|
Merge branch 'xingyy'
# Conflicts:
# components/title-block/title-block.vue
# unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/components/uiq-tabbar/uiq-tabbar.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/contract/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/set-up.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/order-details.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/paySuccess/paySuccess.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/realName/realName.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/register.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-count-down/u-count-down.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-divider/u-divider.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line/u-line.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-transition/u-transition.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-upload/u-upload.js.map
# unpackage/dist/dev/mp-weixin/common/vendor.js
# unpackage/dist/dev/mp-weixin/pages/contract/index.js
# unpackage/dist/dev/mp-weixin/pages/order-goods/order-details.js
|
2023-09-22 15:04:46 +08:00 |
|
|
|
14820459e0
|
submit
|
2023-09-22 15:04:15 +08:00 |
|
|
|
f2f22b4ce5
|
submit
|
2023-09-22 15:03:45 +08:00 |
|
|
|
024a67a8ae
|
submit
|
2023-09-22 15:03:02 +08:00 |
|
|
|
842b62b940
|
fix
|
2023-09-22 15:00:26 +08:00 |
|
|
|
74da231357
|
fix
|
2023-09-22 14:35:58 +08:00 |
|
|
|
865a180629
|
submit
|
2023-09-22 14:31:17 +08:00 |
|
|
|
93555318e9
|
submit
|
2023-09-22 14:30:37 +08:00 |
|
|
|
0a6124e287
|
Merge remote-tracking branch 'origin/master'
# 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/uiq-tabbar/uiq-tabbar.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/contract/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/set-up.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/order-details.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/paySuccess/paySuccess.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/realName/realName.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/register.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/tm-vuetify/components/tm-icons/tm-icons.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/tm-vuetify/components/tm-listitem/tm-listitem.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/tm-vuetify/components/tm-maskFlow/tm-maskFlow.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/tm-vuetify/components/tm-menu/tm-menu.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/tm-vuetify/components/tm-translate/tm-translate.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-count-down/u-count-down.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-divider/u-divider.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line/u-line.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-transition/u-transition.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-upload/u-upload.js.map
# unpackage/dist/dev/mp-weixin/common/runtime.js
# unpackage/dist/dev/mp-weixin/common/vendor.js
# unpackage/dist/dev/mp-weixin/components/uiq-tabbar/uiq-tabbar.js
# unpackage/dist/dev/mp-weixin/pages/mine/index.js
# unpackage/dist/dev/mp-weixin/pages/mine/set-up.js
# unpackage/dist/dev/mp-weixin/pages/order-goods/index.js
# unpackage/dist/dev/mp-weixin/pages/order-goods/order-details.js
# unpackage/dist/dev/mp-weixin/pages/payError/payError.js
# unpackage/dist/dev/mp-weixin/pages/paySuccess/paySuccess.js
# unpackage/dist/dev/mp-weixin/project.private.config.json
# unpackage/dist/dev/mp-weixin/uview-ui/components/u--image/u--image.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u--input/u--input.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-count-down/u-count-down.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-divider/u-divider.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-image/u-image.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-input/u-input.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-line/u-line.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-transition/u-transition.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-upload/u-upload.js
|
2023-09-22 14:25:43 +08:00 |
|
|
|
d974711b77
|
submit
|
2023-09-22 14:24:51 +08:00 |
|
|
|
42d02836a3
|
节点
|
2023-09-22 13:24:04 +08:00 |
|
|
|
a6806e96c8
|
fix
|
2023-09-22 13:23:33 +08:00 |
|
|
|
4ecf815564
|
fix
|
2023-09-22 13:15:04 +08:00 |
|
|
|
89e7dff671
|
liantiao
|
2023-09-22 13:13:26 +08:00 |
|
|
|
78043e01c0
|
节点
|
2023-09-21 14:40:19 +08:00 |
|
|
|
c8c792884f
|
节点
|
2023-09-21 14:15:35 +08:00 |
|
|
|
8698bd5a4d
|
submit
|
2023-09-21 12:01:11 +08:00 |
|
|
|
5a6c800583
|
submit
|
2023-09-21 09:53:19 +08:00 |
|
|
|
42be3396d8
|
pull
|
2023-09-21 09:47:18 +08:00 |
|
|
|
733b1af6ce
|
submit
|
2023-09-21 09:47:05 +08:00 |
|
|
|
7a376be64c
|
Merge branch 'master' into xingyy
|
2023-09-21 09:45:08 +08:00 |
|
|
|
1b21b9fbe9
|
submit
|
2023-09-21 09:44:59 +08:00 |
|
