binbinyouli %!s(int64=5) %!d(string=hai) anos
pai
achega
e184b31bcc

+ 1 - 1
public/themes/admin_simpleboot3/admin/market/marketoneuser.html

@@ -60,7 +60,7 @@
         <a class="btn btn-danger" onclick="doDelete()">批量删除</a>
         <!-- <a class="btn btn-danger" href="{:url('user/adminIndex/index')}" style="border-color:#7349B8;background-color:#7349B8">已冻结的用户</a> -->
 
-        <a class="btn btn-danger"  id="showcho" style="border-color:#7349B8;background-color:#7349B8">条件筛选</a>
+      <!--   <a class="btn btn-danger"  id="showcho" style="border-color:#7349B8;background-color:#7349B8">条件筛选</a> -->
 
         <div id="showchoice" style="display: none;  margin-top: 10px;">
           <php>$educationarray=array(1=>'大专',2=>'本科',3=>'硕士',4=>'博士');</php>

+ 13 - 28
public/themes/admin_simpleboot3/admin/market/marketset.html

@@ -2,12 +2,21 @@
 </head>
 <body>
 <div class="wrap js-check-wrap">
+
     <ul class="nav nav-tabs">
-        <li class="active"><a href="#A" data-toggle="tab">分销设置</a></li>
-        
+       
+        <li><a href="{:url('Market/marketsetlist')}">分销设置列表</a></li>
+        <li  class="active"><a href="#">编辑分销设置</a></li>
     </ul>
-    <form class="form-horizontal js-ajax-form margin-top-20" role="form" action="{:url('Market/marketsetpost')}"
+    <if condition="$Request.param.id neq ''">
+    <form class="form-horizontal js-ajax-form margin-top-20" role="form" action="{:url('Market/marketsetedit')}"
+          method="post">
+          <input type="hidden" name="id" value="{$market.id}"> 
+    <else/>
+        <form class="form-horizontal js-ajax-form margin-top-20" role="form" action="{:url('Market/marketsetpost')}"
           method="post">
+    </if>
+
         <fieldset>
             <div class="tabbable">
                 <div class="tab-content">
@@ -57,8 +66,7 @@
                          <label for="follow_msg" class="col-sm-2 control-label">备注</label>
                             <div class="col-md-8 col-sm-8">
                                 <textarea name="remark" id="remark" style="border: 1px solid #ddd" cols="80" rows="3" maxlength="150">{$market.remark|default=''}</textarea>
-                                <!--<script type="text/plain" id="content" name="options[follow_msg]">{$site_info.follow_msg|default=''}</script>-->
-                               <!--  <span class="help-block">用户扫码关注公众号推送信息,变量替换,字符串“{nickname}” 将替换成关注用户的昵称</span> -->
+                             
                             </div>
                         </div>
                         <div class="form-group">
@@ -79,29 +87,6 @@
 
 </div>
 <script type="text/javascript" src="__STATIC__/js/admin.js"></script>
-<script type="text/javascript">
-    //编辑器路径定义
-    var editorURL = GV.WEB_ROOT;
-</script>
-<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script>
-<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script>
-<script type="text/javascript">
-    $(function () {
-
-        editorcontent = new baidu.editor.ui.Editor();
-        editorcontent.render('content');
-        try {
-            editorcontent.sync();
-        } catch (err) {
-        }
 
-        noticeeditorcontent = new baidu.editor.ui.Editor();
-        noticeeditorcontent.render('close_result');
-        try {
-            noticeeditorcontent.sync();
-        } catch (err) {
-        }
-    });
-</script>
 </body>
 </html>

+ 88 - 0
public/themes/admin_simpleboot3/admin/market/marketsetlist.html

