接口大调整

application/admin/view/task/edit.html

@@ -6,7 +6,7 @@
             <input id="c-name" data-rule="required" disabled class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
         </div>
     </div>
-    <!--<div class="form-group">
+    <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">
                         
@@ -17,7 +17,7 @@
             </select>
 
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -32,23 +32,23 @@
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
-    <!--<div class="form-group">
+    <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" disabled name="row[android_url]" type="text" value="{$row.android_url|htmlentities}">
+            <input id="c-android_url" 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" disabled name="row[ios_url]" type="text" value="{$row.ios_url|htmlentities}">
+            <input id="c-ios_url" 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" disabled class="form-control selectpicker" name="row[url_type]">
+            <select  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>
                 {/foreach}
@@ -59,9 +59,9 @@
     <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" disabled name="row[number]" type="number" value="{$row.number|htmlentities}">
+            <input id="c-number" class="form-control" name="row[number]" type="number" value="{$row.number|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Exp')}:</label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/Greet.php

@@ -61,7 +61,7 @@ class Greet extends Api
 
         Db::name('user_greet')->insertGetId($data);
 
-        $this->success('添加成功');
+        $this->success('添加成功,等待审核');
     }
 
     //删除招呼
@@ -76,10 +76,10 @@ class Greet extends Api
     //女性打个招呼
     public function once_greet(){
 
-        $type1 = Db::name('user_greet')->where('user_id',$this->auth->id)->where('type',1)->orderRaw('rand()')->find();
+        $type1 = Db::name('user_greet')->where('user_id',$this->auth->id)->where('status',1)->where('type',1)->orderRaw('rand()')->find();
 
 
-        $type2 = Db::name('user_greet')->where('user_id',$this->auth->id)->where('type',2)->orderRaw('rand()')->find();
+        $type2 = Db::name('user_greet')->where('user_id',$this->auth->id)->where('status',1)->where('type',2)->orderRaw('rand()')->find();
         $type2 = info_domain_image($type2,['image']);
 
         $result = [

application/api/controller/Match.php

@@ -642,6 +642,15 @@ class Match extends Api
         $data['next_level_value'] = $next_level_value; //下一等级亲密度值
         $data['level_list'] = $list; //等级列表
 
+        $data['my_avatar'] = localpath_to_netpath($this->auth->avatar);
+        $data['my_nickname'] = $this->auth->nickname;
+
+        $other_user = Db::name('user')->field('avatar,nickname')->where('id',$user_id)->find();
+        $data['other_avatar'] = localpath_to_netpath($other_user['avatar']);
+        $data['other_nickname'] = $other_user['nickname'];
+
+
+
         $this->success('亲密度等级信息', $data);
     }
 

application/extra/site.php

@@ -111,4 +111,6 @@ return array (
   'withdraw_rule' => '1、每日提现一次，累计100金币可提现
 2、到账时间：每天18:00点之前申请提现，当日24:00前到账，每天18:00后申请提现，将在次日24:00前到账(节假日及特殊情况，提现到账将适度延迟)
 3、收益提现时平台将收取6.5%的手续费',
+  'intimacy_rule' => '1.在你们私信聊天当中，每产生消耗金币的行为（消息互动，语音聊天，视频聊天，赠送礼物都包含在内）1亲密度=100金币
+2.不同等级可解锁不同权限',
 );