Commit Graph

32 Commits

Author SHA1 Message Date
9a4b91910e fix 2023-10-07 18:08:22 +08:00
e36c5453c2 fix 2023-10-07 17:51:18 +08:00
222d1107cc fix 2023-10-07 17:44:16 +08:00
d13d86d123 fix 2023-09-26 13:59:35 +08:00
6d9779d21d submit 2023-09-26 10:43:39 +08:00
5a5dd31c68 Merge branch 'xingyy'
# Conflicts:
#	App.vue
#	http/interface.js
#	pages/home/index.vue
2023-09-25 19:34:29 +08:00
5a900e0378 submit 2023-09-25 19:01:50 +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
dd91a4f69e submit 2023-09-23 14:38:30 +08:00
2d0e817c1f submit 2023-09-23 11:50:34 +08:00
42d02836a3 节点 2023-09-22 13:24:04 +08:00
8698bd5a4d submit 2023-09-21 12:01:11 +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
c346019269 submit 2023-09-20 14:13:13 +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
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
5a59c268f9 ui页面 2023-09-19 19:18:11 +08:00
b62fc09471 submit 2023-09-19 15:48:24 +08:00
0fc9c9883c submit 2023-09-19 10:53:38 +08:00
71a33a0dac submit 2023-09-19 10:50:09 +08:00
9a840e4064 merge 2023-09-19 09:55:59 +08:00
bf58c42582 登录 2023-09-19 09:48:45 +08:00
6973d6dba5 submit 2023-09-19 09:42:44 +08:00
2742c317ee submit 2023-09-18 15:35:21 +08:00