lihuilin
|
a10c6d613c
|
Merge branch 'milestone-20250623-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250623-金币前端
|
9 months ago |
|
lihuilin
|
6dd01e75d9
|
排序好了吗
|
9 months ago |
|
lihuilin
|
b63af1ac32
|
排序好了吗
|
9 months ago |
lihui
|
c1f6f2fbcf
|
Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端
# Conflicts:
# src/views/consume/addCoinConsume.vue
|
9 months ago |
|
lihui
|
96c9e98f1c
|
fix合并冲突
|
9 months ago |
|
lihui
|
c1e9f741ed
|
Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端
|
9 months ago |
|
lihui
|
afc786d19f
|
fix:充值审核增加排序
|
9 months ago |
zry
|
3ba3bd0e4f
|
merge success-20250704
|
9 months ago |
|
zry
|
e80c96abf0
|
fixed some bug...
|
9 months ago |
|
lihui
|
4bcaf3fa7c
|
Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端
|
9 months ago |
|
lihui
|
90630a8fe8
|
fix:充值审核 去掉总计的任务金币显示，充值金额与永久金币统一，去掉审核时间的排序
|
9 months ago |
|
lihuilin
|
07ee34f59b
|
修改箭头
|
9 months ago |
|
lihui
|
e41c835833
|
Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端
|
9 months ago |
|
lihui
|
278dff9c8b
|
fix:消耗详情 ERP系统改为ERP
汇率增加验证数字与字符串
充值审核改了按钮的布局
|
9 months ago |
|
lihui
|
4a6bfe739d
|
Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端
|
9 months ago |
|
lihui
|
a610f59f26
|
fix: 新增消耗金币分配问题，传adminId问题 汇率页面传adminId问题
|
9 months ago |
|
lihuilin
|
a581757670
|
工作台/100
|
9 months ago |
|
lihuilin
|
c169e8802c
|
与测试同步
|
9 months ago |
|
lihuilin
|
a071e5c8d5
|
小bug
|
9 months ago |
|
lihuilin
|
585e96770d
|
改了域名，导出好了
|
10 months ago |
|
lihuilin
|
ba5d48fec1
|
导出好了
|
10 months ago |
|
lihuilin
|
a669588ec5
|
登录完成
|
10 months ago |
|
lihuilin
|
cdb80edce6
|
差登录，网卡死了天哪
|
10 months ago |
|
lihuilin
|
ba32b86392
|
Merge branch 'lihuilin/feature-20250623164044-金币前端' into milestone-20250623-金币前端
|
10 months ago |
|
lihuilin
|
397592b0c5
|
差登录
|
10 months ago |
|
lihuilin
|
30ab9514d2
|
Merge branch 'lihuilin/feature-20250623164044-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into lihuilin/feature-20250623164044-金币前端
|
10 months ago |
|
lihuilin
|
e5d28b9da3
|
差支付凭证
|
10 months ago |
no99
|
56ec957a95
|
Merge branch 'lihuilin/feature-20250623164044-金币前端' into milestone-20250623-金币前端
|
10 months ago |
|
no99
|
b8ba2a3bc5
|
在登陆界面浏览器链接拼上machineId
|
10 months ago |
|
lihuilin
|
dac9f6f5a0
|
删了用户登录，动画保留！
|
10 months ago |
|
no99
|
18639c0f49
|
暂时登录页面
|
10 months ago |
|
no99
|
7487eaf275
|
login-hxl暂时登陆界面
|
10 months ago |
|
lihuilin
|
6cc6fc02e7
|
充值审核没改完
|
10 months ago |
|
lihuilin
|
79b2b39b5d
|
差退款审核、柱状图
|
10 months ago |
|
lihuilin
|
9f8855cafe
|
测试一下
|
10 months ago |
|
zry
|
b699ac9ad8
|
success merge branch 'zhangrenyuan/feature-20250623164058-金币前端' into milestone-20250623-金币前端
|
10 months ago |
|
zry
|
79e6046fae
|
完成数据的测试，传数据库的*100，拿数据的/100，包括充值，退款，客户账户明细。存在的问题（也许是后端）：1、排序；2、客户账户明细的永久金币字段
|
10 months ago |
|
lihuilin
|
533f04e709
|
差柱状图、退款审核
|
10 months ago |
|
lihui
|
5792155eaa
|
feat: 1.充值审核（缺总计接口、缺排序）2.消费传给后端*100 拿到数据/100 3.修改请求地址为测试服务器
fix:修改合并出现问题
|
10 months ago |
|
zry
|
137c178636
|
merge lh,zry,milestone success
|
10 months ago |
|
zry
|
b4ccc725ac
|
地址更换为服务器的，修改了新增充值、充值明细，昨天的退款
|
10 months ago |
|
lihui
|
152b99adfc
|
style: 修改 汇率 消耗详情的代码格式，优化汇率输入错误的提示
feat：消耗明细金币总计（根据筛选）、排序功能
refactor: 重构充值审核，退款审核页面样式、字段 ，目前缺后端接口
|
10 months ago |
|
lihuilin
|
c9efe4f4cd
|
??
|
10 months ago |
|
lihuilin
|
4c3c8cd5e0
|
??
|
10 months ago |
|
lihuilin
|
d03b13e750
|
0629merge
|
10 months ago |
|
lihuilin
|
ed0d2b0659
|
0629
|
10 months ago |
|
zry
|
e1a58c669d
|
退款合并冲突解决
|
10 months ago |
|
zry
|
2597185c27
|
登录做了修改，不需要验证登录，退款页面（基本完成，需要后端的退款类型接口、商品接口；以及计算明细的合计数的正确逻辑
|
10 months ago |
|
lihui
|
bae599c1e2
|
feat: 新增消耗（完成） 消耗明细（总计金币数[后端不能筛选]） 汇率页面（完成）
|
10 months ago |
|
lihui
|
49807ae9e3
|
feat: 新增消耗（提交，数据正常提交，后端返回提示错误） 消耗明细（缺总计金币数） 汇率页面（完成）
|
10 months ago |
