67 Commits (master)

Author SHA1 Message Date
Aiden 41cbac698a fix 3 months ago
Aiden 48b8fb44a0 fix 3 months ago
Aiden 368b2d7997 fix 3 months ago
Aiden 1f9549df40 fix 3 months ago
Phoenix afae532764 submit 6 months ago
Aiden e9e1b75a94 fix 6 months ago
Aiden 070b82fa4e fix 6 months ago
Phoenix 1664235cf5 submit 6 months ago
Aiden 166d70e900 push 9 months ago
xingyy 23adf9d1c7 submit 9 months ago
xingyy df50066b09 submit 9 months ago
Aiden 493f4e9eef push 9 months ago
Aiden 6c21adaaba push 9 months ago
xingyy 0bda2d9b96 submit 9 months ago
Aiden 8d05bab236 fix 11 months ago
xingyy f17870d8b2 remove ignored_dir 11 months ago
Aiden 077a989124 fix 11 months ago
Aiden 7a8da59189 fix 11 months ago
Aiden 7dacc5d9bc fix 11 months ago
xingyy 4619629d2a submit 11 months ago
xingyy 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
11 months ago
xingyy d7d7582409 submit 11 months ago
Aiden e836f8b1fb fix 11 months ago
Aiden debb9e148f fix 11 months ago
Aiden 6ac1b9a92c fix 11 months ago
xingyy 2145ce9aac submit 11 months ago
Aiden 47df11c81f fix 11 months ago
xingyy bcd7e8d0e3 submit 11 months ago
Aiden dd1f40353a fix 12 months ago
Aiden 2caa156983 fix 12 months ago
Aiden 2ab9962bec fix 12 months ago
xingyy 2c43332649 submit 12 months ago
Aiden 9a4b91910e fix 12 months ago
Aiden 8615940d86 fix 12 months ago
Aiden e36c5453c2 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
Aiden 74da231357 fix 1 year ago
xingyy 93555318e9 submit 1 year ago
Aiden 4ecf815564 fix 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
xingyy 43ab787cff submit 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