chenzhi
|
b69ca03856
|
bug修复2
|
5 years ago |
 ELF
|
145144ba51
|
解决冲突
|
5 years ago |
|
ELF
|
4a403076b9
|
解决冲突
|
5 years ago |
|
ELF
|
983b707d69
|
修改手机端显示
|
5 years ago |
zhengchanglong
|
a550435883
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
9cebace169
|
Merge branch 'dev-cz' into dev
|
5 years ago |
tpingzhang
|
99f4d30af0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
tpingzhang
|
41075f8abc
|
Merge branch 'serveridnull' into dev
|
5 years ago |
|
chenzhi
|
b8945e8655
|
修复bug
|
5 years ago |
|
zhengchanglong
|
604fe050d0
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
tpingzhang
|
f7ca69eba6
|
支付回调域名
|
5 years ago |
|
zhengchanglong
|
c3cb46cab0
|
超级签充值BUG修复
|
5 years ago |
|
tpingzhang
|
f05e7a3149
|
支付回调域名
|
5 years ago |
|
tpingzhang
|
ba644484e7
|
Merge branch 'serveridnull' into dev
|
5 years ago |
|
tpingzhang
|
81f85e672d
|
支付回调域名
|
5 years ago |
chenxiaojun
|
975b514e90
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenzhi
|
165fa76414
|
更新浏览器识别
|
5 years ago |
|
chenxiaojun
|
b4653fa0b8
|
检索修改
|
5 years ago |
|
chenxiaojun
|
9fb953ea60
|
检索修改
|
5 years ago |
|
tpingzhang
|
bd10995fad
|
Merge branch 'serveridnull' into dev
|
5 years ago |
|
tpingzhang
|
8a5f833335
|
apple alipay
|
5 years ago |
|
tpingzhang
|
6fbc15359b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
tpingzhang
|
63f8e24208
|
解决冲突
|
5 years ago |
|
tpingzhang
|
cdb5e1e699
|
去掉pay_header
|
5 years ago |
|
chenzhi
|
88a971b56e
|
优化css
|
5 years ago |
|
chenxiaojun
|
ae9d502150
|
订单查询修改
|
5 years ago |
|
chenxiaojun
|
82e2c3faab
|
订单查询修改
|
5 years ago |
|
tpingzhang
|
a6c99cda3a
|
1，修改server_id传0 增加game_player_id
2，微信限额》=3000
3，小程序
|
5 years ago |
|
zhengchanglong
|
ae6a18303a
|
超级签名充值测试金额改为0.01
|
5 years ago |
|
zhengchanglong
|
47ba229b80
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
059900320b
|
超级签回跳地址是否需要https判断
|
5 years ago |
|
chenxiaojun
|
a7f2695665
|
无检索条件默认包括本账号
|
5 years ago |
|
chenxiaojun
|
e3d0e885f2
|
无检索条件默认包括本账号
|
5 years ago |
|
zhengchanglong
|
a6398b488f
|
Merge branch 'dev_zcl' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
ELF
|
db956a2d77
|
修改bug
|
5 years ago |
|
ELF
|
cc9aa1a640
|
解决冲突
|
5 years ago |
|
chenzhi
|
b8153b1cd2
|
比例加大
|
5 years ago |
|
chenzhi
|
866fb4c290
|
适配加大
|
5 years ago |
|
ELF
|
a093dd3d5b
|
修改手机端目录
|
5 years ago |
|
chenzhi
|
92942cb7f5
|
优化ssg
|
5 years ago |
|
chenzhi
|
b01ff154ea
|
新增礼包
|
5 years ago |
zyx
|
db34f256fd
|
Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
zyx
|
96b81a57ca
|
礼包添加bug修正
|
5 years ago |
|
chenzhi
|
4e887c7f71
|
Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
chenzhi
|
953cb6b988
|
流程样式
|
5 years ago |
|
zhengchanglong
|
5390597093
|
超级签首页 搜索框样式自适应
|
5 years ago |
|
zhengchanglong
|
228f7de164
|
样式修改
|
5 years ago |
|
zyx
|
bd572379b0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
5c5d879710
|
资源日志bug修复
|
5 years ago |
|
ELF
|
84174b18e9
|
修改bug
|
5 years ago |
|
chenzhi
|
d8095f3397
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
chenzhi
|
712498aff9
|
下载
|
5 years ago |
|
zyx
|
63eebf5611
|
礼包管理新增全部，超级签选项
|
5 years ago |
|
chenzhi
|
6ed821429f
|
检索
|
5 years ago |
|
zyx
|
f64225cff0
|
测试功能移交到总管理后台，扶持号管理bug修正
|
5 years ago |
|
zyx
|
18cddff9a4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform
|
5 years ago |
|
ELF
|
91866f4433
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
d9e7a55af4
|
修改bug
|
5 years ago |
|
chenxiaojun
|
80e2a7e0fa
|
订单查询、注册明细->组长与推广员组合检索bug修复
|
5 years ago |
|
chenxiaojun
|
57c9c7419a
|
订单查询、注册明细->组长与推广员组合检索bug修复
|
5 years ago |
|
chenzhi
|
0669d15e3e
|
Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
chenzhi
|
4ac6442777
|
更新
|
5 years ago |
|
zhengchanglong
|
9fd85bb4b5
|
完善超级签支付业务
|
5 years ago |
sunke
|
94e7594f40
|
删除id
|
5 years ago |
|
zhengchanglong
|
fb7a8f809c
|
Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl
|
5 years ago |
|
zhengchanglong
|
3bfb23b360
|
超级签支付
|
5 years ago |
|
chenxiaojun
|
d93a68144f
|
订单查询->组长、推广员检索框位置更改
|
5 years ago |
|
chenxiaojun
|
6947802527
|
订单查询->组长、推广员检索框位置更改
|
5 years ago |
|
chenxiaojun
|
837d168f2d
|
每日概况、数据汇总、订单查询、注册明细 组长检索bug修复
|
5 years ago |
|
chenxiaojun
|
307146cd3c
|
每日概况、数据汇总、订单查询、注册明细 组长检索bug修复
|
5 years ago |
|
chenzhi
|
da8aee73c6
|
增加弹框
|
5 years ago |
|
chenxiaojun
|
203e2df7c8
|
数据管理->订单查询->支付方式检索bug修复
|
5 years ago |
|
chenxiaojun
|
a01c8f04b8
|
数据管理->订单查询->支付方式检索bug修复
|
5 years ago |
|
zhengchanglong
|
308903d396
|
Merge branch 'dev-cz' into dev_zcl
# Conflicts:
# Application/Sdk/Controller/Ipa365Controller.class.php
|
5 years ago |
|
chenzhi
|
d1428e1044
|
名字测试
|
5 years ago |
|
chenxiaojun
|
580d52bf3c
|
新增->游戏管理->分成比例|设置
|
5 years ago |
|
zhengchanglong
|
67291fb95e
|
超级签BUG修复
|
5 years ago |
|
chenxiaojun
|
c8f7014fb2
|
新增->游戏管理->分成比例|设置
|
5 years ago |
|
“‘
|
9316dedc6c
|
修复
|
5 years ago |
|
“‘
|
96ca80221b
|
修复
|
5 years ago |
|
“‘
|
56f567e47f
|
支付
|
5 years ago |
|
chenxiaojun
|
414f3121fb
|
每页条数bug修复
|
5 years ago |
|
chenxiaojun
|
f91c0f0965
|
每页条数bug修复
|
5 years ago |
|
zhengchanglong
|
2dc6304ec3
|
超级签微信支付
|
5 years ago |
|
zhengchanglong
|
bb0a399ef7
|
推广员平台币支付 支付宝支付账户信息重配置文件读取
|
5 years ago |
|
ELF
|
b2f357608f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
c715996821
|
修改bug
|
5 years ago |
|
sunke
|
2e18b8cc05
|
资料详情落地页增加layui样式
|
5 years ago |
|
zyx
|
c988ee0517
|
Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform
|
5 years ago |
|
zhengchanglong
|
9ffb5fd753
|
New branch commit
|
5 years ago |
|
zhengchanglong
|
c2945ce522
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
6db2ead554
|
误提交恢复
|
5 years ago |
|
chenxiaojun
|
a9cb458ada
|
订单查询支付方式修改
|
5 years ago |
|
chenxiaojun
|
4e7904c3de
|
订单查询支付方式修改
|
5 years ago |
|
zhengchanglong
|
24f70b8380
|
new branch commit
|
5 years ago |
|
zyx
|
607e32e43a
|
首页功能提示样式修改
|
5 years ago |
|
chenxiaojun
|
0e87fc7267
|
订单查询支付方式修改
|
5 years ago |
|
chenxiaojun
|
446085a154
|
订单查询支付方式修改
|
5 years ago |
|
chenxiaojun
|
7456c891a8
|
区服ID更新
|
5 years ago |
|
zyx
|
e4be69d796
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform
|
5 years ago |