Commit Graph

35 Commits

Author SHA1 Message Date
3d03a580fc fix 2024-10-21 10:12:19 +08:00
51a0d85b24 fix 2024-10-21 10:00:09 +08:00
41cbac698a fix 2024-07-04 11:22:41 +08:00
48b8fb44a0 fix 2024-07-03 14:05:23 +08:00
368b2d7997 fix 2024-06-28 16:09:48 +08:00
1f9549df40 fix 2024-06-28 10:09:36 +08:00
6c21adaaba push 2024-01-03 15:06:22 +08:00
8d05bab236 fix 2023-11-09 09:35:29 +08:00
f17870d8b2 remove ignored_dir 2023-11-08 14:14:55 +08:00
7dacc5d9bc fix 2023-11-07 17:01:24 +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
8615940d86 fix 2023-10-07 17:54:23 +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
842b62b940 fix 2023-09-22 15:00:26 +08:00
93555318e9 submit 2023-09-22 14:30:37 +08:00
89e7dff671 liantiao 2023-09-22 13:13:26 +08:00
42be3396d8 pull 2023-09-21 09:47:18 +08:00
a3548500b2 Merge branch 'xingyy'
# Conflicts:
#	App.vue
#	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/contract/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/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-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-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/app.json
#	unpackage/dist/dev/mp-weixin/common/main.wxss
#	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/cameraContext/cameraContext.js
#	unpackage/dist/dev/mp-weixin/pages/contract/index.js
#	unpackage/dist/dev/mp-weixin/pages/home/index.js
#	unpackage/dist/dev/mp-weixin/pages/mine/index.js
#	unpackage/dist/dev/mp-weixin/pages/order-goods/index.js
#	unpackage/dist/dev/mp-weixin/pages/realName/realName.js
#	unpackage/dist/dev/mp-weixin/pages/register/register.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-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-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-21 09:38:46 +08:00
c620d13212 fix 2023-09-20 19:59:14 +08:00
bd6eee493f submit 2023-09-20 15:34:58 +08:00
fceea5a04a fix 2023-09-20 15:20:50 +08:00
9682f9259f 相机 2023-09-20 15:11:23 +08:00
67b464f111 submit 2023-09-20 11:30:52 +08:00
e1e8daabfa submit 2023-09-20 11:30:06 +08:00
185c1158b3 submit 2023-09-20 11:29:46 +08:00
3e443dc649 submit 2023-09-19 19:57:48 +08:00
7dfada99a5 submit 2023-09-19 11:48:23 +08:00
eb02bb7d2d submit 2023-09-19 11:22:28 +08:00