diff --git a/test_mini/pages/article/detail.js b/test_mini/pages/article/detail.js index a3d3bc1..737a648 100644 --- a/test_mini/pages/article/detail.js +++ b/test_mini/pages/article/detail.js @@ -68,16 +68,7 @@ Page({ getDetail: function (id) { var that = this api.request(`/cms/article/${id}/`,'GET').then(res => { - if(res.data.elink){ - let elink_f = getApp().globalData.host + '/redirect?url='+res.data.elink - console.log(elink_f) - that.setData({ - elink_f:elink_f - }) - }else{ - that.setData(res.data) - } - + that.setData(res.data) }) }, diff --git a/test_mini/pages/article/detail.wxml b/test_mini/pages/article/detail.wxml index 52dffbe..22ea265 100644 --- a/test_mini/pages/article/detail.wxml +++ b/test_mini/pages/article/detail.wxml @@ -1,11 +1,10 @@ - - + {{title}} {{ifrom}} 置顶 - 原创 + 原创 diff --git a/test_server/crm/views.py b/test_server/crm/views.py index 152a8ad..8e7bf23 100644 --- a/test_server/crm/views.py +++ b/test_server/crm/views.py @@ -202,7 +202,7 @@ class ConsumerViewSet(ModelViewSet): companyname = sheet['C'+str(m)].value if companyname: companyname = companyname.replace(' ', '') - companyobj = Company.objects.get_or_create(id=companydict[companyname])[0] + companyobj = Company.objects.get_or_create(name=companyname)[0] workscope = sheet['d'+str(m)].value if Consumer.objects.filter(username = username).exists(): obj = Consumer.objects.filter(username = username).first()