Commit Graph

55 Commits

Author SHA1 Message Date
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
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
4095ec7700 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair 2024-09-26 10:43:14 +08:00
xiao-fajia
ab3798aef2 更新代码 2024-09-26 10:43:07 +08:00
Vinjor
6785e0a503 1 2024-09-25 23:16:03 +08:00
Vinjor
d6aac90751 代码丢失问题处理 2024-09-25 20:52:41 +08:00
Vinjor
0611548eae 登录页 2024-09-25 18:39:49 +08:00
xiao-fajia
47bda569f7 更新代码 2024-09-25 10:22:50 +08:00
xiao-fajia
90de7773a2 更新代码 2024-09-25 10:09:50 +08:00
xiao-fajia
2c1e8242f7 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair
# Conflicts:
#	.idea/.gitignore
2024-09-25 08:56:09 +08:00
xiao-fajia
374b24294d 更新代码 2024-09-25 08:46:39 +08:00
Vinjor
5076f85835 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair 2024-09-24 22:41:09 +08:00
Vinjor
1ee334a032 登录 2024-09-24 22:41:07 +08:00
PQZ
257cf7df40 1 2024-09-24 22:37:42 +08:00
PQZ
a49d953ccc 1 2024-09-24 22:36:59 +08:00
PQZ
4a2421b1bd 1 2024-09-24 22:33:21 +08:00
PQZ
9998c0a1b7 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair
# Conflicts:
#	.gitignore
#	config.js
2024-09-24 21:36:30 +08:00
PQZ
7a2d58754d 1 2024-09-24 21:30:53 +08:00
Lihx
e3cad75481 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	package-lock.json
2024-09-24 21:23:35 +08:00
Lihx
ddda766931 信息公告 2024-09-24 21:20:37 +08:00
xiao-fajia
ac30a445dc 更新代码 2024-09-24 21:00:38 +08:00
xiao-fajia
96cb93ae35 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair
# Conflicts:
#	config.js
2024-09-24 20:46:13 +08:00
xiao-fajia
fdc82f2a13 更新代码 2024-09-24 20:45:24 +08:00
Vinjor
a554d97cb7 1 2024-09-24 20:12:27 +08:00
zhaotianfeng
0b3558b3d2 Merge remote-tracking branch 'origin/master' 2024-09-24 19:48:11 +08:00
zhaotianfeng
11d95dd1b4 我的车辆 2024-09-24 19:46:55 +08:00
Vinjor
b1fa12ccbf 账号密码登录 2024-09-24 19:42:08 +08:00
Vinjor
ce148f695b Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair
# Conflicts:
#	config.js
2024-09-24 18:35:30 +08:00
Vinjor
ed71f35fcb 微信公众号自动登录 2024-09-24 18:32:59 +08:00
PQZ
b6a0f47245 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair 2024-09-24 16:58:31 +08:00
PQZ
33becfbcc1 1 2024-09-24 16:58:29 +08:00
109a522322 Merge remote-tracking branch 'origin/master' 2024-09-24 16:46:35 +08:00
69fd5efed0 优惠卷 2024-09-24 16:46:05 +08:00
xiao-fajia
b4059c6792 Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair
# Conflicts:
#	config.js
2024-09-24 16:26:44 +08:00
xiao-fajia
0ffb565546 先提交一下 2024-09-24 16:26:03 +08:00
PQZ
5070f7277e 先提交一下 2024-09-24 16:25:27 +08:00
d6ad3e73d8 调整 2024-09-24 16:14:08 +08:00
f84f9fc043 调整 2024-09-24 16:03:57 +08:00
fd6ddb5122 优惠卷 2024-09-24 16:02:12 +08:00
PQZ
508ca8f135 1 2024-09-24 00:19:47 +08:00
PQZ
8294a578b3 1 2024-09-24 00:06:18 +08:00
d7b061fba9 1212 2024-09-23 23:34:24 +08:00
92cd59443e pay 2024-09-23 23:19:38 +08:00