Эхлэл Бүгдийг харах Тусламж
Бүртгүүлэх Нэвтрэх
wushaodong
/
nostone_loan
1
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

h5

wushaodong 3 жил өмнө
parent
0010d48bda
commit
a0c77d054e
13 өөрчлөгдсөн 18 нэмэгдсэн , 14 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 2 0
      apps/account/urls.py
  2. 14 0
      apps/account/views.py
  3. 1 1
      apps/order/models.py
  4. 0 12
      apps/order/views.py
  5. 0 0
      uis/dist/css/app.98dd3e76.css
  6. 1 1
      uis/dist/index.html
  7. 0 0
      uis/dist/js/app.341c2c6e.js
  8. 0 0
      uis/dist/js/app.341c2c6e.js.map
  9. 0 0
      uis/dist/js/app.380726b1.js
  10. 0 0
      uis/dist/js/app.380726b1.js.map
  11. 0 0
      uis/dist/js/chunk-vendors.423d661f.js
  12. 0 0
      uis/dist/js/chunk-vendors.423d661f.js.map
  13. 0 0
      uis/dist/js/chunk-vendors.8ecc10bc.js.map

+ 2 - 0
apps/account/urls.py
Файл харах 

@@ -13,6 +13,8 @@ urlpatterns = [
 
     url(r'^code2Session/$', WxLoginView.as_view()), # 自动登录
 
     url(r'^code2Session/$', WxLoginView.as_view()), # 自动登录
 
     url(r'^setUserInfo/$', SetUserInfoView.as_view()),
 
     url(r'^setUserInfo/$', SetUserInfoView.as_view()),
 
     url(r'^wxbind/$', WxBindView.as_view()), # 微信快捷登录
 
     url(r'^wxbind/$', WxBindView.as_view()), # 微信快捷登录
 
+
 
+    url(r'^get_user/$', UserDictView.as_view()), # 微信快捷登录
 
 ]
 
 ]
 
 
 
 router = SimpleRouter()
 
 router = SimpleRouter()

+ 14 - 0
apps/account/views.py
Файл харах 

@@ -49,6 +49,7 @@ class RefreshTokenView(RefreshJSONWebToken):
 
             return response_error(str(e))
 
             return response_error(str(e))
 
 
 
 class ChangePassword(APIView):
 
 class ChangePassword(APIView):
 
+    permission_classes = [isLogin, ]
 
 
 
     def post(self, request, *args, **kwargs):
 
     def post(self, request, *args, **kwargs):
 
         id = request.GET.get('id')
 
         id = request.GET.get('id')
 
@@ -150,3 +151,16 @@ class WxBindView(APIView):
 
             return response_ok(ser.validated_data)
 
             return response_ok(ser.validated_data)
 
         else:
 
         else:
 
             return response_error('参数错误')
 
             return response_error('参数错误')
 
+
 
+class UserDictView(APIView):
 
+
 
+    def get(self, request):
 
+        data = []
 
+        queryset = User.objects.filter(is_active=True, type=User.SELLER)
 
+        for row in queryset:
 
+            item = {
 
+                'id': row.id,
 
+                'name': '{}-{}'.format(row.name, row.username),
 
+            }
 
+            data.append(item)
 
+        return response_ok(data)

+ 1 - 1
apps/order/models.py
Файл харах 

@@ -56,7 +56,7 @@ class Order(models.Model):
 
     category = models.PositiveSmallIntegerField(choices=order.CATEGORY_CHOICES, verbose_name=u"订单类型", default=order.ZERO)
 
     category = models.PositiveSmallIntegerField(choices=order.CATEGORY_CHOICES, verbose_name=u"订单类型", default=order.ZERO)
 
     status = models.PositiveSmallIntegerField(choices=order.STATUS_CHOICES, verbose_name=u"订单状态", default=order.ZERO, editable=False)
 
     status = models.PositiveSmallIntegerField(choices=order.STATUS_CHOICES, verbose_name=u"订单状态", default=order.ZERO, editable=False)
 
     seller = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='order_seller', verbose_name=u"业务人员",
 
     seller = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='order_seller', verbose_name=u"业务人员",
 
-                                    on_delete=models.PROTECT, editable=False)
 
+                                    on_delete=models.PROTECT)
 
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='order_create_user', verbose_name=u"添加人",
 
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='order_create_user', verbose_name=u"添加人",
 
                                     on_delete=models.PROTECT, editable=False)
 
                                     on_delete=models.PROTECT, editable=False)
 
     create_time = models.DateTimeField(verbose_name=u'添加时间', auto_now_add=True, editable=False)
 
     create_time = models.DateTimeField(verbose_name=u'添加时间', auto_now_add=True, editable=False)

+ 0 - 12
apps/order/views.py
Файл харах 

