Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/webapp/WEB-INF/page/sale/sale.html

@@ -239,7 +239,6 @@
                         <i-button data-toggle="modal" @click="toResumePending" class="goods-button" ><i class="fa fa-pencil-square-o"></i>&nbsp;恢复挂起</i-button>
                         <i-button data-toggle="modal" @click="calculateOrderPrice" type="primary" class="goods-button" ><i class="fa fa-pencil-square-o"></i>&nbsp;计算优惠后价格</i-button>
                         <i-button data-toggle="modal" @click="toOrderSubmit" type="primary" class="goods-button" ><i class="fa fa-pencil-square-o"></i>&nbsp;提交订单</i-button>
-                        <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="demo" id="demo" data-dismiss="modal">测试打印小票</button>
 
 <!--                        45636914-->
                         <div class="modal fade" id="pendignOrderModal"  role="dialog" aria-labelledby="pendignOrderLabel" aria-hidden="true">