|
|
070b82fa4e
|
fix
|
2024-04-02 14:25:17 +08:00 |
|
Phoenix
|
1664235cf5
|
submit
|
2024-04-01 17:02:13 +08:00 |
|
|
|
166d70e900
|
push
|
2024-01-04 15:09:07 +08:00 |
|
|
|
23adf9d1c7
|
submit
|
2024-01-04 14:54:48 +08:00 |
|
|
|
df50066b09
|
submit
|
2024-01-04 14:54:24 +08:00 |
|
|
|
493f4e9eef
|
push
|
2024-01-03 15:14:29 +08:00 |
|
|
|
6c21adaaba
|
push
|
2024-01-03 15:06:22 +08:00 |
|
|
|
0bda2d9b96
|
submit
|
2024-01-03 15:03:13 +08:00 |
|
|
|
8d05bab236
|
fix
|
2023-11-09 09:35:29 +08:00 |
|
|
|
f17870d8b2
|
remove ignored_dir
|
2023-11-08 14:14:55 +08:00 |
|
|
|
ea0be4daf5
|
解决冲突，保留远程版本
|
2023-11-08 14:12:24 +08:00 |
|
|
|
e57139eb34
|
submit
|
2023-11-08 14:05:56 +08:00 |
|
|
|
077a989124
|
fix
|
2023-11-07 17:49:16 +08:00 |
|
|
|
7a8da59189
|
fix
|
2023-11-07 17:04:59 +08:00 |
|
|
|
7dacc5d9bc
|
fix
|
2023-11-07 17:01:24 +08:00 |
|
|
|
4619629d2a
|
submit
|
2023-11-07 17:00:29 +08:00 |
|
|
|
00c5e89386
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/order-details.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/realName/realName.js.map
|
2023-11-07 16:49:37 +08:00 |
|
|
|
d7d7582409
|
submit
|
2023-11-07 16:25:30 +08:00 |
|
|
|
e836f8b1fb
|
fix
|
2023-11-07 14:35:24 +08:00 |
|
|
|
debb9e148f
|
fix
|
2023-11-06 09:41:48 +08:00 |
|
|
|
6ac1b9a92c
|
fix
|
2023-11-06 09:39:22 +08:00 |
|
|
|
04ec6d3659
|
sumit
|
2023-11-04 13:22:46 +08:00 |
|
|
|
2145ce9aac
|
submit
|
2023-11-04 11:27:41 +08:00 |
|
|
|
47df11c81f
|
fix
|
2023-11-01 14:51:11 +08:00 |
|
|
|
bcd7e8d0e3
|
submit
|
2023-11-01 11:56:29 +08:00 |
|
|
|
dd1f40353a
|
fix
|
2023-10-08 13:57:38 +08:00 |
|
|
|
41df0afa36
|
fix
|
2023-10-08 11:27:02 +08:00 |
|
|
|
2caa156983
|
fix
|
2023-10-08 10:56:46 +08:00 |
|
|
|
2ab9962bec
|
fix
|
2023-10-08 10:47:55 +08:00 |
|
|
|
2c43332649
|
submit
|
2023-10-08 09:53:43 +08:00 |
|
|
|
9a4b91910e
|
fix
|
2023-10-07 18:08:22 +08:00 |
|
|
|
8615940d86
|
fix
|
2023-10-07 17:54:23 +08:00 |
|
|
|
8efeb51ae5
|
fix
|
2023-10-07 17:52:24 +08:00 |
|
|
|
e36c5453c2
|
fix
|
2023-10-07 17:51:18 +08:00 |
|
|
|
222d1107cc
|
fix
|
2023-10-07 17:44:16 +08:00 |
|
|
|
df52885c1b
|
update .gitignore
|
2023-09-22 15:24:01 +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 |
|
|
|
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 |
|
|
|
4ecf815564
|
fix
|
2023-09-22 13:15:04 +08:00 |
|
