多处微调，provincename

application/admin/controller/Topicdongtai.php

@@ -58,8 +58,8 @@ class Topicdongtai extends Backend
             $list = $this->model
                     ->with(['user','topichub'])
                     ->where($where)
-//                    ->order($sort, $order)
-                    ->order('toptime desc,id desc')
+                    ->order($sort, $order)
+                    //->order('toptime desc,id desc')
                     ->paginate($limit);
 
             foreach ($list as $row) {

application/api/controller/Topicdongtai.php

@@ -52,6 +52,7 @@ class Topicdongtai extends Api
             'audio_file' => $audio_file,
             'type'  => $type,
             'cityname'  => input('cityname',''),
+            'provincename'  => input('provincename',''),
             'aite'  => $aite,
             'is_public'  => input('is_public',1),
             'audio_second'  => $audio_second,
@@ -265,7 +266,7 @@ class Topicdongtai extends Api
 
         //附近，根据距离排序
         if($order == 'near'){
-            $where['dt.cityname'] = $this->auth->cityname;
+            $where['dt.provincename'] = $this->auth->provincename;
             $orderby  = 'dt.toptime desc,distance asc';
         }
 

application/api/controller/User.php

@@ -479,6 +479,7 @@ class User extends Api
         $longitude = input_post('longitude',0);
         $latitude  = input_post('latitude',0);
         $cityname  = input_post('cityname','');
+        $provincename  = input_post('provincename','');
         $plat_unique_id  = input_post('plat_unique_id','');
         /*if(empty($longitude) || empty($latitude) || empty($cityname)){
             $this->error();
@@ -489,6 +490,7 @@ class User extends Api
         $longitude      && $data['longitude'] = $longitude;
         $latitude       && $data['latitude'] = $latitude;
         $cityname       && $data['cityname'] = $cityname;
+        $provincename   && $data['provincename'] = $provincename;
         $plat_unique_id && $data['plat_unique_id'] = $plat_unique_id;
 
         if(!empty($data)){

application/common/library/Auth.php

@@ -47,6 +47,7 @@ class Auth
 
         'longitude',
         'latitude',
+        'provincename',
         'cityname',
         'photo_images',
 

application/extra/site.php

@@ -55,7 +55,7 @@ return array (
 4、禁止通过任何非常规或其他被TKEN认定为恶意的手段完成邀请。',
   'introsite_introrule' => '1、所有用户可以参加邀请好友活动。111
 2、通过自己分享的活动页面地址下载注册成功，即发放注册奖励，邀请新用户达100人，奖励额外增加20%。',
-  'kefu_user_ids' => '436',
+  'kefu_user_ids' => '538',
   'user_auth_switch' => '0',
   'min_withdrawal_money' => '1',
   'max_withdrawal_money' => '10000',
@@ -72,9 +72,9 @@ return array (
   'intro_newuser_gift_moneynum' => '5',
   'android_is_force' => '1',
   'android_apkUrl' => 'https://oss.tken.vip/apk/app-release.apk',
-  'android_apkName' => 'TKEN1.0.8',
+  'android_apkName' => 'TKEN1.0.9',
   'android_desc' => '修复已知问题，优化用户体验',
-  'android_versionCode' => '8',
+  'android_versionCode' => '9',
   'iso_is_force' => '1',
   'ios_downurl' => 'http://www.apple.com/store',
   'iso_appname' => 'TKEN1.0.1',
@@ -88,6 +88,6 @@ return array (
   'question_icon' => '/uploads/20231130/FrrnKYeSEwjcrPfWp3yKFbtq7Kdb.png',
   'question_title' => '常见问题',
   'question_basedatakey' => 'question',
-  'enumtag_max' => '4',
-  'lianmeng_msg_uids' => '401,402',
+  'enumtag_max' => '18',
+  'lianmeng_msg_uids' => '538',
 );

public/assets/js/backend/topicdongtai.js

@@ -21,7 +21,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
-                sortName: 'id',
+                sortName: 'toptime',
                 columns: [
                     [
                         {checkbox: true},
@@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'topichub.name', title: __('Topichub.name'), operate: 'LIKE'},
 
                         {field: 'user_id', title: __('User_id')},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.username', title: __('User.username'),sortable:true, operate: 'LIKE'},
 
                         {field: 'content', title: __('Content'), operate: 'LIKE',
                             cellStyle:  {css: {
@@ -59,16 +59,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
 //                        {field: 'goodnum', title: __('Goodnum')},
 //                        {field: 'answernum', title: __('Answernum')},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'createtime', title: __('Createtime'),sortable:true, operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 //                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 //                        {field: 'cityname', title: __('Cityname'), operate: 'LIKE'},
 //                        {field: 'longitude', title: __('Longitude'), operate: 'LIKE'},
 //                        {field: 'latitude', title: __('Latitude'), operate: 'LIKE'},
 //                        {field: 'aite', title: __('Aite'), operate: 'LIKE'},
                         {field: 'is_public', title: __('Is_public'), searchList: {"1":__('Is_public 1'),"2":__('Is_public 2')}, formatter: Table.api.formatter.normal},
-                        {field: 'toptime', title: __('toptime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'toptime', title: __('toptime'),sortable:true, operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'auditstatus', title: __('Auditstatus'), searchList: {"0":__('Auditstatus 0'),"1":__('Auditstatus 1'),"2":__('Auditstatus 2')}, formatter: Table.api.formatter.status},
-                        {field: 'audittime', title: __('Audittime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'audittime', title: __('Audittime'),sortable:true, operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'auditremark', title: __('Auditremark'), operate: 'LIKE',
                             cellStyle:  {css: {
                                 "white-space": "break-spaces",

public/assets/js/backend/user/user.js

@@ -45,7 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'successions', title: __('Successions')},
 //                        {field: 'maxsuccessions', title: __('Maxsuccessions')},
 //                        {field: 'prevtime', title: __('Prevtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'logintime', title: __('Logintime'),sortable:true, operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
 //                        {field: 'loginfailure', title: __('Loginfailure')},
 //                        {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},