空投

application/admin/controller/product/Transfer.php

@@ -5,7 +5,7 @@ namespace app\admin\controller\product;
 use app\common\controller\Backend;
 
 /**
- * 转让专区
+ * 寄售转让专区  
  *
  * @icon fa fa-circle-o
  */
@@ -22,11 +22,8 @@ class Transfer extends Backend
     {
         parent::_initialize();
         $this->model = new \app\common\model\ProductTransfer();
-
     }
 
-
-
     /**
      * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑

application/admin/controller/user/Airdrop.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace app\admin\controller\user;
+
+use app\common\controller\Backend;
+
+/**
+ * 空投管理管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Airdrop extends Backend
+{
+
+    /**
+     * Airdrop模型对象
+     * @var \app\admin\model\user\Airdrop
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\common\model\UserAirdrop;
+
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+}

application/admin/controller/user/Welfare.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace app\admin\controller\user;
+
+use app\common\controller\Backend;
+
+/**
+ * 新人福利管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Welfare extends Backend
+{
+
+    /**
+     * Welfare模型对象
+     * @var \app\admin\model\user\Welfare
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\common\model\UserWelfare;
+    }
+
+    /**
+     * 查看
+     */
+    public function index()
+    {   
+        $row = $this->model->get(1);
+        if ($this->request->isPost()) {
+            $params = $this->request->post("row/a");
+            $result = $row->allowField(true)->save($params);
+            $this->success("提交成功", null, ['data' => json_encode($this->request->post("row/a"), JSON_UNESCAPED_UNICODE)]);
+        }
+        $this->view->assign('row', $row);
+        return $this->view->fetch();
+    }
+
+
+}

application/admin/lang/zh-cn/product/lists.php

@@ -11,6 +11,10 @@ return [
     'Weigh'       => '排序',
     'Details'     => '详情',
     'Status'      => '状态',
+    'Min_transfer_fee' => '最小运费',
+    'Max_transfer_fee' => '最大运费',
+    'Gift_fee'         => '赠送手续费(百分比)',
+    'Freight'          => '提货物流费',
     'Create_time' => '创建时间',
     'Update_time' => '更新时间'
 ];

application/admin/lang/zh-cn/user/airdrop.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'Id'         => 'ID',
+    'Address'    => '用户地址投放',
+    'Rwa_num'    => '超过Rwa数量投放',
+    'Product_id' => '产品id',
+    'Num'        => '空投数量',
+    'Remark'     => '备注',
+    'Status'     => '状态:  0代发货  1已发货 2完成'
+];

application/admin/lang/zh-cn/user/welfare.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'Id'         => 'ID',
+    'Num'        => '数量',
+    'Product_id' => '产品ID',
+    'Status'     => '状态:  0代发货  1已发货 2完成'
+];

application/admin/view/product/lists/add.html

@@ -24,11 +24,32 @@
         </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">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Min_transfer_fee')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-min_transfer_fee" data-rule="required" class="form-control" name="row[min_transfer_fee]" type="text" value="">
+        </div>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Max_transfer_fee')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-max_transfer_fee" data-rule="required" class="form-control" name="row[max_transfer_fee]" type="text"  value="">
+        </div>
+    </div>
+    <div class="form-group">
+        
+        <label class="control-label col-xs-12 col-sm-2">{:__('Gift_fee')}:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input id="c-gift_fee" data-rule="required" class="form-control" name="row[gift_fee]" type="text"  value="">
+        </div>
+    
+        <label class="control-label col-xs-12 col-sm-1">{:__('关联区域')}:</label>
+        <div class="col-xs-12 col-sm-1">
             {:build_radios('row[is_area]', ['0'=>__('否'), '1'=>__('关联')])}
         </div>
+        <label class="control-label col-xs-12 col-sm-1">{:__('Freight')}:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input id="c-freight" data-rule="required" class="form-control" name="row[freight]" type="text"  value="">
+        </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Thum')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/product/lists/edit.html

@@ -23,11 +23,32 @@
         </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">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Min_transfer_fee')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-min_transfer_fee" data-rule="required" class="form-control" name="row[min_transfer_fee]" type="text" value="{$row.min_transfer_fee|htmlentities}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Max_transfer_fee')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-max_transfer_fee" data-rule="required" class="form-control" name="row[max_transfer_fee]" type="text"  value="{$row.max_transfer_fee|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        
+        <label class="control-label col-xs-12 col-sm-2">{:__('Gift_fee')}:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input id="c-gift_fee" data-rule="required" class="form-control" name="row[gift_fee]" type="text"  value="{$row.gift_fee|htmlentities}">
+        </div>
+    
+        <label class="control-label col-xs-12 col-sm-1">{:__('关联区域')}:</label>
+        <div class="col-xs-12 col-sm-1">
             {:build_radios('row[is_area]', ['0'=>__('否'), '1'=>__('关联')], $row['is_area'])}
         </div>
