Commit Graph

209 Commits

Author SHA1 Message Date
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
6c91b0cde9 submit 2023-09-21 09:42:25 +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
43ab787cff submit 2023-09-21 09:30:49 +08:00
52f705eb80 submit 2023-09-20 20:01:11 +08:00
5a7a6ae287 submit 2023-09-20 19:59:36 +08:00
c620d13212 fix 2023-09-20 19:59:14 +08:00
080dc7b624 submit 2023-09-20 18:00:27 +08:00
e4df8c6394 submit 2023-09-20 17:22:49 +08:00
03a89aec01 submit 2023-09-20 17:11:42 +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
c346019269 submit 2023-09-20 14:13:13 +08:00
4c4d91b1f8 Merge branch 'master' into xingyy 2023-09-20 11:32:23 +08:00
f91a042ae9 submit 2023-09-20 11:32:00 +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
e86437e493 submit 2023-09-20 10:54:22 +08:00
d0710a75ee submit 2023-09-20 10:33:14 +08:00
f35c480fed submit 2023-09-20 10:23:48 +08:00
a50d9ed4c8 submit 2023-09-20 09:47:12 +08:00
3e443dc649 submit 2023-09-19 19:57:48 +08:00
dc23d7c932 submit 2023-09-19 19:34:18 +08:00
beefee79d7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	App.vue
#	main.js
#	pages.json
2023-09-19 19:29:10 +08:00
39acf22625 submit 2023-09-19 19:21:16 +08:00
c24f861c75 merge 2023-09-19 19:20:43 +08:00
5a59c268f9 ui页面 2023-09-19 19:18:11 +08:00
cd161f33f4 submit 2023-09-19 19:02:33 +08:00
e710d39e5e submit 2023-09-19 16:42:19 +08:00
b62fc09471 submit 2023-09-19 15:48:24 +08:00
45b6a51859 submit 2023-09-19 11:56:43 +08:00
1371e6aa49 Merge branch 'master' into xingyy
# Conflicts:
#	pages/index/index.vue
2023-09-19 11:56:33 +08:00
196031129d submit 2023-09-19 11:54:59 +08:00
7dfada99a5 submit 2023-09-19 11:48:23 +08:00
4ea4062543 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	package.json
2023-09-19 11:22:58 +08:00
eb02bb7d2d submit 2023-09-19 11:22:28 +08:00
e07213fbd4 submit 2023-09-19 11:20:41 +08:00
59666731cc pull 2023-09-19 11:07:21 +08:00