feature:

反馈信息,增加app类型等

Controller/FeedBack.py

@@ -92,12 +92,16 @@ class FeedBackView(View):
     def do_add(self, userID, request_dict, response):
         nowTime = int(time.time())
         content = request_dict.get('content', None)
-        app = request_dict.get('app', None)
         type = request_dict.get('type', None)
         res_1 = request_dict.get('res_1', None)
         res_2 = request_dict.get('res_2', None)
         res_3 = request_dict.get('res_3', None)
-        # res_list = []
+
+        app = request_dict.get('app', None)
+        phone_model = request_dict.get('phone_model', None)
+        os_version = request_dict.get('os_version', None)
+        uid = request_dict.get('uid', None)
+
         try:
             with transaction.atomic():
                 fb = FeedBackModel()
@@ -108,6 +112,12 @@ class FeedBackView(View):
                     fb.type = type
                 if app:
                     fb.app = app
+                if phone_model:
+                    fb.phone_model = phone_model
+                if os_version:
+                    fb.os_version = os_version
+                if uid:
+                    fb.uid = uid
                 fb.userID_id = userID
                 fb.save()
                 if res_1:
@@ -178,6 +188,7 @@ class FeedBackView(View):
                     fb_qs = fb_qs.filter(**filter_data)
                 count = fb_qs.count()
                 fb_qs = fb_qs[(page - 1) * line:page * line].values('id', 'type', 'status', 'content', 'addTime', 'app',
+                                                                    'uid', 'os_version', 'phone_model',
                                                                     'updTime', 'userID__username')
                 sid_list = []
                 print(fb_qs)

Model/models.py

@@ -371,7 +371,10 @@ class FeedBackModel(models.Model):
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
     FS = models.ManyToManyField(to='StatResModel', blank=True, verbose_name=u'用户反馈关联资源',
                                 db_table='fb_res')
-    app = models.CharField(max_length=64, default='', verbose_name='类型')
+    app = models.CharField(max_length=8, default='', verbose_name='类型')  # [ios,android]
+    phone_model = models.CharField(max_length=64, default='', verbose_name='手机型号')  # [小米,android]
+    os_version = models.CharField(max_length=16, default='', verbose_name='系统版本')
+    uid = models.CharField(max_length=20, default='', verbose_name='设备uid')
 
     def __str__(self):
         return self.id

Object/ResponseObject.py

@@ -18,6 +18,7 @@ class ResponseObject(object):
             48: 'System object error!',
             89: 'Already send the code, please check it or get it again after 10m',
             90: 'please check code or get it again after 5m',
+            99: 'Mail doesn\'t exist!',
             100: 'Phone format error！',
             101: 'Phone already existed!',
             102: 'Phone doesn\'t exist!',
@@ -69,6 +70,7 @@ class ResponseObject(object):
             48: '系统对象错误',
             89: '已发验证码，请检测或10分钟后重新获取。',
             90: '请检测或5分钟后重新获取。',
+            99: '邮箱不存在！',
             100: '手机格式错误！',
             101: '手机已存在！',
             102: '手机不存在！',