anyv / xkeasy · 提交

转到一个项目

作者 刘朕
提交 331fa67a07ed596d5303a31c4a02ebd1ca81d999 2 个父辈 2e3742e8 0b912ecd
1 个管道 的构建 通过 耗费 1 秒

合并分支 'liuzhen' 到 'master' 

商品管理调整，业务员菜单调整



查看合并请求 !159
内嵌 并排对比
正在显示 3 个修改的文件 包含 23 行增加 和 19 行删除
@@ -45,21 +45,21 @@ @@ -45,21 +45,21 @@
45 </div> 45 </div>
46 </div> 46 </div>
47 </a> 47 </a>
48 - <a href="{:url('Personalcenter/salesman_postage')}">  
49 - <div class="log_one_list_one">  
50 - <div class="log_one_list_left">  
51 - <div class="log_one_list_img">  
52 - <img src="__TMPL__/public/assets/images/postage.png" alt="" />  
53 - </div>  
54 - <div class="log_one_list_word">  
55 - 邮费设置  
56 - </div>  
57 - </div>  
58 - <div class="log_one_list_right">  
59 - <img src="__TMPL__/public/assets/images/29.png" alt="" />  
60 - </div>  
61 - </div>  
62 - </a> 48 +<!-- <a href="{:url('Personalcenter/salesman_postage')}">-->
  49 +<!-- <div class="log_one_list_one">-->
  50 +<!-- <div class="log_one_list_left">-->
  51 +<!-- <div class="log_one_list_img">-->
  52 +<!-- <img src="__TMPL__/public/assets/images/postage.png" alt="" />-->
  53 +<!-- </div>-->
  54 +<!-- <div class="log_one_list_word">-->
  55 +<!-- 邮费设置-->
  56 +<!-- </div>-->
  57 +<!-- </div>-->
  58 +<!-- <div class="log_one_list_right">-->
  59 +<!-- <img src="__TMPL__/public/assets/images/29.png" alt="" />-->
  60 +<!-- </div>-->
  61 +<!-- </div>-->
  62 +<!-- </a>-->
63 <a href="{:url('OrderSalesman/get_all')}"> 63 <a href="{:url('OrderSalesman/get_all')}">
64 <div class="log_one_list_one"> 64 <div class="log_one_list_one">
65 <div class="log_one_list_left"> 65 <div class="log_one_list_left">
@@ -195,7 +195,8 @@ @@ -195,7 +195,8 @@
195 </div> 195 </div>
196 <div class="log_two_input_one"> 196 <div class="log_two_input_one">
197 <div class="log_two_input_title"> 197 <div class="log_two_input_title">
198 - <span>*</span>开本 198 +<!-- <span>*</span>-->
  199 + 开本
199 </div> 200 </div>
200 <div class="log_two_input_contant"> 201 <div class="log_two_input_contant">
201 <input type="text" placeholder="请输入开本" name="book_size" /> 202 <input type="text" placeholder="请输入开本" name="book_size" />
@@ -605,7 +606,8 @@ @@ -605,7 +606,8 @@
605 if(img2 == "http://xkeasy.w.bronet.cn/themes/simpleboot3/public/assets/images/jiahao.png"){ 606 if(img2 == "http://xkeasy.w.bronet.cn/themes/simpleboot3/public/assets/images/jiahao.png"){
606 img2 = ''; 607 img2 = '';
607 } 608 }
608 - if(book_name!=""&&money!=""&&price!=""&&book_size!=""&&suit!=""&&grade!=""&&(img0!=""||img1!=""||img2!="")&&zixun_phone!=""){ 609 + if(book_name!=""&&money!=""&&price!=""&&suit!=""&&grade!=""&&(img0!=""||img1!=""||img2!="")&&zixun_phone!=""){
  610 + // if(book_name!=""&&money!=""&&price!=""&&book_size!=""&&suit!=""&&grade!=""&&(img0!=""||img1!=""||img2!="")&&zixun_phone!=""){
609 $.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){ 611 $.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){
610 if(data == 3){ 612 if(data == 3){
611 alert('添加失败,业务员书籍不能超过16本'); 613 alert('添加失败,业务员书籍不能超过16本');
@@ -204,7 +204,8 @@ @@ -204,7 +204,8 @@
204 </div> 204 </div>
205 <div class="log_two_input_one"> 205 <div class="log_two_input_one">
206 <div class="log_two_input_title"> 206 <div class="log_two_input_title">
207 - <span>*</span>开本 207 +<!-- <span>*</span>-->
  208 + 开本
208 </div> 209 </div>
209 <div class="log_two_input_contant"> 210 <div class="log_two_input_contant">
210 <input type="text" placeholder="请输入开本" name="book_size" value="{$goods_data.book_size}" /> 211 <input type="text" placeholder="请输入开本" name="book_size" value="{$goods_data.book_size}" />
@@ -633,7 +634,8 @@ @@ -633,7 +634,8 @@
633 if(img2 == "http://xkeasy.w.bronet.cn/themes/simpleboot3/public/assets/images/jiahao.png"){ 634 if(img2 == "http://xkeasy.w.bronet.cn/themes/simpleboot3/public/assets/images/jiahao.png"){
634 img2 = ''; 635 img2 = '';
635 } 636 }
636 - if(book_name!=""&&money!=""&&price!=""&&book_size!=""&&suit!=""&&grade!=""&&(img0!=""||img1!=""||img2!="")&&zixun_phone!=""){ 637 + if(book_name!=""&&money!=""&&price!=""&&suit!=""&&grade!=""&&(img0!=""||img1!=""||img2!="")&&zixun_phone!=""){
  638 + // if(book_name!=""&&money!=""&&price!=""&&book_size!=""&&suit!=""&&grade!=""&&(img0!=""||img1!=""||img2!="")&&zixun_phone!=""){
637 $.post("{:url('Salesmangoods/Salesman_goods_edit')}",{id:id,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){ 639 $.post("{:url('Salesmangoods/Salesman_goods_edit')}",{id:id,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){
638 if(data == 2){ 640 if(data == 2){
639 alert('佣金不能大于售价'); 641 alert('佣金不能大于售价');