@@ -0,0 +1,88 @@
+<include file="public@header"/>
+</head>
+<body>
+<div class="wrap js-check-wrap">
+     <ul class="nav nav-tabs">
+        <li class="active"><a href="{:url('Market/showmarklist')}">分销设置列表</a></li>
+        <li><a href="{:url('Market/marketset')}">添加分销设置</a></li>
+    </ul>
+    <form class="well form-inline margin-top-20" method="post" action="{:url('AdminPage/index')}">
+        标题:
+        <input type="text" class="form-control" name="keyword" style="width: 200px;"
+               value="{$keyword|default=''}" placeholder="请输入关键字">
+        <button class="btn btn-primary">搜索</button>
+    </form>
+    <form class="js-ajax-form" method="post">
+        <div class="table-actions">
+            <button class="btn btn-danger btn-sm js-ajax-submit" type="submit" data-action="{:url('AdminPage/delete')}"
+                    data-subcheck="true" data-msg="{:lang('DELETE_CONFIRM_MESSAGE')}">{:lang('DELETE')}
+            </button>
+        </div>
+        <table class="table table-hover table-bordered table-list">
+            <thead>
+            <tr>
+                <th width="16">
+                    <label>
+                        <input type="checkbox" class="js-check-all" data-direction="x" data-checklist="js-check-x">
+                    </label>
+                </th>
+                <th width="100">ID</th>
+                <th>标题</th>
+                <th >奖励方式</th>
+                <th >一级分成金额/比例</th>
+                <th >二级分成金额/比例</th>
+                <th >三级级分成金额/比例</th>
+                <th >更新时间</th>
+                <th >备注</th>
+                <th width="80">操作</th>
+            </tr>
+            </thead>
+            <php>$types=array("1"=>'金额',"2"=>'比例分成');</php>
+            <foreach name="list" item="vo">
+                <tr>
+                    <td>
+                        <input type="checkbox" class="js-check" data-yid="js-check-y" data-xid="js-check-x" name="ids[]"
+                               value="{$vo.id}">
+                    </td>
+                    <td>{$vo.id}</td>
+                    <td>{$vo.name}</td>
+                   
+                    <td>
+                     <switch name="vo.type">
+                            <case value="1">
+                                <span>{$types['1']}</span>
+                            </case>
+                            <case value="2">
+                                <span>{$types['2']}</span>
+                            </case>
+                      </switch>
+                    </td>
+
+                    <td>{$vo.level_1}</td>
+                    <td>{$vo.level_2}</td>
+                    <td>{$vo.level_3}</td>
+
+                    <td>{$vo.updated_at}</td>
+                    <td>{$vo['remark']}</td>
+                  
+
+                    <td>
+                        <a class="btn btn-xs btn-primary" href="{:url('Market/marketset',array('id'=>$vo['id']))}">{:lang('EDIT')}</a>
+                    </td>
+                </tr>
+            </foreach>
+       
+        </table>
+        <div class="table-actions">
+            <button class="btn btn-danger btn-sm js-ajax-submit" type="submit" data-action="{:url('Market/deleteset')}"
+                    data-subcheck="true" data-msg="你确定删除吗?">{:lang('DELETE')}
+            </button>
+        </div>
+        <div class="pagination">{$page}</div>
+    </form>
+
+</div>
+<script type="text/javascript" src="__STATIC__/js/admin.js"></script>
+
+</body>
+</html>

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

@@ -13,7 +13,7 @@ namespace app\admin\controller;
 use cmf\controller\AdminBaseController;
 use think\Db;
 use think\db\Query;
-use app\admin\model\BooksModel;
+use app\admin\model\MarketModel;
 use app\weixin\model\Wechat;
 use app\weixin\service\PRedis;
 
@@ -33,13 +33,29 @@ use app\weixin\service\PRedis;
 class MarketController extends AdminBaseController
 {
 
+    //分销设置列表
+    public function marketsetlist(){
+
+         //查询得到分销表
+        $marketlist=Db::name('market')->where('status',1)
+            ->order("updated_at DESC")
+            ->paginate(10,false,['query'=>request()->param()]);
+       
+        // var_dump($market);die();
+     
+        $page = $marketlist->render();
+        $this->assign('list', $marketlist);
+        $this->assign('page', $page);
+       return $this->fetch();
+    }
+
     /**
      * 分销设置界面
      */
     public function marketset(){
 
        //查询得到分销表
-        $market=Db::name('market')->where('id',1)->find();
+        $market=Db::name('market')->where(array('status'=>1,'id'=> input('id')))->find();
        
         // var_dump($market);die();
         $this->assign('market', $market);
@@ -54,9 +70,10 @@ class MarketController extends AdminBaseController
 
         //提交 param('level_1'),也可以相当于param['level_1'];
         $data=$this->request->param();
+        $MarketModel = new MarketModel();
         $data['updated_at'] = date('Y-m-d H:i:s',time());
       
-        if(Db::name('market')->where('id',1)->update($data)){
+        if($MarketModel->save($data)){
             $this->success('保存成功!');
         }else{
             $this->error('保存失败!');
@@ -65,6 +82,26 @@ class MarketController extends AdminBaseController
 
     }
 
+    /**
+     * 分销设置面编辑
+     */
+    public function marketsetedit(){
+
+        //提交 param('level_1'),也可以相当于param['level_1'];
+        $data=$this->request->param();
+        $MarketModel = new MarketModel();
+        $data['updated_at'] = date('Y-m-d H:i:s',time());
+      
+        if($MarketModel->allowField(true)->isUpdate(true)->save($data)){
+            $this->success('保存成功!');
+        
+        }else{
+            $this->error('保存失败!');
+        }
+
+
+    }
+
     //分销用户显示
     public function marketuser(){
 

+ 19 - 0
vendor/thinkcmf/cmf-app/src/admin/model/MarketModel.php

@@ -0,0 +1,19 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkCMF [ WE CAN DO IT MORE SIMPLE ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2013-2019 http://www.thinkcmf.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 老猫 <thinkcmf@126.com>
+// +----------------------------------------------------------------------
+namespace app\admin\model;
+
+use think\Model;
+
+class MarketModel extends Model
+{
+
+
+}