Commit Graph

321 Commits

Author SHA1 Message Date
GaoHao 703f53c8ac 商品数量修改 2024-08-03 15:31:42 +08:00
魏啾 529a43903c 11 2024-08-03 14:12:59 +08:00
GaoHao c62ee92b86 Merge branch 'wwz_x' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into gaohao 2024-08-03 11:39:29 +08:00
GaoHao 29af36c446 多用户下单 其他用户付款 当前用户数据重置 2024-08-03 11:39:20 +08:00
GaoHao 035c63ce2b 多用户其他用户支付 当前用户购物清空 2024-08-03 11:36:43 +08:00
魏啾 b9328d0a1c Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-08-03 11:31:54 +08:00
魏啾 5d99a4c373 11 2024-08-03 11:31:43 +08:00
GaoHao 87a544a526 规格数量修改 2024-08-03 11:21:31 +08:00
魏啾 b1937c2c84 Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-08-03 11:20:11 +08:00
GaoHao 520d791326 规格数量处理 2024-08-03 11:19:44 +08:00
魏啾 f442a5a85c 11 2024-08-03 11:18:26 +08:00
GaoHao 0e3e975627 sku接口code参数增加 2024-08-03 10:58:26 +08:00
魏啾 3e49f319c2 11 2024-08-03 10:56:20 +08:00
魏啾 8e3ac4dca0 11 2024-08-03 10:54:15 +08:00
GaoHao 2b66e1d7f8 支付界面更新 2024-08-03 10:50:38 +08:00
魏啾 9605bb5499 滑动防抖 2024-08-03 10:50:00 +08:00
GaoHao e1e501e150 会员支付密码修改 2024-08-03 09:19:37 +08:00
GaoHao 8dd53c530a 11 2024-08-02 17:44:29 +08:00
GaoHao 9326d10d51 Merge branch 'wwz_x' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into gaohao 2024-08-02 17:40:51 +08:00
魏啾 24bfe3763e 11 2024-08-02 17:39:52 +08:00
GaoHao 57958f9db4 ^^^ 2024-08-02 17:35:32 +08:00
GaoHao 9ccd13a19c 支付密码界面更新 2024-08-02 17:32:07 +08:00
魏啾 c23ef86147 11 2024-08-02 17:27:34 +08:00
魏啾 4ab448e3c7 购物车 2024-08-02 17:26:45 +08:00
GaoHao a6cf6c70f3 商品数量调试 2024-08-02 16:50:34 +08:00
GaoHao 807d1970e6 商品数量调整 2024-08-02 11:43:06 +08:00
GaoHao 40a6a88305 商品列表修改 2024-08-02 11:09:20 +08:00
GaoHao d4001e5f37 fix::商品页面/订单页面完善、进入页面黑色弹框提示解决、 2024-08-01 16:42:22 +08:00
GaoHao 92e79a74f4 fix::扫码商品页面接口对接 2024-07-31 17:50:24 +08:00
魏啾 5b63e01215 1 2024-07-31 10:55:00 +08:00
魏啾 a5eb227aca 购物车列表数量处理 2024-07-31 10:52:35 +08:00
GaoHao 2d3ea3ea5e fix::新版本商品页面\订单页面逻辑完善\依赖完善 2024-07-31 10:12:23 +08:00
GaoHao ece7a35afd fix::菜品列表修改增加 2024-07-26 11:17:49 +08:00
魏啾 f6ac523cd0 Merge branch 'dev' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-07-26 11:16:27 +08:00
魏啾 62f0e6f25b 列表 2024-07-26 11:16:13 +08:00
GaoHao 82b3a74435 fix::新版确认订单调整 2024-07-26 09:16:34 +08:00
GaoHao fde34fa151 fix::商品页面左侧分类选中状态修复 2024-07-24 16:58:56 +08:00
GaoHao 4d09e97c2e fix::第三版确认订单重构 2024-07-24 14:52:56 +08:00
魏啾 9ee4ff1f30 message 2024-07-23 09:51:48 +08:00
魏啾 16fa1dae73 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into dev 2024-07-22 14:11:54 +08:00
魏啾 f43b15a712 列表页面 2024-07-22 14:11:13 +08:00
duan 85bba7828c 根据token静默登录 2024-07-20 15:33:54 +08:00
duan 638ffcb824 订单去充值跳转修改 2024-07-20 14:10:34 +08:00
duan a71399f675 充值 2024-07-20 13:34:31 +08:00
魏啾 e63122b160 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-07-20 13:25:51 +08:00
魏啾 ca46106afb 备注 2024-07-20 13:25:39 +08:00
duan 2d49fbe45d 首页充值跳转 2024-07-20 13:24:48 +08:00
魏啾 8655d7ed2f 点歌 2024-07-20 10:02:34 +08:00
魏啾 b1191261f2 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-07-20 09:36:11 +08:00
魏啾 b6f84338dc 购物车 2024-07-20 09:35:34 +08:00
duan 37f0e88add 会员卡支付 2024-07-20 09:24:10 +08:00
duan 81f122c9fc 合并更改 2024-07-19 18:24:32 +08:00
duan 2f182c9b39 优化问题 2024-07-19 18:23:38 +08:00
魏啾 f47418ab32 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-07-19 17:57:10 +08:00
魏啾 194497eed2 登录 2024-07-19 17:57:00 +08:00
duan 7a3f337eb8 Merge branch 'wwz_x' of e.coding.net:g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_d 2024-07-19 17:56:22 +08:00
duan c17b6302a4 取消会员二维码跳转 2024-07-19 17:56:13 +08:00
魏啾 a0baa5b59a 11 2024-07-19 17:44:18 +08:00
魏啾 0de026c34a Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-07-19 16:13:34 +08:00
魏啾 35e73b5106 点歌 2024-07-19 16:10:50 +08:00
duan 2a3c5eabba Merge branch 'wwz_x' of e.coding.net:g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_d 2024-07-19 16:09:03 +08:00
duan 679f919106 会员充值三版 2024-07-19 16:08:51 +08:00
魏啾 6493a1bf0f Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-07-19 15:37:02 +08:00
魏啾 dc2df55efe 点歌 2024-07-19 15:36:48 +08:00
duan 77c52b3625 充值静默登录 2024-07-19 15:34:07 +08:00
魏啾 54de16a6c7 1 2024-07-19 13:41:59 +08:00
duan 0faa782b00 Merge branch 'wwz_x' of e.coding.net:g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_d 2024-07-19 09:40:30 +08:00
duan bb2f0ea36e 合并代码 2024-07-19 09:40:18 +08:00
魏啾 913144f665 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-07-19 09:36:41 +08:00
魏啾 c79a74d43f 支付页面 2024-07-19 09:36:27 +08:00
duan 2ea874c692 登录和个人中心修改手机号,重置页面绑定手机号 2024-07-17 14:57:48 +08:00
魏啾 a011e72584 dianji 2024-07-16 16:35:37 +08:00
魏啾 46e91a1e89 2024.7.16 2024-07-16 15:37:13 +08:00
魏啾 07c7562628 小程序bug 2024-07-06 18:28:07 +08:00
魏啾 380a6312f8 更改首页 2024-07-05 18:26:46 +08:00
duan a40cfd9c5f 桌码 2024-06-30 11:11:54 +08:00
duan 0359bc4947 添加桌号 2024-06-30 10:08:42 +08:00
duan ff7dbe9a0c 增加按钮大小 2024-06-28 11:37:07 +08:00
魏啾 736ff85457 socket 2024-06-28 11:29:09 +08:00
duan 49e5ed4b5c 外卖跳转 2024-06-19 18:08:37 +08:00
魏啾 802cc2d721 更新详情 2024-06-19 17:11:23 +08:00
魏啾 cba4e6065e 更新优化 2024-06-14 18:30:19 +08:00
duan 139e4039a5 优化代码 2024-06-13 16:17:47 +08:00
duan aef0f1060d 优化隐藏取餐号 2024-06-13 14:58:32 +08:00
魏啾 a5e07a4f62 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-06-13 14:25:51 +08:00
魏啾 cee5af2671 11 2024-06-13 14:25:37 +08:00
duan 46dfcc394a 优化详情倒计时 2024-06-13 14:25:01 +08:00
魏啾 6cf34acfc2 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-06-13 13:45:45 +08:00
魏啾 4465ddf666 执行顺序 2024-06-13 13:45:33 +08:00
duan 9a6d9d1598 扫码订单详情倒计时 2024-06-13 13:45:03 +08:00
duan 84b5632d23 提交代码 2024-06-12 14:50:03 +08:00
duan 3abfa4658a 提交代码 2024-06-12 14:04:38 +08:00
duan ed28c771cb 提交代码 2024-06-12 13:37:15 +08:00
魏啾 4582bcac2f order 2024-06-12 13:33:38 +08:00
duan badc547797 提交代码 2024-06-12 11:43:06 +08:00
魏啾 647aa0b717 购物车更改 2024-06-12 11:30:56 +08:00
duan 06a9c4f2de 提交代码 2024-06-12 11:10:59 +08:00
魏啾 02cbc93a14 11 2024-06-07 17:41:05 +08:00
魏啾 5a16a5199e web 2024-06-07 17:21:52 +08:00
duan c8633827cc 提交代码 2024-06-07 15:55:12 +08:00
duan 554217180e 优化长连接 2024-06-06 14:55:23 +08:00
魏啾 1e9797f09a 更改订单 2024-06-05 17:15:28 +08:00
魏啾 5ea2ab4aa9 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-06-05 16:07:13 +08:00
魏啾 8f0114bb00 首页更改 2024-06-05 16:07:03 +08:00
duan ba106d1f96 优化问题 2024-06-05 15:47:04 +08:00
duan bdd5a6a325 优化接口 2024-06-04 15:45:49 +08:00
duan a54580549a 合并代码 2024-06-04 10:36:56 +08:00
魏啾 636a8e2915 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-06-04 10:34:27 +08:00
魏啾 d09082e6ea 换了 wxc2bb94c0ddda1032 2024-06-04 10:34:13 +08:00
duan cb577d265e 优化提交 2024-06-04 09:53:37 +08:00
duan e2c096e65a 优化余额支付返回,和长连接 2024-06-03 14:54:02 +08:00
duan 3d2fce5745 优化页面 2024-06-03 09:46:02 +08:00
魏啾 697f207683 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-05-31 17:26:21 +08:00
魏啾 def9db0884 更改下单页面 2024-05-31 17:26:02 +08:00
duan a3dfe46cbd 优化登录 2024-05-31 16:26:34 +08:00
duan 65be66ba91 优化w 2024-05-31 11:36:24 +08:00
duan b880b65e9e 优化长链接 2024-05-31 10:20:13 +08:00
魏啾 7fcdcfcb1e 支付选项 2024-05-31 09:24:00 +08:00
魏啾 adbc75f4e0 更改支付逻辑 2024-05-31 09:23:39 +08:00
魏啾 9ac0246e02 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-05-30 15:13:21 +08:00
duan 2f7fac1888 优化金额 2024-05-30 15:13:12 +08:00
魏啾 1efdcca59c 支付修改 2024-05-30 15:12:31 +08:00
魏啾 6402da83aa 1 2024-05-30 14:08:15 +08:00
魏啾 a4d0bc8177 修改首页下拉 2024-05-30 14:07:19 +08:00
duan a627b9b6ab 优化底部按钮的距离 2024-05-30 14:06:31 +08:00
魏啾 63d85521eb Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-05-30 11:59:44 +08:00
魏啾 05d31a6012 首页 2024-05-30 11:59:31 +08:00
魏啾 d140ef4f41 首页修改 2024-05-30 11:57:46 +08:00
duan d5cf194fd1 优化问题 2024-05-30 11:40:17 +08:00
魏啾 d3dc53783e 更新跳转 2024-05-30 11:22:06 +08:00
魏啾 59e21b5ed0 index 2024-05-30 11:17:33 +08:00
魏啾 8abd538d88 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-05-30 11:01:01 +08:00
魏啾 5ce56b7030 优惠shopId 2024-05-30 11:00:49 +08:00
duan 28d7354913 优化问题 2024-05-30 10:56:11 +08:00
魏啾 086f203d70 Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-05-30 10:46:45 +08:00
魏啾 7cf201581e 首页 更改 2024-05-30 10:46:19 +08:00
duan 57fbc3e5ae 优化图片 2024-05-30 10:24:11 +08:00
魏啾 81b9131f9e Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x 2024-05-30 09:57:08 +08:00
魏啾 9c636e6948 登录 修改 2024-05-30 09:56:54 +08:00
duan 1e279517e0 优化问题 2024-05-30 09:56:23 +08:00
duan 089745dfa6 优化充值传参 2024-05-30 09:19:34 +08:00
duan cb7d853707 优化问题 2024-05-30 09:12:02 +08:00
duan 66e15baaee 优化问题 2024-05-28 18:17:30 +08:00
duan b2e8d69c61 Merge branch 'wwz_x' of e.coding.net:g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_d 2024-05-28 16:41:07 +08:00
duan f49aa283f9 1 2024-05-28 16:40:32 +08:00
魏啾 407a5c7e52 调支付 2024-05-28 16:40:02 +08:00
魏啾 219dce9b2f 11 2024-05-28 16:24:42 +08:00
魏啾 c6c2680993 1 2024-05-28 15:57:18 +08:00
魏啾 eb99040703 提示 2024-05-28 15:24:53 +08:00
duan 85e2c074f7 Merge branch 'wwz_x' of e.coding.net:g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_d 2024-05-28 14:08:26 +08:00