From 41dfe5f87223178f7697548748b7ac8f4f9baaf0 Mon Sep 17 00:00:00 2001
From: xu <perelmen>
Date: Tue, 7 Jan 2020 19:51:58 +0800
Subject: [PATCH] app-wx(v0.1.0 build 21) 1. F 统一底部toolbar 的HTML来源

---
 app-wx/config/params.php                                            |  2 +-
 app-wx/modules/order/views/default/pages/cost-list-template.php     |  2 +-
 app-wx/modules/order/views/default/pages/index-template.php         |  2 +-
 app-wx/modules/order/views/default/pages/order-details-template.php |  2 +-
 app-wx/modules/order/views/default/pages/submit-template.php        |  2 +-
 app-wx/modules/order/views/default/pages/toolbar-template.php       | 22 ----------------------
 app-wx/modules/user/views/default/pages/about-template.php          |  2 +-
 app-wx/modules/user/views/default/pages/regulation-template.php     |  2 +-
 app-wx/modules/user/views/default/pages/toolbar-template.php        | 22 ----------------------
 app-wx/views/layouts/toolbar-template.php                           | 21 +++++++++++++++++++++
 10 files changed, 28 insertions(+), 51 deletions(-)
 delete mode 100644 app-wx/modules/order/views/default/pages/toolbar-template.php
 delete mode 100644 app-wx/modules/user/views/default/pages/toolbar-template.php
 create mode 100644 app-wx/views/layouts/toolbar-template.php

diff --git a/app-wx/config/params.php b/app-wx/config/params.php
index f27d114..a96756f 100644
--- a/app-wx/config/params.php
+++ b/app-wx/config/params.php
@@ -2,5 +2,5 @@
 return [
     'adminEmail'            => 'admin@example.com',
     'testLoginPhones'       => ['13900139001'],
-    'VERSION'               => 'v0.1.0 build 20', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数
+    'VERSION'               => 'v0.1.0 build 21', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数
 ];
diff --git a/app-wx/modules/order/views/default/pages/cost-list-template.php b/app-wx/modules/order/views/default/pages/cost-list-template.php
index 2e749ac..7814ce5 100644
--- a/app-wx/modules/order/views/default/pages/cost-list-template.php
+++ b/app-wx/modules/order/views/default/pages/cost-list-template.php
@@ -99,7 +99,7 @@ $baseUrl = Url::base(true);
                 </div>
                 <div class="btn-submit"> 提交 </div>
             </div>
-            <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'order'])?>
+            <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'order'])?>
         </div>
     </div>
 </script>
diff --git a/app-wx/modules/order/views/default/pages/index-template.php b/app-wx/modules/order/views/default/pages/index-template.php
index e56d4ba..3d3eabd 100644
--- a/app-wx/modules/order/views/default/pages/index-template.php
+++ b/app-wx/modules/order/views/default/pages/index-template.php
@@ -55,7 +55,7 @@ $baseUrl = Url::base(true);
                 <div class="order-list" id="index-order-list-box"></div>
             </div>
             <div class="add-btn-cls"><img style="width:4rem;" src="<?=$baseUrl?>/i/order/order_enter.png" /></div>
-            <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'order'])?>
+            <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'order'])?>
         </div>
     </div>
 </script>
diff --git a/app-wx/modules/order/views/default/pages/order-details-template.php b/app-wx/modules/order/views/default/pages/order-details-template.php
index 70853df..875fc4b 100644
--- a/app-wx/modules/order/views/default/pages/order-details-template.php
+++ b/app-wx/modules/order/views/default/pages/order-details-template.php
@@ -207,7 +207,7 @@ $baseUrl = Url::base(true);
                     </div>
                 {{/js_compare}}
             </div>
-            <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'order'])?>
+            <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'order'])?>
         </div>
     </div>
 </script>
diff --git a/app-wx/modules/order/views/default/pages/submit-template.php b/app-wx/modules/order/views/default/pages/submit-template.php
index c0a34f9..dfe20a5 100644
--- a/app-wx/modules/order/views/default/pages/submit-template.php
+++ b/app-wx/modules/order/views/default/pages/submit-template.php
@@ -144,7 +144,7 @@ $baseUrl = Url::base(true);
                      <div class="submit-btn-cls">提交</div>
                 </div>
             </div>
-            <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'order'])?>
+            <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'order'])?>
         </div>
     </div>
 </script>
