Commit Graph

766 Commits

Author SHA1 Message Date
devil_gong
699a9ae62a Merge branch 'master' into develop 2019-01-03 17:20:04 +08:00
devil_gong
0c7ec4702b 细节优化 2019-01-03 17:19:26 +08:00
devil_gong
8c8617cdc2 Merge branch 'master' into develop 2019-01-03 16:46:25 +08:00
devil_gong
ac735a6319 修复url模式下支付入口文件导致url错误 2019-01-03 16:43:46 +08:00
devil_gong
f51d5266c3 默认模板封面更换 2019-01-03 15:25:03 +08:00
devil_gong
094afbdd77 前端展示友情链接 2019-01-03 15:10:18 +08:00
devil_gong
3ede56f9f7 前端展示友情链接 2019-01-03 15:05:43 +08:00
devil_gong
2e375c4ab6 用户地址页面lang移除 2019-01-03 13:54:00 +08:00
gongfuxiang
e62ceabde8 微信小程序登录+绑定手机号码 2019-01-03 00:16:06 +08:00
devil_gong
66f7cbe919 微信小程序登录 2019-01-02 18:51:34 +08:00
devil_gong
7bc0f07846 微信小程序登录 2019-01-02 18:42:06 +08:00
gongfuxiang
bc8782cdd9 wechat mini 2019-01-02 02:50:28 +08:00
gongfuxiang
b6f984d4fc wechat mini 2019-01-02 02:48:36 +08:00
gongfuxiang
e440f8c7b0 Merge branch 'master' into develop 2019-01-02 02:24:55 +08:00
gongfuxiang
6c7a0dabf7 安装程序,数据库版本支持最低5.6起 2019-01-02 02:24:30 +08:00
gongfuxiang
e6cd084499 安装程序,数据库版本支持最低5.6起 2019-01-02 02:24:15 +08:00
gongfuxiang
12057ecd8e 微信 2019-01-02 02:11:03 +08:00
gongfuxiang
306eb704b9 微信 2019-01-02 02:02:06 +08:00
gongfuxiang
8d1f68a61c 微信 2019-01-02 01:55:03 +08:00
gongfuxiang
3902f2ae2d 微信小程序 2019-01-01 02:53:36 +08:00
gongfuxiang
014a35b3c3 Merge branch 'master' into develop 2018-12-31 19:30:19 +08:00
gongfuxiang
8a7a9bd038 路由优化 2018-12-31 19:29:52 +08:00
gongfuxiang
727dcb6f0b Merge branch 'master' into develop 2018-12-31 19:22:11 +08:00
gongfuxiang
79f9cada54 路由规则优化 2018-12-31 19:17:32 +08:00
gongfuxiang
bb7d6f3c1d 自定义页面路由 2018-12-31 19:15:48 +08:00
gongfuxiang
9e4eacc73a 路由规则,新增短地址 2018-12-31 19:07:03 +08:00
gongfuxiang
3fb88327d8 Merge branch 'master' into develop 2018-12-31 12:23:14 +08:00
gongfuxiang
3ea0a67677 细节优化 2018-12-31 12:22:51 +08:00
gongfuxiang
7071dc8ecd git排除htaccess 2018-12-31 11:39:53 +08:00
gongfuxiang
bd376cdfcb wechat 2018-12-31 11:34:09 +08:00
gongfuxiang
b2faecc8b4 index wx 2018-12-30 14:06:04 +08:00
gongfuxiang
ab010d3de8 Merge branch 'master' into develop 2018-12-30 01:00:24 +08:00
gongfuxiang
af84979465 去掉调试常量 2018-12-30 00:53:01 +08:00
gongfuxiang
3370f9e406 命令行兼容 2018-12-29 21:42:26 +08:00
devil_gong
4681984b75 微信小程序初始化 2018-12-29 18:39:25 +08:00
devil_gong
7ce4586f2d dev 2018-12-29 15:45:37 +08:00
devil_gong
0eb3c23b77 Merge branch 'develop' of gitee.com:gongfuxiang/shopxo into develop 2018-12-29 15:44:57 +08:00
devil_gong
61b542f1b6 新增伪静态规则文件 2018-12-29 14:03:22 +08:00
devil_gong
bb4ecf5df5 新增伪静态规则文件 2018-12-29 13:49:13 +08:00
devil_gong
05404fb186 close debug 2018-12-29 13:23:13 +08:00
devil_gong
a09d76db6d sql 2018-12-29 13:19:24 +08:00
devil_gong
54b7ff9d90 忽略配置文件 2018-12-29 13:14:29 +08:00
devil_gong
39dbb5d2e4 细节优化 2018-12-29 13:13:09 +08:00
灰大狼
4e1d8d2ba7 !1 测试Pull Request
Merge pull request !1 from 灰大狼/crazy
2018-12-29 11:28:15 +08:00
灰大狼
164844a44d 测试pull request 2018-12-29 11:15:39 +08:00
gongfuxiang
7e42f5e8e3 细节优化 2018-12-29 00:48:56 +08:00
gongfuxiang
e96a81d00e 后台管理配置附件被覆盖bug 2018-12-29 00:00:14 +08:00
gongfuxiang
2f155e6a2d 用户头像bug 2018-12-28 22:27:22 +08:00
gongfuxiang
4654449744 用户头像bug 2018-12-28 22:25:03 +08:00
gongfuxiang
c2de4b9a91 用户头像bug 2018-12-28 22:22:32 +08:00