From fdee8192c27a2e9141ef02eaaa63652275b21623 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sat, 2 May 2020 11:29:29 +0800 Subject: [PATCH] remain_count --- test_mini/pages/article/index.wxml | 3 +-- test_mini/pages/lianxi/main.wxml | 2 +- .../crm/migrations/0014_auto_20200502_1054.py | 18 ++++++++++++++++++ test_server/crm/urls.py | 3 ++- test_server/crm/views.py | 11 +++++++++++ test_server/server/settings.py | 2 ++ 6 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 test_server/crm/migrations/0014_auto_20200502_1054.py diff --git a/test_mini/pages/article/index.wxml b/test_mini/pages/article/index.wxml index a17e055..ae9acb4 100644 --- a/test_mini/pages/article/index.wxml +++ b/test_mini/pages/article/index.wxml @@ -9,8 +9,7 @@ 置顶 {{item.title}} - 来源: - {{item.ifrom}} + {{item.ifrom}} {{item.update_time}} diff --git a/test_mini/pages/lianxi/main.wxml b/test_mini/pages/lianxi/main.wxml index cf1dfda..afad9f3 100644 --- a/test_mini/pages/lianxi/main.wxml +++ b/test_mini/pages/lianxi/main.wxml @@ -1,5 +1,5 @@ - 题量: {{tm_index+1}}/{{tmtotal}} + diff --git a/test_server/crm/migrations/0014_auto_20200502_1054.py b/test_server/crm/migrations/0014_auto_20200502_1054.py new file mode 100644 index 0000000..5847f04 --- /dev/null +++ b/test_server/crm/migrations/0014_auto_20200502_1054.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.4 on 2020-05-02 02:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('crm', '0013_consumer_remain_count'), + ] + + operations = [ + migrations.AlterField( + model_name='consumer', + name='remain_count', + field=models.IntegerField(default=3, verbose_name='体验次数'), + ), + ] diff --git a/test_server/crm/urls.py b/test_server/crm/urls.py index e61718d..b19a840 100644 --- a/test_server/crm/urls.py +++ b/test_server/crm/urls.py @@ -1,5 +1,5 @@ from django.urls import path,include -from .views import CompanyViewSet, ConsumerViewSet, ConsumerMPLoginView, ConsumerRegister +from .views import CompanyViewSet, ConsumerViewSet, ConsumerMPLoginView, ConsumerRegister, change_remain_count from rest_framework import routers @@ -10,5 +10,6 @@ router.register('company', CompanyViewSet, basename="company") urlpatterns = [ path('consumer/mplogin/', ConsumerMPLoginView.as_view()), path('consumer/register/', ConsumerRegister.as_view()), + path('change_remain_count/', change_remain_count.as_view()), path('', include(router.urls)), ] diff --git a/test_server/crm/views.py b/test_server/crm/views.py index 8e7bf23..96dd355 100644 --- a/test_server/crm/views.py +++ b/test_server/crm/views.py @@ -300,3 +300,14 @@ class ConsumerRegister(APIView): return Response({'error':'认证错误!'}) else: return Response({'error':'信息不全!'}) + + +class change_remain_count(APIView): + perms_map=[{'*':'change_remain_count'}] + def get(self, request, *args, **kwargs): + # count = request.query_params.get('count', None) + # if count: + for i in Consumer.objects.all(): + i.remain_count = i.remain_count + 2 + i.save() + return Response(status=status.HTTP_200_OK) \ No newline at end of file diff --git a/test_server/server/settings.py b/test_server/server/settings.py index 973ef19..65e0fcf 100644 --- a/test_server/server/settings.py +++ b/test_server/server/settings.py @@ -142,6 +142,8 @@ STATIC_ROOT = os.path.join(BASE_DIR,'static') REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [ + 'rest_framework.authentication.BasicAuthentication', + 'rest_framework.authentication.SessionAuthentication', 'crm.authentication.MyTokenAuthentication' ], 'DEFAULT_PERMISSION_CLASSES':[