+        <label class="control-label col-xs-12 col-sm-1">{:__('Freight')}:</label>
+        <div class="col-xs-12 col-sm-2">
+            <input id="c-freight" data-rule="required" class="form-control" name="row[freight]" type="text"  value="{$row.freight|htmlentities}">
+        </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Thum')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/user/airdrop/add.html

@@ -0,0 +1,58 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-address" data-rule="required" class="form-control" name="row[address]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Rwa_num')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-rwa_num" data-rule="required" class="form-control" name="row[rwa_num]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Product_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-product_id" data-rule="required" data-source="product/index" class="form-control selectpage" name="row[product_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-num" data-rule="required" class="form-control" name="row[num]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" data-rule="required" class="form-control" name="row[remark]" type="text" value="">
+        </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">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-update_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/user/airdrop/edit.html

@@ -0,0 +1,58 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-address" data-rule="required" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Rwa_num')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-rwa_num" data-rule="required" class="form-control" name="row[rwa_num]" type="number" value="{$row.rwa_num|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Product_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-product_id" data-rule="required" data-source="product/index" class="form-control selectpage" name="row[product_id]" type="text" value="{$row.product_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-num" data-rule="required" class="form-control" name="row[num]" type="number" value="{$row.num|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" data-rule="required" class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}">
+        </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">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-update_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:$row.update_time?datetime($row.update_time):''}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/user/airdrop/index.html

@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/airdrop/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/airdrop/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/airdrop/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        
+
+                        <div class="dropdown btn-group {:$auth->check('user/airdrop/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('user/airdrop/edit')}"
+                           data-operate-del="{:$auth->check('user/airdrop/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/admin/view/user/welfare/add.html

@@ -0,0 +1,40 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-num" data-rule="required" class="form-control" name="row[num]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Product_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-product_id" data-rule="required" data-source="product/index" class="form-control selectpage" name="row[product_id]" type="text" value="">
+        </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">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-update_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/user/welfare/edit.html

@@ -0,0 +1,40 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-num" data-rule="required" class="form-control" name="row[num]" type="number" value="{$row.num|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Product_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-product_id" data-rule="required" data-source="product/index" class="form-control selectpage" name="row[product_id]" type="text" value="{$row.product_id|htmlentities}">
+        </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">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-update_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:$row.update_time?datetime($row.update_time):''}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/user/welfare/index.html

@@ -0,0 +1,54 @@
+<div class="row">
+    <div class="col-md-8">
+        <div class="box box-info">
+            <div class="panel-heading">
+                {:__('新人福利')}
+            </div>
+            <div class="panel-body">
+                <form id="second-form" role="form" data-toggle="validator" method="POST" action="">
+                    <div class="form-group row">
+                        <label class="control-label col-xs-12">空投产品</label>
+                        <div class="col-xs-12">
+                            <input id="c-product_id" data-rule="required" data-source="product/lists/index" class="form-control selectpage" data-field="zh_name" name="row[product_id]" type="text" value="{$row.product_id|htmlentities}">
+                            <div data-favisible="product_id=1" class="p-3"></div>
+                        </div>
+                    </div>
+                     
+                    <div class="form-group row">
+                        <label class="control-label col-xs-12">数量</label>
+                        <div class="col-xs-12">
+                            <input type="text" class="form-control" name="row[num]" placeholder="数量RWA茶数量" value="{$row.num|htmlentities}">
+                            <div data-favisible="num=1" class="p-3"></div>
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <label class="control-label col-xs-12">新人福利</label>
+                        <div class="col-xs-12">
+                            {:build_radios('row[is_newbie]', ['1'=>__('开启'), '0'=>__('关闭')], $row['is_newbie'])}
+                        </div>
+                    </div>
+                    <hr>
+                    <div class="form-group row">
+                        <label class="control-label col-xs-12">超级福利</label>
+                        <div class="col-xs-12">
+                            {:build_radios('row[is_super]', ['1'=>__('开启'), '0'=>__('关闭')], $row['is_super'])}
+                        </div>
+                    </div>
+                    <hr>
+                
+                    <div class="form-group row">
+                        <label class="control-label col-xs-12"></label>
+                        <div class="col-xs-12">
+                            <button type="submit" class="btn btn-success btn-embossed">{:__('OK')}</button>
+                            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+                        </div>
+                    </div>
+
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+</div>

application/api/controller/Airdrop.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\controller\Api;
+use app\common\model\AnnouncementModel;
+
+//空投
+class Airdrop extends Api
+{
+
+    protected array $noNeedLogin = ['list','show'];
+    protected string $lan = '';
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->lan = $this->request->getLan();
+    }
+
+    //新人福利
+    public function newbie()
+    {
+        $paginator = (new AnnouncementModel)
+            ->where('type_id', 1)
+            ->where('status', 1)
+            ->order('id DESC,weigh desc')
+            ->field('id,img_url,createtime,' . $this->lan.'_title as title')
+            ->paginate($this->pageSize);
+        $this->success('', $this->buildResp($paginator->total(), $paginator->currentPage(), $paginator->items()));
+    }
+
+    public function show(int $id)
+    {
+        $info = (new AnnouncementModel)
+            ->where('id', $id)
+            ->where('status', 1)
+            ->field('id,img_url,body,createtime,' . $this->lan.'_title as title')
+            ->find();
+        if(empty($info)){
+            $this->error('公告信息不存');
+        }
+        $this->success('', $info);
+    }
+
+
+}

