Commit Graph

3055 Commits

Author SHA1 Message Date
阳华祥
708364aebf 签名模糊问题调整:处理签名模糊 --提交人:阳华祥 2020-07-01 18:03:16 +08:00
yuweiqi
0c880c93a6 Merge branch 'feature/GFRS-1523【待确定】商品商城' into dev 2020-07-01 15:58:19 +08:00
yuweiqi
a5ee96c279 [FIX]【商品商城】商品详情页样式调整 2020-07-01 15:55:54 +08:00
anbbukn
689f3777fb Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 15:53:42 +08:00
anbbukn
592e4428b0 [FIX] nbs剔除Vuex 2020-07-01 15:53:28 +08:00
anbbukn
c4be4559c4 Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 15:38:13 +08:00
anbbukn
a425acdf8b [FIX] 移除Vuex 2020-07-01 15:37:56 +08:00
anbbukn
a517fc463a Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 15:28:16 +08:00
anbbukn
fce1ee7035 [FIX] nbs router 2020-07-01 15:28:02 +08:00
anbbukn
28fba4caa1 [Fix] nbs router 2020-07-01 15:27:29 +08:00
anbbukn
d026466583 Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 15:08:23 +08:00
anbbukn
f715f2b930 [FIX] nbs router 2020-07-01 15:08:09 +08:00
anbbukn
12eb6e917b Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 15:00:51 +08:00
anbbukn
64efc19438 [Fix] nbs router 2020-07-01 15:00:34 +08:00
anbbukn
f25fb42ea7 Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 14:57:59 +08:00
anbbukn
2af2c21d1f [FIX] app router 2020-07-01 14:57:48 +08:00
anbbukn
eb6ded2ef1 Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 14:23:47 +08:00
anbbukn
e3b992a03e [FIX] nbs router 2020-07-01 14:18:00 +08:00
anbbukn
c44429cfab Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 13:39:26 +08:00
anbbukn
58b0782679 [Fix] nbs router 2020-07-01 13:39:12 +08:00
anbbukn
57a454a689 [FIX] nbs router 2020-07-01 13:38:37 +08:00
anbbukn
e25704e0df Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 13:31:31 +08:00
anbbukn
572c51960b [FIX] nbs router 2020-07-01 13:31:16 +08:00
anbbukn
043d83f796 Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 12:57:16 +08:00
anbbukn
ef44976886 [FIX] nbs router 2020-07-01 12:56:53 +08:00
anbbukn
141749ceed Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 12:51:57 +08:00
anbbukn
f1cd27e420 [FIX] nbs router 2020-07-01 12:51:41 +08:00
anbbukn
d9dadbd733 Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 12:45:51 +08:00
anbbukn
504c6cc578 [FIX] nbs router 2020-07-01 12:45:34 +08:00
anbbukn
c58e2286fd Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 11:23:35 +08:00
anbbukn
0a57507e5f [FIX] 路由跳转修复 2020-07-01 11:23:24 +08:00
anbbukn
5ef9caf6b5 Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 10:57:00 +08:00
anbbukn
ae6bf1f401 【FIX】 nbs export 2020-07-01 10:56:46 +08:00
anbbukn
cc4a55b950 Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 10:24:59 +08:00
anbbukn
98d6b5e820 【FIX】 nbs 添加loading 2020-07-01 10:24:43 +08:00
anbbukn
4b46008221 Merge branch 'origin/feature/GFRS-1469【0630】nbsapp' into dev 2020-07-01 10:23:51 +08:00
anbbukn
3992815695 Merge branch 'feature/GFRS-1469【0630】nbsapp' into dev 2020-06-30 22:47:57 +08:00
anbbukn
9691d0e141 [FIX]【nbs】 页面补充 2020-06-30 22:47:42 +08:00
anbbukn
c3a8a68fcb Merge branch 'feature/GFRS-1469【0630】nbsapp' into dev 2020-06-30 22:37:10 +08:00
anbbukn
a01a518109 [Fix] 【nbs内勤】页面补充 2020-06-30 22:34:31 +08:00
yuweiqi
de741c1c7a Merge branch 'feature/GFRS-1198【待确定】自助入司改造(涉及销管)' into dev 2020-06-30 21:55:50 +08:00
yuweiqi
a424537f84 [FIX]【自助入司优化二期】审批相关页面开户银行、职级显示问题调整 2020-06-30 21:54:29 +08:00
anbbukn
74c3f4dda7 [NEW] nbs 统计 和后台 2020-06-30 21:33:15 +08:00
anbbukn
53a32ba985 Merge branch 'dev' of 112.124.100.131:GFRS/ebiz-h5 into dev
# Conflicts:[NEW] nbs 统计 和后台
#	src/views/app/Home.vue
2020-06-30 21:29:04 +08:00
anbbukn
6109294641 Merge branch 'feature/GFRS-1469【0630】nbsapp' into dev
# Conflicts:
#	src/store/index.js
[NEW] nbs 统计 和后台
2020-06-30 20:25:12 +08:00
anbbukn
8de510e14f [NEW] nbs 统计及内勤 2020-06-30 20:10:58 +08:00
anbbukn
24d5c4997d [NEW] nbs 统计及内勤 2020-06-30 20:04:28 +08:00
anbbukn
23f64fd359 新需求nbs 2020-06-30 18:44:54 +08:00
yuweiqi
302be13bed Merge branch 'feature/GFRS-1198【待确定】自助入司改造(涉及销管)' into dev 2020-06-30 17:58:11 +08:00
yuweiqi
5a764b49ee [FIX]【入司优化二期】待审批列表查询、审批提交修改;历史审批记录-无推荐人时,推荐人、团队等显示-- 2020-06-30 17:55:49 +08:00