From 9ed24bb56563dfc0f1e8866fb24e1b14c4209c7a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 26 Aug 2020 15:43:06 +0800 Subject: [PATCH] renling --- test_client/src/api/crm.js | 7 + test_client/src/router/index.js | 6 + test_client/src/store/getters.js | 1 + test_client/src/views/crm/claim.vue | 177 ++++++++++++++++++ test_client/src/views/crm/consumer.vue | 4 +- test_mini/app.js | 4 +- test_mini/images/data.png | Bin 1587 -> 2075 bytes test_mini/images/data1.png | Bin 0 -> 1587 bytes test_mini/images/datad.png | Bin 2075 -> 0 bytes test_mini/images/home.png | Bin 902 -> 1120 bytes test_mini/images/home1.png | Bin 0 -> 902 bytes test_mini/images/homed.png | Bin 1120 -> 0 bytes test_mini/images/me.png | Bin 1335 -> 1716 bytes test_mini/images/me1.png | Bin 0 -> 1335 bytes test_mini/images/med.png | Bin 1716 -> 0 bytes test_mini/images/news.png | Bin 688 -> 808 bytes test_mini/images/news1.png | Bin 0 -> 688 bytes test_mini/images/newsd.png | Bin 808 -> 0 bytes test_mini/images/play.png | Bin 1793 -> 1423 bytes test_mini/images/play1.png | Bin 0 -> 1793 bytes test_mini/images/playc.png | Bin 1282 -> 1541 bytes test_mini/images/playc1.png | Bin 0 -> 1282 bytes test_mini/pages/article/detail.js | 11 ++ test_mini/pages/article/detail.wxss | 8 +- test_mini/pages/article/index.wxml | 2 +- test_mini/project.config.json | 2 +- test_server/crm/filters.py | 2 +- .../crm/migrations/0023_auto_20200826_1444.py | 21 +++ test_server/crm/models.py | 2 +- test_server/crm/views.py | 19 ++ test_server/examtest/views.py | 3 + 31 files changed, 260 insertions(+), 9 deletions(-) create mode 100644 test_client/src/views/crm/claim.vue create mode 100644 test_mini/images/data1.png delete mode 100644 test_mini/images/datad.png create mode 100644 test_mini/images/home1.png delete mode 100644 test_mini/images/homed.png create mode 100644 test_mini/images/me1.png delete mode 100644 test_mini/images/med.png create mode 100644 test_mini/images/news1.png delete mode 100644 test_mini/images/newsd.png create mode 100644 test_mini/images/play1.png create mode 100644 test_mini/images/playc1.png create mode 100644 test_server/crm/migrations/0023_auto_20200826_1444.py diff --git a/test_client/src/api/crm.js b/test_client/src/api/crm.js index 2928e23..8e19519 100644 --- a/test_client/src/api/crm.js +++ b/test_client/src/api/crm.js @@ -94,6 +94,13 @@ export function unbindConsumer(id) { }) } +export function claimConsumer(id) { + return request({ + url: `/crm/consumer/${id}/claim/`, + method: 'put', + }) +} + export function getConsumerRoleAll(query) { return request({ url: '/crm/consumerrole/', diff --git a/test_client/src/router/index.js b/test_client/src/router/index.js index 805bc94..b5c6636 100644 --- a/test_client/src/router/index.js +++ b/test_client/src/router/index.js @@ -116,6 +116,12 @@ export const asyncRoutes = [ component: () => import('@/views/crm/consumer.vue'), meta: { title: '学员列表', icon: '', perms: ['consumer_view'] } }, + { + path: 'claim', + name: 'Claim', + component: () => import('@/views/crm/claim.vue'), + meta: { title: '认领学员', icon: '', perms: ['consumer_view'] } + }, { path: 'consumerrule', name: 'ConsumerRule', diff --git a/test_client/src/store/getters.js b/test_client/src/store/getters.js index 1854b88..389dde4 100644 --- a/test_client/src/store/getters.js +++ b/test_client/src/store/getters.js @@ -4,6 +4,7 @@ const getters = { token: state => state.user.token, avatar: state => state.user.avatar, name: state => state.user.name, + username: state=> state.user.username, perms: state => state.user.perms, permission_routes: state => state.permission.routes } diff --git a/test_client/src/views/crm/claim.vue b/test_client/src/views/crm/claim.vue new file mode 100644 index 0000000..f99e89e --- /dev/null +++ b/test_client/src/views/crm/claim.vue @@ -0,0 +1,177 @@ + + + diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue index 21c1180..c927b6c 100644 --- a/test_client/src/views/crm/consumer.vue +++ b/test_client/src/views/crm/consumer.vue @@ -182,11 +182,11 @@ - +