application/api/controller/Ledger.php

@@ -32,21 +32,18 @@ class Ledger extends Api
     public function assets()
     {
         $config = getAllConfig();
-        $chabao = LedgerWalletModel::getWalletChaBao($this->auth->id);
-        $res['assets']       = $chabao;
+        $wallet = LedgerWalletModel::getWallet($this->auth->id);
+        $res['assets']       = $wallet->token;
         $res['chabao_rate']  = $config['chabao_rate'];    //茶宝汇率
         $res['withdrawal_fee']= $config['withdrawal_fee'];//提现收费
         $res['transfes_fee']  = $config['transfer_fee'];  //转让手续费比例
-        $res['transfes_txt']  = $config['transfes_txt'];     //转让文字表述
-        $res['giveaway']      = $config['giveaway'];      //赠送手续费比例
-        $res['giveaway_txt']  = $config['giveaway_txt'];  //赠送文字表述
-        $res['logistics_freight']= $config['logistics_freight'];  //物流运费
+        $res['transfes_txt']  = $config['transfes_txt'];   //转让文字表述
         $res['coin_list'] = [
             [
                 'coin_name' => '茶宝',
                 'coin_key'  => 'token', 
-                'amount'    => $chabao,
-                'frozen_amount' => $this->auth->frozen_amount //冻结金额
+                'amount'    => $wallet->token,
+                'frozen_amount' => $wallet->frozen //冻结金额
             ]
         ];
         $this->success('', $res);

application/api/controller/Product.php

@@ -58,7 +58,7 @@ class Product extends Api
 
     /**
      * 转让列表
-     * sort: 0 默认排序 1价格从高到低 2价格从低到高 
+     * sort: 0 默认排序 1价格从高到低 2价格从低到高
      * type_id 分类
      * key_val 商品名称搜索
      */

application/api/controller/Test.php

@@ -23,7 +23,6 @@ use think\Db;
 use think\Log;
 use think\Model;
 
-
 class Test
 {
     public function copy_user()

application/api/controller/User.php

@@ -50,7 +50,7 @@ class User extends Api
             'token'           => '0', // 平台币余额
             'name'            => $user['name'], // 姓名
             'phone'           => $user['phone'], // 手机号
-            'rental_power'    => '0', // 自己购买的算力
+            'rental_power'    => '0', // 自己购买的算力22
             'team_power'      => '0', // 团队总算里
             'balance'         => $ledgerWalletModel::getWalletChaBao($this->auth->id), // 余额
             'rwa_num'         => $user['rwa_num'], // 总茶权

application/common/model/LedgerFrozenModel.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class LedgerFrozenModel extends Model
-{
-
-    protected $name = "ledger_frozen";
-
-
-}

application/common/model/ProductOrder.php

@@ -36,6 +36,8 @@ class ProductOrder extends Model
     const Popular           = 0; //热销
     const Transfer          = 1; //转让
     const Giveaway          = 2; //赠送
+    const Newbie            = 3; //新人茶权空投
+    const Super             = 4; //新人福利空投
     /* 
      *  订单状态 '已下单', 1=>'已付款', 2=>'已转让', 3=>'提货', 4=>'已取消', 5=>'完成'];
      */

application/common/model/UserAirdrop.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+
+class UserAirdrop extends Model
+{
+
+    // 表名
+    protected $table = 'user_airdrop';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'create_time';
+    protected $updateTime = 'update_time';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'create_time_text',
+        'update_time_text'
+    ];
+    
+
+    
+
+
+
+    public function getCreateTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['create_time']) ? $data['create_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+
+    public function getUpdateTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['update_time']) ? $data['update_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+    protected function setCreateTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+    protected function setUpdateTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+
+}

application/common/model/UserModel.php

@@ -54,12 +54,6 @@ class UserModel extends Model
         return $arr;
     }
 
-    //获取用户余额 冻结金额 和 折合金额
-    public static function getUserAmount(int $uid): float
-    {   
-        return self::where('id', $uid)->sum("balance-frozen_amount");
-    }
-    
 
     //获取用户RWA
     public static function getUserRwaNum(int $uid): int

