From 323c4189e995c9044b13187bb65fba9190e4b1fe Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 23 Jul 2020 22:23:18 +0800 Subject: [PATCH] =?UTF-8?q?role=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test_mini/app.js | 6 +++--- test_mini/pages/my/index.js | 2 +- test_mini/project.config.json | 3 ++- test_server/crm/views.py | 10 ++++++++++ test_server/media/muban/user.xlsx | Bin 13300 -> 13388 bytes 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/test_mini/app.js b/test_mini/app.js index 0adcdb0..af25636 100644 --- a/test_mini/app.js +++ b/test_mini/app.js @@ -24,7 +24,7 @@ App({ // var currentPage = pages[pages.length - 1] //获取当前页面的对象 // currentPage.showExp() - if(res.data.userinfo.username == null){ + if(res.data.userinfo.role_name == '游客'){ //匿名用户 wx.reLaunch({ url: '/pages/login/login', @@ -57,9 +57,9 @@ App({ globalData: { userInfo: {}, userinfo: {}, // 服务器传回的消费者信息 - //host: 'https://apitest.ahctc.cn', + host: 'https://apitest.ahctc.cn', mediahost: 'https://apitest.ahctc.cn', - host: 'http://127.0.0.1:8000', + //host: 'http://127.0.0.1:8000', //mediahost: 'http://127.0.0.1:8000', token : '', } diff --git a/test_mini/pages/my/index.js b/test_mini/pages/my/index.js index 29ef025..65a6815 100644 --- a/test_mini/pages/my/index.js +++ b/test_mini/pages/my/index.js @@ -73,7 +73,7 @@ Page({ }, register: function() { var that = this - if (!that.data.userinfo.username){ + if (that.data.userinfo.role_name=='游客'){ wx.reLaunch({ url: '/pages/login/login', }) diff --git a/test_mini/project.config.json b/test_mini/project.config.json index acd0dd0..ff08581 100644 --- a/test_mini/project.config.json +++ b/test_mini/project.config.json @@ -23,7 +23,8 @@ "disablePlugins": [], "outputPath": "" }, - "useCompilerModule": true, + "useIsolateContext": true, + "useCompilerModule": false, "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", diff --git a/test_server/crm/views.py b/test_server/crm/views.py index 29dcbea..2ee17c3 100644 --- a/test_server/crm/views.py +++ b/test_server/crm/views.py @@ -230,6 +230,8 @@ class ConsumerViewSet(ModelViewSet): return Response({"error":"单位列错误!"}) if sheet['d2'].value != '工作类别': return Response({"error":"工作类别列错误!"}) + if sheet['e2'].value != '角色': + return Response({"error":"角色列错误!"}) companydict = {} companys = Company.objects.filter(is_delete=0) for i in companys: @@ -247,6 +249,7 @@ class ConsumerViewSet(ModelViewSet): companyname = companyname.replace(' ', '') companyobj = Company.objects.get_or_create(name=companyname)[0] workscope = sheet['d'+str(m)].value + role = sheet['e'+str(m)].value if Consumer.objects.filter(username = username).exists(): obj = Consumer.objects.filter(username = username).first() else: @@ -264,6 +267,13 @@ class ConsumerViewSet(ModelViewSet): except: return Response({"error":"工作类别不存在!"}) obj.role = role1 + if role: + role = role.replace(' ', '') + try: + roleobj = ConsumerRole.objects.get(name=role) + obj.role = roleobj + except: + pass obj.save() m = m + 1 return Response(status=status.HTTP_200_OK) diff --git a/test_server/media/muban/user.xlsx b/test_server/media/muban/user.xlsx index 6d9d6251aa8f6383206cf32d521105133c63a473..9d78c9e12c816b8218f8ff80361c9f849b8d30da 100644 GIT binary patch delta 4299 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