合并分支 'liuzhen' 到 'master'

Liuzhen



查看合并请求 !150

@@ -142,7 +142,7 @@ class SalesmanController extends AdminBaseController{
                 $this -> error('佣金不能大于售价');
                 $this -> error('佣金不能大于售价');
             }
             }
            $goods_data = Db::name('goods') -> where('uid',$_POST['uid']) -> select() -> toArray();
            $goods_data = Db::name('goods') -> where('uid',$_POST['uid']) -> select() -> toArray();
-            if(count($goods_data) >= 8){
+            if(count($goods_data) >= 16){
                 $this -> error('添加失败');
                 $this -> error('添加失败');
             }else{
             }else{
                 if(!empty($_POST['det_img'])){
                 if(!empty($_POST['det_img'])){

@@ -608,7 +608,7 @@
         if(book_name!=""&&money!=""&&price!=""&&book_size!=""&&suit!=""&&grade!=""&&(img0!=""||img1!=""||img2!="")&&zixun_phone!=""){
         if(book_name!=""&&money!=""&&price!=""&&book_size!=""&&suit!=""&&grade!=""&&(img0!=""||img1!=""||img2!="")&&zixun_phone!=""){
             $.post("{:url('Salesmangoods/Salesman_goods_add')}",{show_img:show_img,thumbnail:thumbnail,book_name:book_name,money:money,price:price,pricing:pricing,instr:instr,book_number:book_number,paper:paper,book_size:book_size,binding:binding,author:author,press:press,press_time:press_time,suit:suit,grade:grade,img0:img0,img1:img1,img2:img2,printing:printing,zixun_phone:zixun_phone},function(data){
             $.post("{:url('Salesmangoods/Salesman_goods_add')}",{show_img:show_img,thumbnail:thumbnail,book_name:book_name,money:money,price:price,pricing:pricing,instr:instr,book_number:book_number,paper:paper,book_size:book_size,binding:binding,author:author,press:press,press_time:press_time,suit:suit,grade:grade,img0:img0,img1:img1,img2:img2,printing:printing,zixun_phone:zixun_phone},function(data){
                 if(data == 3){
                 if(data == 3){
-                    alert('添加失败,业务员书籍不能超过8本');
+                    alert('添加失败,业务员书籍不能超过16本');
                 }else if(data == 2){
                 }else if(data == 2){
                     alert('佣金不能大于售价');
                     alert('佣金不能大于售价');
                 }else{
                 }else{