OTHER_COMPANY_PROJECTS / gk_auto

Download as
Browse Code »

Commit 41dfe5f87223178f7697548748b7ac8f4f9baaf0

Authored by xu
1 parent 986c4074
Exists in master

app-wx(v0.1.0 build 21) 

1. F 统一底部toolbar 的HTML来源
Showing 10 changed files with 28 additions and 51 deletions   Show diff stats
app-wx/config/params.php
  Diff comments   View file @41dfe5f
@@ -2,5 +2,5 @@ @@ -2,5 +2,5 @@
2 return [ 2 return [
3 'adminEmail' => 'admin@example.com', 3 'adminEmail' => 'admin@example.com',
4 'testLoginPhones' => ['13900139001'], 4 'testLoginPhones' => ['13900139001'],
5 - 'VERSION' => 'v0.1.0 build 20', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数 5 + 'VERSION' => 'v0.1.0 build 21', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数
6 ]; 6 ];
app-wx/modules/order/views/default/pages/cost-list-template.php
  Diff comments   View file @41dfe5f
@@ -99,7 +99,7 @@ $baseUrl = Url::base(true); @@ -99,7 +99,7 @@ $baseUrl = Url::base(true);
99 </div> 99 </div>
100 <div class="btn-submit"> 提交 </div> 100 <div class="btn-submit"> 提交 </div>
101 </div> 101 </div>
102 - <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'order'])?> 102 + <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'order'])?>
103 </div> 103 </div>
104 </div> 104 </div>
105 </script> 105 </script>
app-wx/modules/order/views/default/pages/index-template.php
  Diff comments   View file @41dfe5f
@@ -55,7 +55,7 @@ $baseUrl = Url::base(true); @@ -55,7 +55,7 @@ $baseUrl = Url::base(true);
55 <div class="order-list" id="index-order-list-box"></div> 55 <div class="order-list" id="index-order-list-box"></div>
56 </div> 56 </div>
57 <div class="add-btn-cls"><img style="width:4rem;" src="<?=$baseUrl?>/i/order/order_enter.png" /></div> 57 <div class="add-btn-cls"><img style="width:4rem;" src="<?=$baseUrl?>/i/order/order_enter.png" /></div>
58 - <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'order'])?> 58 + <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'order'])?>
59 </div> 59 </div>
60 </div> 60 </div>
61 </script> 61 </script>
app-wx/modules/order/views/default/pages/order-details-template.php
  Diff comments   View file @41dfe5f
@@ -207,7 +207,7 @@ $baseUrl = Url::base(true); @@ -207,7 +207,7 @@ $baseUrl = Url::base(true);
207 </div> 207 </div>
208 {{/js_compare}} 208 {{/js_compare}}
209 </div> 209 </div>
210 - <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'order'])?> 210 + <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'order'])?>
211 </div> 211 </div>
212 </div> 212 </div>
213 </script> 213 </script>
app-wx/modules/order/views/default/pages/submit-template.php
  Diff comments   View file @41dfe5f
@@ -144,7 +144,7 @@ $baseUrl = Url::base(true); @@ -144,7 +144,7 @@ $baseUrl = Url::base(true);
144 <div class="submit-btn-cls">提交</div> 144 <div class="submit-btn-cls">提交</div>
145 </div> 145 </div>
146 </div> 146 </div>
147 - <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'order'])?> 147 + <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'order'])?>
148 </div> 148 </div>
149 </div> 149 </div>
150 </script> 150 </script>
app-wx/modules/order/views/default/pages/toolbar-template.php
View file @986c407
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1 -<?php  
2 -  
3 -use yii\helpers\Url;  
4 -  
5 -$baseUrl = Url::base(true);  
6 -?>  
7 -<style>  
8 - .mytoolbar {background:#fff;}  
9 - .mytoolbar .toolbar-inner{background:#fff;}  
10 - .mytoolbar span.tabbar-label{font-size: 1rem;}  
11 - .mytoolbar a.active{color:#FF8728}  
12 -  
13 - .mytoolbar, .mytoolbar a{color:#7C7A7A}  
14 -</style>  
15 -<div class="toolbar tabbar mytoolbar">  
16 - <div class="toolbar-inner">  
17 - <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#about')" class="tab-link <?php if('about' == $active){echo "active";}?>"> <span class="tabbar-label">关于我们</span></a>  
18 - <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#regulation')" class="tab-link <?php if('regulation' == $active){echo "active";}?>"><span class="tabbar-label">维修流程标准</span></a>  
19 - <a href="javascript:window.location.href = '<?=$baseUrl?>/order/#index'" class="tab-link <?php if('order' == $active){echo "active";}?>"> <span class="tabbar-label">维修管理</span></a>  
20 -  
21 - </div>  
22 -</div>  
app-wx/modules/user/views/default/pages/about-template.php
  Diff comments   View file @41dfe5f
@@ -25,7 +25,7 @@ $baseUrl = Url::base(true); @@ -25,7 +25,7 @@ $baseUrl = Url::base(true);
25 </div> 25 </div>
26 </div> 26 </div>
27 </div> 27 </div>
28 - <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'about'])?> 28 + <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'about'])?>
29 </div> 29 </div>
30 </div> 30 </div>
31 </script> 31 </script>
app-wx/modules/user/views/default/pages/regulation-template.php
  Diff comments   View file @41dfe5f
