tangqian
|
64a66f2a3a
|
Merge branch 'feature/mall_product'
|
2023-05-25 12:02:15 +08:00 |
 TianYu
|
99f1fb5e33
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-25 11:23:34 +08:00 |
|
TianYu
|
1462178e7a
|
fix: 生成海报失败增加提示
|
2023-05-25 11:23:31 +08:00 |
 Jruome
|
b11b71be2e
|
uniapp 手机号正则修改
|
2023-05-25 11:08:25 +08:00 |
 perry
|
7569be214a
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 22:19:32 +08:00 |
|
Jruome
|
6fadb15d27
|
uniapp 话费返回详情
|
2023-05-24 19:59:44 +08:00 |
|
perry
|
0aafa2fd7c
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 19:06:33 +08:00 |
|
TianYu
|
7a2b8e64a3
|
fix: 调整海报文案
|
2023-05-24 19:01:59 +08:00 |
|
perry
|
82692fecaf
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 19:01:23 +08:00 |
|
TianYu
|
4aed73b1d5
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 18:34:46 +08:00 |
|
TianYu
|
66e4d6ee54
|
fix: 调整充值页面生命周期
|
2023-05-24 18:34:43 +08:00 |
|
perry
|
328864388b
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 18:11:23 +08:00 |
|
Jruome
|
cd68bf0be8
|
uniapp 会员权益
|
2023-05-24 17:51:37 +08:00 |
 js199000126
|
fee16f8471
|
商城-购物车
|
2023-05-24 17:11:30 +08:00 |
|
js199000126
|
4f1d28feac
|
商城-购物车
|
2023-05-24 17:08:06 +08:00 |
|
perry
|
cbed37d4f0
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 17:04:28 +08:00 |
|
Jruome
|
b18ed2551c
|
uniapp 会员权益
|
2023-05-24 17:00:39 +08:00 |
|
TianYu
|
989fec4ebc
|
fix: 修复IOS无法生成海报的问题
|
2023-05-24 16:54:06 +08:00 |
|
perry
|
9e28c0b616
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 16:36:38 +08:00 |
|
TianYu
|
51e3506baf
|
fix: 海报文案修改
|
2023-05-24 16:03:59 +08:00 |
|
TianYu
|
be58048ce7
|
fix: 海报文案修改
|
2023-05-24 16:00:06 +08:00 |
|
TianYu
|
e5ea2d52f7
|
feat: 分销海报生成
|
2023-05-24 15:56:32 +08:00 |
|
js199000126
|
a1295f5943
|
商城
|
2023-05-24 09:46:03 +08:00 |
|
TianYu
|
1c4fb81f08
|
fix: git排除mainifest.json文件
|
2023-05-23 18:09:58 +08:00 |
|
Jruome
|
f9c4d2b102
|
uniapp 会员权益判断
|
2023-05-23 18:08:01 +08:00 |
|
js199000126
|
2e99714330
|
zhy
|
2023-05-23 17:37:49 +08:00 |
|
TianYu
|
9ad7196292
|
feat: 增加导航条图标
|
2023-05-23 16:48:56 +08:00 |
|
TianYu
|
9ce77c4782
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-23 16:23:33 +08:00 |
|
TianYu
|
0c1eb5e969
|
feat: 新增支付页面
|
2023-05-23 16:23:09 +08:00 |
|
perry
|
4d0cf5dca3
|
Merge branch 'feature/mall_product_new'
|
2023-05-23 14:07:59 +08:00 |
|
perry
|
eaede930cc
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# yudao-ui-app/pages/member_equity/index.vue
|
2023-05-23 14:03:50 +08:00 |
|
Jruome
|
2d459bd679
|
uniapp 为他人支付
|
2023-05-23 12:03:27 +08:00 |
|
TianYu
|
56c888e295
|
fix: 修复IOS下无法复制支付宝链接问题
|
2023-05-23 11:27:13 +08:00 |
|
TianYu
|
bb12efb278
|
feat: 新增功能
|
2023-05-23 09:47:23 +08:00 |
|
TianYu
|
87fc147c02
|
feat: 样式调整
|
2023-05-22 16:01:49 +08:00 |
|
TianYu
|
e157121924
|
fix: 修改接口域名
|
2023-05-22 15:25:27 +08:00 |
|
TianYu
|
336aef34b6
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-22 14:30:00 +08:00 |
|
TianYu
|
0746c080b4
|
feat: 增加图标
|
2023-05-22 14:29:57 +08:00 |
|
Jruome
|
6382219c13
|
uniapp 新增loding
|
2023-05-22 14:29:04 +08:00 |
|
TianYu
|
e2f85963ca
|
fix: 修改商户生成码推广链接
|
2023-05-22 14:00:59 +08:00 |
|
Jruome
|
0799a89b0e
|
uniapp 支付宝支付复制
|
2023-05-22 13:29:42 +08:00 |
|
Jruome
|
9ba8a8a827
|
uniapp 支付回调处理
|
2023-05-19 18:05:20 +08:00 |
|
Jruome
|
5c8ddf6e44
|
uniapp 支付回调处理
|
2023-05-19 18:04:40 +08:00 |
|
Jruome
|
496ffbe2f9
|
Merge remote-tracking branch 'origin/feature/mall_product'
|
2023-05-19 17:57:50 +08:00 |
|
Jruome
|
c4a02b30ba
|
uniapp 支付回调处理
|
2023-05-19 17:56:58 +08:00 |
|
TianYu
|
d194009324
|
fix: 修复bug
|
2023-05-19 17:34:57 +08:00 |
|
TianYu
|
d75d571637
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-19 16:13:26 +08:00 |
|
TianYu
|
2925d35df8
|
fix: 修复bug
|
2023-05-19 16:10:03 +08:00 |
|
Jruome
|
0385010a11
|
uniapp 申请退款
|
2023-05-19 16:09:25 +08:00 |
|
TianYu
|
02ff453ff1
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-19 11:42:16 +08:00 |