Merge branch 'refill_queue' of 39.97.239.116:gyfl/xyzshop into refill_queue

admin/templates/default/merchant.add.php

@@ -7,7 +7,7 @@
             <ul class="tab-base">
                 <li><a href="index.php?act=merchant&op=merchant"><span><?php echo $lang['nc_manage'] ?></span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span><?php echo $lang['nc_new'] ?></span></a></li>
-                <li><a href="index.php?act=merchant&op=orderStorge"><span>机构单量设置</span></a></li>
+                <li><a href="index.php?act=merchant&op=orderStorge"><span>机构库存锁定</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/merchant.edit.php

@@ -7,7 +7,7 @@
             <ul class="tab-base">
                 <li><a href="index.php?act=merchant&op=merchant"><span><?php echo $lang['nc_manage'] ?></span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span><?php echo $lang['nc_update'] ?></span></a></li>
-                <li><a href="index.php?act=merchant&op=orderStorge"><span>机构单量设置</span></a></li>
+                <li><a href="index.php?act=merchant&op=orderStorge"><span>机构库存锁定</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/merchant.index.php

@@ -7,7 +7,7 @@
             <ul class="tab-base">
                 <li><a href="JavaScript:void(0);" class="current"><span><?php echo $lang['nc_manage'] ?></span></a></li>
                 <li><a href="index.php?act=merchant&op=merchant_add"><span><?php echo $lang['nc_new'] ?></span></a></li>
-                <li><a href="index.php?act=merchant&op=orderStorge"><span>机构单量设置</span></a></li>
+                <li><a href="index.php?act=merchant&op=orderStorge"><span>机构库存锁定</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/merchant.orderlimit.php

@@ -82,7 +82,7 @@
             <ul class="tab-base">
                 <li><a href="index.php?act=merchant&op=merchant"><span><?php echo $lang['nc_manage'] ?></span></a></li>
                 <li><a href="index.php?act=merchant&op=merchant_add"><span><?php echo $lang['nc_new'] ?></span></a></li>
-                <li><a href="JavaScript:void(0);"  class="current"><span>机构单量设置</span></a></li>
+                <li><a href="JavaScript:void(0);"  class="current"><span>机构库存锁定</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/merchant.price.php

@@ -82,7 +82,7 @@
             <ul class="tab-base">
                 <li><a href="index.php?act=merchant&op=merchant"><span><?php echo $lang['nc_manage'] ?></span></a></li>
                 <li><a href="index.php?act=merchant&op=merchant_add"><span><?php echo $lang['nc_new'] ?></span></a></li>
-                <li><a href="index.php?act=merchant&op=orderStorge"><span>机构单量设置</span></a></li>
+                <li><a href="index.php?act=merchant&op=orderStorge"><span>机构库存锁定</span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span>费率设置</span></a></li>
             </ul>
         </div>