'brand_domain': self.brand_domain or settings.KODO_DEFAULT_BRAND_DOMAIN,
|
|
88
|
+ }
|
|
|
89
|
+
|
|
81
|
90
|
|
|
82
|
91
|
class BrandInfo(BaseModelMixin):
|
|
83
|
92
|
brand_id = ShortUUIDField(_(u'brand_id'), max_length=32, help_text=u'品牌唯一标识', db_index=True, unique=True)
|
|
|
|
@@ -85,6 +94,7 @@ class BrandInfo(BaseModelMixin):
|
|
85
|
94
|
brand_descr = models.TextField(_(u'brand_descr'), max_length=255, blank=True, null=True, help_text=u'品牌描述')
|
|
86
|
95
|
|
|
87
|
96
|
brand_logo = models.ImageField(_(u'brand_logo'), upload_to=upload_path, blank=True, null=True, help_text=u'品牌商标')
|
|
|
97
|
+ brand_domain = models.CharField(_(u'brand_domain'), max_length=255, blank=True, null=True, help_text=u'品牌域名')
|
|
88
|
98
|
|
|
89
|
99
|
position = models.IntegerField(_(u'position'), default=1, help_text=u'排序')
|
|
90
|
100
|
|
|
|
|
@@ -9,7 +9,7 @@ from mch.models import SaleclerkInfo
|
|
9
|
9
|
|
|
10
|
10
|
|
|
11
|
11
|
def clerk_info_oauth(request):
|
|
12
|
|
- brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND)
|
|
|
12
|
+ brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
13
|
13
|
unionid = request.GET.get('unionid', '')
|
|
14
|
14
|
|
|
15
|
15
|
try:
|
|
|
|
@@ -57,7 +57,7 @@ def login_qrcode(request):
|
|
57
|
57
|
|
|
58
|
58
|
|
|
59
|
59
|
def clerk_oauth(request):
|
|
60
|
|
- brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND)
|
|
|
60
|
+ brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
61
|
61
|
unionid = request.GET.get('unionid', '')
|
|
62
|
62
|
|
|
63
|
63
|
try:
|
|
|
|
@@ -85,7 +85,7 @@ def clerk_oauth(request):
|
|
85
|
85
|
@transaction.atomic
|
|
86
|
86
|
def clerk_submit_api(request):
|
|
87
|
87
|
""" 店员授权信息提交 """
|
|
88
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND)
|
|
|
88
|
+ brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
89
|
89
|
unionid = request.POST.get('unionid', '')
|
|
90
|
90
|
openid = request.POST.get('openid', '')
|
|
91
|
91
|
phone = request.POST.get('phone', '')
|
|
|
|
@@ -16,7 +16,7 @@ from utils.rdm_utils import randnum
|
|
16
|
16
|
|
|
17
|
17
|
@logit
|
|
18
|
18
|
def tj_distributor(request):
|
|
19
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND)
|
|
|
19
|
+ brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
20
|
20
|
|
|
21
|
21
|
ymd = int(tc.local_string(format='%Y%m%d'))
|
|
22
|
22
|
|
|
|
|
@@ -70,7 +70,7 @@ def tj_distributor(request):
|
|
70
|
70
|
|
|
71
|
71
|
@logit
|
|
72
|
72
|
def tj_consumer(request):
|
|
73
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND)
|
|
|
73
|
+ brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
74
|
74
|
|
|
75
|
75
|
ymd = int(tc.local_string(format='%Y%m%d'))
|
|
76
|
76
|
|