|
|
@@ -209,7 +209,7 @@ class FeedBackView(View):
|
|
|
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', 'product_type',
|
|
|
- 'updTime', 'userID__username','app_version','appBundleId','email'
|
|
|
+ 'updTime', 'userID__username','userID__phone','userID__userEmail','app_version','appBundleId','email'
|
|
|
)
|
|
|
sid_list = []
|
|
|
print(fb_qs)
|
|
|
@@ -230,6 +230,10 @@ class FeedBackView(View):
|
|
|
# img_url.replace('statres.oss-cn-hongkong.aliyuncs.com','static.zositech.xyz')
|
|
|
fb['img_url'].append(img_url)
|
|
|
# fb['FS__name'] = sm['name']
|
|
|
+ if fb['userID__username'] =='':
|
|
|
+ fb['userID__username'] = sm['userID__userEmail']
|
|
|
+ if fb['userID__username'] =='':
|
|
|
+ fb['userID__username'] = sm['userID__phone']
|
|
|
res.append(fb)
|
|
|
return response.json(0, {'datas': res, 'count': count})
|
|
|
else:
|
pzb