Commit Graph

41 Commits

Author SHA1 Message Date
ljy fcf1d45522 fix:完善门店和总部管理端 2026-07-06 20:58:38 +08:00
ljy 67b5a580c5 fix:修改样式 2026-07-05 23:52:58 +08:00
ljy 569becedaa feat;提交管理端和城市合伙人端 2026-07-05 23:48:20 +08:00
jacy fecfc61ec5 Merge dev_jacy: fix WeChat pay invoke 2026-07-03 16:04:09 +08:00
jacy def3ed5175 fix(user): correct WeChat JSAPI pay invoke params and JSSDK init
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-03 16:04:01 +08:00
jacy ced1fe0688 Merge dev_jacy: partner WeChat auth for upload 2026-07-03 15:45:31 +08:00
jacy cabc9e6ebb feat(partner): require WeChat OAuth before store photo upload
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-03 15:44:46 +08:00
jacy f87325df21 Merge dev_jacy: WeChat store upload fix 2026-07-03 15:33:08 +08:00
jacy 81413e4d08 fix(partner): resolve WeChat image picker auth denied on store create
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-03 15:32:53 +08:00
jacy 30eb8ff8a6 提交express 2026-07-03 15:07:27 +08:00
jacy 0829696ea9 Merge #3 into dev from dev_jacy
门店开通流程

* dev_jacy: (5 commits)
  上传部署环境文件
  上传校验文件
  微信验证接通
  微信校验后登录服务器错误bug
  门店开通流程

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/3
2026-07-03 14:56:07 +08:00
jacy f2175b83f7 门店开通流程 2026-07-03 14:53:21 +08:00
jacy c7dc6a2274 微信校验后登录服务器错误bug 2026-07-03 13:22:41 +08:00
jacy cc39975117 微信验证接通 2026-07-03 12:57:01 +08:00
jacy 160fdcb0d7 上传校验文件 2026-07-03 09:58:40 +08:00
jacy ceaf45ef03 上传部署环境文件 2026-07-03 00:58:56 +08:00
jacy 02681bcc4a Merge #1 into dev from dev_jacy
支付时检测是否已经微信授权

* dev_jacy: (15 commits)
  v3数据表更改
  fix:更新skill和rules
  fix:需求完善
  agents 和 skills 上传
  fix:提交修改信息
  Merge commit &#39;a0ee3a21cd01229a555384ad5e1f4b3ccdcdd620&#39; into dev_jacy
  微信SDK接通
  oss1
  web端打通oss资源上传
  admin web 修改订单状态
  手机号从地址栏里获取
  对接微信支付
  oss接通了80端口,还没有接通https,先用
  微信支付
  支付时检测是否已经微信授权

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/1
2026-07-02 17:56:36 +08:00
jacy f7fe4597c6 支付时检测是否已经微信授权 2026-07-02 17:34:58 +08:00
jacy a0f4d8c18f 微信支付 2026-07-02 17:23:13 +08:00
jacy 4b2589156c oss接通了80端口,还没有接通https,先用 2026-07-02 16:13:45 +08:00
jacy ff4622ff6c 对接微信支付 2026-07-01 22:41:49 +08:00
jacy b78ef8798c 手机号从地址栏里获取 2026-07-01 22:13:25 +08:00
jacy 8a67d72de4 admin web 修改订单状态 2026-07-01 22:00:10 +08:00
jacy 139e37651b web端打通oss资源上传 2026-07-01 21:46:36 +08:00
jacy ef6cc18fb2 oss1 2026-07-01 20:21:51 +08:00
jacy aea1513836 微信SDK接通 2026-07-01 19:56:44 +08:00
jacy a1cbfc7241 Merge commit 'a0ee3a21cd01229a555384ad5e1f4b3ccdcdd620' into dev_jacy 2026-07-01 19:38:05 +08:00
ljy a0ee3a21cd fix:提交修改信息 2026-07-01 17:58:01 +08:00
jacy 9cbd65f8d7 agents 和 skills 上传 2026-07-01 17:12:46 +08:00
ljy d6855c9f5c fix:需求完善 2026-07-01 16:24:18 +08:00
ljy f3ae9e6520 fix:更新skill和rules 2026-07-01 15:04:53 +08:00
jacy aeb4ecfc84 v3数据表更改 2026-07-01 14:36:50 +08:00
jacy 638898b71e 改动测试 2026-07-01 10:31:52 +08:00
jacy 6fa8ecc714 Merge branch 'hq_web' into dev_jacy 2026-07-01 08:29:00 +08:00
jacy 25f0d8e97b hqweb端 2026-07-01 08:27:26 +08:00
jacy 9f4577d3d8 用户静默注册 2026-07-01 02:48:59 +08:00
jacy d3dd3a0ad1 用户端和服务端增加地址功能(三个地址共存) 2026-07-01 00:52:44 +08:00
jacy eb85e0926f 删除用户头像吓的badge 2026-07-01 00:33:01 +08:00
jacy 1800e792b1 订单详情页内容调整(增加配送方式、订单号等) 2026-07-01 00:29:39 +08:00
jacy c43defca3f 用户端调整
2.首页商品详情增加点击区域
3.浓香型 酱香型 点击增加提示:暂未开放
5.首页餐券2字更换为“好客权益”
6.门店页面地址筛选功能 (三级菜单,省市区)
7.好客权益:去使用点击交互调整为核销页面,单张好客权益点击核销页面带参数和金额
7.核销金额限制为可用余额最大数,不是500
9.收货地址电话号码增加校验,长度限制,地址或者未填提示,地区调整为省市区三级菜单
10.微信授权位置调整在手机验证码下侧
2026-07-01 00:19:08 +08:00
jacy 6e047dc0a5 init 2026-06-30 10:33:56 +08:00