branch_id
променени са 3 файла, в които са добавени 1 реда и са изтрити 20 реда
+ 0
- 10
api/mch_views.py
@@ -26,11 +26,6 @@ WECHAT = settings.WECHAT |
||
| 26 | 26 |
|
| 27 | 27 |
@logit |
| 28 | 28 |
def optor_login_api(request): |
| 29 |
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
| 30 |
- |
|
| 31 |
- if brand_id != settings.KODO_DEFAULT_BRAND_ID: |
|
| 32 |
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH) |
|
| 33 |
- |
|
| 34 | 29 |
phone = request.POST.get('phone', '')
|
| 35 | 30 |
password = request.POST.get('password', '')
|
| 36 | 31 |
|
@@ -52,11 +47,6 @@ def optor_login_api(request): |
||
| 52 | 47 |
|
| 53 | 48 |
@logit |
| 54 | 49 |
def admin_login_api(request): |
| 55 |
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
| 56 |
- |
|
| 57 |
- if brand_id != settings.KODO_DEFAULT_BRAND_ID: |
|
| 58 |
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH) |
|
| 59 |
- |
|
| 60 | 50 |
phone = request.POST.get('phone', '')
|
| 61 | 51 |
password = request.POST.get('password', '')
|
| 62 | 52 |
|
+ 1
- 1
mch/admin.py
@@ -13,7 +13,7 @@ from mch.models import (ActivityInfo, AdministratorInfo, BrandInfo, ConsumeInfoS |
||
| 13 | 13 |
|
| 14 | 14 |
|
| 15 | 15 |
class AdministratorInfoAdmin(admin.ModelAdmin): |
| 16 |
- list_display = ('admin_id', 'phone', 'password', 'encryption', 'name', 'brand_id', 'brand_name', 'user_status', 'status', 'created_at', 'updated_at')
|
|
| 16 |
+ list_display = ('admin_id', 'phone', 'name', 'brand_id', 'brand_name', 'user_status', 'status', 'created_at', 'updated_at')
|
|
| 17 | 17 |
list_filter = ('user_status', 'status', 'brand_name')
|
| 18 | 18 |
readonly_fields = ('encryption', 'brand_name')
|
| 19 | 19 |
|
+ 0
- 9
miniapp/views.py
@@ -26,9 +26,6 @@ WECHAT = settings.WECHAT |
||
| 26 | 26 |
def get_userinfo_api(request): |
| 27 | 27 |
brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
| 28 | 28 |
|
| 29 |
- if brand_id != settings.KODO_DEFAULT_BRAND_ID: |
|
| 30 |
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH) |
|
| 31 |
- |
|
| 32 | 29 |
wxcfg = WECHAT.get('MINIAPP', {})
|
| 33 | 30 |
|
| 34 | 31 |
appid = wxcfg.get('appID')
|
@@ -97,9 +94,6 @@ def get_userinfo_api(request): |
||
| 97 | 94 |
def mini_login_api(request): |
| 98 | 95 |
brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
| 99 | 96 |
|
| 100 |
- if brand_id != settings.KODO_DEFAULT_BRAND_ID: |
|
| 101 |
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH) |
|
| 102 |
- |
|
| 103 | 97 |
wxcfg = WECHAT.get('MINIAPP', {})
|
| 104 | 98 |
|
| 105 | 99 |
appid = wxcfg.get('appID')
|
@@ -169,9 +163,6 @@ def get_userinfo_api2(request): |
||
| 169 | 163 |
brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
| 170 | 164 |
user_id = request.POST.get('user_id', '')
|
| 171 | 165 |
|
| 172 |
- if brand_id != settings.KODO_DEFAULT_BRAND_ID: |
|
| 173 |
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH) |
|
| 174 |
- |
|
| 175 | 166 |
wxcfg = WECHAT.get('MINIAPP', {})
|
| 176 | 167 |
|
| 177 | 168 |
appid = wxcfg.get('appID')
|