@@ -16,7 +16,7 @@ $baseUrl = Url::base(true); @@ -16,7 +16,7 @@ $baseUrl = Url::base(true);
16 <div class="page-content" id="regulation_content"> 16 <div class="page-content" id="regulation_content">
17 17
18 </div> 18 </div>
19 - <?=$this->render('toolbar-template', ['asset' => $asset, 'active' => 'regulation'])?> 19 + <?=$this->render("@app/views/layouts/toolbar-template", ['asset' => $asset, 'active' => 'regulation'])?>
20 </div> 20 </div>
21 </div> 21 </div>
22 </script> 22 </script>
app-wx/modules/user/views/default/pages/toolbar-template.php
View file @986c407
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1 -<?php  
2 -  
3 -use yii\helpers\Url;  
4 -  
5 -$baseUrl = Url::base(true);  
6 -?>  
7 -<style>  
8 - .mytoolbar {background:#fff;}  
9 - .mytoolbar .toolbar-inner{background:#fff;}  
10 - .mytoolbar span.tabbar-label{font-size: 1rem;}  
11 - .mytoolbar a.active{color:#FF8728}  
12 -  
13 - .mytoolbar, .mytoolbar a{color:#7C7A7A}  
14 -</style>  
15 -<div class="toolbar tabbar mytoolbar">  
16 - <div class="toolbar-inner">  
17 - <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#about')" class="tab-link <?php if('about' == $active){echo "active";}?>"> <span class="tabbar-label">关于我们</span></a>  
18 - <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#regulation')" class="tab-link <?php if('regulation' == $active){echo "active";}?>"><span class="tabbar-label">维修流程标准</span></a>  
19 - <a href="javascript:window.location.href = '<?=$baseUrl?>/order/#index'" class="tab-link <?php if('order' == $active){echo "active";}?>"> <span class="tabbar-label">维修管理</span></a>  
20 -  
21 - </div>  
22 -</div>  
app-wx/views/layouts/toolbar-template.php 0 → 100644
  Diff comments   View file @41dfe5f
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
  1 +<?php
  2 +
  3 +use yii\helpers\Url;
  4 +
  5 +$baseUrl = Url::base(true);
  6 +?>
  7 +<style>
  8 + .mytoolbar {background:#fff;}
  9 + .mytoolbar .toolbar-inner{background:#fff;}
  10 + .mytoolbar span.tabbar-label{font-size: 1rem;}
  11 + .mytoolbar a.active{color:#FF8728}
  12 +
  13 + .mytoolbar, .mytoolbar a{color:#7C7A7A}
  14 +</style>
  15 +<div class="toolbar tabbar mytoolbar">
  16 + <div class="toolbar-inner">
  17 + <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#about')" class="tab-link <?php if('about' == $active){echo "active";}?>"> <span class="tabbar-label">关于我们</span></a>
  18 + <a href="javascript:window.location.replace('<?=$baseUrl?>/user/#regulation')" class="tab-link <?php if('regulation' == $active){echo "active";}?>"><span class="tabbar-label">维修流程标准</span></a>
  19 + <a href="javascript:window.location.replace('<?=$baseUrl?>/order/#index')" class="tab-link <?php if('order' == $active){echo "active";}?>"> <span class="tabbar-label">维修管理</span></a>
  20 + </div>
  21 +</div>