390 Commits (027df189f3863af8f9462f18e3ffc57986fed969)

Author SHA1 Message Date
liuyang 91926b00d3 1 5 years ago
kevin jiang 0fca538d9d 组织管理-大区功能开发。 5 years ago
kevin jiang 223efe0268 样式错误修改。 5 years ago
root b3e50f554e 参数 5 years ago
root 2c4ac0e343 Merge remote-tracking branch 'origin/0605' into 0605 5 years ago
root 98addca3fb Merge remote-tracking branch 'remotes/origin/feature/20200514_version' into 0605
# Conflicts:
#	src/pages/Home.vue
#	src/pages/activity/useTable.vue
5 years ago
liuyang 439620fdb6 1 5 years ago
kevin jiang 3594ca1288 调整页面处理。 5 years ago
kevin jiang aa1baa82d8 调整页面处理。 5 years ago
kevin jiang a227dc1a69 调整页面处理。 5 years ago
kevin jiang d95810955a 调整页面处理。 5 years ago
cuijie 5e47dd1240 活动池页面优化 5 years ago
kevin jiang 14bfd534ab baseurl修改。 5 years ago
cuijie a58499c87c Merge remote-tracking branch 'remotes/origin/feature/20200514_version' into 0605 5 years ago
zhenghuang 9589780eb7 1 5 years ago
zhenghuang e83a02fb9e 1 5 years ago
yechenhao ecf6da78d0 回车监听 5 years ago
yechenhao 7db4e850ea 批量上传门店号 5 years ago
root 65ffcd6698 Merge remote-tracking branch 'remotes/git/feature_0521' into feature/20200514_version
# Conflicts:
#	src/services/CommonHttp.js
5 years ago
root 7a312a2ac2 Merge remote-tracking branch 'git/feature_0521' into feature_05212 5 years ago
liuyang 19af376602 Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
liuyang f86657a7e9 1 5 years ago
郑皇 18a18687ef 1 5 years ago
郑皇 91db056057 1 5 years ago
zhenghuang 4e3e08705a 1 5 years ago
root c218e17ad7 Merge branch 'feature/20200514_version' into feature_05212
# Conflicts:
#	src/services/CommonHttp.js
5 years ago
kevin jiang 7b8e1c1980 Merge branch 'feature_0521' into feature/20200514_version
# Conflicts:
#	src/services/CommonHttp.js
5 years ago
liuyang f1fb32f841 Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
liuyang bbc2e6b605 1 5 years ago
郑皇 70a5d144d2 1 5 years ago
郑皇 55a8ebc119 1 5 years ago
郑皇 260c582603 1 5 years ago
郑皇 23c2b5cba0 1 5 years ago
郑皇 ee69ee4f78 1 5 years ago
kevin jiang 0e426c4a00 添加加载中。 5 years ago
kevin jiang ee145885f2 添加加载中。 5 years ago
郑皇 36fadd8644 1 5 years ago
郑皇 4b1ca750fc 1 5 years ago
zhenghuang 70dc6282c6 1 5 years ago
zhenghuang d3e02dfd21 1 5 years ago
zhenghuang a5aa251d01 1 5 years ago
zhenghuang 28f5de6b6e 1 5 years ago
zhenghuang a68a710d43 1 5 years ago
zhenghuang 7e6b4a7e8c 1 5 years ago
kevin jiang 0906db435f 推广管理-零售公司,默认不查询。 5 years ago
liuyang f1f89e5212 Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
liuyang 2a8e623b64 1 5 years ago
yechenhao df7fdcd143 修改主副店长 5 years ago
kevin jiang 28c496b8e5 推广管理-零售公司,默认不查询。 5 years ago
zhenghuang 99fe34dceb 1 5 years ago
zhenghuang 26bfc4f0cc 1 5 years ago
zhenghuang 61286c65c8 1 5 years ago
kevin jiang 9b164041ad Merge branch 'feature/20200413_exploit' into feature/20200514_version 5 years ago
kevin jiang 57edc3f1a0 修改报错。 5 years ago
yechenhao 82063fd5f7 批量上传门店号 5 years ago
kevin jiang 4a3baf481c Merge branch 'feature_0521' into feature/20200514_version
# Conflicts:
#	.gitignore
#	postcss.config.js
#	src/pages/shop/IncreaseStaffManager.vue
#	src/pages/user/AccountManagementModify.vue
#	src/pages/user/AccountManager.vue
#	src/pages/user/AccountManagerAdd.vue
#	src/router/index.js
#	src/services/CommonHttp.js
#	src/services/store/IncreaseStoreManager.js
#	vue.config.js
5 years ago
yechenhao e02412a650 批量上传门店号 5 years ago
kevin jiang 6b6fe8f588 定时任务去掉。 5 years ago
郑皇 23d5c93977 Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
郑皇 4d3f82c38a 1 5 years ago
liuyang b0c6a78678 Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
liuyang 72594c4b56 1 5 years ago
郑皇 716713daad 1 5 years ago
郑皇 00ec56ab75 1 5 years ago
郑皇 6ef2a253ef 1 5 years ago
郑皇 4715dc2d6e 1 5 years ago
yechenhao 2179d65337 批量上传门店号 5 years ago
郑皇 44d787ebac Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
郑皇 fdfd6fc320 1 5 years ago
liuyang 059640d3a3 1 5 years ago
liuyang 35b024b94f 1 5 years ago
liuyang 699221d7ef Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
liuyang 32ab14649b 1 5 years ago
郑皇 1757e67184 1 5 years ago
zhenghuang 0ccd7149fc Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
zhenghuang eff606391a 1 5 years ago
liuyang 8fd1abcf0a Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
liuyang 84187d86dc 1 5 years ago
zhenghuang 74435bbc31 Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
zhenghuang 7c22309103 1 5 years ago
liuyang 301c445f16 1 5 years ago
liuyang a17e5f9f2c 1 5 years ago
liuyang 283c6c7c12 活动计划列表按钮调整 5 years ago
zhenghuang 73bc66e32d 1 5 years ago
zhenghuang 24cc3ab7e2 1 5 years ago
zhenghuang 16c8cd82fa 1 5 years ago
zhenghuang ba8d3a8a48 1 5 years ago
root d00e6e8752 欢迎语页面 5 years ago
yechenhao 1b7cbdf593 批量上传门店号 5 years ago
liuyang 0ae45869a7 1 5 years ago
liuyang 2ec44aa7bd 活动日期调整 5 years ago
郑皇 d0b8e748b5 Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521 5 years ago
郑皇 e37ee2f05c 1 5 years ago
root 232d5b39fe 裂变页面 5 years ago
郑皇 c1532fc48e 1 5 years ago
郑皇 d646e44356 1 5 years ago
yechenhao 5af96c5900 批量上传门店号 5 years ago
yechenhao af6bdfd94d 批量上传门店号 5 years ago
zhenghuang 1c157da00f 1 5 years ago
zhenghuang 3a6093b9c1 1 5 years ago