binbinyouli před 5 roky
rodič
revize
37a47e0c27

+ 14 - 1
public/themes/admin_simpleboot3/admin/market/marketset.html

@@ -6,7 +6,11 @@
     <ul class="nav nav-tabs">
        
         <li><a href="{:url('Market/marketsetlist')}">分销设置列表</a></li>
+        <if condition="$Request.param.id neq ''">
         <li  class="active"><a href="#">编辑分销设置</a></li>
+         <else/>
+        <li  class="active"><a href="#">添加分销设置</a></li>
+         </if>
     </ul>
     <if condition="$Request.param.id neq ''">
     <form class="form-horizontal js-ajax-form margin-top-20" role="form" action="{:url('Market/marketsetedit')}"
@@ -23,12 +27,21 @@
                     <div class="tab-pane active" id="A">
                         <div class="form-group">
                             <label for="input-site-name" class="col-sm-2 control-label"><span
-                                    class="form-required">*</span>分销参数名称</label>
+                                    class="form-required">*</span>分销名称</label>
                             <div class="col-md-6 col-sm-10">
                                 <input type="text" class="form-control" id="name" name="name"
                                        value="{$market.name|default=''}">
                             </div>
                         </div>
+                              <div class="form-group">
+                            <label for="input-site-name" class="col-sm-2 control-label"><span
+                                    class="form-required">*</span>参数标识</label>
+                            <div class="col-md-6 col-sm-10">
+                                <input type="text" class="form-control" id="code" name="code"
+                                       value="{$market.code|default=''}">
+                            </div>
+                        </div>
+                        
                         <div class="form-group">
                             <label for="input-close1" class="col-sm-2 control-label">状态</label>
                             <div class="col-md-6 col-sm-10">

+ 2 - 1
public/themes/admin_simpleboot3/admin/market/marketsetlist.html

@@ -28,6 +28,7 @@
                 </th>
                 <th width="100">ID</th>
                 <th>标题</th>
+                <th>参数标识</th>
                 <th >奖励方式</th>
                 <th >一级分成金额/比例</th>
                 <th >二级分成金额/比例</th>
@@ -46,7 +47,7 @@
                     </td>
                     <td>{$vo.id}</td>
                     <td>{$vo.name}</td>
-                   
+                       <td>{$vo.code}</td>
                     <td>
                      <switch name="vo.type">
                             <case value="1">

+ 6 - 6
vendor/thinkcmf/cmf-app/src/admin/controller/MarketController.php

@@ -39,7 +39,7 @@ class MarketController extends AdminBaseController
          //查询得到分销表
         $marketlist=Db::name('market')->where('status',1)
             ->order("updated_at DESC")
-            ->paginate(10,false,['query'=>request()->param()]);
+            ->paginate(15,false,['query'=>request()->param()]);
        
         // var_dump($market);die();
      
@@ -72,11 +72,11 @@ class MarketController extends AdminBaseController
         $data=$this->request->param();
         $MarketModel = new MarketModel();
         $data['updated_at'] = date('Y-m-d H:i:s',time());
-      
-        if($MarketModel->save($data)){
-            $this->success('保存成功!');
+
+        if($MarketModel->allowField(true)->save($data)){
+            $this->success('增加成功!',url("Market/marketsetlist"));
         }else{
-            $this->error('保存失败!');
+            $this->error('增加失败!');
         }
 
 
@@ -93,7 +93,7 @@ class MarketController extends AdminBaseController
         $data['updated_at'] = date('Y-m-d H:i:s',time());
       
         if($MarketModel->allowField(true)->isUpdate(true)->save($data)){
-            $this->success('保存成功!');
+            $this->success('保存成功!',url("Market/marketsetlist"));
         
         }else{
             $this->error('保存失败!');