@@ -148,18 +148,11 @@ class OrderCreatView(CreateAPIView):
 
     serializer_class = OrderSerializer
 
     serializer_class = OrderSerializer
 
 
 
     def post(self, request, *args, **kwargs):
 
     def post(self, request, *args, **kwargs):
 
-        seller_tel = request.POST.get('seller_tel')
 
         try:
 
         try:
 
             with transaction.atomic():
 
             with transaction.atomic():
 
                 serializer = self.get_serializer(data=request.data)
 
                 serializer = self.get_serializer(data=request.data)
 
                 if serializer.is_valid(raise_exception=True):
 
                 if serializer.is_valid(raise_exception=True):
 
                     instance = serializer.save()
 
                     instance = serializer.save()
 
-                    seller = User.objects.filter(username=seller_tel).first()
 
-                    if seller:
 
-                        instance.seller = seller
 
-                        instance.save()
 
-                    else:
 
-                        raise CustomError('请填写正确的业务人员电话')
 
                     BizLog.objects.addnew(None, BizLog.INSERT,
 
                     BizLog.objects.addnew(None, BizLog.INSERT,
 
                                           u'添加订单[%s]，id=%d' % (instance.name, instance.id), request.data)
 
                                           u'添加订单[%s]，id=%d' % (instance.name, instance.id), request.data)
 
                     return response_ok(instance.id)
 
                     return response_ok(instance.id)
 
@@ -316,16 +309,11 @@ class OrderViewSet(CustomModelViewSet):
 
             return response_ok(result)
 
             return response_ok(result)
 
 
 
     def create(self, request, *args, **kwargs):
 
     def create(self, request, *args, **kwargs):
 
-        seller_tel = request.POST.get('seller_tel')
 
         try:
 
         try:
 
             with transaction.atomic():
 
             with transaction.atomic():
 
                 serializer = self.get_serializer(data=request.data)
 
                 serializer = self.get_serializer(data=request.data)
 
                 if serializer.is_valid(raise_exception=True):
 
                 if serializer.is_valid(raise_exception=True):
 
                     instance = serializer.save()
 
                     instance = serializer.save()
 
-                    seller = User.objects.filter(username=seller_tel).first()
 
-                    if seller:
 
-                        instance.seller = seller
 
-                        instance.save()
 
                     BizLog.objects.addnew(self.request.user, BizLog.INSERT,
 
                     BizLog.objects.addnew(self.request.user, BizLog.INSERT,
 
                                           u'添加订单[%s]，id=%d' % (instance.name, instance.id), request.data)
 
                                           u'添加订单[%s]，id=%d' % (instance.name, instance.id), request.data)
 
                     return response_ok(instance.id)
 
                     return response_ok(instance.id)

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
uis/dist/css/app.98dd3e76.css


+ 1 - 1
uis/dist/index.html
Файл харах 

@@ -1 +1 @@
 
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,initial-scale=1,viewport-fit=cover"><link rel="icon" href="logo.png"><title>诺信通金融</title><link href="css/chunk-5548dce5.79027bda.css" rel="prefetch"><link href="js/chunk-5548dce5.c74e43dc.js" rel="prefetch"><link href="css/app.745f8f42.css" rel="preload" as="style"><link href="css/chunk-vendors.754acb04.css" rel="preload" as="style"><link href="js/app.380726b1.js" rel="preload" as="script"><link href="js/chunk-vendors.8ecc10bc.js" rel="preload" as="script"><link href="css/chunk-vendors.754acb04.css" rel="stylesheet"><link href="css/app.745f8f42.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but nuoxintong doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.8ecc10bc.js"></script><script src="js/app.380726b1.js"></script></body></html>
 
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,initial-scale=1,viewport-fit=cover"><link rel="icon" href="logo.png"><title>诺信通金融</title><link href="css/chunk-5548dce5.79027bda.css" rel="prefetch"><link href="js/chunk-5548dce5.c74e43dc.js" rel="prefetch"><link href="css/app.98dd3e76.css" rel="preload" as="style"><link href="css/chunk-vendors.754acb04.css" rel="preload" as="style"><link href="js/app.341c2c6e.js" rel="preload" as="script"><link href="js/chunk-vendors.423d661f.js" rel="preload" as="script"><link href="css/chunk-vendors.754acb04.css" rel="stylesheet"><link href="css/app.98dd3e76.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but nuoxintong doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.423d661f.js"></script><script src="js/app.341c2c6e.js"></script></body></html>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
uis/dist/js/app.341c2c6e.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
uis/dist/js/app.341c2c6e.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
uis/dist/js/app.380726b1.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
uis/dist/js/app.380726b1.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
uis/dist/js/chunk-vendors.423d661f.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
uis/dist/js/chunk-vendors.423d661f.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
uis/dist/js/chunk-vendors.8ecc10bc.js.map


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно