26 Commits (7a8da59189791c5ecb75b3dd60e86c7415377a5b)

Author SHA1 Message Date
Aiden 7dacc5d9bc fix 11 months ago
xingyy bcd7e8d0e3 submit 11 months ago
Aiden dd1f40353a fix 12 months ago
Aiden 41df0afa36 fix 12 months ago
Aiden 2caa156983 fix 12 months ago
Aiden 2ab9962bec fix 12 months ago
xingyy 2c43332649 submit 12 months ago
Aiden 8615940d86 fix 12 months ago
Aiden 222d1107cc fix 12 months ago
xingyy df52885c1b update .gitignore 1 year ago
xingyy ecb08e26a4 submit 1 year ago
Aiden 842b62b940 fix 1 year ago
xingyy 93555318e9 submit 1 year ago
Aiden 89e7dff671 liantiao 1 year ago
Aiden 42be3396d8 pull 1 year ago
xingyy 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
1 year ago
Aiden c620d13212 fix 1 year ago
xingyy bd6eee493f submit 1 year ago
Aiden fceea5a04a fix 1 year ago
Aiden 9682f9259f 相机 1 year ago
xingyy 67b464f111 submit 1 year ago
xingyy e1e8daabfa submit 1 year ago
xingyy 185c1158b3 submit 1 year ago
xingyy 3e443dc649 submit 1 year ago
xingyy 7dfada99a5 submit 1 year ago
xingyy eb02bb7d2d submit 1 year ago