合并分支 'liuzhen' 到 'master'

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



查看合并请求 !159

@@ -45,21 +45,21 @@
             </div>
         </div>
     </a>
-    <a href="{:url('Personalcenter/salesman_postage')}">
-        <div class="log_one_list_one">
-            <div class="log_one_list_left">
-                <div class="log_one_list_img">
-                    <img src="__TMPL__/public/assets/images/postage.png" alt="" />
-                </div>
-                <div class="log_one_list_word">
-                    邮费设置
-                </div>
-            </div>
-            <div class="log_one_list_right">
-                <img src="__TMPL__/public/assets/images/29.png" alt="" />
-            </div>
-        </div>
-    </a>
+<!--    <a href="{:url('Personalcenter/salesman_postage')}">-->
+<!--        <div class="log_one_list_one">-->
+<!--            <div class="log_one_list_left">-->
+<!--                <div class="log_one_list_img">-->
+<!--                    <img src="__TMPL__/public/assets/images/postage.png" alt="" />-->
+<!--                </div>-->
+<!--                <div class="log_one_list_word">-->
+<!--                    邮费设置-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="log_one_list_right">-->
+<!--                <img src="__TMPL__/public/assets/images/29.png" alt="" />-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </a>-->
     <a href="{:url('OrderSalesman/get_all')}">
         <div class="log_one_list_one">
             <div class="log_one_list_left">

@@ -195,7 +195,8 @@
         </div>
         <div class="log_two_input_one">
             <div class="log_two_input_title">
-                <span>*</span>开本
+<!--                <span>*</span>-->
+                开本
             </div>
             <div class="log_two_input_contant">
                 <input type="text" placeholder="请输入开本" name="book_size" />
@@ -605,7 +606,8 @@
         if(img2 == "http://xkeasy.w.bronet.cn/themes/simpleboot3/public/assets/images/jiahao.png"){
             img2 = '';
         }
-        if(book_name!=""&&money!=""&&price!=""&&book_size!=""&&suit!=""&&grade!=""&&(img0!=""||img1!=""||img2!="")&&zixun_phone!=""){
+        if(book_name!=""&&money!=""&&price!=""&&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){
                 if(data == 3){
                     alert('添加失败,业务员书籍不能超过16本');

@@ -204,7 +204,8 @@
         </div>
         <div class="log_two_input_one">
             <div class="log_two_input_title">
-                <span>*</span>开本
+<!--                <span>*</span>-->
+                开本
             </div>
             <div class="log_two_input_contant">
                 <input type="text" placeholder="请输入开本" name="book_size" value="{$goods_data.book_size}" />
@@ -633,7 +634,8 @@
         if(img2 == "http://xkeasy.w.bronet.cn/themes/simpleboot3/public/assets/images/jiahao.png"){
             img2 = '';
         }
-        if(book_name!=""&&money!=""&&price!=""&&book_size!=""&&suit!=""&&grade!=""&&(img0!=""||img1!=""||img2!="")&&zixun_phone!=""){
+        if(book_name!=""&&money!=""&&price!=""&&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_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){
                 if(data == 2){
                     alert('佣金不能大于售价');