@@ -368,6 +368,7 @@ class User extends Api
'height','weight','bio',
'marital_id','job_id','wages_id','suqiu_id','tag_ids','hobby_ids',
'hide_is_finishinfo',
+ 'invite_no',
];
@@ -527,6 +528,14 @@ class User extends Api
$data['wealth_level'] = 1;
}
+ if(isset($data['invite_no']) && !empty($data['invite_no']) && empty($this->auth->intro_uid) && empty($this->auth->invite_uid)){
+ $invite_user = Db::name('user')->where('introcode',$data['invite_no'])->value('id');
+ if($invite_user){
+ $data['invite_uid'] = $invite_user;
+ }
+ unset($data['invite_no']);//别人的邀请码,不能改了自己的
+
//
if(isset($data['birthday'])){
@@ -26,7 +26,7 @@ class Userintro extends Api
$today = date('Y-m-d');
$starttime = strtotime($today) - 86400;
$endtime = $starttime + 86399;
- $zuori_count = Db::name('user')->where('intro_uid',$this->auth->id)->where('yaoqingtime','BETWEEN',[$starttime,$endtime])->count();
+ $zuori_count = Db::name('user')->where('intro_uid',$this->auth->id)->where('createtime','BETWEEN',[$starttime,$endtime])->count();
$total_count = Db::name('user')->where('intro_uid',$this->auth->id)->count();
@@ -643,6 +643,15 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
return '<audio controls="controls" src="' + value + '" /></audio>';
},
+ video: function (value, row, index) {
+ value = value == null || value.length === 0 ? '' : value.toString();
+ if(!value){
+ return '';
+ return '<video width="100" height="100" controls><source src="'+ Fast.api.cdnurl(value) +'" type="video/ogg"></video>';
+ },
color: function (value, row, index) {
value = value == null || value.length === 0 ? '' : value.toString();
value = value ? value : '#ffffff';