...

apps/account/views.py

@@ -49,7 +49,7 @@ def login(request):
         return JSONResponse({
             'user_id': user.id,
             'access_token': form.access_token,
-            'name': user.name,
+            'name': user.name or user.username,
             'superuser': superuser,
         })
     else:

apps/activity/serializers.py

@@ -12,6 +12,8 @@ from apps.foundation.models import BizLog
 from apps.customer.models import Customer
 from apps.account.models import Branch
 from apps import base
+from libs.booleancharfield import PriceShowCharField
+
 
 class BranchSerializer(serializers.ModelSerializer):
     enabled_text = serializers.SerializerMethodField()
@@ -95,6 +97,8 @@ class OrderSerializer(serializers.ModelSerializer):
     delete_text = serializers.SerializerMethodField()
     split_status_text = serializers.SerializerMethodField()
     create_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
+    amount = PriceShowCharField(read_only=True)
+    rebate = PriceShowCharField(read_only=True)
 
     class Meta:
         model = Order

libs/booleancharfield.py

@@ -2,7 +2,7 @@
 
 from rest_framework import serializers
 from libs.utils import strftime,strfdate
-from apps.base import Formater
+from util.format import Formater
 
 def getAttributeValue(instance, obj):
     if '.' in instance.source:

uis/views/activity/index.html

@@ -121,6 +121,11 @@
     var superuser = layui.data(layui.setter.tableName)['superuser'];
       if(!superuser){
           $('#show_check').remove();
+      }else {
+          $('#btn_add').remove();
+          $('#btn_set').remove();
+          $('#btn_coupon').remove();
+          $('#btn_del').remove();
       }
 
     table.render({