|
|
@@ -348,8 +348,8 @@ class ShopifyView(View):
|
|
|
lang_qs = LanguageModel.objects.filter(lang=lang)
|
|
|
language = lang_qs[0]
|
|
|
country_qs = CountryLanguageModel.objects.filter(language_id=language.id)
|
|
|
- country_qs = country_qs.annotate(api=F('country__region__zosi_api'))
|
|
|
- country_qs = country_qs.values('country_id', 'country_name', 'api').order_by('country_id')
|
|
|
+ country_qs = country_qs.annotate(api=F('country__region__zosi_api'), country_code=F('country__country_code'))
|
|
|
+ country_qs = country_qs.values('country_id', 'country_name', 'country_code', 'api').order_by('country_id')
|
|
|
country_list = []
|
|
|
for country in country_qs:
|
|
|
country['api'] = country['api'] + 'shopify/shopifyRegister'
|
|
|
@@ -407,7 +407,7 @@ class ShopifyView(View):
|
|
|
@staticmethod
|
|
|
def verify_authcode(request_dict, response):
|
|
|
"""
|
|
|
- 验证验证码
|
|
|
+ 在修改密码的时候验证验证码
|
|
|
"""
|
|
|
email = request_dict.get("email", None)
|
|
|
authcode = request_dict.get("authCode", None)
|
