Commit Graph

4811 Commits (b7b9c15b18deaf8333b7580f148fd7d0a63193e6)

Author SHA1 Message Date
js199000131 bb5ef9be1c 修改商品规格属性添加对象 2023-05-24 11:09:19 +08:00
tangqian 3582bdd395 fix: 修改判断用户是否被禁用 2023-05-24 11:02:32 +08:00
TianYu 9c1415e411 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-24 10:52:29 +08:00
tangqian 9c626bcbbc fix: 添加支付截至时间 2023-05-24 10:35:54 +08:00
TianYu 4afe43b327 fix: 修改bug 2023-05-24 10:34:35 +08:00
tangqian fc9922c264 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-24 10:23:27 +08:00
tangqian 02a33fbf08 fix: 添加支付截至时间 2023-05-24 10:23:04 +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
tangqian 9a6e45053c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-23 17:21:37 +08:00
tangqian 3863a5a1d2 fix: 修改app获取用户信息 2023-05-23 17:21:26 +08:00
小小张 23c3f3bb90 后台--运费模板:配送区域修改 2023-05-23 17:16:23 +08:00
小小张 07de47d308 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-23 17:15:28 +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
axzsd 2ca8808957 Merge remote-tracking branch 'origin/master' 2023-05-23 14:14:50 +08:00
axzsd 7a2b924b64 构建文件 2023-05-23 14:14:44 +08:00
perry f5d54e5153 Merge remote-tracking branch 'origin/master' 2023-05-23 14:08:09 +08:00
perry 4d0cf5dca3 Merge branch 'feature/mall_product_new' 2023-05-23 14:07:59 +08:00
axzsd 3b251f9745 构建文件 2023-05-23 14:07:48 +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
axzsd 3ba3e53c14 构建文件 2023-05-23 14:00:03 +08:00
axzsd bb1ce7bc2c 构建文件 2023-05-23 13:56:59 +08:00
Jruome 2d459bd679 uniapp 为他人支付 2023-05-23 12:03:27 +08:00
TianYu ec8c740a3b Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-23 11:27:26 +08:00
TianYu 56c888e295 fix: 修复IOS下无法复制支付宝链接问题 2023-05-23 11:27:13 +08:00
perry b6de22d7a5 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-23 11:26:57 +08:00
perry 3c2eca8fba 微信支付 2023-05-23 11:26:48 +08:00
tangqian a8bfcebce4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-23 11:23:21 +08:00
tangqian aa88423153 fix: 修改档次信息 2023-05-23 11:23:15 +08:00
perry 2adf4d610a 微信支付 2023-05-23 11:12:28 +08:00
perry 032074a119 微信支付 2023-05-23 11:05:48 +08:00
perry bbb204191a 微信公众号 2023-05-23 11:00:24 +08:00
perry 0e3b3bf667 推广员 2023-05-23 10:34:09 +08:00
perry 1098528193 推广员 2023-05-23 10:30:53 +08:00
TianYu 1f3d68faf0 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-23 09:47:36 +08:00
TianYu bb12efb278 feat: 新增功能 2023-05-23 09:47:23 +08:00
小小张 97f24e988d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-23 09:43:54 +08:00
perry b45a6d49b6 短信发送频率 2023-05-23 09:22:04 +08:00
perry 57084b320c 修改测试环境地址 2023-05-23 09:19:03 +08:00
perry 071c2bf863 正式环境 2023-05-22 23:26:27 +08:00
perry 4ce908adce 正式环境 2023-05-22 22:14:17 +08:00
perry a6f614c580 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-22 22:04:07 +08:00
perry 0b928b1abc 正式环境 2023-05-22 22:03:48 +08:00
tangqian d84b6869f5 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-22 18:06:01 +08:00
tangqian 2d223030d4 feat: 根据手机号查询档次信息 2023-05-22 18:05:56 +08:00
TianYu 87fc147c02 feat: 样式调整 2023-05-22 16:01:49 +08:00