account/models.py

@@ -363,7 +363,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                         return self.nickname
              

                 
              

                     @property
              

                -    def data(self):
              

                +    def data(self, brand_id=None):
              

                         return {
              

                             'user_id': self.user_id,
              

                             'name': self.name,
              
@@ -373,7 +373,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                             'phone': self.phone,
              

                             # TODO: Diff for Brands
              

                             'has_membercard': self.has_membercard,
              

                -            'saleclerk': SaleclerkInfo.objects.filter(unionid=self.unionid, status=True).exists(),
              

                +            'saleclerk': SaleclerkInfo.objects.filter(brand_id=brand_id, unionid=self.unionid, status=True).exists(),
              

                         }
              

                 
              

                 
              

miniapp/views.py

@@ -80,7 +80,7 @@ def get_userinfo_api(request):

                 
              

                     set_profile_info(user)
              

                 
              

                -    return response(200, 'Mini App Login Success', u'微信小程序登录成功', user.data)
              

                +    return response(200, 'Mini App Login Success', u'微信小程序登录成功', user.data(brand_id=brand_id))
              

                 
              

                 
              

                 @logit
              

requirements_dj.txt

@@ -4,7 +4,7 @@ django-cors-headers==2.3.0

                 django-curtail-uuid==1.0.4
              

                 django-detect==1.0.5
              

                 django-file-md5==1.0.2
              

                -django-file-upload==1.0.5
              

                +django-file-upload==1.1.0
              

                 django-ip==1.0.2
              

                 django-json-render==1.0.1
              

                 django-json-response==1.1.5