lanan-repair/pages
Vinjor 110bbf8232 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair
# Conflicts:
#	config.js
#	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/VNavigationBar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/mote-lines-divide/mote-lines-divide.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/reservationOrder/reservationOrder.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/tabBar/tabBar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/guideList/guideDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/guideList/guideList.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/cardRoll.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/evaluate.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/message.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myEquity.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myInfo.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/register.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCar/carDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCar/myCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/myReservation/addReservation.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/myReservation/myReservation.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/myReservation/reservationSuccess.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderDetail/evaluate.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderDetail/orderDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderList/orderList.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopDetail/shopDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.js.map
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/common/main.js
#	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/VNavigationBar.js
#	unpackage/dist/dev/mp-weixin/components/mote-lines-divide/mote-lines-divide.js
#	unpackage/dist/dev/mp-weixin/components/reservationOrder/reservationOrder.js
#	unpackage/dist/dev/mp-weixin/components/reservationOrder/reservationOrder.json
#	unpackage/dist/dev/mp-weixin/components/tabBar/tabBar.js
#	unpackage/dist/dev/mp-weixin/pages/guideList/guideDetail.js
#	unpackage/dist/dev/mp-weixin/pages/guideList/guideList.js
#	unpackage/dist/dev/mp-weixin/pages/home/home.js
#	unpackage/dist/dev/mp-weixin/pages/home/home.wxml
#	unpackage/dist/dev/mp-weixin/pages/my/cardRoll.js
#	unpackage/dist/dev/mp-weixin/pages/my/evaluate.js
#	unpackage/dist/dev/mp-weixin/pages/my/message.js
#	unpackage/dist/dev/mp-weixin/pages/my/my.js
#	unpackage/dist/dev/mp-weixin/pages/my/myEquity.js
#	unpackage/dist/dev/mp-weixin/pages/my/myInfo.js
#	unpackage/dist/dev/mp-weixin/pages/my/register.js
#	unpackage/dist/dev/mp-weixin/pages/my/register.json
#	unpackage/dist/dev/mp-weixin/pages/my/register.wxml
#	unpackage/dist/dev/mp-weixin/pages/my/register.wxss
#	unpackage/dist/dev/mp-weixin/pages/myCar/carDetail.js
#	unpackage/dist/dev/mp-weixin/pages/myCar/myCar.js
#	unpackage/dist/dev/mp-weixin/pages/myReservation/addReservation.js
#	unpackage/dist/dev/mp-weixin/pages/myReservation/addReservation.wxml
#	unpackage/dist/dev/mp-weixin/pages/myReservation/myReservation.js
#	unpackage/dist/dev/mp-weixin/pages/myReservation/reservationSuccess.js
#	unpackage/dist/dev/mp-weixin/pages/orderDetail/evaluate.js
#	unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.js
#	unpackage/dist/dev/mp-weixin/pages/orderList/orderList.js
#	unpackage/dist/dev/mp-weixin/pages/orderList/orderList.wxml
#	unpackage/dist/dev/mp-weixin/pages/orderList/orderList.wxss
#	unpackage/dist/dev/mp-weixin/pages/shopDetail/shopDetail.js
#	unpackage/dist/dev/mp-weixin/pages/shopDetail/shopDetail.wxml
#	unpackage/dist/dev/mp-weixin/project.config.json
#	unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js
#	unpackage/dist/dev/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.js
2024-09-27 17:26:03 +08:00
..
detedetails 信息公告 2024-09-24 21:20:37 +08:00
guideList 提交 2024-09-22 15:07:01 +08:00
home Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair 2024-09-27 17:20:28 +08:00
index 简易登录页 2024-09-23 09:48:02 +08:00
login 会员注册 2024-09-27 17:21:10 +08:00
my 会员注册 2024-09-27 17:21:10 +08:00
myCar 会员注册 2024-09-27 17:21:10 +08:00
myReservation 会员注册 2024-09-27 17:21:10 +08:00
orderDetail 更新代码 2024-09-24 20:45:24 +08:00
orderList idea 2024-09-26 18:44:42 +08:00
shopDetail idea 2024-09-26 18:44:42 +08:00