Ver código fonte

道具核销

lizhen_gitee 1 ano atrás
pai
commit
bcd0b7542d

+ 11 - 9
application/admin/controller/Userdecoratelianmeng.php

@@ -84,6 +84,17 @@ class Userdecoratelianmeng extends Backend
             ->where('id',$id)
             ->find();
 
+        //道具详情
+        $daoju_info = Db::name('decorate_lianmeng')->field('name,type')->where('id',$info['decorate_id'])->find();
+        $type_arr = [
+            1 => '吉傲T币',
+            2 => '吉傲会员',
+            3 => '联盟商家币',
+            4 => '联盟商家会员'
+        ];
+        $daoju_name = $type_arr[$daoju_info['type']].':'.$daoju_info['name'];
+        $this->assign('daoju_name',$daoju_name);
+
         if ($this->request->isPost()) {
 
             $status      = input('status',0);
@@ -119,15 +130,6 @@ class Userdecoratelianmeng extends Backend
             Db::startTrans();
             $rs = Db::name('user_decorate_lianmeng')->where('id',$id)->update($data);
 
-            //道具详情
-            $daoju_info = Db::name('decorate_lianmeng')->field('name,type')->where('id',$info['decorate_id'])->find();
-            $type_arr = [
-                1 => '吉傲T币',
-                2 => '吉傲会员',
-                3 => '联盟商家币',
-                4 => '联盟商家会员'
-            ];
-            $daoju_name = $type_arr[$daoju_info['type']].':'.$daoju_info['name'];
 
             if($status == 1){
                 //系统消息

+ 24 - 19
application/admin/lang/zh-cn/userdecoratelianmeng.php

@@ -1,23 +1,28 @@
 <?php
 
 return [
-    'Id'          => 'ID',
-    'User_id'     => '用户ID',
-    'Decorate_id' => '道具ID',
-    'Createtime'  => '创建时间',
-    'Updatetime'  => '更新时间',
-    'Is_using'    => '使用状态',
-    'Is_using 1'  => '已使用',
-    'Is_using 0'  => '未使用',
-    'Plat_name'   => '对应平台用户名',
-    'Status'      => '核销状态',
-    'Status 0'    => '待核销',
-    'Status 1'    => '核销成功',
-    'Status 2'    => '核销失败',
-    'Audittime'   => '核销时间',
-    'Auditremark' => '核销失败原因',
-    'User.username'         => '用户名',
-    'User.nickname'         => '昵称',
-    'User.mobile'           => '手机号',
-    'Decoratelianmeng.name' => '名称'
+    'Id'                      => 'ID',
+    'User_id'                 => '用户ID',
+    'Decorate_id'             => '道具ID',
+    'Createtime'              => '创建时间',
+    'Updatetime'              => '更新时间',
+    'Is_using'                => '使用状态',
+    'Is_using 1'              => '已使用',
+    'Is_using 0'              => '未使用',
+    'Plat_name'               => '对应平台用户名',
+    'Status'                  => '核销状态',
+    'Status 0'                => '待核销',
+    'Status 1'                => '核销成功',
+    'Status 2'                => '核销失败',
+    'Audittime'               => '核销时间',
+    'Auditremark'             => '核销失败原因',
+    'User.username'           => '用户名',
+    'User.nickname'           => '昵称',
+    'User.mobile'             => '手机号',
+    'Decoratelianmeng.name'   => '名称',
+    'Decoratelianmeng.type'   => '类型',
+    'Decoratelianmeng.type 1' => '吉傲T币',
+    'Decoratelianmeng.type 2' => '吉傲会员',
+    'Decoratelianmeng.type 3' => '联盟商家币',
+    'Decoratelianmeng.type 4' => '联盟商家会员'
 ];

+ 7 - 1
application/admin/view/userdecoratelianmeng/audit.html

@@ -6,11 +6,17 @@
             <input id="c-user_id" data-rule="required" data-source="user/user/index" disabled data-field="username" class="form-control selectpage"  type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Decorate_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-decorate_id" data-rule="required" data-source="decoratelianmeng/index" disabled class="form-control selectpage"  type="text" value="{$row.decorate_id|htmlentities}">
         </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">
+            <input  class="form-control" disabled type="text" value="{$daoju_name|htmlentities}">
+        </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_using')}:</label>

+ 1 - 1
public/assets/js/backend/userdecoratelianmeng.js

@@ -32,7 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
                         {field: 'decorate_id', title: __('Decorate_id')},
                         {field: 'decoratelianmeng.name', title: __('Decoratelianmeng.name'), operate: 'LIKE'},
-                        {field: 'decoratelianmeng.type', title: __('Decoratelianmeng.type')},
+                        {field: 'decoratelianmeng.type', title: __('Decoratelianmeng.type'),searchList: {"1":__('Decoratelianmeng.type 1'),"2":__('Decoratelianmeng.type 2'),"3":__('Decoratelianmeng.type 3'),"4":__('Decoratelianmeng.type 4')}, formatter: Table.api.formatter.normal},
                         {field: 'createtime', title: __('Createtime'), 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: 'is_using', title: __('Is_using'), searchList: {"1":__('Is_using 1'),"0":__('Is_using 0')}, formatter: Table.api.formatter.normal},