Commit Graph

118 Commits

Author SHA1 Message Date
Vinjor
ac6dd47b06 1 2024-10-24 18:15:15 +08:00
Vinjor
9b67a469d4 1 2024-10-24 16:44:45 +08:00
Vinjor
1535eb874e 分页bug 2024-10-22 12:02:57 +08:00
Vinjor
14cd3aafdd Merge branch 'dev'
# Conflicts:
#	config.js
2024-10-21 17:09:58 +08:00
Vinjor
6b8cc0fee5 小程序完善 2024-10-21 17:08:12 +08:00
PQZ
bb59d93494 1 2024-10-19 18:07:32 +08:00
PQZ
087d25f451 1 2024-10-19 16:26:36 +08:00
Vinjor
4d63d694f3 微信分享注册 2024-10-15 18:47:56 +08:00
Vinjor
a7f4597468 订单列表加分页,操作指南对接扣 2024-10-15 15:24:01 +08:00
Vinjor
52cc6cd3c3 Merge branch 'dev' of http://122.51.230.86:3000/sunliwei/lanan-repair into dev 2024-10-14 18:36:29 +08:00
Vinjor
dccf1d0bde 客户信息及授权 2024-10-14 18:36:20 +08:00
xiaofajia
6fb5d7dce8 Merge branch 'dev' of http://122.51.230.86:3000/sunliwei/lanan-repair into dev 2024-10-14 18:09:26 +08:00
Vinjor
6ad7a2ea20 小程序完善 2024-10-14 18:06:55 +08:00
xiaofajia
f0774a853d 修改订单评价 2024-10-14 18:04:47 +08:00
Vinjor
c39ae9419e 个人信息、车辆信息 2024-10-11 20:50:05 +08:00
PQZ
532e0e6700 1 2024-09-28 17:35:06 +08:00
Vinjor
17c53afdb4 bug修改 2024-09-28 11:22:55 +08:00
Vinjor
65e5c884fa bug修改 2024-09-28 10:29:20 +08:00
8c7965638e 1 2024-09-28 00:43:23 +08:00
c23969ee2f 分包 2024-09-28 00:17:38 +08:00
ccf6bea361 回退 active.vue 2024-09-27 23:38:57 +08:00
2a0ccebfac 首页调整 2024-09-27 23:32:05 +08:00
5a2e35198b idea 2024-09-27 23:14:09 +08:00
Vinjor
d60c3c9b70 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair 2024-09-27 21:17:34 +08:00
Vinjor
93c477323b 参加活动 2024-09-27 21:17:16 +08:00
xiao-fajia
727c9fd2f6 参与活动 2024-09-27 21:08:18 +08:00
xiao-fajia
4215f0ff1f 参与活动 2024-09-27 21:07:00 +08:00
xiao-fajia
2e815440de banner图 2024-09-27 20:58:56 +08:00
Vinjor
ba8549a0b8 防重点击 2024-09-27 20:48:40 +08:00
Vinjor
bd34071f8e 参加到点有礼后刷新活动 2024-09-27 20:43:57 +08:00
Vinjor
85121466ee Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair 2024-09-27 20:37:30 +08:00
Vinjor
4e85a2906a 活动营销 2024-09-27 20:37:19 +08:00
aea2cf1ccb 图片大小调整 2024-09-27 20:14:38 +08:00
Vinjor
3e1542cc93 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair 2024-09-27 20:09:52 +08:00
Vinjor
a5ac523309 1 2024-09-27 20:08:34 +08:00
Vinjor
a7d35738b9 活动 2024-09-27 20:08:04 +08:00
Vinjor
c63d50bdf8 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair
# Conflicts:
#	config.js
#	pages/home/active.vue
#	utils/common.js
2024-09-27 19:32:34 +08:00
Vinjor
0596468486 参加活动 2024-09-27 19:31:07 +08:00
xiao-fajia
9aa289a172 更新代码 2024-09-27 19:14:16 +08:00
xiao-fajia
7f92f9b9e7 更新代码 2024-09-27 18:42:50 +08:00
Vinjor
ece7767727 强制判断是否登录 2024-09-27 17:57:20 +08:00
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
Vinjor
be4124f28c 删除unpackage 2024-09-27 17:23:49 +08:00
Vinjor
73b881b94e Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair 2024-09-27 17:21:23 +08:00
Vinjor
262fb27332 会员注册 2024-09-27 17:21:10 +08:00
xiao-fajia
d4d7a58f07 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair 2024-09-27 17:20:28 +08:00
xiao-fajia
1e97652cea 更新代码 2024-09-27 17:19:46 +08:00
PQZ
c1db484b55 11111 2024-09-27 17:14:48 +08:00
3254ba30e7 idea 2024-09-26 18:44:42 +08:00
xiao-fajia
90cf155a95 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair 2024-09-26 10:57:32 +08:00