Commit Graph

802 Commits

Author SHA1 Message Date
devil_gong
ae1331a6b3 debug 2019-01-07 14:00:16 +08:00
devil_gong
5fe0464447 Merge branch 'master' into develop 2019-01-07 13:56:53 +08:00
devil_gong
55da2c367b debug 2019-01-07 13:56:28 +08:00
devil_gong
d992bc422d pay debug 2019-01-07 13:53:27 +08:00
devil_gong
c00101e9ba pay debug 2019-01-07 13:52:42 +08:00
devil_gong
8f9c8fe4d6 Merge branch 'master' into develop 2019-01-07 10:05:22 +08:00
devil_gong
a2ae81dfd5 编辑器初始化非登录状态下不能操作 2019-01-07 10:04:06 +08:00
devil_gong
3c057b81ad Merge branch 'master' into develop 2019-01-07 10:00:34 +08:00
devil_gong
c6535c7fdd 编辑器初始化未登录校验 2019-01-07 09:57:49 +08:00
gongfuxiang
453a999bc6 微信小程序购物车优化 2019-01-06 18:48:53 +08:00
gongfuxiang
6781a95ba2 支付宝小程序 2019-01-06 17:21:53 +08:00
gongfuxiang
bc7015c953 支付宝小程序配置修改 2019-01-06 17:20:55 +08:00
gongfuxiang
df4eec9e64 支付宝小程序组件优化 2019-01-06 17:20:25 +08:00
gongfuxiang
a1849de54b 支付宝小程序自定义组件优化 2019-01-06 17:15:57 +08:00
gongfuxiang
14ccac5b16 首页商品分类优化img 2019-01-06 15:40:33 +08:00
gongfuxiang
fc61a5a80e 支付提示状态 2019-01-06 00:23:04 +08:00
gongfuxiang
b64988f827 Merge branch 'master' into develop 2019-01-06 00:21:26 +08:00
gongfuxiang
7ba3a71312 删除优化 2019-01-06 00:20:24 +08:00
gongfuxiang
d84c3001b1 Merge branch 'master' into develop 2019-01-05 22:15:58 +08:00
gongfuxiang
0c321e1e72 商品管理分类bug修复 2019-01-05 22:13:56 +08:00
gongfuxiang
1bb757a327 小程序优化 2019-01-05 21:37:48 +08:00
gongfuxiang
454e1dd6f1 小程序优化 2019-01-05 16:17:15 +08:00
gongfuxiang
2f9217e93d 微信小程序 2019-01-05 01:47:30 +08:00
gongfuxiang
fd385d4134 Merge branch 'master' into develop 2019-01-04 21:13:49 +08:00
gongfuxiang
74a47437c9 安装检查去掉 public/install 2019-01-04 21:12:59 +08:00
gongfuxiang
3a94cdd0e4 Merge branch 'master' into develop 2019-01-04 20:20:20 +08:00
gongfuxiang
36a13821ca 安装完成样式优化 2019-01-04 20:19:43 +08:00
gongfuxiang
e80e823f87 Merge branch 'master' into develop 2019-01-04 20:07:14 +08:00
gongfuxiang
a4d3ab3cac install bug 2019-01-04 20:05:41 +08:00
devil_gong
b873b842fb Merge branch 'master' into develop 2019-01-04 18:20:17 +08:00
devil_gong
bb8713b6f8 小程序包删除,防止路径回溯 2019-01-04 18:16:20 +08:00
devil_gong
6707ddcec8 安装完成提示信息优化 2019-01-04 17:57:40 +08:00
devil_gong
d48cee25e7 防止系统被非法重复安装,将sql文件移到config中 2019-01-04 17:47:57 +08:00
devil_gong
d49398c3d4 xcx 2019-01-04 17:30:28 +08:00
gongfuxiang
89af496432 微信小重新 2019-01-04 01:11:45 +08:00
devil_gong
3a26acba1c 小程序 2019-01-03 18:44:57 +08:00
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