@@ -571,7 +573,7 @@ def consumer_shot_unbinding(request):
'submit_at': submit_at,
'reason': reason,
})
- else:
+ except:
ConsumeInfoSubmitLogInfo.objects.filter(user_id=user_id, model_id=model_id, serialNo=sn).update(delete_type=ConsumeInfoSubmitLogInfo.UNBINDING, status=False)
return response(200, 'Consume Shot Unbinding Success', u'消费者镜头解绑成功')
@@ -162,6 +162,7 @@ urlpatterns += [ |
||
| 162 | 162 |
url(r'^admin/record/sale/batch$', admin_views.record_sale_batch, name='record_sale_batch'), |
| 163 | 163 |
url(r'^admin/record/warehouse$', admin_views.record_warehouse, name='record_warehouse'), |
| 164 | 164 |
url(r'^admin/consumer/shot/unbinding/list$', consumer_admin_view.consumer_shot_unbinding_list, name='consumer_shot_unbinding_list'), |
| 165 |
+ url(r'^admin/consumer/shot/unbinding/delete$', consumer_admin_view.consumer_shot_unbinding_delete, name='consumer_shot_unbinding_delete'), |
|
| 165 | 166 |
|
| 166 | 167 |
url(r'^admin/list/model$', admin_views.model_list, name='model_list'), |
| 167 | 168 |
url(r'^admin/list/distributor$', admin_views.distributor_list, name='distributor_list'), |
@@ -846,6 +846,7 @@ class ConsumeShotUnbindingInfo(BaseModelMixin, BrandInfoMixin): |
||
| 846 | 846 |
user = UserInfo.objects.get(user_id=self.user_id) |
| 847 | 847 |
|
| 848 | 848 |
return {
|
| 849 |
+ 'pk': self.pk, |
|
| 849 | 850 |
'user_id': self.user_id, |
| 850 | 851 |
'phone': user.phone, |
| 851 | 852 |
'model_info': model_info, |