 zjf
|
14f4b160e6
|
酒店
|
2026-11-05 17:34:45 +08:00 |
|
|
zjf
|
2a1d0b1d11
|
Merge remote-tracking branch 'origin/master'
|
2026-11-04 14:55:36 +08:00 |
|
|
zjf
|
2c5112a715
|
酒店
|
2026-11-04 14:55:27 +08:00 |
|
|
zjf
|
764dd7380b
|
登录自动注册
|
2026-11-02 14:17:09 +08:00 |
|
|
zjf
|
2b0e53aca2
|
Merge remote-tracking branch 'origin/master'
|
2026-11-02 13:39:16 +08:00 |
|
|
zjf
|
a098b75578
|
酒店
|
2026-11-02 13:39:05 +08:00 |
|
|
zjf
|
03da886ffe
|
酒店
|
2026-10-23 16:23:28 +08:00 |
|
|
zjf
|
afa6a582bc
|
酒店差旅改为出行
|
2026-10-22 16:54:59 +08:00 |
|
|
zjf
|
6405ac60bf
|
Merge branch 'master' of https://gitea.zianxin.com/zianxin/biz-mobile-cloud-zax
|
2026-10-22 12:57:17 +08:00 |
|
|
zjf
|
319d7ffeb1
|
酒店优化
|
2026-10-22 12:57:14 +08:00 |
|
|
zjf
|
64ed90ffd0
|
Merge remote-tracking branch 'origin/master'
|
2026-10-20 11:51:00 +08:00 |
|
|
zjf
|
366d304ab6
|
酒店优化
|
2026-10-20 11:50:51 +08:00 |
|
|
zjf
|
b9e2010cd2
|
酒店优化
|
2026-10-16 11:09:25 +08:00 |
|
|
zjf
|
751993856b
|
酒店优化
|
2026-10-15 13:38:49 +08:00 |
|
|
zjf
|
d441fffc19
|
酒店详情
|
2026-10-13 17:31:41 +08:00 |
|
|
zjf
|
0958d8dded
|
Merge remote-tracking branch 'origin/master'
|
2026-10-13 16:43:41 +08:00 |
|
|
zjf
|
de3d5f052e
|
酒店
|
2026-10-13 16:43:25 +08:00 |
|
|
zjf
|
eb46a785e6
|
Merge remote-tracking branch 'origin/master'
|
2026-10-10 18:03:47 +08:00 |
|
|
zjf
|
b6380ab6da
|
酒店
|
2026-10-10 18:03:37 +08:00 |
|
|
zjf
|
c958509e8a
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
|
2026-10-10 12:02:52 +08:00 |
|
|
zjf
|
8cb8eac9cd
|
食堂字段
|
2026-10-10 12:02:41 +08:00 |
|
|
zjf
|
71ba22bedc
|
h5环境配置
|
2026-09-28 17:25:10 +08:00 |
|
|
zjf
|
487082cc80
|
h5环境配置
|
2026-09-28 17:16:27 +08:00 |
|
|
zjf
|
a82b41585b
|
1.套餐字段添加 2.移除浙政钉环境和诗画环境
|
2026-09-28 16:53:17 +08:00 |
|
|
zjf
|
7850e0a042
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .env
# src/sheep/hooks/use-scan-code.ts
|
2026-09-28 16:52:27 +08:00 |
|
|
zjf
|
5c977fbc4b
|
1.套餐字段添加 2.移除浙政钉环境和诗画环境
|
2026-09-28 16:50:24 +08:00 |
|
|
zjf
|
82eb671f0d
|
Merge remote-tracking branch 'origin/master'
|
2026-09-22 14:13:10 +08:00 |
|
|
zjf
|
0f2926ff91
|
ai点餐
|
2026-09-22 14:12:57 +08:00 |
|
|
zjf
|
69f48c4595
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/pages/root/login.vue
|
2026-09-21 15:07:56 +08:00 |
|
|
zjf
|
a6e71a1e22
|
登录增强
|
2026-09-21 15:01:13 +08:00 |
|
|
zjf
|
f76aee3ecc
|
Merge remote-tracking branch 'origin/master'
|
2026-09-09 10:41:31 +08:00 |
|
|
zjf
|
09d4f2430d
|
国际化
|
2026-09-09 10:41:15 +08:00 |
|
|
zjf
|
3cbb8fb6df
|
Merge remote-tracking branch 'origin/master'
|
2026-09-08 11:03:19 +08:00 |
|
|
zjf
|
51515a71a9
|
中文简体，邀请注册
|
2026-09-08 11:03:04 +08:00 |
|
|
zjf
|
ded3be3fb5
|
Merge remote-tracking branch 'origin/master'
|
2026-09-03 14:03:56 +08:00 |
|
|
zjf
|
cb348cacae
|
订单页面样式调整，个别页面国际化适配完善
|
2026-09-03 14:03:39 +08:00 |
|
|
zjf
|
4a50b9fc64
|
冲突页面国际化重新适配
|
2026-09-02 15:51:02 +08:00 |
|
|
zjf
|
396b724d5e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .env
# src/pages/message/list.vue
# src/pages/order/daily-menu-confirm.vue
# src/sheep/components/order/daily-menu-cart-drawer.vue
|
2026-09-02 15:36:58 +08:00 |
|
|
zjf
|
24a7aac15c
|
Merge branch 'gjh'
# Conflicts:
# .env
|
2026-09-02 15:26:04 +08:00 |
|
|
zjf
|
f787f01657
|
国际化
|
2026-09-02 15:25:31 +08:00 |
|
|
zjf
|
e10c6f2c24
|
.env
|
2026-09-02 11:47:43 +08:00 |
|
|
zjf
|
2bdc2ca71b
|
国际化
|
2026-09-02 11:39:35 +08:00 |
|
|
zjf
|
d9c059c9df
|
国际化
|
2026-09-02 11:39:26 +08:00 |
|
|
zjf
|
2f3b238320
|
Merge branch 'master' into gjh
# Conflicts:
# src/pages/setting/index.vue
|
2026-08-31 11:52:28 +08:00 |
|
|
zjf
|
8bdb41a4fc
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
|
2026-08-31 11:31:12 +08:00 |
|
|
zjf
|
d3658e1946
|
超市商城样式调整
|
2026-08-31 11:31:01 +08:00 |
|
|
zjf
|
e136de1030
|
国际化
|
2026-08-27 14:29:23 +08:00 |
|
|
zjf
|
7cf86763a6
|
.env
|
2026-08-07 17:12:53 +08:00 |
|
|
zjf
|
c05765ee0c
|
Merge remote-tracking branch 'origin/master'
|
2026-08-07 17:12:01 +08:00 |
|
|
zjf
|
5ff95c6e4e
|
增加apple登录
|
2026-08-07 17:11:49 +08:00 |
|
|
zjf
|
24b303d519
|
增加apple登录
|
2026-08-07 17:11:41 +08:00 |
|
|
zjf
|
7f695aa27a
|
每日菜谱支持套餐
|
2026-08-04 16:41:37 +08:00 |
|
|
zjf
|
99aa1ac213
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
# Conflicts:
# .env
|
2026-08-03 15:37:59 +08:00 |
|
|
zjf
|
92747d069f
|
.
|
2026-08-03 15:36:14 +08:00 |
|
|
zjf
|
fe36a3cd9b
|
Merge remote-tracking branch 'origin/master'
|
2026-07-25 19:47:26 +08:00 |
|
|
zjf
|
7895beeeb2
|
餐段bug修复
|
2026-07-25 19:47:13 +08:00 |
|
|
zjf
|
0b369ed340
|
Merge remote-tracking branch 'origin/master'
|
2026-07-22 15:04:10 +08:00 |
|
|
zjf
|
9a3a1615ed
|
食堂样式美化，增加套餐，修复后台账号移动端个别搜索问题
|
2026-07-22 15:03:52 +08:00 |
|
|
zjf
|
6d96f3828b
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
# Conflicts:
# .env
|
2026-07-22 10:33:12 +08:00 |
|
|
zjf
|
16bceaea29
|
.env
|
2026-07-22 10:32:20 +08:00 |
|
|
zjf
|
e008d753dd
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
# Conflicts:
# .env
|
2026-07-14 10:23:42 +08:00 |
|
|
zjf
|
248e747bee
|
.env加入国际化开启配置
|
2026-07-14 10:23:14 +08:00 |
|
|
zjf
|
4c82fa307b
|
Merge remote-tracking branch 'origin/master'
|
2026-07-13 21:54:24 +08:00 |
|
|
zjf
|
b11f6b6dd7
|
我的页面增加个人信息编辑，修复用户管理和钱包管理搜索兼容性问题，修复编辑用户报错问题
|
2026-07-13 21:54:10 +08:00 |
|
|
zjf
|
dc19487f5f
|
我的，商家页面样式修改，增加我的商家页面广告模块
|
2026-06-30 18:31:09 +08:00 |
|
|
zjf
|
3b59c42110
|
我的增加后台管理，用户管理，电子钱包
|
2026-06-25 17:24:49 +08:00 |
|
|
zjf
|
3ff794a944
|
我的增加后台管理，用户管理，电子钱包
|
2026-06-25 17:24:23 +08:00 |
|
|
zjf
|
a8b09c7cc9
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
# Conflicts:
# .env
|
2026-06-24 09:39:10 +08:00 |
|
|
zjf
|
f5b5abbc86
|
.
|
2026-06-24 09:38:48 +08:00 |
|
|
zjf
|
dcca1af418
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .env
# src/sheep/utils/request.ts
|
2026-06-18 17:02:55 +08:00 |
|
|
zjf
|
4f5fd21898
|
微信登录，重置密码
|
2026-06-18 17:01:09 +08:00 |
|
|
zjf
|
20d04d7fe4
|
修复安卓我的地址不显示确定按钮问题
|
2026-06-17 09:37:59 +08:00 |
|
|
zjf
|
796528ea95
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
# Conflicts:
# .env
|
2026-06-17 09:30:22 +08:00 |
|
|
zjf
|
57b1d4070a
|
.env
|
2026-06-17 09:30:07 +08:00 |
|
|
zjf
|
3ff57c3186
|
退出登录调用退出登录接口
|
2026-06-15 18:53:05 +08:00 |
|
|
zjf
|
5170a326a4
|
登录错误信息缩短
|
2026-06-15 13:43:48 +08:00 |
|
|
zjf
|
40546988a7
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
# Conflicts:
# .env
|
2026-06-15 10:09:02 +08:00 |
|
|
zjf
|
99d37f3401
|
开发环境不加密
|
2026-06-15 10:08:22 +08:00 |
|
|
zjf
|
66a573beec
|
开发环境不加密
|
2026-06-15 10:08:09 +08:00 |
|
|
zjf
|
41b5b36c5c
|
Merge remote-tracking branch 'origin/master'
|
2026-06-11 14:17:39 +08:00 |
|
|
zjf
|
c57912a0f5
|
加密修改，我的页面修复存在重复请求用户info的情况
|
2026-06-11 14:17:27 +08:00 |
|
|
zjf
|
c810b0515f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/pages/tabbar/my.vue
|
2026-06-09 16:03:34 +08:00 |
|
|
zjf
|
39b05e62bf
|
新用户首次登录强制修改密码，修改菜单名称
|
2026-06-09 16:01:47 +08:00 |
|
|
zjf
|
335df8b593
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .env
# src/sheep/scss/font/iconfont.scss
|
2026-06-05 18:36:56 +08:00 |
|
|
zjf
|
ef32ecbf7b
|
报餐图标更新
|
2026-06-05 18:35:49 +08:00 |
|
|
zjf
|
d58a3186be
|
Merge remote-tracking branch 'origin/master'
|
2026-06-02 14:25:48 +08:00 |
|
|
zjf
|
0cea375cfc
|
商品管理
|
2026-06-02 14:25:35 +08:00 |
|
|
zjf
|
823e1e3477
|
Merge remote-tracking branch 'origin/master'
|
2026-06-01 19:05:13 +08:00 |
|
|
zjf
|
7014ebf937
|
商家订单，骑手订单页面
|
2026-06-01 19:03:30 +08:00 |
|
|
zjf
|
7d9e021d75
|
报餐
|
2026-05-27 14:54:16 +08:00 |
|
|
zjf
|
72fb3c071d
|
修改报餐入口，完善报餐餐段
|
2026-05-27 13:31:06 +08:00 |
|
|
zjf
|
b25642b028
|
报餐记录改为记录，赚米改为兑换，报餐统计改为统计
|
2026-05-27 11:10:20 +08:00 |
|
|
zjf
|
5264ee70ee
|
Merge remote-tracking branch 'origin/master'
|
2026-05-25 20:10:43 +08:00 |
|
|
zjf
|
d698a703f2
|
报餐
|
2026-05-25 20:10:24 +08:00 |
|
|
zjf
|
ef322a8e90
|
报餐
|
2026-05-25 18:59:37 +08:00 |
|
|
zjf
|
392648a16e
|
报餐
|
2026-05-25 18:59:29 +08:00 |
|
|
zjf
|
6777d81473
|
报餐
|
2026-05-25 18:59:07 +08:00 |
|
|
zjf
|
69ab46a10c
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
# Conflicts:
# .env
|
2026-05-22 17:32:18 +08:00 |
|
|
zjf
|
f3aa05c798
|
.env
|
2026-05-22 17:32:10 +08:00 |
|
|
zjf
|
d4a0dec85f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .env
|
2026-04-15 17:26:52 +08:00 |
|