商家活动调整

@@ -514,7 +514,11 @@ class Seller extends Common
                         $data['title'] = '满'.$data['max_num'].'立减'.$data['min_num'];break;
                         $data['title'] = '满'.$data['max_num'].'立减'.$data['min_num'];break;
                     }
                     }
                 case '2':
                 case '2':
-                    $data['title'] = '满赠';
+                    if($data['max_num']==0){
+                        $data['title'] = '赠'.$data['min_num'];break;
+                    }else{
+                        $data['title'] = '满'.$data['max_num'].'赠'.$data['min_num'];break;
+                    }
                     break;
                     break;
                 case '3':
                 case '3':
                     if($data['max_num']==0){
                     if($data['max_num']==0){
@@ -532,6 +536,8 @@ class Seller extends Common
                     # code...
                     # code...
                     break;
                     break;
             }
             }
+
+            print_r($data);die;
             //字段空值过滤
             //字段空值过滤
             //添加活动
             //添加活动
             $res= file_get_contents(ON_LINE.'App.Seller.SetActivity&str='.serialize($data));
             $res= file_get_contents(ON_LINE.'App.Seller.SetActivity&str='.serialize($data));

@@ -94,8 +94,8 @@ return [
     'companyAddress'  =>'公司地址',
     'companyAddress'  =>'公司地址',
 
 
     'admin'=>'管理员',
     'admin'=>'管理员',
-    'operate'=>'运营人员',
-    'agent'=>'代理商人员',
+    'operate'=>'订座运营人员',
+    'agent'=>'订座代理商人员',
     'module'=>'模型',
     'module'=>'模型',
 
 
     'user'=>'会员',
     'user'=>'会员',

@@ -4,7 +4,7 @@
         <legend>运营、代理商列表信息</legend>
         <legend>运营、代理商列表信息</legend>
     </fieldset>
     </fieldset>
     <blockquote class="layui-elem-quote">
     <blockquote class="layui-elem-quote">
-        <a href="{:url('operateAdd')}" class="layui-btn layui-btn-sm">{:lang('add')}小饕{:lang('operate')}</a>
+        <a href="{:url('operateAdd')}" class="layui-btn layui-btn-sm">{:lang('add')}{:lang('operate')}</a>
         <a href="{:url('agentAdd')}" class="layui-btn layui-btn-sm">{:lang('add')}{:lang('agent')}</a>
         <a href="{:url('agentAdd')}" class="layui-btn layui-btn-sm">{:lang('add')}{:lang('agent')}</a>
     </blockquote>
     </blockquote>
     <table class="layui-table" id="list" lay-filter="list"></table>
     <table class="layui-table" id="list" lay-filter="list"></table>

@@ -136,8 +136,11 @@
             $('#desc').html('');
             $('#desc').html('');
             switch(data.value){
             switch(data.value){
                 case "2":
                 case "2":
-                    $('#title_tag').hide();
-                    $('#title').val('满增活动');
+                    $('#title_tag').show();
+                    $('#first_html').html('  满');
+                    $('#mid_html').html('，赠');
+                    $('#last_html').html('');
+                    //$('#title').val('满增活动');
                     break;
                     break;
                 case "1":
                 case "1":
                     $('#title_tag').show();
                     $('#title_tag').show();