From 72456b56c0128f96905b71deb12eaf535c887ae6 Mon Sep 17 00:00:00 2001 From: xurongyao Date: Mon, 10 Sep 2018 14:08:34 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/wap/controller/Wechat.php | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 application/wap/controller/Wechat.php diff --git a/application/wap/controller/Wechat.php b/application/wap/controller/Wechat.php old mode 100644 new mode 100755 index 81f25f59..e802cce8 --- a/application/wap/controller/Wechat.php +++ b/application/wap/controller/Wechat.php @@ -18,6 +18,7 @@ class Wechat */ public function serve() { + ob_clean(); WechatService::serve(); } From 6d4a4f48d9c2dd678486cdb58d05cb074a4e6ba5 Mon Sep 17 00:00:00 2001 From: xurongyao Date: Mon, 10 Sep 2018 14:14:52 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/routine/model/user/UserRecharge.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 application/routine/model/user/UserRecharge.php diff --git a/application/routine/model/user/UserRecharge.php b/application/routine/model/user/UserRecharge.php old mode 100644 new mode 100755 From 9e9d771c9b0524d4aee58dd154c641185389e884 Mon Sep 17 00:00:00 2001 From: xurongyao Date: Mon, 10 Sep 2018 14:16:19 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=97=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/routine/model/store/StoreOrder.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 application/routine/model/store/StoreOrder.php diff --git a/application/routine/model/store/StoreOrder.php b/application/routine/model/store/StoreOrder.php old mode 100644 new mode 100755 From a35e182836b68aa5df41b1aa27d77b9896b7aaa6 Mon Sep 17 00:00:00 2001 From: xurongyao Date: Mon, 10 Sep 2018 17:30:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?form-builder=20=E6=9B=B4=E6=96=B01.4.2=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9B=BE=E7=89=87=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=97=A0=E6=B3=95=E5=85=B3=E9=97=AD=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BC=B9=E7=AA=97=E5=8F=B3=E4=B8=8A=E8=A7=92=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/xaboy/form-builder/src/Form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/xaboy/form-builder/src/Form.php b/vendor/xaboy/form-builder/src/Form.php index 2fe17fe5..8fd35e81 100644 --- a/vendor/xaboy/form-builder/src/Form.php +++ b/vendor/xaboy/form-builder/src/Form.php @@ -87,7 +87,7 @@ class Form 'iview-css' => '', 'iview' => '', //form-create 版本 1.3.1 - 'form-create' => '', + 'form-create' => '', 'city-data' => '', 'city-area-data' => '' ]; From d5c715e33d6f5b037e7a9790b3df669bca9a0ae6 Mon Sep 17 00:00:00 2001 From: xurongyao Date: Mon, 10 Sep 2018 17:34:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/widget/icon.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/admin/view/widget/icon.php b/application/admin/view/widget/icon.php index adde45f3..02898c84 100644 --- a/application/admin/view/widget/icon.php +++ b/application/admin/view/widget/icon.php @@ -794,11 +794,11 @@ parent.$f.closeModal(); }); - //close - $('#close').on('click', function () { - parent.$f.closeModal(); - - }); +// //close +// $('#close').on('click', function () { +// parent.$f.closeModal(); +// +// }); //搜索图标 $("#search").on('input',function () { From d32d91a52a6ced2f911cc0d3193aa09fb85fd3de Mon Sep 17 00:00:00 2001 From: xurongyao Date: Mon, 10 Sep 2018 17:35:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/widget/images.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/admin/view/widget/images.php b/application/admin/view/widget/images.php index b2d25d48..1084e759 100644 --- a/application/admin/view/widget/images.php +++ b/application/admin/view/widget/images.php @@ -62,7 +62,7 @@
  • {$vo.name}
    • {/if} {volist name="$vo.child" id="voo" key="kk"} -
  • ┣{$voo.name}
    • +
  • -{$voo.name}
    • {/volist} {/volist} @@ -84,7 +84,7 @@
    - +
    {$page}
    From b9d9f3a7a536d7c28d1bb06b20664d1976252855 Mon Sep 17 00:00:00 2001 From: xurongyao Date: Mon, 10 Sep 2018 17:39:13 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/widget/icon.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/admin/view/widget/icon.php b/application/admin/view/widget/icon.php index 02898c84..d7c99377 100644 --- a/application/admin/view/widget/icon.php +++ b/application/admin/view/widget/icon.php @@ -24,7 +24,7 @@ } .form-control{ display: inline-block; - width: 75%; + width: 85%; } @@ -33,7 +33,7 @@
    - +
    v4.3.0新增图标