diff --git a/app-wx/modules/order/views/default/pages/toolbar-template.php b/app-wx/modules/order/views/default/pages/toolbar-template.php
deleted file mode 100644
index ed6c4da..0000000
--- a/app-wx/modules/order/views/default/pages/toolbar-template.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-use yii\helpers\Url;
-
-$baseUrl = Url::base(true);
-?>
-<style>
-    .mytoolbar {background:#fff;}
-    .mytoolbar .toolbar-inner{background:#fff;}
-    .mytoolbar span.tabbar-label{font-size: 1rem;}
-    .mytoolbar a.active{color:#FF8728}
-
-    .mytoolbar, .mytoolbar a{color:#7C7A7A}
-</style>
-<div class="toolbar tabbar mytoolbar">
-    <div class="toolbar-inner">
-        <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#about')" class="tab-link <?php if('about' == $active){echo "active";}?>">  <span class="tabbar-label">关于我们</span></a>
-        <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#regulation')" class="tab-link <?php if('regulation' == $active){echo "active";}?>"><span class="tabbar-label">维修流程标准</span></a>
-        <a href="javascript:window.location.href = '<?=$baseUrl?>/order/#index'" class="tab-link <?php if('order' == $active){echo "active";}?>">  <span class="tabbar-label">维修管理</span></a>
-
-    </div>
-</div>
diff --git a/app-wx/modules/user/views/default/pages/about-template.php b/app-wx/modules/user/views/default/pages/about-template.php
index 64aecca..a3b9efd 100644
--- a/app-wx/modules/user/views/default/pages/about-template.php
+++ b/app-wx/modules/user/views/default/pages/about-template.php
@@ -25,7 +25,7 @@ $baseUrl = Url::base(true);
                     </div>
                 </div>
             </div>
-            <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'about'])?>
+            <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'about'])?>
         </div>
     </div>
 </script>
diff --git a/app-wx/modules/user/views/default/pages/regulation-template.php b/app-wx/modules/user/views/default/pages/regulation-template.php
index 9fe466b..e66095f 100644
--- a/app-wx/modules/user/views/default/pages/regulation-template.php
+++ b/app-wx/modules/user/views/default/pages/regulation-template.php
@@ -16,7 +16,7 @@ $baseUrl = Url::base(true);
             <div class="page-content" id="regulation_content">
 
             </div>
-            <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'regulation'])?>
+            <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'regulation'])?>
         </div>
     </div>
 </script>
diff --git a/app-wx/modules/user/views/default/pages/toolbar-template.php b/app-wx/modules/user/views/default/pages/toolbar-template.php
deleted file mode 100644
index ed6c4da..0000000
--- a/app-wx/modules/user/views/default/pages/toolbar-template.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-use yii\helpers\Url;
-
-$baseUrl = Url::base(true);
-?>
-<style>
-    .mytoolbar {background:#fff;}
-    .mytoolbar .toolbar-inner{background:#fff;}
-    .mytoolbar span.tabbar-label{font-size: 1rem;}
-    .mytoolbar a.active{color:#FF8728}
-
-    .mytoolbar, .mytoolbar a{color:#7C7A7A}
-</style>
-<div class="toolbar tabbar mytoolbar">
-    <div class="toolbar-inner">
-        <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#about')" class="tab-link <?php if('about' == $active){echo "active";}?>">  <span class="tabbar-label">关于我们</span></a>
-        <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#regulation')" class="tab-link <?php if('regulation' == $active){echo "active";}?>"><span class="tabbar-label">维修流程标准</span></a>
-        <a href="javascript:window.location.href = '<?=$baseUrl?>/order/#index'" class="tab-link <?php if('order' == $active){echo "active";}?>">  <span class="tabbar-label">维修管理</span></a>
-
-    </div>
-</div>
diff --git a/app-wx/views/layouts/toolbar-template.php b/app-wx/views/layouts/toolbar-template.php
new file mode 100644
index 0000000..77d845e
--- /dev/null
+++ b/app-wx/views/layouts/toolbar-template.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Url;
+
+$baseUrl = Url::base(true);
+?>
+<style>
+    .mytoolbar {background:#fff;}
+    .mytoolbar .toolbar-inner{background:#fff;}
+    .mytoolbar span.tabbar-label{font-size: 1rem;}
+    .mytoolbar a.active{color:#FF8728}
+
+    .mytoolbar, .mytoolbar a{color:#7C7A7A}
+</style>
+<div class="toolbar tabbar mytoolbar">
+    <div class="toolbar-inner">
+        <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#about')" class="tab-link <?php if('about' == $active){echo "active";}?>">  <span class="tabbar-label">关于我们</span></a>
+        <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#regulation')" class="tab-link <?php if('regulation' == $active){echo "active";}?>"><span class="tabbar-label">维修流程标准</span></a>
+        <a href="javascript:window.location.replace('<?=$baseUrl?>/order/#index')" class="tab-link <?php if('order' == $active){echo "active";}?>">  <span class="tabbar-label">维修管理</span></a>
+    </div>
+</div>
--
libgit2 0.21.0