Merge branch 'master' of hyq/kmall-pt into master

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

@@ -107,8 +107,10 @@
                 #if($shiro.hasPermission("goods:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
+                #if($shiro.hasPermission("goods:unSaleBatch"))
                 <i-button type="primary" @click="enSale"><i class="fa fa-hand-o-up"></i>&nbsp;上架</i-button>
                 <i-button type="dashed" @click="unSale"><i class="fa fa-hand-o-down"></i>&nbsp;下架</i-button>
+                #end
                 <!--<i-button type="info" @click="goodsExport"><i class="fa fa-plus"></i>&nbsp;商品导入</i-button>-->
                 <!--<i-button type="info" @click="sameGoodsExport"><i class="fa fa-plus"></i>&nbsp;普货商品导入</i-button>-->
 
@@ -130,9 +132,11 @@
                     </Upload>
                 </i-col>
                 #end
+                #if($shiro.hasPermission("goods:down"))
                 &nbsp;&nbsp;&nbsp;&nbsp;
                 <a href="../statics/file/goods_export_yyyy_mm_dd_v1.0.0.xls">商品模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
                 <a href="../statics/file/general_goods_export_yyyy_mm_dd_v1.0.0.xls">普货商品模板下载</a>
+                #end
             </div>
         </Row>
         <table id="jqGrid"></table>

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

@@ -55,7 +55,9 @@
                 #if($shiro.hasPermission("order:confirm"))
                 <i-button type="error" @click="confirm">确认收货</i-button>
                 #end
+                #if($shiro.hasPermission("shop:comment"))
                 <i-button type="info" @click="openComment">评价</i-button>
+                #end
             </div>
         </Row>
         <table id="jqGrid"></table>

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

@@ -27,9 +27,15 @@
                 #if($shiro.hasPermission("user:export"))
                 <i-button type="info" @click="exportUser"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>
                 #end
+                #if($shiro.hasPermission("shop:usercoupon"))
                 <i-button type="primary" @click="coupon"><i class="fa fa-cc-visa"></i>&nbsp;优惠券</i-button>
+                #end
+                #if($shiro.hasPermission("shop:cart"))
                 <i-button type="primary" @click="shopCart"><i class="fa fa-shopping-cart"></i>&nbsp;购物车</i-button>
+                #end
+                #if($shiro.hasPermission("shop:address"))
                 <i-button type="primary" @click="address"><i class="fa fa-map"></i>&nbsp;收货地址</i-button>
+                #end
             </div>
         </Row>
         <table id="jqGrid"></table>

kmall-admin/src/main/webapp/js/shop/order.js

@@ -148,10 +148,12 @@ $(function () {
                 formatter: function (value, col, row) {
                     let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
                     //订单状态： 0订单创建成功等待付款，　101订单已取消，　102订单已删除，201订单已付款，等待发货，300订单已发货， 301用户确认收货，401 没有发货，退款　402 已收货，退款退货
-                    if (hasPermission('order:refund')) {
+                    if(hasPermission('order:printMsg')){
                         if (row.orderStatus == 300 && (row.orderBizType == '10' || row.orderBizType == '02')) {
                             htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.printDetail(' + row.id + ')"><i class="fa fa-print"></i>打印</button>&nbsp;';
                         }
+                    }
+                    if (hasPermission('order:refund')) {
                         if (row.orderStatus == 0) {
                             htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.cancelUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;取消</button>&nbsp;';
                         }

kmall-admin/src/main/webapp/js/shop/orderrefund.js

@@ -65,8 +65,12 @@ $(function () {
                     let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
                     if (hasPermission('order:refund')) {
                         if (row.refundStatus == 1) {
-                            htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.refundUpdate(' + row.orderId + ', ' + row.id + ')"><i class="fa fa-check-circle"></i>&nbsp;退款</button>&nbsp;' +
-                                '<button class="btn btn-outline btn-danger" onclick="vm.approval(' + row.id + ')"><i class="fa fa-times-circle-o"></i>审核</button>&nbsp;';
+                            if (hasPermission('order:refund')) {
+                                htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.refundUpdate(' + row.orderId + ', ' + row.id + ')"><i class="fa fa-check-circle"></i>&nbsp;退款</button>&nbsp;';
+                            }
+                            if(hasPermission('orderrefund:info')){
+                                htmlStr +='<button class="btn btn-outline btn-danger" onclick="vm.approval(' + row.id + ')"><i class="fa fa-times-circle-o"></i>审核</button>&nbsp;';
+                            }
                         }
                     }
                     return htmlStr;