28 Commits

Author SHA1 Message Date
17f51522a7 Merge branch 'feature-oneLogin' into pre-release
# Conflicts:
#	App.vue
#	manifest.json
#	pages.json
#	pages/gather/gather.vue
#	pages/index/index.vue
#	pages/user/index.vue
#	pages/users/login/login_copy.vue
2024-05-14 16:27:00 +08:00
1154079537
1f1392cc1d 修改 2024-05-11 16:55:28 +08:00
1154079537
ed54b94354 下拉 2024-05-11 14:38:31 +08:00
1154079537
8f7ba8ba4e continue 2024-05-10 18:06:31 +08:00
1154079537
c5437b487a 修改 2024-05-10 16:32:04 +08:00
zmj
0e407ece6a bug修复 2024-05-07 17:31:34 +08:00
zmj
42afabe62f 新商户引导页弹出规则修改 2024-05-05 22:22:45 +08:00
zmj
4972fb2884 商户入住bug修复 2024-05-03 15:02:21 +08:00
zmj
d7900f8eb1 bug修复 2024-04-30 18:56:28 +08:00
zmj
8084522158 add 2024-04-29 23:05:04 +08:00
weipengfei
32ff09e5fd 修复了定位bug 2024-04-24 18:00:36 +08:00
DESKTOP-GMUNQ1B\k
88ec36b28e 1 2024-04-02 18:41:12 +08:00
DESKTOP-GMUNQ1B\k
b4d25be9b3 1 2024-04-02 18:34:35 +08:00
DESKTOP-GMUNQ1B\k
8c711250b9 1 2024-04-02 16:37:05 +08:00
weipengfei
d06a841a59 更新 2024-03-29 15:17:12 +08:00
weipengfei
d0e4a8b096 更新 2024-03-28 13:43:25 +08:00
weipengfei
b269a9dd88 修复bug 2024-03-27 09:44:47 +08:00
DESKTOP-GMUNQ1B\k
4a407b8ecc Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app 2024-03-26 17:07:02 +08:00
DESKTOP-GMUNQ1B\k
1996c10418 1 2024-03-26 17:06:27 +08:00
weipengfei
9e7b16a79b 更新 2024-03-26 16:55:50 +08:00
weipengfei
5c9b02ed3b 更新 2024-03-26 14:28:26 +08:00
DESKTOP-GMUNQ1B\k
c58d4982f9 1 2024-03-22 17:46:44 +08:00
DESKTOP-GMUNQ1B\k
aeaa74ff25 Revert "1"
This reverts commit 6c7a7ccd46334a9eac0a57b360cf1041f894c8af.
2024-03-22 16:26:46 +08:00
DESKTOP-GMUNQ1B\k
6c7a7ccd46 1 2024-03-22 16:15:10 +08:00
weipengfei
561f525dd1 更新 2024-03-20 15:17:04 +08:00
weipengfei
b8e676fa3b 新增老商城部分功能 2024-02-26 13:35:08 +08:00
weipengfei
eccdb7bc24 更新 2024-02-19 18:00:04 +08:00
weipengfei
3bfde5c3f7 初始化 2024-02-19 10:44:33 +08:00