application/common/model/UserWelfare.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+
+class UserWelfare extends Model
+{
+
+
+    // 表名
+    protected $table = 'user_welfare';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'create_time';
+    protected $updateTime = 'update_time';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'create_time_text',
+        'update_time_text'
+    ];
+    
+
+    
+
+
+
+    public function getCreateTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['create_time']) ? $data['create_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+
+    public function getUpdateTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['update_time']) ? $data['update_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+    protected function setCreateTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+    protected function setUpdateTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+
+}

application/extra/site.php

@@ -1,7 +1,7 @@
 <?php
 
 return array (
-  'name' => 'Rwa管理系统',
+  'name' => 'RWA茶',
   'beian' => '',
   'cdnurl' => '',
   'version' => '1.0.7',
@@ -38,15 +38,17 @@ return array (
     'custom' => '自定义',
   ),
   'direct_income' => '10',
-  'transfer_fee' => '0.8',
+  'transfer_fee' => '0.05',
   'recharge_txt' => 'xxddddss',
-  'chabao_rate' => '0.7',
+  'chabao_rate' => '1',
   'withdrawal_fee' => '0.1',
   'withdraw_min_amount' => '100',
   'convert_rate' => '7.2',
-  'giveaway' => '0.12',
-  'giveaway_txt' => '赠送订单xxxx',
+  'giveaway' => '0.05',
+  'giveaway_txt' => '赠送收取5%网络费',
   'pv_rate' => '0.1',
-  'chabao_giveaway' => '0.3',
-  'chabao_giveaway_txt' => '茶宝赠送xxxxx',
+  'chabao_giveaway' => '0.03',
+  'chabao_giveaway_txt' => '赠送收取3%网络费',
+  'transfes_txt' => '收取交易百分之五',
+  'logistics_freight' => '6',
 );

public/assets/js/backend/product/lists.js

@@ -65,12 +65,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'area', 'vue', 'ELEME
                         },
                         { field: 'total_num', title: __('总设置数量'), operate: false },
                         { field: 'sell_num', title: __('已出售数量'), operate: false },
+                        { field: 'min_transfer_fee', title: __('寄售转让费'), operate: false, formatter: function (value, row, index, field) {
+                            return row.min_transfer_fee+ "~"+ row.max_transfer_fee;
+                        }},
+                        { field: 'gift_fee', title: __('Gift_fee'), operate: false },
+                        { field: 'freight', title: __('Freight'), operate: false },
                         { field: 'thum', title: __('Thum'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images },
                         { field: 'status', title: __('Status'), searchList: { "1": __('上架'), "0": __('下架') }, formatter: Table.api.formatter.toggle },
                         { field: 'weigh', title: __('Weigh'), operate: false },
-                        { field: 'is_area', title: __('关联区域'), searchList: { "1": __('关联'), "0": __('否') }, formatter: Table.api.formatter.status },
+                        { field: 'is_area', title: __('关联区域'), searchList: { "1": __('是'), "0": __('否') }, formatter: Table.api.formatter.status },
                         { field: 'create_time', title: __('Create_time'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime },
-                        { field: 'update_time', title: __('Update_time'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime },
+                        
                         { field: 'operate', title: __('Operate'),
                             buttons:[
                                 {

public/assets/js/backend/user/airdrop.js

@@ -0,0 +1,58 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'user/airdrop/index' + location.search,
+                    add_url: 'user/airdrop/add',
+                    edit_url: 'user/airdrop/edit',
+                    del_url: 'user/airdrop/del',
+                    multi_url: 'user/airdrop/multi',
+                    import_url: 'user/airdrop/import',
+                    table: 'user_airdrop',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'address', title: __('Address'), operate: 'LIKE'},
+                        {field: 'rwa_num', title: __('Rwa_num')},
+                        {field: 'product_id', title: __('Product_id')},
+                        {field: 'num', title: __('Num')},
+                        {field: 'remark', title: __('Remark'), operate: 'LIKE'},
+                        {field: 'status', title: __('Status')},
+                        {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'update_time', title: __('Update_time'), 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}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});

public/assets/js/backend/user/welfare.js

@@ -0,0 +1,52 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'user/welfare/index' + location.search,
+                    add_url: 'user/welfare/add',
+                    edit_url: 'user/welfare/edit',
+                    del_url: 'user/welfare/del',
+                    multi_url: 'user/welfare/multi',
+                    import_url: 'user/welfare/import',
+                    table: 'user_welfare',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'num', title: __('Num')},
+                        {field: 'product_id', title: __('Product_id')},
+                        {field: 'status', title: __('Status')},
+                        {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'update_time', title: __('Update_time'), 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}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        index: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});