OTHER_COMPANY_PROJECTS / gk_auto

Download as
Browse Code »

Commit 955204e87e981d7ae23182d9607c0482443bbbb6

Authored by xu
1 parent da06162f
Exists in master

app-ht(v0.0.1 build 4) 

1. A增加维修厂地址
2. A 删除多余的icon
Showing 6 changed files with 11 additions and 6 deletions   Show diff stats
app-ht/config/params.php
  Diff comments   View file @955204e
1 <?php 1 <?php
2 return [ 2 return [
3 - 'VERSION' => 'v0.0.1 build 3', 3 + 'VERSION' => 'v0.0.1 build 4',
4 ]; 4 ];
5 \ No newline at end of file 5 \ No newline at end of file
app-ht/modules/maintainer/controllers/UserController.php
  Diff comments   View file @955204e
@@ -120,6 +120,7 @@ class UserController extends BaseController @@ -120,6 +120,7 @@ class UserController extends BaseController
120 'username' => $userModel->user_name, 120 'username' => $userModel->user_name,
121 'name' => $userModel->name, 121 'name' => $userModel->name,
122 'status' => $userModel->status, 122 'status' => $userModel->status,
  123 + 'address' => $userProfile->address,
123 'status_label' => User::getStatusLabels($userModel->status), 124 'status_label' => User::getStatusLabels($userModel->status),
124 'emergencyContact' => $userProfile->emergency_contact, 125 'emergencyContact' => $userProfile->emergency_contact,
125 'emergencyPerson' => $userProfile->emergency_person, 126 'emergencyPerson' => $userProfile->emergency_person,
app-ht/modules/maintainer/views/user/info.php
  Diff comments   View file @955204e
@@ -50,10 +50,14 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -50,10 +50,14 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
50 </tr> 50 </tr>
51 <tr> 51 <tr>
52 <th>紧急联系人</th> 52 <th>紧急联系人</th>
53 - <td><?=$user['emergencyContact']; ?></td> 53 + <td><?=$user['emergencyPerson']; ?></td>
54 54
55 <th>紧急联系电话</th> 55 <th>紧急联系电话</th>
56 - <td><?=$user['emergencyPerson']; ?></td> 56 + <td><?=$user['emergencyContact']; ?></td>
  57 + </tr>
  58 + <tr>
  59 + <th>维修厂地址</th>
  60 + <td colspan="3"><?=$user['address']; ?></td>
57 </tr> 61 </tr>
58 <tr> 62 <tr>
59 <th>营业执照</th> 63 <th>营业执照</th>
app-ht/views/layouts/iframe.php
  Diff comments   View file @955204e
@@ -22,7 +22,7 @@ function isShowContentHeader(View $view) @@ -22,7 +22,7 @@ function isShowContentHeader(View $view)
22 <!DOCTYPE html> 22 <!DOCTYPE html>
23 <html lang="<?= Yii::$app->language ?>"> 23 <html lang="<?= Yii::$app->language ?>">
24 <head> 24 <head>
25 - <link rel="shortcut icon" href="<?=$baseUrl?>/favicon.ico" /> 25 +
26 <meta charset="<?= Yii::$app->charset ?>"> 26 <meta charset="<?= Yii::$app->charset ?>">
27 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 27 <meta http-equiv="X-UA-Compatible" content="IE=edge">
28 <meta name="viewport" content="width=device-width, initial-scale=1"> 28 <meta name="viewport" content="width=device-width, initial-scale=1">
app-ht/views/layouts/login.php
  Diff comments   View file @955204e
@@ -13,7 +13,7 @@ AppAsset::register($this); @@ -13,7 +13,7 @@ AppAsset::register($this);
13 <!DOCTYPE html> 13 <!DOCTYPE html>
14 <html lang="<?= Yii::$app->language ?>"> 14 <html lang="<?= Yii::$app->language ?>">
15 <head> 15 <head>
16 - <link rel="shortcut icon" href="<?=Yii::$app->request->baseUrl?>/favicon.ico" /> 16 +
17 <meta charset="<?= Yii::$app->charset ?>"> 17 <meta charset="<?= Yii::$app->charset ?>">
18 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 18 <meta http-equiv="X-UA-Compatible" content="IE=edge">
19 <meta name="viewport" content="width=device-width, initial-scale=1"> 19 <meta name="viewport" content="width=device-width, initial-scale=1">
app-ht/views/layouts/main.php
  Diff comments   View file @955204e
@@ -13,7 +13,7 @@ $appendTimestamp = Yii::$app-&gt;assetManager-&gt;appendTimestamp; @@ -13,7 +13,7 @@ $appendTimestamp = Yii::$app-&gt;assetManager-&gt;appendTimestamp;
13 <!DOCTYPE html> 13 <!DOCTYPE html>
14 <html lang="<?= Yii::$app->language ?>"> 14 <html lang="<?= Yii::$app->language ?>">
15 <head> 15 <head>
16 - <link rel="shortcut icon" href="<?=$baseUrl?>/favicon.ico" /> 16 +
17 <meta charset="<?= Yii::$app->charset ?>"> 17 <meta charset="<?= Yii::$app->charset ?>">
18 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 18 <meta http-equiv="X-UA-Compatible" content="IE=edge">
19 <meta http-equiv="Expires" content="0"> 19 <meta http-equiv="Expires" content="0">