zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,739 Commits
3 Branches
0 Tags
162 MiB
Commit Graph

165 Commits (da123b99f58e08158e228c8177ef023ee4b00acc)

Author SHA1 Message Date
TianYu c4fc7ec96e fix: 修复bug 2023-05-26 15:21:36 +08:00
js199000126 1bd8b84439 订单 2023-05-26 15:20:44 +08:00
js199000126 8938ee67c7 订单 2023-05-26 15:11:55 +08:00
js199000126 b10de0ca81 商城-首页 2023-05-26 13:48:55 +08:00
js199000126 15a30885a7 navbar 2023-05-26 11:39:43 +08:00
js199000126 64fcfc72ad navbar 2023-05-25 18:12:05 +08:00
js199000126 fb2379948f Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 17:25:58 +08:00
Jruome debd84a7e0 uniapp ui修改 2023-05-25 17:25:16 +08:00
js199000126 9cf17dc717 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 17:22:50 +08:00
js199000126 712c0b1580 index 2023-05-25 17:22:39 +08:00
TianYu e6c0b55c09 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 16:12:02 +08:00
TianYu 60392dd6e2 fix: 客服电话跳转 2023-05-25 16:11:49 +08:00
js199000126 f3f523f5c9 商城-购物车 2023-05-25 15:47:41 +08:00
js199000126 5641a8b566 525-购物车 2023-05-25 15:45:57 +08:00
Jruome de63f91e43 uniapp 登录正则修改 2023-05-25 15:44:52 +08:00
TianYu 503e5034d9 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 15:35:15 +08:00
TianYu a4d2fac5cd fix: 修复首页启动报错的问题 2023-05-25 15:35:02 +08:00
tangqian a61d46e620 Merge branch 'feature/mall_product' 2023-05-25 14:48:49 +08:00
Jruome 149ea95d48 uniapp 会员购买申请退款 2023-05-25 14:33:27 +08:00
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
Jruome f9c4d2b102 uniapp 会员权益判断 2023-05-23 18:08:01 +08:00
js199000126 2e99714330 zhy 2023-05-23 17:37:49 +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 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
Jruome 9d95f2cae7 uniapp 会员申请ui 2023-05-19 11:40:50 +08:00
TianYu 98fc15f45e Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-19 11:35:20 +08:00
Jruome 91b21f344d uniapp 会员申请ui 2023-05-19 11:34:07 +08:00
TianYu 381632dc9d fix: UI优化 2023-05-19 11:25:26 +08:00
TianYu 3a0fd70313 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-18 18:09:43 +08:00
TianYu 2b5c66acf2 feat: 微信支付联调 2023-05-18 18:07:27 +08:00
Jruome 5b89459951 uniapp 购买记录 2023-05-18 18:03:06 +08:00
TianYu 6ff2f26c2c feat: 推广员海报生成 2023-05-18 14:56:38 +08:00
TianYu 9617169e6f feat: 增加支付宝支付 2023-05-17 16:28:31 +08:00
Jruome 40dd065e30 uniapp 会员申请 2023-05-17 15:25:16 +08:00
Jruome 19dd57f4dd uview 更新 2023-05-16 18:22:32 +08:00
TianYu 24b4be91d0 feat: 功能开发 2023-05-16 18:00:52 +08:00
TianYu a32c7378d6 feat: 增加注册页面 2023-05-15 18:19:03 +08:00
TianYu eb6fc5d9c7 feat: 提交代码 2023-05-15 10:12:22 +08:00
YunaiV aa74df4e5a uniapp：增加部分 confirm 下单确认页 2022-12-27 20:38:24 +08:00
YunaiV 4aeaa21854 uniapp：【商品列表】样式 review 2022-12-26 22:18:40 +08:00
YunaiV d4ceceee8c uniapp：【商品详情】对接后端接口 2022-12-26 21:29:19 +08:00
YunaiV d453301455 product：完善 App 商品分页接口 2022-12-15 19:48:21 +08:00
YunaiV b7c447897b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-12-14 20:32:51 +08:00
YunaiV 2f9eef589b product：优化商品分类的代码 2022-12-14 20:32:44 +08:00
sfmind d5c1c29795 订单列表和订单详情页初步完善 2022-12-14 00:58:25 +08:00
YunaiV 7f131a3853 trade：增加用户 App 的订单分页和详情接口 2022-12-10 23:06:53 +08:00
sfmind 6878ac04c9 购物车、结算和订单初始页面 2022-12-05 21:51:39 +08:00
sfmind a72c68ce87 微调组件显示 2022-11-23 00:20:35 +08:00
sfmind dbf2597d3b 重构页面抽取组件 2022-11-19 21:40:26 +08:00
sfmind f0e964f180 uni-app：个人信息修改 2022-10-19 10:47:58 +08:00
YunaiV efd4942129 mall：完善商品分类的 APP 后端接口 2022-07-30 21:24:05 +08:00
luowenfeng af6a022450 feature(uniapp商品): 商品详情 2022-07-27 16:04:53 +08:00
luowenfeng e2a6530acb feature(uniapp分类): 分类列表以及商品加载 2022-07-11 12:05:48 +08:00
sfmind 13b5ad127a 1.同步调整到OAuth2方式登录 2.微信小程序一键登录; 2022-06-02 17:59:57 +08:00
YunaiV 75d34080df 1. 删除 yudao-ui-app-tmp 和 yudao-ui-app-v1，用户 app 以 yudao-ui-app 为准。 
2. 修改 auth.js 的 /auth 路径
 2022-05-29 11:32:30 +08:00
sfmind c8e00ad04c 使用社交账号（微信小程序）登录 2022-05-05 19:09:04 +08:00
sfmind 5efd621f21 vuex统一命名风格 2022-05-02 16:53:56 +08:00
sfmind aa22ef8339 会员地址管理CRUD 2022-05-01 22:39:54 +08:00