Selaa lähdekoodia

创建房间和实名调整

zhangxiaobin 1 vuosi sitten
vanhempi
commit
d6cfd5fab6

+ 1 - 28
application/admin/view/user/auth/add.html

@@ -18,34 +18,7 @@
             <input id="c-idcard" data-rule="required" class="form-control" name="row[idcard]" type="text">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('身份证正面照')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-zimage"  class="form-control" size="50" name="row[zimage]" type="text" value="">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-zimage" class="btn btn-danger faupload" data-input-id="c-zimage" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-zimage"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-zimage" class="btn btn-primary fachoose" data-input-id="c-zimage" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-zimage"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-zimage"></ul>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('身份证反面照')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-fimage"  class="form-control" size="50" name="row[fimage]" type="text" value="">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-fimage" class="btn btn-danger faupload" data-input-id="c-fimage" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-fimage"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-fimage" class="btn btn-primary fachoose" data-input-id="c-fimage" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-fimage"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-fimage"></ul>
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 0 - 28
application/admin/view/user/auth/edit.html

@@ -19,34 +19,6 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('身份证正面照')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-zimage" class="form-control" size="50" name="row[zimage]" type="text" value="{$row.zimage|htmlentities}">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-zimage" class="btn btn-danger faupload" data-input-id="c-zimage" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-zimage"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-zimage" class="btn btn-primary fachoose" data-input-id="c-zimage" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-zimage"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-zimage"></ul>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('身份证反面照')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-fimage"  class="form-control" size="50" name="row[fimage]" type="text" value="{$row.fimage|htmlentities}">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-fimage" class="btn btn-danger faupload" data-input-id="c-fimage" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-fimage"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-fimage" class="btn btn-primary fachoose" data-input-id="c-fimage" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-fimage"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-fimage"></ul>
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
             

+ 1 - 1
application/api/controller/Noble.php

@@ -186,7 +186,7 @@ class Noble extends Api
                 \app\common\model\Message::addMessage($this->auth->id,"贵族开通通知","恭喜,您已成功开通!".$noblelevelInfo["name"]." 贵族特权!");
 
                 // 赠送消息尾灯
-                \app\common\model\AttireBack::addToMyBack(15,$this->auth->id);
+                //\app\common\model\AttireBack::addToMyBack(15,$this->auth->id);
 
                 // 赠送聊天气泡
                 if($noblelevelInfo->tqgq) {

+ 1 - 0
application/api/controller/Party.php

@@ -90,6 +90,7 @@ class Party extends Common
         $where = [];
         $where["user_id"] = $user_id;
         $where["room_type"] = $room_type;
+        $where["is_close"] = 0;
         $sqlPartyInfo = $partyModel->where($where)->find();
 
         if(!$sqlPartyInfo) { // sql中不存在派对信息

+ 16 - 13
application/common/model/AttireBack.php

@@ -21,19 +21,22 @@ class AttireBack extends Model
      */
     public static function addToMyBack($attire_id,$user_id,$params_from = "") {
         $attireInfo = \app\common\model\Attire::where(["id"=>$attire_id])->find();
-        $data = [];
-        $data["user_id"] = $user_id;
-        $data["attire_id"] = $attire_id;
-        $data["attire_name"] = $attireInfo["title"];
-        $data["price"] = $attireInfo["price"];
-        $data["gif_image"] = $attireInfo["gif_image"];
-        $data["limit_day"] = $attireInfo["limit_day"];
-        $data["type"] = $attireInfo["type"];
-        $data["createtime"] = time();
-        // 安卓聊天气泡问题
-        $data["android_image"] = $attireInfo["android_image"];// 安卓聊天气泡问题
-        $data["file_image"] = $attireInfo["file_image"];
+        if (!empty($attireInfo)) {
+            $data = [];
+            $data["user_id"] = $user_id;
+            $data["attire_id"] = $attire_id;
+            $data["attire_name"] = $attireInfo["title"];
+            $data["price"] = $attireInfo["price"];
+            $data["gif_image"] = $attireInfo["gif_image"];
+            $data["limit_day"] = $attireInfo["limit_day"];
+            $data["type"] = $attireInfo["type"];
+            $data["createtime"] = time();
+            // 安卓聊天气泡问题
+            $data["android_image"] = $attireInfo["android_image"];// 安卓聊天气泡问题
+            $data["file_image"] = $attireInfo["file_image"];
 
-        return self::insert($data);
+            return self::insert($data);
+        }
+        return true;
     }
 }

+ 2 - 2
public/assets/js/backend/user/auth.js

@@ -26,8 +26,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'realname', title: __('Realname'), operate: 'LIKE'},
                         {field: 'idcard', title: __('Idcard'), operate: 'LIKE'},
-                        {field: 'zimage', title: __('身份证正面照'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'fimage', title: __('身份证反面照'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        /*{field: 'zimage', title: __('身份证正面照'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'fimage', title: __('身份证反面照'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},*/
                         {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},