Merge branch 'master' of https://git.hxiaoju.top/Teapay/RWACha-API

* 'master' of https://git.hxiaoju.top/Teapay/RWACha-API:
  最大兑换量
  兑换详情
  详情

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

@@ -11,6 +11,8 @@ return [
     'Token_name'       => '代币名称',
     'Token_address'    => '代币合约地址',
     'Token_num'        => '代币数量',
+    'Limit_num'        => '最大兑换量',
+    'Describe'         => '描述',
     'Start_time'  => '开始时间',
     'End_time'    => '结束时间',
     'Create_time' => '创建时间',

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

@@ -4,7 +4,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-title" data-rule="required" class="form-control" rows="5" name="row[title]" cols="50"></textarea>
+            <textarea id="c-title" data-rule="required" class="form-control" rows="2" name="row[title]" cols="50"></textarea>
         </div>
     </div>
     <div class="form-group">
@@ -35,9 +35,13 @@
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Usdt_num')}:</label>
-        <div class="col-xs-12 col-sm-8">
+        <div class="col-xs-12 col-sm-3">
             <input id="c-usdt_num" data-rule="required" class="form-control" step="0.0001" name="row[usdt_num]" type="number" value="0.0000">
         </div>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Limit_num')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-limit_num" data-rule="required" class="form-control"  name="row[limit_num]" type="number" value="">
+        </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
@@ -75,7 +79,12 @@
             <input id="c-token_num" data-rule="required" class="form-control" step="0.0001" name="row[token_num]" type="number" value="0.0000">
         </div>
     </div>
-
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Describe')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-describe" data-rule="required" class="form-control editor" rows="5" name="row[describe]" cols="50"></textarea>
+        </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">
@@ -83,5 +92,7 @@
             <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
         </div>
     </div>
+ 
+    
 </div>
 </form>

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

@@ -4,7 +4,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-title" data-rule="required" class="form-control" rows="5" name="row[title]" cols="50">{$row.title|htmlentities}</textarea>
+            <textarea id="c-title" data-rule="required" class="form-control" rows="2" name="row[title]" cols="50">{$row.title|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group">
@@ -38,9 +38,9 @@
         <div class="col-xs-12 col-sm-3">
             <input id="c-usdt_num" data-rule="required" class="form-control" step="0.0001" name="row[usdt_num]" type="number" value="{$row.usdt_num|htmlentities}">
         </div>
-        <label class="control-label col-xs-12 col-sm-2">{:__('排序')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Limit_num')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-weigh" class="form-control" step="0.0001" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
+            <input id="c-limit_num" data-rule="required" class="form-control"  name="row[limit_num]" type="number" value="{$row.limit_num|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -55,10 +55,14 @@
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_token')}:</label>
-        <div class="col-xs-12 col-sm-8">
+        <div class="col-xs-12 col-sm-3">
             <input type="radio" name="row[is_token]" value="0" {if $row.is_token==0} checked {/if}  />不需要 
             <input type="radio" name="row[is_token]" value="1" {if $row.is_token==1} checked {/if} /> 需要
         </div>
+        <label class="control-label col-xs-12 col-sm-2">{:__('排序')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-weigh" class="form-control" step="0.0001" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
+        </div>
     </div>
 
     <div class="form-group" data-favisible="is_token=1">
@@ -79,7 +83,12 @@
             <input id="c-token_num" data-rule="required" class="form-control" step="0.0001" name="row[token_num]" type="number" value="{$row.token_num|htmlentities}">
         </div>
     </div>
-
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Describe')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-describe" data-rule="required" class="form-control editor" rows="3" name="row[describe]" cols="50">{$row.describe|htmlentities}</textarea>
+        </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">

application/api/controller/Exchange.php

@@ -59,7 +59,7 @@ class Exchange extends Api
                 'token_name' => $welfare['token_name'],
                 'token_num' => round($welfare['token_num'], 2),
             ];
-            $this->success('ok', ['data'=>$data_info, 'desc'=> config('welfare_rede_desc')]);
+            $this->success('ok', ['data'=>$data_info, 'desc'=> $welfare['describe']]);
       }
 
 

public/assets/js/backend/product/welfarerede.js

@@ -56,6 +56,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'token_address', title: __('Token_address'), operate: false},
                         {field: 'token_num', title: __('Token_num'), operate:false},
                         {field: 'weigh', title: __('Weigh'), operate: false },
+                        {field: 'limit_num', title: __('Limit_num'), operate: false },
                         {field: 'status', title: __('Status'), searchList: { "1": __('开启'), "0": __('关闭') }, formatter: Table.api.formatter.toggle },
                         {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'end_time', title: __('End_time'), operate: false, addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
@@ -67,6 +68,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             // 为表格绑定事件
             Table.api.bindevent(table);
+            $(".btn-add").data("area", ["60%", "80%"]);
+            table.on('post-body.bs.table', function () {
+                $('.btn-editone').data("area", ["60%", "80%"]);
+            });
         },
         add: function () {
             Controller.api.bindevent();