Commit Graph

26 Commits

Author SHA1 Message Date
970d50b372 Merge remote-tracking branch 'origin/txx'
# Conflicts:
#	manifest.json
#	pages/users/order_confirm/index.vue
2024-02-27 09:54:28 +08:00
b630ea73df Merge remote-tracking branch 'origin/master'
# Conflicts:
#	api/api.js
#	pages/index/index.vue
#	pages/user/index.vue
2024-02-27 09:51:54 +08:00
5bdc301972 修复渠道代码 2024-02-26 22:47:52 +08:00
dac94a6e6b 支付 2024-02-22 18:06:29 +08:00
559ee026fb 111 2024-02-22 13:17:16 +08:00
af31fc3a0c 支付宝小程序代码修改 2024-02-22 13:15:51 +08:00
481bfba4bc Merge branch 'master' into wp 2024-02-17 20:32:46 +08:00
cbb3dc5b0c 提交 2024-02-07 16:58:08 +08:00
15e9e60660 提交 2024-02-07 15:58:34 +08:00
fcf7b0bada 审核调整 2024-02-07 15:17:46 +08:00
6002dbb75b 2024-2-6邱贞招提交 2024-02-06 21:00:54 +08:00
280d71140e Merge remote-tracking branch 'origin/wp'
# Conflicts:
#	api/public.js
#	config/app.js
#	config/cache.js
#	main.js
#	pages/goods_details/index.vue
#	pages/index/index.vue
#	pages/users/wechat_login/index.vue
2024-02-01 21:17:49 +08:00
37324cb1f8 '2024-2-1提交' 2024-02-01 21:14:26 +08:00
a4de0e97ef '1.30提交了' 2024-01-30 16:58:58 +08:00
38b120d270 '新更新文件' 2024-01-29 11:21:36 +08:00
c5f055cc1c 静默保存渠道id 2024-01-27 21:16:35 +08:00
4f61751327 提交 2024-01-27 17:13:21 +08:00
ac869cfaf6 '提交了' 2024-01-27 17:11:53 +08:00
0c4f396599 '更新了' 2024-01-27 17:03:34 +08:00
d5d780218e 提交 2024-01-23 17:17:47 +08:00
f1c58f8ddb 提交 2024-01-22 14:30:38 +08:00
1f8cdbb270 提交了 2024-01-20 12:29:18 +08:00
53c5afe0ab 提交 2024-01-20 12:23:33 +08:00
ecde698b3b 提交分期页面 2024-01-18 22:27:33 +08:00
ef8651eb04 删除注释 2023-12-25 17:31:07 +08:00
2c9de69a51 初始化项目 2023-12-20 21:41:47 +08:00