1

app/admin/view/store/store_product/index.php

@@ -107,7 +107,7 @@
                     </script>
                     <!--操作-->
                     <script type="text/html" id="act">
-                        {{# if(d.mer_id <= 0){ }} <!-- 如果mer_id小于等于0则显示 -->
+                        {{# if(d.mer_id <= 0 || ($mer_id > 0 && (d.mer_id == $mer_id))){ }} <!-- 如果mer_id小于等于0或者当前管理员有权限编辑该商品则显示 -->
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='edit'>
                             编辑
                         </button>
@@ -259,7 +259,7 @@
         }
     });
 
-    // 上下加商品
+    // 上下架商品
     layList.switch('is_show', function (odj, value) {
         if (odj.elem.checked == true) {
             layList.baseGet(layList.Url({c: 'store.store_product', a: 'set_show', p: {is_show: 1, id: value}}), function (res) {
@@ -281,8 +281,11 @@
         switch (event) {
             case 'delstor':
                 var url = layList.U({c: 'store.store_product', a: 'delete', q: {id: data.id}});
-                if (data.is_del) var code = {title: "操作提示", text: "确定恢复商品操作吗？", type: 'info', confirm: '是的，恢复该商品'};
-                else var code = {title: "操作提示", text: "确定将该商品移入回收站吗？", type: 'info', confirm: '是的，移入回收站'};
+                if (data.is_del) {
+                    var code = {title: "操作提示", text: "确定恢复商品操作吗？", type: 'info', confirm: '是的，恢复该商品'};
+                } else {
+                    var code = {title: "操作提示", text: "确定将该商品移入回收站吗？", type: 'info', confirm: '是的，移入回收站'};
+                }
                 $eb.$swal('delete', function () {
                     $eb.axios.get(url).then(function (res) {
                         if (res.status == 200 && res.data.code == 200) {
@@ -301,14 +304,18 @@
                 $eb.openImage(data.image);
                 break;
             case 'edit':
-                if (mer_id <= 0) { // 在前端也进行判断
+                if (mer_id <= 0 || (mer_id > 0 && data.mer_id == mer_id)) { // 在前端也进行判断
                     location.href = layList.U({a: 'create', q: {id: data.id}});
                 } else {
                     layList.msg('您没有权限编辑此商品');
                 }
                 break;
             case 'attr':
-                $eb.createModalFrame(data.store_name + '-属性', layList.U({a: 'attr', q: {id: data.id}}), {h: 600, w: 800});
+                if (mer_id <= 0 || (mer_id > 0 && data.mer_id == mer_id)) { // 在前端也进行判断
+                    $eb.createModalFrame(data.store_name + '-属性', layList.U({a: 'attr', q: {id: data.id}}), {h: 600, w: 800});
+                } else {
+                    layList.msg('您没有权限修改此商品的属性');
+                }
                 break;
         }
     });