礼物SVIP,任务编辑，首页接口昵称改成备注昵称

application/admin/lang/zh-cn/gift.php

@@ -4,7 +4,8 @@ return [
     'Id'        => 'ID',
     'Is_vip'    => 'vip礼物',
     'Is_vip 0'  => '否',
-    'Is_vip 1'  => '是',
+    'Is_vip 1'  => 'VIP',
+    'Is_vip 2'  => 'SVIP',
     'Name'      => '礼物名称',
     'Price'     => '礼物价格',
     'Image'     => '礼物图片',

application/admin/model/Gift.php

@@ -41,7 +41,7 @@ class Gift extends Model
     
     public function getIsVipList()
     {
-        return ['0' => __('Is_vip 0'), '1' => __('Is_vip 1')];
+        return ['0' => __('Is_vip 0'), '1' => __('Is_vip 1'), '2' => __('Is_vip 2')];
     }
 
     public function getIsShowList()

application/admin/view/task/edit.html

@@ -3,14 +3,14 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+            <input id="c-name" disabled data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-type_id" data-rule="required" class="form-control selectpicker" name="row[type_id]">
+            <select disabled id="c-type_id" data-rule="required" class="form-control selectpicker" name="row[type_id]">
                 {foreach name="typeIdList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.type_id"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -35,22 +35,22 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Android_url')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-android_url" class="form-control" name="row[android_url]" type="text" value="{$row.android_url|htmlentities}">
+            <input id="c-android_url" disabled class="form-control" name="row[android_url]" type="text" value="{$row.android_url|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Ios_url')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-ios_url" class="form-control" name="row[ios_url]" type="text" value="{$row.ios_url|htmlentities}">
+            <input id="c-ios_url" disabled class="form-control" name="row[ios_url]" type="text" value="{$row.ios_url|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Url_type')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-url_type" class="form-control selectpicker" name="row[url_type]">
+            <select disabled id="c-url_type" class="form-control selectpicker" name="row[url_type]">
                 {foreach name="urlTypeList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.url_type"}selected{/in}>{$vo}</option>
+                    <option value="{$key}"  {in name="key" value="$row.url_type"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
@@ -59,7 +59,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-number" class="form-control" name="row[number]" type="number" value="{$row.number|htmlentities}">
+            <input id="c-number" disabled class="form-control" name="row[number]" type="number" value="{$row.number|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/api/controller/Index.php

@@ -81,11 +81,13 @@ class Index extends Api
 
         $field = [
             'user.id','user.nickname','user.birthday','user.height','user.avatar','user.bio','user.gender','user.idcard_status', 'user.real_status',
-            'user.is_active','user.is_recommend', 'user.cityname','user.is_hideaddress','uw.vip_endtime','uw.vip_level'
+            'user.is_active','user.is_recommend', 'user.cityname','user.is_hideaddress','uw.vip_endtime','uw.vip_level',
+            'ur.nickname_remark'
         ];
 
         $list = Db::name('user')->alias('user')->field($field)
             ->join('user_wallet uw','uw.user_id = user.id','LEFT')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
             ->where($map)->order($order)->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
@@ -98,6 +100,9 @@ class Index extends Api
 
 
         foreach($list as $key => &$v) {
+
+            $v['nickname'] = !empty($v['nickname_remark']) ? $v['nickname_remark'] : $v['nickname'];
+
             //年龄
             $age = birthtime_to_age($v['birthday']);
             $age = $age > 0 ? $age : 18;

public/assets/js/backend/gift.js

@@ -26,7 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'is_vip', title: __('Is_vip'), searchList: {"0":__('Is_vip 0'),"1":__('Is_vip 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'is_vip', title: __('Is_vip'), searchList: {"0":__('Is_vip 0'),"1":__('Is_vip 1'),"2":__('Is_vip 2')}, formatter: Table.api.formatter.normal},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'price', title: __('Price')},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},

public/assets/js/backend/task.js

@@ -29,8 +29,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'type_id', title: __('Type_id'), searchList: {"1":__('Type_id 1'),"2":__('Type_id 2')}, formatter: Table.api.formatter.normal},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'android_url', title: __('Android_url'), operate: 'LIKE', formatter: Table.api.formatter.url},
-                        {field: 'ios_url', title: __('Ios_url'), operate: 'LIKE', formatter: Table.api.formatter.url},
+                        {field: 'android_url', title: __('Android_url'), operate: 'LIKE'},
+                        {field: 'ios_url', title: __('Ios_url'), operate: 'LIKE'},
                         {field: 'url_type', title: __('Url_type'), searchList: {"1":__('Url_type 1'),"2":__('Url_type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'number', title: __('Number')},
                         {field: 'exp', title: __('Exp')},