任务，隐私，礼物墙

application/admin/view/task/edit.html

@@ -18,11 +18,11 @@
 
         </div>
     </div>-->
-    <!--<div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-image" data-rule="required" disabled class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
+                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -31,7 +31,7 @@
             </div>
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
-    </div>-->
+    </div>
     <!--<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">

application/api/controller/Task.php

@@ -24,8 +24,8 @@ class Task extends Api
      * 获取任务列表
      */
     public function getTaskList() {
-        $type_id = $this->request->request("type_id",1); // 任务类型:1=实时任务,2=每日任务
-        $plat = $this->request->request("plat",1); // 平台:1=安卓,2=ios
+        $type_id = input("type_id",1); // 任务类型:1=实时任务,2=每日任务
+        $plat = input("plat",1); // 平台:1=安卓,2=ios
 
         $urlArr = ["1"=>"android_url","2"=>"ios_url"];
         $jump_url = $urlArr[$plat];
@@ -113,7 +113,7 @@ class Task extends Api
      * 领取奖励
      */
     public function getReward() {
-        $task_id = $this->request->request("task_id"); // 任务ID
+        $task_id = input("task_id"); // 任务ID
         if (!$task_id) {
             $this->error(__('Invalid parameters'));
         }
@@ -170,8 +170,8 @@ class Task extends Api
      * 完成任务
      */
     public function finishTask() {
-        $task_id = $this->request->request("task_id"); // 任务编码
-        $number = $this->request->request("number",1); // 完成次数
+        $task_id = input("task_id"); // 任务编码
+        $number = input("number",1); // 完成次数
         if (!$task_id) {
             $this->error(__('Invalid parameters'));
         }

application/api/controller/Usercenter.php

@@ -126,15 +126,18 @@ class Usercenter extends Api
         $userinfo['last_dongtai'] = $last_dongtai;
 
         //礼物墙
-        $gift_wall = Db::name('gift_user_typing')->alias('log')
-            ->join('gift', 'gift.id = log.gift_id', 'LEFT')
-            ->field('log.id,log.gift_name,sum(log.number) as number,gift.image')
-            ->where(['log.user_to_id' => $uid])
-            ->group('log.gift_id')
-            ->order('gift.price desc')
-            ->select();
-        $gift_wall = list_domain_image($gift_wall,['image']);
-        $userinfo['gift_wall'] = $gift_wall;
+        $userinfo['gift_wall'] = [];
+        if($this->user_power($uid,'giftwall')==1){
+            $gift_wall = Db::name('gift_user_typing')->alias('log')
+                ->join('gift', 'gift.id = log.gift_id', 'LEFT')
+                ->field('log.id,log.gift_name,sum(log.number) as number,gift.image')
+                ->where(['log.user_to_id' => $uid])
+                ->group('log.gift_id')
+                ->order('gift.price desc')
+                ->select();
+            $gift_wall = list_domain_image($gift_wall,['image']);
+            $userinfo['gift_wall'] = $gift_wall;
+        }
 
         $this->success('success',$userinfo);
     }
@@ -228,15 +231,18 @@ class Usercenter extends Api
         $userinfo['last_dongtai'] = $last_dongtai;
 
         //礼物墙
-        $gift_wall = Db::name('gift_user_typing')->alias('log')
-            ->join('gift', 'gift.id = log.gift_id', 'LEFT')
-            ->field('log.id,log.gift_name,sum(log.number) as number,gift.image')
-            ->where(['log.user_to_id' => $uid])
-            ->group('log.gift_id')
-            ->order('gift.price desc')
-            ->select();
-        $gift_wall = list_domain_image($gift_wall,['image']);
-        $userinfo['gift_wall'] = $gift_wall;
+        $userinfo['gift_wall'] = [];
+        if($this->user_power($uid,'giftwall')==1){
+            $gift_wall = Db::name('gift_user_typing')->alias('log')
+                ->join('gift', 'gift.id = log.gift_id', 'LEFT')
+                ->field('log.id,log.gift_name,sum(log.number) as number,gift.image')
+                ->where(['log.user_to_id' => $uid])
+                ->group('log.gift_id')
+                ->order('gift.price desc')
+                ->select();
+            $gift_wall = list_domain_image($gift_wall,['image']);
+            $userinfo['gift_wall'] = $gift_wall;
+        }
 
         $this->success('success',$userinfo);
 

application/api/controller/Userwallet.php

@@ -56,7 +56,12 @@ class Userwallet extends Api
         $call_minutes = $audio_call_minutes + $video_call_minutes;
 
         //平均通话（分钟）
-        $pingjun_minutes = bcdiv($call_minutes,($audio_times + $video_times),2);
+        $tonghua_times = $audio_times + $video_times;
+        if($tonghua_times == 0){
+            $pingjun_minutes = 0;
+        }else{
+            $pingjun_minutes = bcdiv($call_minutes,$tonghua_times,2);
+        }
 
         //互动人数
         $call_usernum = count(array_flip(array_flip(array_merge($audio_userid,$video_userid))));

public/assets/js/backend/task.js

@@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {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: '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: 'url_type', title: __('Url_type'), searchList: {"1":__('Url_type 1'),"2":__('Url_type 2')}, formatter: Table.api.formatter.normal},

新建文本文档.txt

@@ -14,9 +14,11 @@
 关注我的，我关注的，签到，账号注销
 购买vip
 设置收费，完成各项新手任务，青少年模式
-充值，提现，我的钱包，账户流水等
-邀请中心 统计 奖励
+充值，提现，绑卡，我的钱包，账户流水，任务中心
 魅力值，魅力等级，财富等级，隐私设置
+邀请中心 统计 奖励
 特殊需求，充值上限，送礼物上线
 确认首页规则，匹配规则
-后台
+
+后台
+资料审核