Browse Source

礼物与获赠礼物记录

lizhen_gitee 1 year ago
parent
commit
682ad2a14a

+ 2 - 1
application/admin/lang/zh-cn/giftusertyping.php

@@ -7,7 +7,8 @@ return [
     'Gift_id'       => '礼物ID',
     'Gift_name'     => '礼物名称',
     'Number'        => '数量',
-    'Price'         => '总价值',
+    'Price'         => '单个价值',
+    'Total_Price'         => '总价值',
     'Createtime'    => '创建时间',
     'User.username' => '赠送用户名',
     'Touser.username' => '获赠用户名'

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

@@ -104,7 +104,7 @@ class Gift extends Api
             'user_id'     => $this->auth->id,
             'user_to_id'  => $user_id,
             'gift_id'     => $giftinfo['id'],
-//            'gift_name'  => $giftinfo['name'],
+            'gift_name'   => $giftinfo['name'],
             'number'      => $number,
             'price'       => $giftinfo['price'],
             'total_price' => $giftvalue,

+ 1 - 0
public/assets/js/backend/giftusertyping.js

@@ -34,6 +34,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'gift_name', title: __('Gift_name'), operate: 'LIKE'},
                         {field: 'number', title: __('Number')},
                         {field: 'price', title: __('Price')},
+                        {field: 'total_price', title: __('Total_Price')},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 
 //                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}