From 278c2507e27ddaa50cc63f9a663966e319ce7709 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Thu, 7 Nov 2019 02:05:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/menu/edit.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/views/menu/edit.php b/frontend/views/menu/edit.php index a91852e..837769f 100644 --- a/frontend/views/menu/edit.php +++ b/frontend/views/menu/edit.php @@ -13,12 +13,12 @@ use \common\libs\MyLib;
- -
+ +
- -
+ +
- -
+ +
- -
+ +
From f75e27ce79360ed68267f8c9224e633a843b3ce9 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Thu, 7 Nov 2019 02:12:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/common/index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/views/common/index.php b/frontend/views/common/index.php index 9eb75d2..554469c 100644 --- a/frontend/views/common/index.php +++ b/frontend/views/common/index.php @@ -91,6 +91,9 @@
退出 + + +
From 7cbd42849d483458be48a25d31ea3962963e3d0a Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Thu, 7 Nov 2019 02:14:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/common/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/views/common/index.php b/frontend/views/common/index.php index 554469c..a4a9689 100644 --- a/frontend/views/common/index.php +++ b/frontend/views/common/index.php @@ -91,7 +91,7 @@
退出 - +
From 654a12904803c81b67cc1f582b0f9a69296d7c15 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Thu, 7 Nov 2019 02:17:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=88=86=E9=85=8D=E5=85=B3=E8=81=94=E5=8B=BE=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/permissions/permission.php | 123 +++++++++++++--------- 1 file changed, 72 insertions(+), 51 deletions(-) diff --git a/frontend/views/permissions/permission.php b/frontend/views/permissions/permission.php index b770c87..26400ce 100644 --- a/frontend/views/permissions/permission.php +++ b/frontend/views/permissions/permission.php @@ -2,71 +2,92 @@ use \common\libs\MyLib; ?> beginBlock('header_css'); ?> - + endBlock(); ?> -
-
-
-
- - - -
-
-
-
-
- -
-
-
-
- menus as $sub_item) { ?> +
+
+
+
+ + + +
+
+
-
+
- +
+
+ menus as $sub_item) { ?> +
+
+ +
+
+ +
-
- - -
-
-
- + + +
+
+
+ +
-
beginBlock('footer_js'); ?> - - - - + + + -endBlock(); ?> + +endBlock(); ?> \ No newline at end of file From 4159096e644d96f31b53e44b77e0fdc55387af5b Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Thu, 7 Nov 2019 02:18:27 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=85=8D?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/permissions/permission.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/views/permissions/permission.php b/frontend/views/permissions/permission.php index 26400ce..fba3055 100644 --- a/frontend/views/permissions/permission.php +++ b/frontend/views/permissions/permission.php @@ -12,11 +12,11 @@ use \common\libs\MyLib;
-
+
-
+
@@ -26,7 +26,7 @@ use \common\libs\MyLib;
menus as $sub_item) { ?>
-
+
@@ -40,7 +40,7 @@ use \common\libs\MyLib;
-
+
From dc3d11e3525b238530b5a4f26307390bfc786261 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Thu, 7 Nov 2019 02:21:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E6=8B=A8=E5=8F=B7=E8=84=9A=E6=9C=AC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/CommonController.php | 5 ++++- frontend/views/common/call-phone.php | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/controllers/CommonController.php b/frontend/controllers/CommonController.php index 533e403..9f28501 100644 --- a/frontend/controllers/CommonController.php +++ b/frontend/controllers/CommonController.php @@ -385,6 +385,9 @@ class CommonController extends \yii\web\Controller } public function actionCallPhone() { - return $this->render('call-phone'); + $user_info = $this->my; + return $this->render('call-phone',[ + 'user_info' => $user_info + ]); } } diff --git a/frontend/views/common/call-phone.php b/frontend/views/common/call-phone.php index f5b9827..2c3bf1c 100644 --- a/frontend/views/common/call-phone.php +++ b/frontend/views/common/call-phone.php @@ -55,6 +55,7 @@ use \common\libs\MyLib; $(".btn-stop").click(function(){ sendMsg('ATH'); }); + wsInit(); })