From 16e02f643f8dd40fe4b24e1b9f976cb4a1d0307f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E6=9C=A8?= Date: Tue, 21 May 2019 14:07:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E5=A4=9A?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88=E6=97=B6=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=BC=95=E5=8F=91=E5=8D=95=E5=87=BB=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=9B=BE=E7=89=87=E7=B4=A2=E5=BC=95=E6=9D=A5?= =?UTF-8?q?=E5=86=B3=E5=AE=9A=E5=88=9D=E5=A7=8B=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/js/require-table.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index e259ec324..ecd310af6 100644 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -409,6 +409,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table }); Layer.photos({ photos: { + "start":$(this).index(".img-center"), "data": data }, anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数） -- Gitee From 842cfbedebcdb34b0ba53d68e505ae1f8e5dc152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E6=9C=A8?= Date: Wed, 22 May 2019 14:08:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?JS=E6=A8=A1=E5=9D=97=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=A9=BA=E6=93=8D=E4=BD=9C=E9=87=8D=E5=AE=9A=E5=90=91=E5=88=B0?= =?UTF-8?q?=5Fempty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/js/require-backend.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/public/assets/js/require-backend.js b/public/assets/js/require-backend.js index 03aaa73fc..760b77e6b 100644 --- a/public/assets/js/require-backend.js +++ b/public/assets/js/require-backend.js @@ -146,7 +146,13 @@ require(['jquery', 'bootstrap'], function ($, undefined) { //加载相应模块 if (Config.jsname) { require([Config.jsname], function (Controller) { - Controller[Config.actionname] != undefined && Controller[Config.actionname](); + if (Controller.hasOwnProperty(Config.actionname)) { + Controller[Config.actionname](); + } else { + if (Controller.hasOwnProperty("_empty")) { + Controller._empty(); + } + } }, function (e) { console.error(e); // 这里可捕获模块加载的错误 -- Gitee